diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua index e3a5dea..a95ccc4 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua @@ -65,7 +65,7 @@ lsp.setup_servers({ "marksman", "tailwindcss", "bashls", - "clangd", + "ccls", "jsonls", "vuels" }) @@ -76,13 +76,13 @@ lsp.setup() local cmp_nvim_lsp = require "cmp_nvim_lsp" -require("lspconfig").clangd.setup { - capabilities = cmp_nvim_lsp.default_capabilities(), - cmd = { - "clangd", - "--offset-encoding=utf-16", - }, -} +--require("lspconfig").clangd.setup { +-- capabilities = cmp_nvim_lsp.default_capabilities(), +-- cmd = { +-- "clangd", +-- "--offset-encoding=utf-16", +-- }, +--} require("lspconfig").cssls.setup { settings = { diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua index b8da5fd..1d3d2c6 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua @@ -9,11 +9,7 @@ vim.opt.expandtab = true vim.opt.smartindent = true vim.cmd([[ - autocmd FileType python setlocal tabstop=4 shiftwidth=4 softtabstop=4 -]]) - -vim.cmd([[ - autocmd FileType haskell setlocal tabstop=4 shiftwidth=4 softtabstop=4 + autocmd FileType c,cpp,haskell,python setlocal tabstop=4 shiftwidth=4 softtabstop=4 ]]) vim.opt.ignorecase = true diff --git a/src/user/modules/utils/modules/neovim/config/pkgs.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix index 8b396f1..012339e 100644 --- a/src/user/modules/utils/modules/neovim/config/pkgs.nix +++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix @@ -6,6 +6,7 @@ let marksman sumneko-lua-language-server stylua nodePackages."@tailwindcss/language-server" + ccls ]; lsp' = with pkgs.nodePackages; [