From e2e3ada9b1058430b2ad61b5888351db6b37e682 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Mon, 1 Dec 2025 19:37:28 -0600 Subject: [PATCH] move lsp to own setting --- home.nix | 192 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 103 insertions(+), 89 deletions(-) diff --git a/home.nix b/home.nix index 2601d34..2ec5a2e 100755 --- a/home.nix +++ b/home.nix @@ -307,6 +307,109 @@ ]; + # LSP settings + lsp = { + enable = true; + inlayHints = true; + servers = { + html.enable = true; + lua_ls.enable = true; + nil_ls.enable = true; + ts_ls.enable = true; + marksman.enable = true; + pyright.enable = true; + gopls.enable = true; + terraformls.enable = true; + ansiblels.enable = true; + jsonls.enable = true; + yamlls.enable = true; + rust_analyzer = { + enable = true; + installRustc = true; + installCargo = true; + settings = { + cargo = { + features = "all"; + }; + }; + }; + }; + + keymaps = [ + { + key = "gd"; + lspBufAction = "definition"; + desc = "Goto Definition"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "gr"; + lspBufAction = "references"; + desc = "Goto References"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "gD"; + lspBufAction = "declaration"; + desc = "Goto Declaration"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "gI"; + lspBufAction = "implementation"; + desc = "Goto Implementation"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "gT"; + lspBufAction = "type_definition"; + desc = "Type Definition"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "K"; + lspBufAction = "hover"; + desc = "Hover"; + options.silent = true; + mode = [ "n" ]; + } + { + key = "cw"; + action = "workspace_symbol"; + desc = "Workspace Symbol"; + mode = [ "n" ]; + } + { + key = "r"; + action = "rename"; + mode = [ "n" ]; + } + { + key = "cd"; + action = "open_float"; + desc = "Line Diagnostics"; + mode = [ "n" ]; + } + { + key = "]d"; + action = "goto_next"; + desc = "Next Diagnostic"; + mode = [ "n" ]; + } + { + key = "[d"; + action = "goto_prev"; + desc = "Previous Diagnostic"; + mode = [ "n" ]; + } + ]; + }; + plugins = { lualine.enable = true; lsp-lines.enable = true; @@ -319,96 +422,7 @@ # neo-tree dependency web-devicons.enable = true; - lsp = { - enable = true; - inlayHints = true; - servers = { - html.enable = true; - lua_ls.enable = true; - nil_ls.enable = true; - ts_ls.enable = true; - marksman.enable = true; - pyright.enable = true; - gopls.enable = true; - terraformls.enable = true; - ansiblels.enable = true; - jsonls.enable = true; - yamlls.enable = true; - rust_analyzer = { - enable = true; - installRustc = true; - installCargo = true; - settings = { - cargo = { - features = "all"; - }; - }; - }; - }; - keymaps = [ - { - key = "gd"; - lspBufAction = "definition"; - desc = "Goto Definition"; - options.silent = true; - } - { - key = "gr"; - lspBufAction = "references"; - desc = "Goto References"; - options.silent = true; - } - { - key = "gD"; - lspBufAction = "declaration"; - desc = "Goto Declaration"; - options.silent = true; - } - { - key = "gI"; - lspBufAction = "implementation"; - desc = "Goto Implementation"; - options.silent = true; - } - { - key = "gT"; - lspBufAction = "type_definition"; - desc = "Type Definition"; - options.silent = true; - } - { - key = "K"; - lspBufAction = "hover"; - desc = "Hover"; - options.silent = true; - } - { - key = "cw"; - action = "workspace_symbol"; - desc = "Workspace Symbol"; - } - { - key = "r"; - action = "rename"; - } - { - key = "cd"; - action = "open_float"; - desc = "Line Diagnostics"; - } - { - key = "]d"; - action = "goto_next"; - desc = "Next Diagnostic"; - } - { - key = "[d"; - action = "goto_prev"; - desc = "Previous Diagnostic"; - } - ]; - }; cmp = { enable = true;