diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index 07d0a06..1a07b89 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -46,7 +46,7 @@ with final.pkgs.lib; let cmp-cmdline-history # cmp command line history suggestions # copilot-lua # Github Copilot https://github.com/zbirenbaum/copilot.lua/ # copilot-cmp # Add Copilot as a cmp source # https://github.com/zbirenbaum/copilot-cmp/ - # nvim-lspconfig + nvim-lspconfig # ^ nvim-cmp extensions # git integration plugins diff --git a/nvim/ftplugin/c.lua b/nvim/ftplugin/c.lua index b3cf061..679f5b6 100644 --- a/nvim/ftplugin/c.lua +++ b/nvim/ftplugin/c.lua @@ -3,7 +3,9 @@ if vim.fn.executable('clangd') ~= 1 then return end -local root_files = { +require'lspconfig'.clangd.setup{} + +--[[ local root_files = { 'compile_commands.json', '.vscode', '.git', @@ -14,7 +16,7 @@ vim.lsp.start { cmd = { 'clangd' }, root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]), capabilities = require('user.lsp').make_client_capabilities(), -} +} ]] local dap = require("dap") diff --git a/nvim/ftplugin/lua.lua b/nvim/ftplugin/lua.lua index 125c422..caec13e 100644 --- a/nvim/ftplugin/lua.lua +++ b/nvim/ftplugin/lua.lua @@ -7,6 +7,8 @@ if vim.fn.executable(lua_ls_cmd) ~= 1 then return end +-- require'lspconfig'.lua_ls.setup{} + local root_files = { '.luarc.json', '.luarc.jsonc',