Remove missed merge conflicts, Removed double oil.lua plugin file

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

after/ftplugin/cpp.lua

@@ -1,5 +0,0 @@
-local tab_spacing = 2
-vim.opt.tabstop = tab_spacing
-vim.opt.softtabstop = tab_spacing
-vim.opt.shiftwidth = tab_spacing
-vim.opt_local.makeprg = 'msbuild .\\game.vcxproj /p:Configuration=Release /p:Platform=x64'

after/ftplugin/php.lua

@@ -1,4 +0,0 @@
-vim.keymap.set("n", "<space>pa", function()
-  package.loaded["php.artisan"] = nil
-  require("php.artisan").telescope_select_artisan()
-end)

after/plugin/colors.lua

@@ -1,10 +0,0 @@
-function ColorMyPencils(color)
-    color = color or "catppuccin"
-    vim.cmd.colorscheme(color)
-
-    -- make transparent BG
-    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-end
-
-ColorMyPencils()

lazy-lock.json

@@ -1,56 +1,72 @@
 {
+<<<<<<< Updated upstream
+  "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
+  "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
+  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+=======
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "catppuccin": { "branch": "main", "commit": "193e123cdbc4dd3e86db883d55349e9587f0ded6" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
-  "conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
-  "edgy.nvim": { "branch": "main", "commit": "8bfd2808994a988c975694122f68624b8a219f5f" },
+  "gen.nvim": { "branch": "main", "commit": "0be6ca0cdfe45a7b6537cbf41bd22a420c05be85" },
-  "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
-  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
+  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
+  "mason-lspconfig": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mason-lspconfig": { "branch": "main", "commit": "c55bd8a8fb191e24176c206a7af1dd51ce7276a5" },
+  "neoconf.nvim": { "branch": "main", "commit": "3b6db0a913258a91951f96b09c005522cca98f1f" },
-  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
+>>>>>>> Stashed changes
-  "neoconf.nvim": { "branch": "main", "commit": "3c1b589a73f4a73fed63d017626acd2c10d0a8f8" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
-  "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
-  "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
+<<<<<<< Updated upstream
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-jdtls": { "branch": "master", "commit": "f73731b543f5971e0da9665eb1d7ceffe1fde71f" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a2bd1cf7b0446a7414aaf373cea5e4ca804c9c69" },
+  "nvim-treesitter": { "branch": "master", "commit": "140f534ce9c02189921b80f5c8a68ab9e3f92ce8" },
-  "nvim-navigator": { "branch": "master", "commit": "3979c931a85335fed1b0755992898b49d0d54678" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1e5a2a796a88b5d696acb07dd5c285b13d13da21" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
-  "oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "roslyn.nvim": { "branch": "main", "commit": "1ebc9393d3e577d9f68102f14d98b2e4e7f15644" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
+  "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
+  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
-  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
-  "twilight.nvim": { "branch": "main", "commit": "664e752f4a219801265cc3fc18782b457b58c1e1" },
+  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
-  "typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
-  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
-  "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
-  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
+  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
+=======
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" },
-  "yazi.nvim": { "branch": "main", "commit": "3bd585a908d7555d9d08ca1bfe5cc2c70e13d8b1" },
+  "nvim-lspconfig": { "branch": "master", "commit": "76e7c8b029e6517f3689390d6599e9b446551704" },
-  "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-treesitter": { "branch": "master", "commit": "140f534ce9c02189921b80f5c8a68ab9e3f92ce8" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1e5a2a796a88b5d696acb07dd5c285b13d13da21" },
+  "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
+  "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" },
+  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
+  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }
+>>>>>>> Stashed changes
 }

lua/barink/after/plugin/colors.lua

@@ -0,0 +1,10 @@
+function ColorMyPencils(color)
+    color = color or "tokyonight"
+    vim.cmd.colorscheme(color)
+
+    -- make transparent BG
+     vim.api.nvim_set_hl(0, "Normal", {bg = "none"})
+     vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none"})
+end
+
+ColorMyPencils()

lua/barink/init.lua

@@ -1,4 +1,5 @@
 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({
@@ -11,12 +12,13 @@ if not vim.loop.fs_stat(lazypath) then
 	})
 end
 vim.opt.rtp:prepend(lazypath)
-require("barink.keys")
+local opts = {
-require("lazy").setup("barink.plugins" , {
+	defaults = {
-    root = vim.fn.stdpath("data") .. "/lazy", 
+		lazy = false,
-    change_detection = {
-      enabled = false,
-      notify = true, 
 	},
-
+	change_detection = {
-})
+		enabled = true,
+		notify = false,
+	},
+}
+require("lazy").setup("barink.plugins", opts)

lua/barink/keys.lua

@@ -13,62 +13,35 @@ 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 })
 
