Moved lsp configurations per language to ftplugins folder

- Added gitsigns.nvim
- Added Treesitter.nvim
- Added Undotree.nvim
- Added vimbegood.nvim

lazy-lock.json

@@ -6,6 +6,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "lazy.nvim": { "branch": "main", "commit": "33be7ac3173c7c20b94ce7e1b9734c1a1e85f292" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@@ -31,6 +32,7 @@
   "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" },
   "trouble.nvim": { "branch": "main", "commit": "88c3be40c061ce053ab326ce4fdcb973a1f785ff" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
   "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
   "which-key.nvim": { "branch": "main", "commit": "7915964e73c30ba5657e9a762c6570925dad421b" }
 }

lua/barink/after/ftplugin/asm.lua

@@ -0,0 +1,3 @@
+require('lspconfig')['asm_lsp'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/bash.lua

@@ -0,0 +1,3 @@
+require('lspconfig')['bashls'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/cpp.lua

@@ -0,0 +1,20 @@
+local root_files = {
+    'premake5.lua',
+    '.clang-tidy',
+    '.clang-format',
+    'compile_commands',
+    'compile_commands.json',
+    'compile_flags.txt',
+    'configure.ac',
+    '.git'
+}
+local util = require('lspconfig.util')
+require('lspconfig')['clangd'].setup({
+    capabilities = capabilities,
+    filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
+    cmd = { 'clangd' },
+    single_file_support = true,
+    root_dir = function (fname)
+        return util.root_pattern(unpack(root_files))(fname)
+    end
+})

lua/barink/after/ftplugin/go.lua

@@ -1,5 +1,8 @@
+require('lspconfig')['gopls'].setup({
+    capabilities = capabilities
+})
+
 local dap = require("dap")
-print("You opened a Golang file")
 
 dap.adapters.delve = {
   type = 'server',

lua/barink/after/ftplugin/java.lua

@@ -12,3 +12,9 @@ local config = {
 require('jdtls').start_or_attach(config)
 require('jdtls').setup_dap({hotcodreplace='auto'})
 require('jdtls.dap').setup_dap_main_class_configs()
+
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+require('lspconfig')['jdtls'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/javascript.lua

@@ -0,0 +1,3 @@
+require('lspconfig')['tsserver'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/lua.lua

@@ -1 +1,14 @@
-print("You opened a LUA file..")
+
+
+local lsp = require("lspconfig")
+lsp.lua_ls.setup({
+    capabilities = require('cmp_nvim_lsp').default_capabilities(),
+    settings = {
+        Lua = {
+            diagnostics = {
+                globals = { 'vim' }
+            }
+        }
+    }
+})
+

lua/barink/after/ftplugin/python.lua

@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['pyright'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/rust.lua

@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['rust_analyzer'].setup({
+    capabilities = capabilities
+})

lua/barink/after/ftplugin/zig.lua

@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['zls'].setup({
+    capabilities = capabilities
+})

lua/barink/plugins/gitsigns.lua

@@ -0,0 +1,4 @@
+return {
+    'lewis6991/gitsigns.nvim',
+    opt = {}
+}

lua/barink/plugins/lsp.lua

@@ -40,9 +40,9 @@ return
                     ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
                 }),
                 sources = cmp.config.sources({
-                    { name = 'path' },
                     { name = 'nvim_lsp', keyword_length = 1 },
                     { name = 'luasnip', option = { show_autosnippets = true}},
+                    { name = 'path' },
                 }, {
                     { name = 'buffer', keyword_length = 2 },
                 }),
@@ -80,17 +80,6 @@ return
                 matching = { disallow_symbol_nonprefix_matching = false }
             })
 
-            local lsp = require("lspconfig")
-            lsp.lua_ls.setup({
-                capabilities = require('cmp_nvim_lsp').default_capabilities(),
-                settings = {
-                    Lua = {
-                        diagnostics = {
-                            globals = { 'vim' }
-                        }
-                    }
-                }
-            })
             local ls = require("luasnip")
             ls.config.set_config({
                 history = true,
@@ -112,53 +101,6 @@ return
             -- Set up lspconfig.
             local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
-            require('lspconfig')['asm_lsp'].setup({
-                capabilities = capabilities
-            })
-            local root_files = {
-                'premake5.lua',
-                '.clang-tidy',
-                '.clang-format',
-                'compile_commands',
-                'compile_commands.json',
-                'compile_flags.txt',
-                'configure.ac',
-                '.git'
-            }
-            local util = require('lspconfig.util')
-            require('lspconfig')['clangd'].setup({
-                capabilities = capabilities,
-                filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
-                cmd = { 'clangd' },
-                single_file_support = true,
-                root_dir = function (fname)
-                    return util.root_pattern(unpack(root_files))(fname)
-                end
-            })
-
-            require('lspconfig')['zls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['rust_analyzer'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['jdtls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['bashls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['gopls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['tsserver'].setup({
-                capabilities = capabilities
-            })
         end
     }
 

lua/barink/plugins/treesitter.lua

@@ -23,7 +23,7 @@ return {
                         show_help = '?'
                     }
                 },
-                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
+                ensure_installed = { "python", "c", "lua", "vim", "vimdoc", "bash" },
                 sync_install = false,
                 highlight = { enable = true },
                 indent = { enable = true },

lua/barink/plugins/undotree.lua

@@ -1 +1,6 @@
-return { "mbbill/undotree" }
+return {
+    "mbbill/undotree",
+    config = function () 
+        vim.keymap.set('n', '<leader><f1>', vim.cmd.UndotreeToggle)
+    end
+}

lua/barink/plugins/vimbegood.lua

@@ -0,0 +1,4 @@
+return {
+    'ThePrimeagen/vim-be-good',
+}
+