diff --git a/modules/home-manager/programs/neovim/ftplugin/cs.lua b/modules/home-manager/programs/neovim/ftplugin/cs.lua index c129918..1b6eb4a 100644 --- a/modules/home-manager/programs/neovim/ftplugin/cs.lua +++ b/modules/home-manager/programs/neovim/ftplugin/cs.lua @@ -122,7 +122,7 @@ function M:start() vim.fn.setenv("DOTNET_ENVIRONMENT", "Development") - local debugger_path = vim.fn.getnixpath "netcoredbg" .. "/bin/netcoredbg" + local debugger_path = vim.fn.get_nix_store "netcoredbg" .. "/bin/netcoredbg" local dap = require "dap" diff --git a/modules/home-manager/programs/neovim/lsp.lua b/modules/home-manager/programs/neovim/lsp.lua index 97f204a..f621f41 100644 --- a/modules/home-manager/programs/neovim/lsp.lua +++ b/modules/home-manager/programs/neovim/lsp.lua @@ -6,197 +6,205 @@ ---@type LazySpec return { "AstroNvim/astrolsp", - ---@type AstroLSPOpts - opts = { - -- Configuration table of features provided by AstroLSP - features = { - autoformat = true, -- enable or disable auto formatting on start - codelens = true, -- enable/disable codelens refresh on start - inlay_hints = false, -- enable/disable inlay hints on start - semantic_tokens = true, -- enable/disable semantic token highlighting - }, - -- customize lsp formatting options - formatting = { - -- control auto formatting on save - format_on_save = { - enabled = true, -- enable or disable format on save globally - allow_filetypes = { -- enable format on save for specified filetypes only - -- "go", - "c", - "cpp", - "cs", - "gdscript", - "h", - "javascript", - "jsx", - "lua", - "nix", - "rust", - "svelte", - "tsx", - "typescript", - "vue", - }, - ignore_filetypes = { -- disable format on save for specified filetypes - -- "python", - }, + ---@param opts AstroLSPOpts + ---@return AstroLSPOpts + opts = function(_, opts) + ---@type AstroLSPOpts + local lsp_options = { + -- Configuration table of features provided by AstroLSP + features = { + autoformat = true, -- enable or disable auto formatting on start + codelens = true, -- enable/disable codelens refresh on start + inlay_hints = false, -- enable/disable inlay hints on start + semantic_tokens = true, -- enable/disable semantic token highlighting }, - disabled = { -- disable formatting capabilities for the listed language servers - -- disable lua_ls formatting capability if you want to use StyLua to format your lua code - -- "lua_ls", - }, - timeout_ms = 1000, -- default format timeout - -- filter = function(client) -- fully override the default formatting function - -- return true - -- end - }, - -- enable servers that you already have installed without mason - servers = { - "basedpyright", - "clangd", - "cmake", - --"csharp_ls", Testing roslyn.nvim - "cssls", - "denols", - "eslint", - "gdscript", - "html", - "jsonls", - "lua_ls", - "marksman", - "nixd", - "rust_analyzer", - "svelte", - "taplo", - "volar", - "vtsls", - "yamlls", - }, - -- customize language server configuration options passed to `lspconfig` - ---@diagnostic disable: missing-fields - config = { - -- clangd = { capabilities = { offsetEncoding = "utf-8" } }, - ---@type lspconfig.Config - nixd = { - settings = { - nixd = { - nixpkgs = { - expr = "import (builtins.getFlake ({location})).inputs.nixpkgs { }", - }, - options = { - nixos = { - expr = '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options', - }, - home_manager = { - expr = - '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options.home-manager.users.type.getSubOptions []', - }, - }, + -- customize lsp formatting options + formatting = { + -- control auto formatting on save + format_on_save = { + enabled = true, -- enable or disable format on save globally + allow_filetypes = { -- enable format on save for specified filetypes only + -- "go", + "c", + "cpp", + "cs", + "gdscript", + "h", + "javascript", + "jsx", + "lua", + "nix", + "rust", + "svelte", + "tsx", + "typescript", + "vue", + }, + ignore_filetypes = { -- disable format on save for specified filetypes + -- "python", }, }, + disabled = { -- disable formatting capabilities for the listed language servers + -- disable lua_ls formatting capability if you want to use StyLua to format your lua code + -- "lua_ls", + }, + timeout_ms = 1000, -- default format timeout + -- filter = function(client) -- fully override the default formatting function + -- return true + -- end }, - ---@type lspconfig.Config - vtsls = { - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, - settings = { - vtsls = { - tsserver = { - globalPlugins = { - { - name = "@vue/typescript-plugin", - location = vim.fn.getnixpath "vue-language-server" - .. "/lib/node_modules/@vue/language-server", - languages = { "vue" }, - configNamespace = "typescript", - enableForWorkspaceTypeScriptVersions = true, + -- enable servers that you already have installed without mason + servers = { + "basedpyright", + "clangd", + "cmake", + --"csharp_ls", Testing roslyn.nvim + "cssls", + "denols", + "eslint", + "gdscript", + "html", + "jsonls", + "lua_ls", + "marksman", + "nixd", + "rust_analyzer", + "svelte", + "taplo", + "volar", + "vtsls", + "yamlls", + }, + -- customize language server configuration options passed to `lspconfig` + ---@diagnostic disable: missing-fields + config = { + -- clangd = { capabilities = { offsetEncoding = "utf-8" } }, + ---@type lspconfig.Config + nixd = { + settings = { + nixd = { + nixpkgs = { + expr = "import (builtins.getFlake ({location})).inputs.nixpkgs { }", + }, + options = { + nixos = { + expr = '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options', + }, + home_manager = { + expr = + '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options.home-manager.users.type.getSubOptions []', }, }, }, }, }, - }, - ---@type lspconfig.Config - rust_analyzer = { - settings = { - ["rust-analyzer"] = { - cargo = { - extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = "dev" }, - extraArgs = { "--profile", "rust-analyzer" }, + ---@type lspconfig.Config + vtsls = { + filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, + settings = { + vtsls = { + tsserver = { + globalPlugins = { + { + name = "@vue/typescript-plugin", + location = vim.fn.get_nix_store "vue-language-server" + .. "/lib/node_modules/@vue/language-server", + languages = { "vue" }, + configNamespace = "typescript", + enableForWorkspaceTypeScriptVersions = true, + }, + }, + }, }, - check = { command = "check", extraArgs = {} }, + }, + }, + ---@type lspconfig.Config + rust_analyzer = { + settings = { + ["rust-analyzer"] = { + cargo = { + extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = "dev" }, + extraArgs = { "--profile", "rust-analyzer" }, + }, + check = { command = "check", extraArgs = {} }, + }, + }, + }, + ---@type lspconfig.Config + html = { + filetypes = { "html", "templ", "razor" }, + }, + }, + -- customize how language servers are attached + handlers = { + -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server + -- function(server, opts) require("lspconfig")[server].setup(opts) end + + -- the key is the server that is being setup with `lspconfig` + -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server + -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed + }, + -- Configure buffer local auto commands to add when attaching a language server + autocmds = { + -- first key is the `augroup` to add the auto commands to (:h augroup) + lsp_document_highlight = { + -- Optional condition to create/delete auto command group + -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean` + -- condition will be resolved for each client on each execution and if it ever fails for all clients, + -- the auto commands will be deleted for that buffer + cond = "textDocument/documentHighlight", + -- cond = function(client, bufnr) return client.name == "lua_ls" end, + -- list of auto commands to set + { + -- events to trigger + event = { "CursorHold", "CursorHoldI" }, + -- the rest of the autocmd options (:h nvim_create_autocmd) + desc = "Document Highlighting", + callback = function() + vim.lsp.buf.document_highlight() + end, + }, + { + event = { "CursorMoved", "CursorMovedI", "BufLeave" }, + desc = "Document Highlighting Clear", + callback = function() + vim.lsp.buf.clear_references() + end, }, }, }, - ---@type lspconfig.Config - html = { - filetypes = { "html", "templ", "razor" }, + -- mappings to be set up on attaching of a language server + mappings = { + n = { + gl = { + function() + vim.diagnostic.open_float() + end, + desc = "Hover diagnostics", + }, + -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean + -- gD = { + -- function() vim.lsp.buf.declaration() end, + -- desc = "Declaration of current symbol", + -- cond = "textDocument/declaration", + -- }, + -- ["uY"] = { + -- function() require("astrolsp.toggles").buffer_semantic_tokens() end, + -- desc = "Toggle LSP semantic highlight (buffer)", + -- cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end, + -- }, + }, }, - }, - -- customize how language servers are attached - handlers = { - -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server - -- function(server, opts) require("lspconfig")[server].setup(opts) end + -- A custom `on_attach` function to be run after the default `on_attach` function + -- takes two parameters `client` and `bufnr` (`:h lspconfig-setup`) + on_attach = function(client, bufnr) + -- this would disable semanticTokensProvider for all clients + -- client.server_capabilities.semanticTokensProvider = nil + end, + } - -- the key is the server that is being setup with `lspconfig` - -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server - -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed - }, - -- Configure buffer local auto commands to add when attaching a language server - autocmds = { - -- first key is the `augroup` to add the auto commands to (:h augroup) - lsp_document_highlight = { - -- Optional condition to create/delete auto command group - -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean` - -- condition will be resolved for each client on each execution and if it ever fails for all clients, - -- the auto commands will be deleted for that buffer - cond = "textDocument/documentHighlight", - -- cond = function(client, bufnr) return client.name == "lua_ls" end, - -- list of auto commands to set - { - -- events to trigger - event = { "CursorHold", "CursorHoldI" }, - -- the rest of the autocmd options (:h nvim_create_autocmd) - desc = "Document Highlighting", - callback = function() - vim.lsp.buf.document_highlight() - end, - }, - { - event = { "CursorMoved", "CursorMovedI", "BufLeave" }, - desc = "Document Highlighting Clear", - callback = function() - vim.lsp.buf.clear_references() - end, - }, - }, - }, - -- mappings to be set up on attaching of a language server - mappings = { - n = { - gl = { - function() - vim.diagnostic.open_float() - end, - desc = "Hover diagnostics", - }, - -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean - -- gD = { - -- function() vim.lsp.buf.declaration() end, - -- desc = "Declaration of current symbol", - -- cond = "textDocument/declaration", - -- }, - -- ["uY"] = { - -- function() require("astrolsp.toggles").buffer_semantic_tokens() end, - -- desc = "Toggle LSP semantic highlight (buffer)", - -- cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end, - -- }, - }, - }, - -- A custom `on_attach` function to be run after the default `on_attach` function - -- takes two parameters `client` and `bufnr` (`:h lspconfig-setup`) - on_attach = function(client, bufnr) - -- this would disable semanticTokensProvider for all clients - -- client.server_capabilities.semanticTokensProvider = nil - end, - }, + opts = vim.tbl_deep_extend("force", opts, lsp_options) + + return opts + end, } diff --git a/modules/home-manager/programs/neovim/lua/plugins/nix-store.lua b/modules/home-manager/programs/neovim/lua/plugins/nix-store.lua new file mode 100644 index 0000000..7607b47 --- /dev/null +++ b/modules/home-manager/programs/neovim/lua/plugins/nix-store.lua @@ -0,0 +1,9 @@ +---@type LazySpec +return { + "wizardlink/nix-store.nvim", + priority = 999999, + lazy = false, + opts = { + allow_unfree = true, + }, +} diff --git a/modules/home-manager/programs/neovim/lua/plugins/nvim-dap.lua b/modules/home-manager/programs/neovim/lua/plugins/nvim-dap.lua index 1e8ce17..7798b02 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/nvim-dap.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/nvim-dap.lua @@ -32,7 +32,7 @@ return { dap.adapters.cppdbg = { id = "cppdbg", type = "executable", - command = vim.fn.getnixpath "vscode-extensions.ms-vscode.cpptools" + command = vim.fn.get_nix_store "vscode-extensions.ms-vscode.cpptools" .. "/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7", } diff --git a/modules/home-manager/programs/neovim/lua/plugins/roslyn-nvim.lua b/modules/home-manager/programs/neovim/lua/plugins/roslyn-nvim.lua index 8554cf9..f926f22 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/roslyn-nvim.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/roslyn-nvim.lua @@ -7,14 +7,18 @@ return { dependencies = { { "tris203/rzls.nvim", - opts = { - capabilities = vim.lsp.protocol.make_client_capabilities(), - path = vim.fn.getnixpath "rzls" .. "/bin/rzls", - }, + opts = function(_, opts) + opts = { + capabilities = vim.lsp.protocol.make_client_capabilities(), + path = vim.fn.get_nix_store "rzls" .. "/bin/rzls", + } + + return opts + end, }, }, opts = function(_, opts) - local rzlspath = vim.fn.getnixpath "rzls" + local rzlspath = vim.fn.get_nix_store "rzls" require("roslyn.config").get() opts = { diff --git a/modules/home-manager/programs/neovim/lua/util.lua b/modules/home-manager/programs/neovim/lua/util.lua index 345871b..8dc9ea4 100644 --- a/modules/home-manager/programs/neovim/lua/util.lua +++ b/modules/home-manager/programs/neovim/lua/util.lua @@ -1,37 +1,3 @@ ---- Define PackageOutput ---- @enum PackageOutput -local PACKAGEOUTPUT = { - out = 0, - lib = 1, -} - ---- Get the store path of a package ---- @param packagename NixSearchExceptions | string ---- @param packageoutput PackageOutput? ---- @return string | nil -vim.fn.getnixpath = function(packagename, packageoutput) - ---@enum (key) NixSearchExceptions - local exceptions = {} - - return vim.split( - vim.api.nvim_cmd( - vim.api.nvim_parse_cmd( - string.format( - "silent !NIXPKGS_ALLOW_UNFREE=1 nix eval --raw --expr 'with import { }; (%s).%s' --impure", - exceptions[packagename] or packagename, - (packageoutput == PACKAGEOUTPUT.out or packageoutput == nil) and "outPath" - or string.format("lib.getLib %s", packagename) - ), - {} - ) --[[@as vim.api.keyset.cmd]], - { - output = true, - } - ), - "\n" - )[3] -end - --- Helper function to allow me to run commands grabbed --- by the current selection. --- @param isLua boolean