From 0df66b4ab6faf481b1a94dd2edef66eec8e1efde Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Mon, 14 Oct 2024 11:56:12 +0800
Subject: [PATCH] fix: conform-nvim option change

---
 README.md              | 21 +++++-------------
 config/lsp/conform.nix | 49 +++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index bff36b7..58b7a33 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,6 @@
-# Nixvim template
+# Nixvim
 
-This template gives you a good starting point for configuring nixvim standalone.
-
-## Configuring
-
-To start configuring, just add or modify the nix files in `./config`.
-If you add a new configuration file, remember to add it to the
-[`config/default.nix`](./config/default.nix) file
-
-## Testing your new configuration
-
-To test your configuration simply run the following command
-
-```
-nix run .
-```
+## TODO
+[ ] Open last active buffer after :bd
+[ ] Code action 
+[ ] DAP support
diff --git a/config/lsp/conform.nix b/config/lsp/conform.nix
index 4a459b6..c55e7e8 100644
--- a/config/lsp/conform.nix
+++ b/config/lsp/conform.nix
@@ -1,26 +1,35 @@
-{ helpers, pkgs, ... }: {
+{ helpers, pkgs, ... }:
+{
   plugins.conform-nvim = {
     enable = true;
-    formatAfterSave = ''
-      {
-        format_after_save = {
-          lsp_format = "fallback",
-        },
-      }
-    '';
-    formattersByFt = {
-      python = [ "black" ];
-      c = [ "clang-format" ];
-      cpp = [ "clang-format" ];
-      cmake = [ "cmake_format" ];
-      nix = [ "nixfmt" ];
-      # Standalone scalafmt is too slow, so we use it as a fallback
-      scala = helpers.mkRaw ''
-        { scalafmt, lsp_format = "prefer" }
+    settings = {
+      format_after_save = ''
+        function(bufnr)
+          if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+            return
+          end
+
+          if not slow_format_filetypes[vim.bo[bufnr].filetype] then
+            return
+          end
+
+          return { lsp_fallback = true }
+        end
       '';
-      toml = [ "taplo" ];
-      yaml = [ "yq" ];
-      json = [ "jq" ];
+      formatters_by_ft = {
+        python = [ "black" ];
+        c = [ "clang-format" ];
+        cpp = [ "clang-format" ];
+        cmake = [ "cmake_format" ];
+        nix = [ "nixfmt" ];
+        # Standalone scalafmt is too slow, so we use it as a fallback
+        scala = helpers.mkRaw ''
+          { scalafmt, lsp_format = "prefer" }
+        '';
+        toml = [ "taplo" ];
+        yaml = [ "yq" ];
+        json = [ "jq" ];
+      };
     };
   };