From 7534b6658a66360e3d0c66cd2794ead7ae75b5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Sun, 8 May 2022 23:58:35 +0200 Subject: [PATCH] Clean up some ftplugin files --- symlinks/config/nvim/after/ftplugin/cs.lua | 5 +++++ symlinks/config/nvim/after/ftplugin/cs.vim | 2 -- symlinks/config/nvim/after/ftplugin/lua.lua | 5 +++++ symlinks/config/nvim/after/ftplugin/lua.vim | 2 -- symlinks/config/nvim/lua/esensar/lsp/capabilities.lua | 1 + symlinks/config/nvim/lua/esensar/lsp/servers.lua | 3 +-- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 symlinks/config/nvim/after/ftplugin/cs.lua delete mode 100644 symlinks/config/nvim/after/ftplugin/cs.vim create mode 100644 symlinks/config/nvim/after/ftplugin/lua.lua delete mode 100644 symlinks/config/nvim/after/ftplugin/lua.vim create mode 100644 symlinks/config/nvim/lua/esensar/lsp/capabilities.lua diff --git a/symlinks/config/nvim/after/ftplugin/cs.lua b/symlinks/config/nvim/after/ftplugin/cs.lua new file mode 100644 index 0000000..f3a3137 --- /dev/null +++ b/symlinks/config/nvim/after/ftplugin/cs.lua @@ -0,0 +1,5 @@ +vim.bo.shiftwidth = 4 +vim.bo.tabstop = 4 +vim.bo.softtabstop = 4 +vim.bo.expandtab = true +vim.bo.autoindent = true diff --git a/symlinks/config/nvim/after/ftplugin/cs.vim b/symlinks/config/nvim/after/ftplugin/cs.vim deleted file mode 100644 index 3101d7c..0000000 --- a/symlinks/config/nvim/after/ftplugin/cs.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal ts=4 sts=4 sw=4 expandtab autoindent -let b:undo_ftplugin = '|setlocal ts< sts< sw< expandtab< autoindent<' diff --git a/symlinks/config/nvim/after/ftplugin/lua.lua b/symlinks/config/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..e1d36a4 --- /dev/null +++ b/symlinks/config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,5 @@ +vim.bo.tabstop = 2 +vim.bo.softtabstop = 2 +vim.bo.shiftwidth = 2 +vim.bo.expandtab = true +vim.bo.autoindent = true diff --git a/symlinks/config/nvim/after/ftplugin/lua.vim b/symlinks/config/nvim/after/ftplugin/lua.vim deleted file mode 100644 index fa15b9a..0000000 --- a/symlinks/config/nvim/after/ftplugin/lua.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal ts=2 sts=2 sw=2 expandtab autoindent -let b:undo_ftplugin .= '|setlocal ts< sts< sw< expandtab< autoindent<' diff --git a/symlinks/config/nvim/lua/esensar/lsp/capabilities.lua b/symlinks/config/nvim/lua/esensar/lsp/capabilities.lua new file mode 100644 index 0000000..d5036a0 --- /dev/null +++ b/symlinks/config/nvim/lua/esensar/lsp/capabilities.lua @@ -0,0 +1 @@ +return require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()) diff --git a/symlinks/config/nvim/lua/esensar/lsp/servers.lua b/symlinks/config/nvim/lua/esensar/lsp/servers.lua index 45a94ed..30cd079 100644 --- a/symlinks/config/nvim/lua/esensar/lsp/servers.lua +++ b/symlinks/config/nvim/lua/esensar/lsp/servers.lua @@ -4,8 +4,7 @@ local lspconfig = require("lspconfig") local common_config = require("esensar.lsp.server_config") - -local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()) +local capabilities = require("esensar.lsp.capabilities") -- Lsp default language servers local servers = {