diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index 53980ac..668178d 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -30,7 +30,7 @@ colorschemes.catppuccin.enable = true; plugins = { persistence = { - enable = true; + enable = true; }; navic = { enable = true; @@ -136,23 +136,23 @@ copilot-cmp.enable = false; neocord.enable = true; rustaceanvim = { - enable = true; + enable = false; settings = { - dap.autoloadConfigurations = true; - dap.adapter = let - code-lldb = pkgs.vscode-extensions.vadimcn.vscode-lldb; - in { - executable.command = "${code-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/codelldb"; - executable.args = [ - "--liblldb" - "${code-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/lldb/lib/liblldb.dylib" - "--port" - "31337" - ]; - type = "server"; - port = "31337"; - host = "127.0.0.1"; - }; + # dap.autoloadConfigurations = true; + # dap.adapter = let + # code-lldb = pkgs.vscode-extensions.vadimcn.vscode-lldb; + # in { + # executable.command = "${code-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/codelldb"; + # executable.args = [ + # "--liblldb" + # "${code-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/lldb/lib/liblldb.dylib" + # "--port" + # "31337" + # ]; + # type = "server"; + # port = "31337"; + # host = "127.0.0.1"; + # }; }; server = { settings = { @@ -163,7 +163,7 @@ }; }; }; - rustaceanvim.settings.server.default_settings.rust-analyzer.diagnostics.disabled = ["inactive-code"]; + # rustaceanvim.settings.server.default_settings.rust-analyzer.diagnostics.disabled = ["inactive-code"]; lsp = { enable = true; inlayHints = true; @@ -183,11 +183,17 @@ java-language-server.enable = true; hls.enable = true; eslint.enable = true; - # rust-analyzer = { - # enable = true; - # installCargo = false; - # installRustc = false; - # }; + rust-analyzer = { + enable = true; + installCargo = false; + installRustc = false; + settings = { + inlayHints = { + closureStyle = "rust_analyzer"; + }; + typing.autoClosingAngleBrackets.enable = true; + }; + }; nil_ls.enable = true; }; }; @@ -208,7 +214,7 @@ nixvimInjections = true; settings = { ensure_installed = "all"; - highlight.enable = true; + # highlight.enable = true; }; }; treesitter-refactor = { @@ -556,45 +562,45 @@ mode = ["n"]; key = "qs"; action = '' - function() - require("persistence").load() - end + function() + require("persistence").load() + end ''; lua = true; - options.desc = "Load the session for the current directory"; + options.desc = "Load the session for the current directory"; } { mode = ["n"]; key = "qS"; action = '' - function() - require("persistence").select() - end + function() + require("persistence").select() + end ''; lua = true; - options.desc = "Select a session to load"; + options.desc = "Select a session to load"; } { mode = ["n"]; key = "ql"; action = '' - function() - require("persistence").load({ last = true }) - end + function() + require("persistence").load({ last = true }) + end ''; lua = true; - options.desc = "Load the last session"; + options.desc = "Load the last session"; } { mode = ["n"]; key = "qd"; action = '' - function() - require("persistence").stop() - end + function() + require("persistence").stop() + end ''; lua = true; - options.desc = "Stop persistence"; + options.desc = "Stop persistence"; } ]; };