chore: enable lsp-format and improve rust-analyzer settings

BastianAsmussen · Jan 3, 2025 · c641eba · c641eba
1 parent 8938962
commit c641eba
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/modules/home-manager/terminal/nixvim/plugins/default.nix b/modules/home-manager/terminal/nixvim/plugins/default.nix
@@ -23,6 +23,7 @@
       gitsigns = import ./gitsigns.nix config;
       hardtime.enable = true;
       indent-blankline.enable = true;
+      lsp-format.enable = true;
       lspkind = import ./lspkind.nix;
       lualine = import ./lualine.nix;
       luasnip = import ./luasnip.nix pkgs;

diff --git a/modules/home-manager/terminal/nixvim/plugins/rustaceanvim.nix b/modules/home-manager/terminal/nixvim/plugins/rustaceanvim.nix
@@ -2,32 +2,35 @@ pkgs: {
   enable = true;
 
   settings = {
-    server.default_settings.rust-analyzer = {
-      check.command = "clippy";
-      assist = {
-        emitMustUse = true;
-        expressionFillDefault = "default";
-      };
+    server = {
+      load_vscode_settings = true;
+      default_settings.rust-analyzer = {
+        check.command = "clippy";
+        assist = {
+          emitMustUse = true;
+          expressionFillDefault = "default";
+        };
 
-      completion.termSearch.enable = true;
-      diagnostics.styleLints.enable = true;
-      imports = {
-        granularity.enforce = true;
-        preferPrelude = true;
-      };
+        completion.termSearch.enable = true;
+        diagnostics.styleLints.enable = true;
+        imports = {
+          granularity.enforce = true;
+          preferPrelude = true;
+        };
 
-      inlayHints = {
-        closureReturnTypeHints.enable = "always";
-        closureStyle = "rust_analyzer";
-        lifetimeElisionHints.enable = "skip_trivial";
-      };
+        inlayHints = {
+          closureReturnTypeHints.enable = "always";
+          closureStyle = "rust_analyzer";
+          lifetimeElisionHints.enable = "skip_trivial";
+        };
 
-      typing.autoClosingAngleBrackets.enable = true;
-    };
+        typing.autoClosingAngleBrackets.enable = true;
+      };
 
-    dap.adapter = {
-      command = "${pkgs.lldb}/bin/lldb-dap";
-      type = "executable";
+      dap.adapter = {
+        command = "${pkgs.lldb}/bin/lldb-dap";
+        type = "executable";
+      };
     };
   };
 }