diff options
-rw-r--r-- | dotfiles/vim/lua/vim-dev.lua | 7 | ||||
-rw-r--r-- | usecases/desktop/development.nix | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua index a852447..d3b93c5 100644 --- a/dotfiles/vim/lua/vim-dev.lua +++ b/dotfiles/vim/lua/vim-dev.lua | |||
@@ -61,6 +61,13 @@ require("rust-tools").setup { | |||
61 | }, | 61 | }, |
62 | } | 62 | } |
63 | 63 | ||
64 | -- TODO: setup nvim-cmp completion score | ||
65 | require("clangd_extensions").setup { | ||
66 | server = { | ||
67 | cmd = { vim.g.clangd_path }, | ||
68 | } | ||
69 | } | ||
70 | |||
64 | require("nlua.lsp.nvim").setup(lspconfig, { | 71 | require("nlua.lsp.nvim").setup(lspconfig, { |
65 | cmd = { | 72 | cmd = { |
66 | string.format("%s/bin/lua-language-server", vim.g.sumneko_lua_base_path), | 73 | string.format("%s/bin/lua-language-server", vim.g.sumneko_lua_base_path), |
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix index c07a1a9..54a869e 100644 --- a/usecases/desktop/development.nix +++ b/usecases/desktop/development.nix | |||
@@ -76,6 +76,7 @@ in | |||
76 | nlua-nvim | 76 | nlua-nvim |
77 | nvim-lspconfig | 77 | nvim-lspconfig |
78 | rust-tools-nvim | 78 | rust-tools-nvim |
79 | clangd_extensions-nvim | ||
79 | vim-grammarous | 80 | vim-grammarous |
80 | playground | 81 | playground |
81 | ]; | 82 | ]; |
@@ -83,10 +84,10 @@ in | |||
83 | variables = { | 84 | variables = { |
84 | rust_analyzer_path = "${rust-analyzer-unwrapped}/bin/rust-analyzer"; | 85 | rust_analyzer_path = "${rust-analyzer-unwrapped}/bin/rust-analyzer"; |
85 | sumneko_lua_base_path = "${sumneko-lua-language-server}"; | 86 | sumneko_lua_base_path = "${sumneko-lua-language-server}"; |
87 | clangd_path = "${clang-tools}/bin/clangd"; | ||
86 | }; | 88 | }; |
87 | 89 | ||
88 | lsp = { | 90 | lsp = { |
89 | clangd.cmd = [ "${clang-tools}/bin/clangd" "--resource-dir=${clang}/resource-root" ]; | ||
90 | elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ]; | 91 | elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ]; |
91 | pylsp.cmd = [ "${python-lsp-server}/bin/pylsp" ]; | 92 | pylsp.cmd = [ "${python-lsp-server}/bin/pylsp" ]; |
92 | hls.cmd = [ "${haskell-language-server}/bin/haskell-language-server" "--lsp" ]; | 93 | hls.cmd = [ "${haskell-language-server}/bin/haskell-language-server" "--lsp" ]; |