FIX: Restructured nvim plugins. moved the configuration for each plugin through Lazy in seperate files.

init.lua

@@ -1,3 +1,3 @@
 require("barink")
-vim.g.netrw_browse_split = 0
+
-vim.g.netrw_winsize = 25
+

lua/barink/colorscheme.lua

@@ -1,9 +0,0 @@
-
-require("tokyonight").setup({
-	style="night",
-	light_style="day",
-	transparent=true,
-	terminal_colors=true,
-	dim_inactive=false,
-	lualine_bold=false
-})

lua/barink/init.lua

@@ -1,3 +1,6 @@
+require("barink.vim")
+require("barink.keys")
+
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
     vim.fn.system({
@@ -10,182 +13,6 @@ if not vim.loop.fs_stat(lazypath) then
     })
 end
 vim.opt.rtp:prepend(lazypath)
-require("lazy").setup({
-    {
-        "folke/tokyonight.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {},
-        config = function()
-            require("tokyonight").setup({
-                style = "night",
-                light_style = "day",
-                transparent = true,
-                terminal_colors = true,
-                dim_inactive = false,
-                lualine_bold = false,
-            })
 
-            vim.cmd [[colorscheme tokyonight]]
+require("lazy").setup("barink.plugins")
-        end
-    },
-    {
-        "nvim-telescope/telescope.nvim",
-        dependencies = { 'nvim-lua/plenary.nvim' }
-    },
-    {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-        config = function()
-            local configs = require("nvim-treesitter.configs")
 
-            configs.setup({
-                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
-                sync_install = false,
-                highlight = { enable = true },
-                indent = { enable = true },
-            })
-        end
-    },
-    { "mbbill/undotree" },
-    {
-        'neovim/nvim-lspconfig',
-        dependencies = {
-            "williamboman/mason-lspconfig",
-            "williamboman/mason.nvim",
-            "hrsh7th/cmp-nvim-lsp",
-            "hrsh7th/cmp-buffer",
-            "hrsh7th/cmp-path",
-            "hrsh7th/cmp-cmdline",
-            "hrsh7th/nvim-cmp",
-            'L3MON4D3/LuaSnip',
-        },
-        config = function()
-            require("mason").setup()
-            require("mason-lspconfig").setup({
-                ensure_installed = { "lua_ls", "bashls", "rust_analyzer" }
-            })
-           local cmp = require('cmp')
-            cmp.setup({
-                snippet = {
-                    expand = function(args)
-                        require('luasnip').lsp_expand(args.body)
-                    end,
-                },
-                mapping = cmp.mapping.preset.insert({
-                    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-                    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-                    ['<C-Space>'] = cmp.mapping.complete(),
-                    ['<C-e>'] = cmp.mapping.abort(),
-                    ['<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 = 'nvim_lsp' },
-                    { name = 'luasnip' },
-                }, {
-                    { name = 'buffer' },
-                })
-            })
-
-            -- Set configuration for specific filetype.
-            cmp.setup.filetype('gitcommit', {
-                sources = cmp.config.sources({
-                    { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
-                }, {
-                    { name = 'buffer' },
-                })
-            })
-
-            -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-            cmp.setup.cmdline({ '/', '?' }, {
-                mapping = cmp.mapping.preset.cmdline(),
-                sources = {
-                    { name = 'buffer' }
-                }
-            })
-
-            -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-            cmp.setup.cmdline(':', {
-                mapping = cmp.mapping.preset.cmdline(),
-                sources = cmp.config.sources({
-                    { name = 'path' }
-                }, {
-                    { name = 'cmdline' }
-                }),
-                matching = { disallow_symbol_nonprefix_matching = false }
-            })
-
-            -- Set up lspconfig.
-            local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-            require('lspconfig')['asm_lsp'].setup({
-                capabilities = capabilities
-            })
-
-            local lsp = require("lspconfig")
-            lsp.lua_ls.setup({
-                capabilities = require('cmp_nvim_lsp').default_capabilities(),
-                settings = {
-                    Lua = {
-                        diagnostics = {
-                            globals = { 'vim' }
-                        }
-                    }
-                }
-            })
-        end
-    },
-    { 'tpope/vim-fugitive' },
-    {
-        "j-hui/fidget.nvim",
-        config = function()
-            require('fidget').setup({})
-        end
-    }
-
-}, {})
-
--- Set basic vim options
-vim.opt.guicursor = ""
-
-vim.opt.nu = true
-vim.opt.relativenumber = true
-
-local tab_spacing = 4
-vim.opt.tabstop = tab_spacing
-vim.opt.softtabstop = tab_spacing
-vim.opt.shiftwidth = tab_spacing
-vim.opt.expandtab = true
-
-vim.opt.smartindent = true
-
-vim.opt.wrap = false
-
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
-
-vim.opt.termguicolors = true
-
-vim.opt.scrolloff = 8
-
--- Keymaps
-vim.g.mapleader = " "
-
-local builtin = require('telescope.builtin')
-
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
-
-vim.keymap.set('n', '<leader><F8>', vim.cmd.UndotreeToggle)
-
-vim.keymap.set('n', '<leader>p', [["_dP]])
-vim.keymap.set('n', '<leader>f', vim.lsp.buf.format)
-vim.keymap.set('n', '<leader>m', ":Mason<CR>")
-local osname = vim.loop.os_uname().sysname
-if osname == "Windows_NT" then
-    print("Windows Detected!!")
-    vim.keymap.set('n', '<leader>x', function() print("sorry this is windows!") end)
-elseif osname == "Linux" then
-    -- Linux only!!
-    vim.keymap.set('n', '<leader>x', "<cmd>!chmod +x %<CR>", { silent = true })
-end

lua/barink/keys.lua

@@ -0,0 +1,15 @@
+-- Keymaps
+vim.g.mapleader = " "
+
+vim.keymap.set('n', '<leader><F8>', vim.cmd.UndotreeToggle)
+vim.keymap.set('n', '<leader>p', [["_dP]])
+vim.keymap.set('n', '<leader>fa', vim.lsp.buf.format)
+vim.keymap.set('n', '<leader>m', ":Mason<CR>")
+local osname = vim.loop.os_uname().sysname
+if osname == "Windows_NT" then
+    print("Windows Detected!!")
+    vim.keymap.set('n', '<leader>x', function() print("sorry this is windows!") end)
+elseif osname == "Linux" then
+    -- Linux only!!
+    vim.keymap.set('n', '<leader>x', "<cmd>!chmod +x %<CR>", { silent = true })
+end

lua/barink/lazy.lua

@@ -1 +0,0 @@
-

lua/barink/plugins/fidget.lua

@@ -0,0 +1,6 @@
+return {
+        "j-hui/fidget.nvim",
+        config = function()
+            require('fidget').setup({})
+        end
+    }

lua/barink/plugins/fugitive.lua

@@ -0,0 +1 @@
+return  { 'tpope/vim-fugitive' }

lua/barink/plugins/lsp.lua

@@ -0,0 +1,88 @@
+return 
+    {
+        'neovim/nvim-lspconfig',
+        dependencies = {
+            "williamboman/mason-lspconfig",
+            "williamboman/mason.nvim",
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-cmdline",
+            "hrsh7th/nvim-cmp",
+            'L3MON4D3/LuaSnip',
+        },
+        config = function()
+            require("mason").setup()
+            require("mason-lspconfig").setup({
+                ensure_installed = { "lua_ls", "bashls", "rust_analyzer" }
+            })
+            local cmp = require('cmp')
+            cmp.setup({
+                snippet = {
+                    expand = function(args)
+                        require('luasnip').lsp_expand(args.body)
+                    end,
+                },
+                mapping = cmp.mapping.preset.insert({
+                    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+                    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+                    ['<C-Space>'] = cmp.mapping.complete(),
+                    ['<C-e>'] = cmp.mapping.abort(),
+                    ['<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 = 'nvim_lsp' },
+                    { name = 'luasnip' },
+                }, {
+                    { name = 'buffer' },
+                })
+            })
+
+            -- Set configuration for specific filetype.
+            cmp.setup.filetype('gitcommit', {
+                sources = cmp.config.sources({
+                    { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+                }, {
+                    { name = 'buffer' },
+                })
+            })
+
+            -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+            cmp.setup.cmdline({ '/', '?' }, {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = 'buffer' }
+                }
+            })
+
+            -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+            cmp.setup.cmdline(':', {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = 'path' }
+                }, {
+                    { name = 'cmdline' }
+                }),
+                matching = { disallow_symbol_nonprefix_matching = false }
+            })
+
+            -- Set up lspconfig.
+            local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+            require('lspconfig')['asm_lsp'].setup({
+                capabilities = capabilities
+            })
+
+            local lsp = require("lspconfig")
+            lsp.lua_ls.setup({
+                capabilities = require('cmp_nvim_lsp').default_capabilities(),
+                settings = {
+                    Lua = {
+                        diagnostics = {
+                            globals = { 'vim' }
+                        }
+                    }
+                }
+            })
+        end
+    }

lua/barink/plugins/telescope.lua

@@ -0,0 +1,10 @@
+return {
+        "nvim-telescope/telescope.nvim",
+        dependencies = { 'nvim-lua/plenary.nvim' },
+        config = function()
+            local builtin = require('telescope.builtin')
+
+            vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+            vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
+        end
+}

lua/barink/plugins/tokyonight.lua

@@ -0,0 +1,18 @@
+return {
+        "folke/tokyonight.nvim",
+        lazy = false,
+        priority = 1000,
+        opts = {},
+        config = function()
+            require("tokyonight").setup({
+                style = "night",
+                light_style = "day",
+                transparent = true,
+                terminal_colors = true,
+                dim_inactive = false,
+                lualine_bold = false,
+            })
+
+            vim.cmd [[colorscheme tokyonight]]
+        end
+    }

lua/barink/plugins/treesitter.lua

@@ -0,0 +1,14 @@
+return {
+        "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate",
+        config = function()
+            local configs = require("nvim-treesitter.configs")
+
+            configs.setup({
+                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
+                sync_install = false,
+                highlight = { enable = true },
+                indent = { enable = true },
+            })
+        end
+    }

lua/barink/plugins/undotree.lua

@@ -0,0 +1 @@
+return { "mbbill/undotree" }

lua/barink/vim.lua

@@ -0,0 +1,26 @@
+-- Set basic vim options
+vim.opt.guicursor = ""
+
+vim.opt.nu = true
+vim.opt.relativenumber = true
+
+local tab_spacing = 4
+vim.opt.tabstop = tab_spacing
+vim.opt.softtabstop = tab_spacing
+vim.opt.shiftwidth = tab_spacing
+vim.opt.expandtab = true
+
+vim.opt.smartindent = true
+
+vim.opt.wrap = false
+
+vim.opt.hlsearch = false
+vim.opt.incsearch = true
+
+vim.opt.termguicolors = true
+
+vim.opt.scrolloff = 8
+
+vim.g.netrw_browse_split = 0
+vim.g.netrw_winsize = 25
+