From eb4ded42d7c4b59437277710d6a9f743b0f375fc Mon Sep 17 00:00:00 2001 From: Jacob Bohanon Date: Mon, 23 Sep 2024 10:04:26 -0400 Subject: [PATCH] luaaaaaa --- nvim/lua/autocmd.lua | 2 +- nvim/lua/keymaps.lua | 1 + nvim/lua/lsp.lua | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nvim/lua/autocmd.lua b/nvim/lua/autocmd.lua index d153c36..aa1fe92 100644 --- a/nvim/lua/autocmd.lua +++ b/nvim/lua/autocmd.lua @@ -5,7 +5,7 @@ vim.api.nvim_create_augroup('jbohanon', {clear=true}) -- command = '%s/\\s\\+$//e', -- }) vim.api.nvim_create_autocmd('FileType', { - pattern = {'yaml','cpp'}, + pattern = {'yaml','cpp', 'tsx'}, group = 'jbohanon', command = 'setlocal tabstop=2 softtabstop=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>', }) diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua index 99a74be..a6e702a 100644 --- a/nvim/lua/keymaps.lua +++ b/nvim/lua/keymaps.lua @@ -42,6 +42,7 @@ vnoremap('K', ':m \'<-2gv=gv') nnoremap('ee', ':NvimTreeFindFileToggle') vnoremap('/', ':Commentary') +nnoremap('/', ':Commentary') -- golang error handling nnoremap('err', 'oif err != nil {return nil, err}kkI') diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 1c1441c..efe8b8a 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -49,6 +49,9 @@ require('lspconfig')['tsserver'].setup { require('lspconfig')['clangd'].setup { on_attach = on_attach, capabilities = capabilities, + -- This is the default list of filetypes excluding proto + -- https://github.com/neovim/nvim-lspconfig/blob/0ef64599b8aa0187ee5f6d92cb39c951f348f041/lua/lspconfig/server_configurations/clangd.lua#L70C5-L70C66 + filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' } } require('lspconfig')['rust_analyzer'].setup { on_attach = on_attach, @@ -109,3 +112,7 @@ require('lspconfig')['zls'].setup { } } } +require('lspconfig')['protols'].setup{ + on_attach = on_attach, + capabilities = capabilities, +}