--- Simplified split navigation
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>')
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>')
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>')
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>')
 -- Diagnostics !
-vim.keymap.set('n', '<C-T>', function() require('trouble').toggle('diagnostics') end)
+vim.keymap.set('n', '<C-T>', function() require('trouble').toggle() end )
 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', '<leader>ca', function() vim.lsp.buf.code_action() end)
+vim.keymap.set('n', '<C-d>', function () vim.lsp.buf.code_action() end)
+
 -- Debugging
-vim.keymap.set('n', '<leader>b', function() require('dap').toggle_breakpoint() end)
+vim.keymap.set("n", "<leader>sb", function()
-vim.keymap.set('n', '<F5>', function()
+	require("dap").toggle_breakpoint()
-    print("Start debug session")
-    require('dap').continue()
 end)
-vim.keymap.set('n', '<F6>', function() require('dap').step_over() end)
+vim.keymap.set("n", "<leader>db", function()
-vim.keymap.set('n', '<F7>', function() require('dap').step_into() end)
+	require("dapui").toggle()
-
+end)
-vim.keymap.set('n', '<leader>=', ":Gen Generate<CR>")
+vim.keymap.set("n", "<F5>", function()
-
+	require("dap").continue()
--- Easily hit escape in terminal mode.
+end)
-vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")
+vim.keymap.set("n", "<F6>", function()
-
+	require("dap").step_over()
--- Open a terminal at the bottom of the screen with a fixed height.
+end)
-vim.keymap.set("n", ",st", function()
+vim.keymap.set("n", "<F7>", function()
-    vim.cmd.new()
+	require("dap").step_into()
-    vim.cmd.wincmd "J"
-    vim.api.nvim_win_set_height(0, 12)
-    vim.wo.winfixheight = true
-    vim.cmd.term()
 end)
 
--- Open quickfix list
+vim.keymap.set("n", "<leader>=", ":Gen Generate<CR>")
-vim.keymap.set("n", "<M-k>", "<cmd>cnext<CR>zz")
-vim.keymap.set("n", "<M-j>", "<cmd>cprev<CR>zz")
-
-
--- Go to next in location list
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
-
--- Highlight on yank
-vim.api.nvim_create_autocmd("TextYankPost", {
-    desc = "Highlight when yanking text ",
-    group = vim.api.nvim_create_augroup('barink', { clear = true }),
-    callback = function()
-        vim.highlight.on_yank()
-    end
-})

lua/barink/plugins/AI.lua

@@ -1,2 +0,0 @@
-return {
-}

lua/barink/plugins/Oil.lua

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

lua/barink/plugins/conform.lua

@@ -1,20 +1,21 @@
 return {
     "stevearc/conform.nvim",
-    config = function()
+    event = { "BufWritePre"},
-        require("conform").setup(
+    cmd = { "ConformInfo"},
-            {
+    opts = {
         formatters_by_ft = {
             php = { "pint"},
             lua = { "stylua"},
             javascript = { "prettierd", "prettier", stop_after_first = true },
             typescript = { "prettierd", "prettier", stop_after_first = true },
-                    java = { "clang-format", },
-                    cpp = { "clang-format", },
         },
-                format_on_save = {
+        format_on_save = { timeout_ms = 500 },
-                    lsp_fallback = true,
+        default_format_ops = {
+            lsp_format = "fallback"
         },
-            })
+    },
+    config = function ()
+       require("conform").setup()
        -- Command to run async formatting 
       vim.api.nvim_create_user_command("Format", function(args)
       local range = nil
@@ -27,5 +28,8 @@ return {
       end
           require("conform").format({ async = true, lsp_format = "fallback", range = range })
        end, { range = true })
+
+
     end
 }
+

lua/barink/plugins/dap.lua

@@ -22,38 +22,21 @@ return {
         },
         config = function ()
             local dap = require('dap')
-            -- Godot Config
-            dap.adapters.godot = {
-                type = "server",
-                host = "127.0.0.1",
-                port = 6006
-            }
-            --dap.configurations.gdscript{
-            --    type = "godot",
-            --    request = "launch",
-            --    name = "launch scene",
-            --    project = "${workspaceFolder}"
-            --}
-            -- C/C++ Config 
             dap.configurations.cpp = {
                 {
                 name = "Launch",
-                type= "lldb",
+                type= "codelldb",
                 request = "launch",
                 program = function ()
                     return vim.fn.input('Path to executable: ', vim.fn.getcwd() , 'file')
                 end,
+                cwd = '${workspaceFolder}/Framework',
                 stopOnEntry = false,
-                runInTerminal = false,
                 }
             }
             dap.adapters.lldb = {
-                type = 'server',
+                type = 'executable',
-                port= "${port}",
+                command = "C:\\Program Files\\LLVM\\bin\\lldb-dap.exe",
-                executable = {
-                    command = "C:\\Users\\nigel\\AppData\\Local\\nvim-data\\mason\\bin\\codelldb.cmd",
-                    args = { "--port", "${port}"}
-                },
                 name = 'lldb'
             }
 
@@ -74,7 +57,17 @@ return {
                 name = "Launch file",
                 program = "java ${file}",
               }}
-            -- Golang config
+           dap.configurations.cpp = {{
+                name="launch",
+                type="lldb",
+                request="launch",
+                program = function ()
+                    return vim.fn.input('Path to executable: ', vim.fn.getcwd() ..'/', 'file')
+                end,
+                cwd = '${workspaceFolder}',
+                stopOnEntry = false,
+                args = {},
+            }}
             dap.configurations.go = {
               {
                 type = "delve",
@@ -106,20 +99,14 @@ return {
                     args = {'dap', '-l', '127.0.0.1:${port}'},
                   }
                 }
-                local dap = require("dap")
+            dap.adapters.codelldb = {
-                local ui = require("dapui")
+                type= 'server',
-                dap.listeners.before.attach.dapui_config = function()
+                port = '${port}',
-                    ui.open()
+                executable = {
-                end
+                    command = 'C:/Users/Nigel/Appdata/Local/nvim-data/mason/bin/codelldb.cmd',
-                dap.listeners.before.launch.dapui_config = function()
+                    args = {"--port", "${port}"}
-                    ui.open()
+                }
-                end
+            }
-                dap.listeners.before.event_terminated.dapui_config = function()
-                    ui.close()
-                end
-                dap.listeners.before.event_exited.dapui_config = function()
-                    ui.close()
-                end
         end
     }
 }

lua/barink/plugins/fidget.lua

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

lua/barink/plugins/flash.lua

@@ -1,12 +0,0 @@
-return {
-    "folke/flash.nvim",
-    event = "VeryLazy",
-    opts = {},
-    keys = {
-        { "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
-        { "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
-        { "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
-        { "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-        { "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
-    },
-}

lua/barink/plugins/gitsigns.lua

@@ -1,29 +1,4 @@
 return {
     'lewis6991/gitsigns.nvim',
-    config = function()
+    opt = {}
-        local opts = {
-            signs = {
-                add          = { text = '+' },
-                change       = { text = "~" },
-                delete       = { text = "_" },
-                topdelete    = { text = "-" },
-                changedelete = { text = "~" }
-            },
-            signs_staged = {
-                add          = { text = '+' },
-                change       = { text = "~" },
-                delete       = { text = "_" },
-                topdelete    = { text = "-" },
-                changedelete = { text = "~" },
-                untracked    = { text = "*" },
-            },
-            signs_staged_enable = true,
-            signcolumn = true,
-            watch_gitdir = {
-                follow_files = true
-            },
-            auto_attach = true
-        }
-        require("gitsigns").setup(opts)
-    end,
 }

lua/barink/plugins/harpoon.lua

@@ -1,25 +1,22 @@
 return {
     "ThePrimeagen/harpoon",
     branch= "harpoon2",
-  dependencies = {
+    dependencies = {{"nvim-lua/plenary.nvim"}},
-    { "nvim-lua/plenary.nvim" },
-    { "nvim-telescope/telescope.nvim" }
-  },
     config = function()
         local harpoon = require("harpoon")
         harpoon.setup()
 
-    vim.keymap.set("n", "<leader>ha", function() harpoon:list():add() end)
+        vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
-    vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+        vim.keymap.set("n", "<C-h>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-    vim.keymap.set("n", "<leader>fe", function() toggle_telescope(harpoon:list()) end,
+
-      { desc = "Open harpoon window" })
+        vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end)
-    vim.keymap.set("n", "C-1", function() harpoon:list():select(1) end)
+        vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end)
-    vim.keymap.set("n", "C-2", function() harpoon:list():select(2) end)
+        vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end)
-    vim.keymap.set("n", "C-3", function() harpoon:list():select(3) end)
+        vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end)
-    vim.keymap.set("n", "C-4", function() harpoon:list():select(4) end)
 
 
-    vim.keymap.set("n", "<C-,>", function() harpoon:list():prev() end)
+        vim.keymap.set("n", "<C-Q>", function() harpoon:list():prev() end)
-    vim.keymap.set("n", "<C-.>", function() harpoon:list():next() end)
+        vim.keymap.set("n", "<C-E>", function() harpoon:list():next() end)
+
     end
 }

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

@@ -15,39 +15,18 @@ return
             "hrsh7th/nvim-cmp",
             {
                 'L3MON4D3/LuaSnip',
-            dependencies = {
+                 dependencies = 'hrsh7th/nvim-cmp',
-                'hrsh7th/nvim-cmp',
-                'rafamadriz/friendly-snippets',
-            },
                  version = "v2.*",
             },
             {'mfussenegger/nvim-jdtls', dependencies = {'nvim-dap'}},
-        "onsails/lspkind.nvim",
         },
         config = function()
-        vim.opt.completeopt = { "menu", "menuone", "noselect", "preview" }
-        require("lspkind").init({})
             require("mason").setup()
             require("mason-lspconfig").setup({
                 ensure_installed = { "lua_ls", "bashls", "rust_analyzer" }
             })
-        local ls = require("luasnip")
-        ls.config.set_config({
-            history = true,
-            updateevents = "TextChanged, TextChangedI",
-            enable_autosnippets = true,
-        })
             local cmp = require('cmp')
-        local lspkind = require("lspkind")
             cmp.setup({
-            formatting = {
-                format = lspkind.cmp_format({
-                    mode = 'symbol',
-                    maxwidth = 60,
-                    ellipsis_char = '...',
-                    show_labelDetails = true,
-                }),
-            },
                 snippet = {
                     expand = function(args)
                         require('luasnip').lsp_expand(args.body)
@@ -56,14 +35,15 @@ return
                 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-Space>'] = cmp.mapping.complete(),
                     ['<C-e>'] = cmp.mapping.abort(),
-                ['<C-y>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                    ['<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', keyword_length = 1 },
-                { name = 'luasnip' },
+                    { name = 'luasnip', option = { show_autosnippets = true}},
                     { name = 'path' },
+                }, {
                     { name = 'buffer', keyword_length = 2 },
                 }),
                 window = {
@@ -81,29 +61,35 @@ return
                 })
             })
 
