Merging Windows into main

Changes
- Removed hardtime ( messages were too annoying)
- Cleaned up key mappings file
- Disabled Lazy loading
- Added Oil and conform

lazy-lock.json

@@ -1,48 +1,35 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
-  "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
-  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" },
+  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "mason-lspconfig": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" },
   "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
-  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" },
-  "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" },
+  "nvim-treesitter": { "branch": "master", "commit": "140f534ce9c02189921b80f5c8a68ab9e3f92ce8" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1e5a2a796a88b5d696acb07dd5c285b13d13da21" },
-  "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
+  "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
+  "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
+  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
   "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
   "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
   "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
   "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
-  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
   "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }

lua/barink/init.lua

@@ -2,15 +2,23 @@ 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({
+	vim.fn.system({
-        "git",
+		"git",
-        "clone",
+		"clone",
-        "--filter=blob:none",
+		"--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
+		"https://github.com/folke/lazy.nvim.git",
-        "--branch=stable", -- latest stable release
+		"--branch=stable", -- latest stable release
-        lazypath,
+		lazypath,
-    })
+	})
 end
 vim.opt.rtp:prepend(lazypath)
-
+local opts = {
-require("lazy").setup("barink.plugins")
+	defaults = {
+		lazy = false,
+	},
+	change_detection = {
+		enabled = true,
+		notify = false,
+	},
+}
+require("lazy").setup("barink.plugins", opts)

lua/barink/keys.lua

@@ -13,12 +13,12 @@ vim.keymap.set('v', '<A-S-j>', ':m \'>+1<CR>gv=gv', {noremap = true})
 vim.keymap.set('v', '<A-S-k>', ':m \'<-2<CR>gv=gv', {noremap = true})
 
 -- Move lines while in normal mode
-vim.keymap.set('n', '<A-S-j>', ':m .+1<CR>==', {noremap = true})
+vim.keymap.set("n", "<A-S-j>", ":m .+1<CR>==", { noremap = true })
-vim.keymap.set('n', '<A-S-k>', ':m .-2<CR>==', {noremap = true})
+vim.keymap.set("n", "<A-S-k>", ":m .-2<CR>==", { noremap = true })
 
 -- Move line in edit mode
-vim.keymap.set('i', '<A-j>', ':m .+1<CR>==gi', {noremap = true})
+vim.keymap.set("i", "<A-j>", ":m .+1<CR>==gi", { noremap = true })
-vim.keymap.set('i', '<A-k>', ':m .-2<CR>==gi', {noremap = true})
+vim.keymap.set("i", "<A-k>", ":m .-2<CR>==gi", { noremap = true })
 
 -- Diagnostics !
 vim.keymap.set('n', '<C-T>', function() require('trouble').toggle() end )
@@ -26,11 +26,22 @@ vim.keymap.set('n', '<leader>d', function ()  vim.diagnostic.open_float() end )
 vim.keymap.set('n', '<leader>dn', function () vim.diagnostic.goto_next() end )
 vim.keymap.set('n', '<leader>dp', function () vim.diagnostic.goto_prev() end )
 vim.keymap.set('n', '<C-d>', function () vim.lsp.buf.code_action() end)
--- Debugging
-vim.keymap.set('n', '<leader>sb', function () require('dap').toggle_breakpoint() end )
-vim.keymap.set('n', '<leader>db', function () require('dapui').toggle() end )
-vim.keymap.set('n', '<F5>', function () print("Start debug session" ) require('dap').continue() end )
-vim.keymap.set('n', '<F6>', function () require('dap').step_over() end )
-vim.keymap.set('n', '<F7>', function () require('dap').step_into() end )
 
-vim.keymap.set('n', '<leader>=',":Gen Generate<CR>")
+-- Debugging
+vim.keymap.set("n", "<leader>sb", function()
+	require("dap").toggle_breakpoint()
+end)
+vim.keymap.set("n", "<leader>db", function()
+	require("dapui").toggle()
+end)
+vim.keymap.set("n", "<F5>", function()
+	require("dap").continue()
+end)
+vim.keymap.set("n", "<F6>", function()
+	require("dap").step_over()
+end)
+vim.keymap.set("n", "<F7>", function()
+	require("dap").step_into()
+end)
+
+vim.keymap.set("n", "<leader>=", ":Gen Generate<CR>")

lua/barink/plugins/highlight-colors.lua

@@ -0,0 +1,9 @@
+return {
+    {
+    'brenoprata10/nvim-highlight-colors',
+    config = function ()
+            vim.opt.termguicolors = true
+            require("nvim-highlight-colors").setup({})
+        end
+    }
+}

lua/barink/plugins/lsp.lua

@@ -50,35 +50,35 @@ return
                     documentation = cmp.config.window.bordered()
                 },
 
