From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 18 Oct 2024 17:07:46 +0200 Subject: refactor(modules): Move all system modules to `by-name` From now on all modules should be added to the new `by-name` directory. This should help remove the (superficial and utterly useless) distinction between `home-manager` and `NixOS` modules. --- modules/home.legacy/conf/nvim/plgs/lsp/default.nix | 29 +++++++++ .../conf/nvim/plgs/lsp/keymaps/default.nix | 70 ++++++++++++++++++++++ .../conf/nvim/plgs/lsp/servers/default.nix | 15 +++++ .../conf/nvim/plgs/lsp/servers/servers/bashls.nix | 5 ++ .../conf/nvim/plgs/lsp/servers/servers/ccls.nix | 5 ++ .../conf/nvim/plgs/lsp/servers/servers/ltex.nix | 39 ++++++++++++ .../conf/nvim/plgs/lsp/servers/servers/lua-ls.nix | 8 +++ .../conf/nvim/plgs/lsp/servers/servers/nil-ls.nix | 10 ++++ .../nvim/plgs/lsp/servers/servers/openscad.nix | 17 ++++++ .../conf/nvim/plgs/lsp/servers/servers/pylyzer.nix | 12 ++++ .../plgs/lsp/servers/servers/quick-lint-js.nix | 15 +++++ .../nvim/plgs/lsp/servers/servers/ruff-lsp.nix | 10 ++++ .../plgs/lsp/servers/servers/rust-analyzer.nix | 17 ++++++ .../conf/nvim/plgs/lsp/servers/servers/texlab.nix | 7 +++ 14 files changed, 259 insertions(+) create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/default.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix create mode 100644 modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix (limited to 'modules/home.legacy/conf/nvim/plgs/lsp') diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/default.nix new file mode 100644 index 00000000..b7c1e174 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/default.nix @@ -0,0 +1,29 @@ +{...}: { + imports = [ + ./keymaps + ./servers + ]; + programs.nixvim.plugins.lsp = { + enable = true; + onAttach = + "" + # + '' + # function(client, bufnr) + # -- Enable completion triggered by + # -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + # end + # '' + ; + preConfig = '' + vim.diagnostic.config({ + underline = true, + -- virtual_text = true, + virtual_text = { + source = "always", -- Or "if_many" + }, + update_in_insert = true, + severity_sort = true, + }, nil); + ''; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix new file mode 100644 index 00000000..b1276639 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix @@ -0,0 +1,70 @@ +{...}: { + programs.nixvim = { + plugins.lsp.keymaps = { + diagnostic = { + "N" = { + action = "goto_prev"; + desc = "go to previous diagnostic message"; + }; + "T" = { + action = "goto_next"; + desc = "go to next diagnostic message"; + }; + "e" = { + action = "open_float"; + desc = "open float for the symbol"; + }; + "gq" = { + action = "setloclist"; + desc = "add buffer diagnostic to the location list (quick-fix)"; + }; + }; + lspBuf = { + "gD" = { + action = "declaration"; + desc = "[G]o to [d]eclaration"; + }; + "hi" = { + action = "hover"; + desc = "Display [h]over [i]nformation"; + }; + "sh" = { + action = "signature_help"; + desc = "Display [s]ignature [h]elp"; + }; + "wa" = { + action = "add_workspace_folder"; + desc = "[W]orkspace folder [a]dd"; + }; + "wr" = { + action = "remove_workspace_folder"; + desc = "[W]orkspace folder [r]emove"; + }; + "rn" = { + action = "rename"; + desc = "[R]e[n]ame the item under the cursor"; + }; + "ca" = { + action = "code_action"; + desc = "Open the [c]ode [a]ction menu"; + }; + }; + }; + keymaps = [ + { + key = "f"; + action.__raw = "function() vim.lsp.buf.format { async = true } end"; + options.desc = "[F]ormat the current buffer (asynchronously)"; + } + { + key = "wl"; + action.__raw = '' + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end + ''; + options.desc = "[W]orkspace folders [l]ist"; + } + ]; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix new file mode 100644 index 00000000..605046d4 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix @@ -0,0 +1,15 @@ +{...}: { + imports = [ + # ./servers/pylyzer.nix + ./servers/bashls.nix + ./servers/ccls.nix + ./servers/quick-lint-js.nix + ./servers/ltex.nix + ./servers/lua-ls.nix + ./servers/nil-ls.nix + ./servers/openscad.nix + ./servers/ruff-lsp.nix + ./servers/rust-analyzer.nix + ./servers/texlab.nix + ]; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix new file mode 100644 index 00000000..0577a335 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix @@ -0,0 +1,5 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + bashls.enable = true; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix new file mode 100644 index 00000000..0698bcce --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix @@ -0,0 +1,5 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + ccls.enable = true; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix new file mode 100644 index 00000000..3224bc41 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix @@ -0,0 +1,39 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + ltex = let + filetypes = [ + "java" + "cpp" + "shell" + "bash" + + "bibtex" + "context" + "context.tex" + "latex" + "tex" + + "markdown" + "org" + "restructuredtext" + "rsweave" + + "git-commit" + "gitcommit" + + "mail" + ]; + in { + enable = true; + inherit filetypes; + settings = { + enabled = filetypes; + completionEnabled = false; + language = "en-CA"; + additionalRules = { + enablePickyRules = true; + }; + }; + }; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix new file mode 100644 index 00000000..4f20558c --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix @@ -0,0 +1,8 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + lua_ls = { + enable = true; + settings.telemetry.enable = false; + }; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix new file mode 100644 index 00000000..f0cccbdc --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix @@ -0,0 +1,10 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + nil_ls = { + enable = true; + settings = { + formatting.command = ["alejandra"]; + }; + }; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix new file mode 100644 index 00000000..a0221cc4 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + programs.nixvim = { + extraConfigLuaPost = + /* + lua + */ + '' + require('lspconfig').openscad_lsp.setup{ + cmd = {"openscad-lsp", "--stdio", "--fmt-style", "WebKit"}, + } + ''; + extraPackages = with pkgs; [ + openscad-lsp + clang-tools # Need to satisfy `clang-format` (which is used by openscad-lsp) + ]; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix new file mode 100644 index 00000000..b1042221 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + programs.nixvim = { + extraConfigLuaPost = + /* + lua + */ + '' + require('lspconfig').pylyzer.setup{} + ''; + extraPackages = with pkgs; [pylyzer]; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix new file mode 100644 index 00000000..23c3054a --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + programs.nixvim = { + extraConfigLuaPost = + /* + lua + */ + '' + require('lspconfig').quick_lint_js.setup{ + } + ''; + extraPackages = with pkgs; [ + quick-lint-js + ]; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix new file mode 100644 index 00000000..6fbdc998 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + programs.nixvim = { + plugins.lsp.servers = { + ruff_lsp = { + enable = true; + }; + }; + extraPackages = with pkgs; [ruff]; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix new file mode 100644 index 00000000..5da61a71 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix @@ -0,0 +1,17 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + rust_analyzer = { + enable = true; + settings = { + typing.autoClosingAngleBrackets.enable = true; + + # Check with `cargo clippy` instead of just `cargo check` + check.command = "clippy"; + }; + # NOTE: These should be provided by the devenv, to support nightly and + # such things <2023-11-25> + installCargo = false; + installRustc = false; + }; + }; +} diff --git a/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix new file mode 100644 index 00000000..59af8d39 --- /dev/null +++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix @@ -0,0 +1,7 @@ +{...}: { + programs.nixvim.plugins.lsp.servers = { + texlab = { + enable = true; + }; + }; +} -- cgit 1.4.1