-        cmp.setup.filetype({ "sql" }, {
+            -- 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 = "vim-dadbod-completion" },
+                    { 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(':', {
                 mapping = cmp.mapping.preset.cmdline(),
                 sources = cmp.config.sources({
-                { name = 'path' },
+                    { name = 'path' }
-                { name = 'buffer' }
                 }, {
                     { name = 'cmdline' }
                 }),
                 matching = { disallow_symbol_nonprefix_matching = false }
             })
 
+            local ls = require("luasnip")
+            ls.config.set_config({
+                history = true,
+                updateevents = "TextChanged, TextChangedI",
+                enable_autosnippets = true,
+            })
 
             vim.keymap.set({"i", "s"}, "<C-K>", function() ls.expand() end, {silent = true})
-        vim.keymap.set({ "i", "s" }, "<C-n>", function() ls.jump(1) end, { silent = true })
+            vim.keymap.set({"i", "s"}, "<C-L>", function() ls.jump(1) end, {silent = true })
-        vim.keymap.set({ "i", "s" }, "<C-p>", function() ls.jump(-1) end, { silent = true })
+            vim.keymap.set({"i", "s"}, "<C-J>", function() ls.jump(-1) end, {silent = true})
             vim.keymap.set({"i", "s"}, "<C-E>", function()
                 if ls.choice_active() then
                     ls.change_choice(1)
@@ -111,17 +97,18 @@ return
             end, {silent = true})
 
             require("luasnip.loaders.from_lua").load({paths= "~/.config/nvim/lua/barink/snippets"})
-        require("luasnip.loaders.from_vscode").lazy_load()
+
+
             -- Set up lspconfig.
             local capabilities = require("cmp_nvim_lsp").default_capabilities()
-        local lsp = vim.lsp.config
+            local lsp = require("lspconfig")
+
             local language_server = {
                 asm_lsp= true,
-            mojo = true,
                 zls = true,
+                kotlin_language_server = true,
                 emmet_language_server = true,
                 rust_analyzer = true,
-            --gdtoolkit = { flags = { debounce_text_changes = 150 }},
                 jdtls = true,
                 pylsp = true,
                 phpactor = {
@@ -132,7 +119,7 @@ return
                 },
                 clangd = {
                 capabilities = capabilities,
-                root_dir = vim.fs.root(0, { 'compile_commands.json', 'compile_flags.txt', '.git' }), -- require("lspconfig").util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
+                root_dir = require('lspconfig').util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
                 cmd = {"clangd"},
                 filetypes = { "c", "cpp", "objc", "objcpp"},
                 settings = {
@@ -145,24 +132,13 @@ return
                 gopls = true,
                 intelephense = true,
                 lua_ls = {
-                config = {
                     settings = {
                         Lua = {
-                            runtime = {
-                                version = 'LuaJIT',
-                            },
-                            workspace = {
-                                checkThirdParty = false,
-                                library = {
-                                    vim.env.VIMRUNTIME
-                                }
-                            },
                             diagnostics = {
                                 globals = { 'vim'}
                             }
                         }
                     }
-                }
                 },
             }
 
@@ -171,8 +147,7 @@ return
                     config = {}
                 end
                 config = vim.tbl_deep_extend("force", {}, { capabilities = capabilities }, config)
-            vim.lsp.config(name, config)
+                lsp[name].setup({})
-            vim.lsp.enable(name)
             end
             vim.api.nvim_create_autocmd("LspAttach", {
                 callback = function (args)
@@ -195,7 +170,10 @@ return
                     vim.keymap.set("n", "<LEADER>cr", vim.lsp.buf.rename, {buffer =-1})
                     vim.keymap.set("n", "<LEADER>ca", vim.lsp.buf.code_action, {buffer = -1})
                     vim.keymap.set("n", "<LEADER>wd", builtin.lsp_document_symbols, {buffer = -1})
+
+
                 end
         })
 	end,
 }
+

lua/barink/plugins/neovim-context.lua

@@ -1,16 +0,0 @@
-return {
-    {
-        "nvim-treesitter/nvim-treesitter-context",
-        dependencies = {
-        },
-        config = function()
-            require('treesitter-context').setup({
-                enable = true,
-                max_lines = 4,
-                min_window_height = 0,
-                line_numbers = true,
-                mode = 'cursor',
-            })
-        end
-    }
-}

lua/barink/plugins/noice.lua

@@ -0,0 +1,11 @@
+return {
+    "folke/noice.nvim",
+    event = "VeryLazy",
+    opts = {
+    },
+    dependencies = {
+        "MunifTanjim/nui.nvim",
+        "rcarriga/nvim-notify",
+    },
+
+}

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/roslynLsp.lua

@@ -1,6 +0,0 @@
-return {
-    "seblyng/roslyn.nvim",
-    config = function()
-        require("roslyn").setup()
-    end,
-}

lua/barink/plugins/telescope.lua

@@ -21,7 +21,7 @@ return {
                 vim.keymap.set('n', '<leader>/', builtin.current_buffer_fuzzy_find)
                 vim.keymap.set('n', '<leader>gw', builtin.grep_string)
                 vim.keymap.set('n', '<leader>fp',function () 
-                    builtin.find_files { cwd = "~/.config/nvim/lua/barink/"}
+                    builtin.find_files { cwd = "~/AppData/Local/nvim/lua/barink/"}
                 end)
             end
         }

lua/barink/plugins/theme.lua

@@ -1,20 +1,23 @@
+-- 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
+--     }
+
 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,
-            })
-        end
-    },
     {
     "catppuccin/nvim",
     name="catppuccin",

lua/barink/plugins/typescriptTools.lua

@@ -1,8 +0,0 @@
-return {
-    "pmizio/typescript-tools.nvim",
-    dependencies = {
-        "nvim-lua/plenary.nvim",
-        "neovim/nvim-lspconfig",
-    },
-    opts = {}
-}

lua/barink/plugins/wezterm.lua

@@ -1,13 +0,0 @@
-return {
-    'craigmac/nvim-navigator',
-    config = function()
-        require('Navigator').setup()
-
-        vim.keymap.set({ 'n', 't' }, '<A-h>', '<CMD>NavigatorLeft<CR>')
-        vim.keymap.set({ 'n', 't' }, '<A-l>', '<CMD>NavigatorRight<CR>')
-        vim.keymap.set({ 'n', 't' }, '<A-k>', '<CMD>NavigatorUp<CR>')
-        vim.keymap.set({ 'n', 't' }, '<A-j>', '<CMD>NavigatorDown<CR>')
-        vim.keymap.set({ 'n', 't' }, '<A-p>', '<CMD>NavigatorPrevious<CR>')
-    end
-
-}

lua/barink/plugins/which-key.lua

@@ -0,0 +1,15 @@
+return {
+    "folke/which-key.nvim",
+    event = "VeryLazy",
+    opts = {
+    },
+    keys = {
+        {
+            "<leader>?",
+            function()
+                require("which-key").show({global = false})
+            end,
+            desc = "Buffer Local Keymaps (which-key)",
+        }
+    }
+}

lua/barink/vim.lua

@@ -21,8 +21,11 @@ vim.opt.termguicolors = true
 
 vim.opt.scrolloff = 8
 
+vim.g.netrw_browse_split = 0
+vim.g.netrw_winsize = 25
+
 vim.opt.completeopt = {'menu', 'menuone', 'noselect' }
-vim.opt.inccommand = 'split'
+
 vim.api.nvim_create_autocmd('LspAttach', {
     callback = function (args)
         local client = vim.lsp.get_client_by_id(args.data.client_id)
@@ -32,6 +35,15 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
-vim.g.netrw_browse_split = 0
+--[[
-vim.g.netrw_winsize = 25
+-- Run zig test on save 
+-- TODO: fix vim.cmd call 
+-- TODO: only do this when a zig test file is open 
+vim.api.nvim_create_autocmd('BufWritePost' , {
+    callback = function ()
+        vim.cmd{cmd = '!zig' , args= {'test', vim.fn.expand('%')} }
+    end
+})]]--
+
+