-            })
+		-- 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" },
+			}),
+		})
 
-            -- Set configuration for specific filetype.
+		-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-            cmp.setup.filetype('gitcommit', {
+		cmp.setup.cmdline({ "/", "?" }, {
-                sources = cmp.config.sources({
+			mapping = cmp.mapping.preset.cmdline(),
-                    { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+			sources = {
-                }, {
+				{ name = "buffer" },
-                    { name = 'buffer' },
+			},
-                })
+		})
-            })
 
-            -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+		-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-            cmp.setup.cmdline({ '/', '?' }, {
+		cmp.setup.cmdline(":", {
-                mapping = cmp.mapping.preset.cmdline(),
+			mapping = cmp.mapping.preset.cmdline(),
-                sources = {
+			sources = cmp.config.sources({
-                    { name = 'buffer' }
+				{ name = "path" },
-                }
+			}, {
-            })
+				{ name = "cmdline" },
+			}),
+			matching = { disallow_symbol_nonprefix_matching = false },
+		})
 
-            -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+		local lsp = require("lspconfig")
-            cmp.setup.cmdline(':', {
-                mapping = cmp.mapping.preset.cmdline(),
-                sources = cmp.config.sources({
-                    { name = 'path' }
-                }, {
-                    { name = 'cmdline' }
-                }),
-                matching = { disallow_symbol_nonprefix_matching = false }
-            })
 
             local ls = require("luasnip")
             ls.config.set_config({
@@ -87,16 +87,24 @@ return
                 enable_autosnippets = true,
             })
 
-            vim.keymap.set({"i", "s"}, "<C-K>", function() ls.expand() end, {silent = true})
+		lsp.lua_ls.setup({
-            vim.keymap.set({"i", "s"}, "<C-L>", function() ls.jump(1) end, {silent = true })
+			capabilities = require("cmp_nvim_lsp").default_capabilities(),
-            vim.keymap.set({"i", "s"}, "<C-J>", function() ls.jump(-1) end, {silent = true})
+			settings = {
-            vim.keymap.set({"i", "s"}, "<C-E>", function()
+				Lua = {
-                if ls.choice_active() then
+					diagnostics = {
-                    ls.change_choice(1)
+						globals = { "vim" },
-                end
+					},
-            end, {silent = true})
+				},
+			},
+		})
+		local ls = require("luasnip")
+		ls.config.set_config({
+			history = true,
+			updateevents = "TextChanged, TextChangedI",
+			enable_autosnippets = true,
+		})
 
-            require("luasnip.loaders.from_lua").load({paths= "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\barink\\snippets"})
+            require("luasnip.loaders.from_lua").load({paths= "~/.config/nvim/lua/barink/snippets"})
 
 
             -- Set up lspconfig.

lua/barink/plugins/oil.lua

@@ -0,0 +1,14 @@
+return {
+    {
+        "stevearc/oil.nvim",
+        opt = {
+            default_file_explorer = false
+        },
+        dependencies = {
+            'nvim-tree/nvim-web-devicons'
+        },
+       config = function ()
+            vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc= "Open parent directory"})
+        end
+    }
+}

lua/barink/plugins/vim-dadbod.lua

@@ -1,3 +1,9 @@
 return {
+<<<<<<< HEAD
+    'tpope/vim-dadbod',
+    }
+
+=======
     "tpope/vim-dadbod",
 }
+>>>>>>> Windows