FEAT: conform and oil added

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,38 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "avante.nvim": { "branch": "main", "commit": "eb1cd44731783024621beafe4e46204cbc9a4320" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" },
+  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
-  "copilot.vim": { "branch": "release", "commit": "8d1e0f86d8aaa64070c080589bc2a516beb4024f" },
+  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "gen.nvim": { "branch": "main", "commit": "bd19cf584b5b82123de977b44105e855e61e5f39" },
-  "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
-  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "gitsigns.nvim": { "branch": "main", "commit": "02eafb1273afec94447f66d1a43fc5e477c2ab8a" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
+  "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "mason-lspconfig": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
-  "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
+  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
-  "mason-lspconfig": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "nvim-dap": { "branch": "master", "commit": "abb238f631609ea4be496ba7946f4f3aaec86c6a" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
+  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "neoconf.nvim": { "branch": "main", "commit": "4625534ac67c1a6f1c1731d019a12ca121c4d3c1" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+  "nvim-emmet": { "branch": "main", "commit": "928cfb74ed436d6d326ccab2061cf3592de1bf55" },
-  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "582064092cff170331064b7d198a5b97cb261fca" },
-  "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" },
+  "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "881a69e25bd6658864fab47450025490b74be878" },
+  "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
+  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
-  "nvim-jdtls": { "branch": "master", "commit": "5ecf13c53c9a66ee97c200970029ab2ebe1c1112" },
+  "nvim-treesitter": { "branch": "master", "commit": "ea2b137f35fb1e87a6471ec311805920fdf45745" },
-  "nvim-lspconfig": { "branch": "master", "commit": "32b6a6449aaba11461fffbb596dd6310af79eea4" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
-  "nvim-navigator": { "branch": "master", "commit": "3979c931a85335fed1b0755992898b49d0d54678" },
+  "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "nvim-treesitter": { "branch": "master", "commit": "684eeac91ed8e297685a97ef70031d19ac1de25a" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" },
+  "telescope.nvim": { "branch": "master", "commit": "2df52609a1632de5d77a0b2416db6ad9cf32e463" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
+  "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" },
-  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
+  "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
-  "ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
+  "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "vim-tabby": { "branch": "main", "commit": "afd76df166ed0f223ede1071e0cfde8075cc4a24" }
-  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
-  "typescript-tools.nvim": { "branch": "master", "commit": "885f4cc150f996f5bff5804874f92ff3051c883d" },
-  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-  "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
-  "vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "460432301a5cb280ea265ddfa15c9f3dcd1d26b7" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }

lua/barink/after/ftplugin/go.lua

@@ -0,0 +1,36 @@
+local dap = require("dap")
+print("You opened a Golang file")
+
+dap.adapters.delve = {
+  type = 'server',
+  port = '${port}',
+  executable = {
+    command = 'dlv',
+    args = {'dap', '-l', '127.0.0.1:${port}'},
+  }
+}
+
+-- https://github.com/go-delve/delve/blob/master/Documentation/usage/dlv_dap.md
+dap.configurations.go = {
+  {
+    type = "delve",
+    name = "Debug",
+    request = "launch",
+    program = "${file}"
+  },
+  {
+    type = "delve",
+    name = "Debug test", -- configuration for debugging test files
+    request = "launch",
+    mode = "test",
+    program = "${file}"
+  },
+  -- works with go.mod packages and sub packages 
+  {
+    type = "delve",
+    name = "Debug test (go.mod)",
+    request = "launch",
+    mode = "test",
+    program = "./${relativeFileDirname}"
+  }
+}

lua/barink/after/ftplugin/java.lua

@@ -0,0 +1,24 @@
+--[[
+-- Only setup for windows 
+-- Don't know if all this is actually necessary
+-- TODO: FIX: Clean this mess up ~ 03/28/2024
+--]]
+if vim.loop.os_uname().sysname == 'Windows_NT' then
+    Cmd = 'c:/Users/nigel/Appdata/Local/nvim-data/mason/bin/jdtls.cmd'
+    JavaDebug = vim.fn.glob("C:/Users/nigel/AppData/Local/nvim-data/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-0.52.0.jar", 1)
+else
+    Cmd = ''
+    JavaDebug = nil
+end
+local config = {
+    cmd = {Cmd},
+    root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
+    init_options = {
+        bundles = {
+            JavaDebug
+        }
+    }
+}
+require('jdtls').start_or_attach(config)
+require('jdtls').setup_dap({hotcodreplace='auto'})
+require('jdtls.dap').setup_dap_main_class_configs()

lua/barink/after/ftplugin/lua.lua

@@ -0,0 +1 @@
+print("You opened a LUA file..")

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,22 +1,25 @@
 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)
-require("barink.keys")
+local opts = {
-require("lazy").setup("barink.plugins" , {
+	defaults = {
-    root = vim.fn.stdpath("data") .. "/lazy", 
+		lazy = false,
-    change_detection = {
+	},
-      enabled = false,
+	change_detection = {
-      notify = true, 
+		enabled = true,
-    },
+		notify = false,
-
+	},
-})
+}
+require("lazy").setup("barink.plugins", opts)

lua/barink/keys.lua

@@ -1,74 +1,54 @@
 -- Keymaps
 vim.g.mapleader = " "
 
-vim.keymap.set('n', '<leader><F8>', vim.cmd.UndotreeToggle)
+vim.keymap.set("n", "<leader><F8>", vim.cmd.UndotreeToggle)
-vim.keymap.set('n', '<leader>p', [["_dP]])
+vim.keymap.set("n", "<leader>p", [["_dP]])
-vim.keymap.set('n', '<leader>fa', vim.lsp.buf.format)
+vim.keymap.set("n", "<leader>fa", vim.lsp.buf.format)
-vim.keymap.set('n', '<leader>m', ":Mason<CR>")
+vim.keymap.set("n", "<leader>m", ":Mason<CR>")
-vim.keymap.set('n', '<leader>e', ':Explore<CR>', { noremap = false, silent = true })
+vim.keymap.set("n", "<leader>e", ":Explore<CR>", { noremap = false, silent = true })
-vim.keymap.set('n', '<leader>le', ':Lexplore<CR>', { noremap = false, silent = true })
+vim.keymap.set("n", "<leader>le", ":Lexplore<CR>", { noremap = false, silent = true })
-vim.keymap.set('n', '<leader>l', ':Neotree<CR>', { noremap = false, silent = true })
+vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
 -- Move lines while in visual mode
-vim.keymap.set('v', '<A-S-j>', ':m \'>+1<CR>gv=gv', { noremap = true })
+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 })
+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()
-vim.keymap.set('n', '<leader>d', function() vim.diagnostic.open_float() end)
+	require("trouble").toggle()
-vim.keymap.set('n', '<leader>dn', function() vim.diagnostic.goto_next() end)
+end)
-vim.keymap.set('n', '<leader>dp', function() vim.diagnostic.goto_prev() end)
+vim.keymap.set("n", "<leader>d", function()
-vim.keymap.set('n', '<leader>ca', function() vim.lsp.buf.code_action() end)
+	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)
+
 -- 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,55 +0,0 @@
-return {
-    "github/copilot.vim",
-    {
-        "nomnivore/ollama.nvim",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-        },
-        cmd = { "Ollama", "OllamaModel", "OllamaServe", "OllamaServeStop" },
-        keys = {
-            {
-                "<leader>oo",
-                ":<c-u>lua require('ollama').prompt()<cr>",
-                desc = "ollama prompt",
-                mode = { "n", "v" },
-            },
-            {
-                "<leader>oG",
-                ":<c-u>lua require('ollama').prompt('Generate_Code')<cr>",
-                desc = "ollama Generate Code",
-                mode = { "n", "v" },
-            },
-        },
-
-        opts = {
-            model = "qwen2.5-coder"
-        },
-    },
-    {
-        "yetone/avante.nvim",
-        event = "VeryLazy",
-        version = false, -- Never set this value to "*"! Never!
-        opts = {
-            system_prompt = function()
-                local hub = require("mcphub").get_hub_instance()
-                return hub:get_active_servers_prompt()
-            end,
-            custom_tools = function()
-                return {
-                    require("mcphub.extensions.avante").mcp_tool(),
-                }
-            end,
-            provider = "ollama",
-            ollama = {
-                model = "qwen2.5-coder"
-            }
-        },
-        dependencies = {
-            "nvim-treesitter/nvim-treesitter",
-            "stevearc/dressing.nvim",
-            "nvim-lua/plenary.nvim",
-            "MunifTanjim/nui.nvim",
-        }
-    }
-
-}

lua/barink/plugins/Oil.lua

@@ -1,15 +0,0 @@
-return {
-    {
-        "stevearc/oil.nvim",
-        opt = {
-            default_file_explorer = true
-        },
-        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/codellama.lua

@@ -0,0 +1,17 @@
+return {
+        {
+        'David-kunz/gen.nvim',
+        opts = {
+            model = "codellama:7b",
+            host = "localhost",
+            port = "11434",
+            quit_mape = "q",
+            init = function (options) pcall(io.popen("ollama serve > /dev/null 2>&1 &)"))  end,
+            display_mode = "split",
+            command =function (options)
+            local body = {model = options.model, stream=true}
+                return "curl --silent --no-buffer -X POST http://" .. options.host .. ':' .. options.port .. "/api/chat -d $body"
+            end,
+        },
+    }
+}

lua/barink/plugins/comments.lua

@@ -1,9 +1,11 @@
 return {
     'numToStr/Comment.nvim',
-    lazy = false,
     opts = {
+        -- add any options here
     },
-    config = function()
+    config = function ()
         require("Comment").setup()
-    end
+    end,
+    lazy = false,
 }
+

lua/barink/plugins/conform.lua

@@ -1,31 +1,18 @@
 return {
-    "stevearc/conform.nvim",
+	"stevearc/conform.nvim",
-    config = function()
+	opts = {},
-        require("conform").setup(
+	config = function()
-            {
+		require("conform").setup({
-                formatters_by_ft = {
+			formatters_by_ft = {
-                    php = { "pint" },
+				lua = { "stylua" },
-                    lua = { "stylua" },
+				javascript = { { "prettierd", "prettier" } },
-                    javascript = { "prettierd", "prettier", stop_after_first = true },
+			},
-                    typescript = { "prettierd", "prettier", stop_after_first = true },
+		})
-                    java = { "clang-format", },
+		vim.api.nvim_create_autocmd("BufWritePre", {
-                    cpp = { "clang-format", },
+			pattern = "*",
-                },
+			callback = function(args)
-                format_on_save = {
+				require("conform").format({ buffer = args.buf })
-                    lsp_fallback = true,
+			end,
-                },
+		})
-            })
+	end,
-        -- Command to run async formatting
-        vim.api.nvim_create_user_command("Format", function(args)
-            local range = nil
-            if args.count ~= -1 then
-                local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
-                range = {
-                    start = { args.line1, 0 },
-                    ["end"] = { args.line2, end_line:len() },
-                }
-            end
-            require("conform").format({ async = true, lsp_format = "fallback", range = range })
-        end, { range = true })
-    end
 }

lua/barink/plugins/dadbod-ui.lua

@@ -1,16 +0,0 @@
-return {
-    "kristijanhusak/vim-dadbod-ui",
-    dependencies = {
-        {'tpope/vim-dadbod', lazy = true },
-        { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql'}, lazy = true },
-    },
-    cmd = {
-        'DBUI',
-        'DBUIToggle',
-        'DBUIAddConnection',
-        'DBUIFindBuffer',
-    },
-    init = function ()
-       vim.g.db_ui_use_nerd_fonts = 1
-    end
-}

lua/barink/plugins/dap.lua

@@ -22,59 +22,13 @@ 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",
-                request = "launch",
-                program = function ()
-                    return vim.fn.input('Path to executable: ', vim.fn.getcwd() , 'file')
-                end,
-                stopOnEntry = false,
-                runInTerminal = false,
-                }
-            }
-            dap.adapters.lldb = {
-                type = 'server',
-                port= "${port}",
-                executable = {
-                    command = "C:\\Users\\nigel\\AppData\\Local\\nvim-data\\mason\\bin\\codelldb.cmd",
-                    args = { "--port", "${port}"}
-                },
-                name = 'lldb'
-            }
-
-            -- Zig configuration
-            dap.configurations.zig = {
-                name = 'launch',
-                type= 'lldb',
-                request = 'launch',
-                program = '${workspaceFolder}/zig-out/bin/tests.exe',
-                cwd = '${workspaceFolder}',
-            }
-            -- Java configuration
-            -- See also ftplugin
             dap.configurations.java = {
               {
-                type = 'java',
+                type = 'java';
-                request = 'launch',
+                request = 'launch';
-                name = "Launch file",
+                name = "Launch file";
-                program = "java ${file}",
+                program = "java ${file}";
               }}
-            -- Golang config
             dap.configurations.go = {
               {
                 type = "delve",
@@ -106,20 +60,6 @@ return {
                     args = {'dap', '-l', '127.0.0.1:${port}'},
                   }
                 }
-                local dap = require("dap")
-                local ui = require("dapui")
-                dap.listeners.before.attach.dapui_config = function()
-                    ui.open()
-                end
-                dap.listeners.before.launch.dapui_config = function()
-                    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/edgy.lua

@@ -1,29 +0,0 @@
-return {
-    "folke/edgy.nvim",
-    event = "VeryLazy",
-    opts= {
-        bottom ={
-            {
-                ft = "toggleterm",
-                size = { height = 0.4 },
-                filter = function (_,  win)
-                    return vim.api.nvim_win_get_config(win).relative == ""
-                end,
-            },
-            {
-                ft = "lazyterm",
-                title = "Lazyterm",
-                size = { height = 0.4 },
-                filter = function(buf, _)
-                    return not vim.b[buf].lazyterm_cmd
-                end
-            }
-    },
-    init = function ()
-        vim.opt.laststatus = 3
-        vim.opt.splitkeep = "screen"
-    end,
-    }
-}
-
-

lua/barink/plugins/fidget.lua

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

lua/barink/plugins/git-worktree.lua

@@ -1,14 +1,10 @@
 return {
-    {
+    'ThePrimeagen/git-worktree.nvim',
-        'ThePrimeagen/git-worktree.nvim',
+    dependencies = {
-        dependencies = {
+        'nvim-telescope/telescope.nvim'
-            'nvim-telescope/telescope.nvim',
+    },
-        },
+    init = function()
-        opts = {},
+        require("git-worktree").setup()
-        init = function ()
+        require("telescope").load_extension("git_worktree")
-            require("git-worktree").setup()
+    end
-            require("telescope").load_extension("git_worktree")
-        end
-    }
 }
-

lua/barink/plugins/gitsigns.lua

@@ -1,29 +0,0 @@
-return {
-    'lewis6991/gitsigns.nvim',
-    config = function()
-        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",
+    "ThePrimeagen/harpoon",
-  branch = "harpoon2",
+    branch= "harpoon2",
-  dependencies = {
+    dependencies = {{"nvim-lua/plenary.nvim"}},
-    { "nvim-lua/plenary.nvim" },
+    config = function()
-    { "nvim-telescope/telescope.nvim" }
+        local harpoon = require("harpoon")
-  },
+        harpoon.setup()
-  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
+
+    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

@@ -1,201 +1,151 @@
-return
+return {
-{
+	"neovim/nvim-lspconfig",
-    'neovim/nvim-lspconfig',
+	dependencies = {
-    dependencies = {
+		"williamboman/mason-lspconfig",
-        {
+		"williamboman/mason.nvim",
-            "folke/neoconf.nvim",
+		"hrsh7th/cmp-nvim-lsp",
-            opts = {}
+		"hrsh7th/cmp-buffer",
-        },
+		"hrsh7th/cmp-path",
-        "williamboman/mason-lspconfig",
+		"hrsh7th/cmp-cmdline",
-        "williamboman/mason.nvim",
+		"hrsh7th/nvim-cmp",
-        "hrsh7th/cmp-nvim-lsp",
+		{
-        "hrsh7th/cmp-buffer",
+			"L3MON4D3/LuaSnip",
-        "hrsh7th/cmp-path",
+			dependencies = "hrsh7th/nvim-cmp",
-        "hrsh7th/cmp-cmdline",
+			version = "v2.*",
-        "hrsh7th/nvim-cmp",
+		},
-        {
+		{ "mfussenegger/nvim-jdtls", dependencies = { "nvim-dap" } },
-            'L3MON4D3/LuaSnip',
+		{
-            dependencies = {
+			"olrtg/nvim-emmet",
-                'hrsh7th/nvim-cmp',
+			config = function()
-                'rafamadriz/friendly-snippets',
+				vim.keymap.set({ "n", "v" }, "<leader>xe", require("nvim-emmet").wrap_with_abbreviation)
-            },
+			end,
-            version = "v2.*",
+		},
-        },
+	},
-        { 'mfussenegger/nvim-jdtls', dependencies = { 'nvim-dap' } },
+	config = function()
-        "onsails/lspkind.nvim",
+		require("mason").setup()
-    },
+		require("mason-lspconfig").setup({
-    config = function()
+			ensure_installed = { "lua_ls", "bashls", "rust_analyzer" },
-        vim.opt.completeopt = { "menu", "menuone", "noselect", "preview" }
+		})
-        require("lspkind").init({})
+		local cmp = require("cmp")
-        require("mason").setup()
+		cmp.setup({
-        require("mason-lspconfig").setup({
+			snippet = {
-            ensure_installed = { "lua_ls", "bashls", "rust_analyzer" }
+				expand = function(args)
-        })
+					require("luasnip").lsp_expand(args.body)
-        local ls = require("luasnip")
+				end,
-        ls.config.set_config({
+			},
-            history = true,
+			mapping = cmp.mapping.preset.insert({
-            updateevents = "TextChanged, TextChangedI",
+				["<C-b>"] = cmp.mapping.scroll_docs(-4),
-            enable_autosnippets = true,
+				["<C-f>"] = cmp.mapping.scroll_docs(4),
-        })
+				["<C-Space>"] = cmp.mapping.complete(),
-        local cmp = require('cmp')
+				["<C-e>"] = cmp.mapping.abort(),
-        local lspkind = require("lspkind")
+				["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        cmp.setup({
+			}),
-            formatting = {
+			sources = cmp.config.sources({
-                format = lspkind.cmp_format({
+				{ name = "path" },
-                    mode = 'symbol',
+				{ name = "nvim_lsp", keyword_length = 1 },
-                    maxwidth = 60,
+				{ name = "luasnip", option = { show_autosnippets = true } },
-                    ellipsis_char = '...',
+			}, {
-                    show_labelDetails = true,
+				{ name = "buffer", keyword_length = 2 },
-                }),
+			}),
-            },
+			window = {
-            snippet = {
+				documentation = cmp.config.window.bordered(),
-                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(),
-                ['<C-y>'] = 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 = 'path' },
-                { name = 'buffer',   keyword_length = 2 },
-            }),
-            window = {
-                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' },
+			},
-            })
+		})
-        })
 
-        cmp.setup.filetype({ "sql" }, {
+		-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-            sources = {
+		cmp.setup.cmdline(":", {
-                { name = "vim-dadbod-completion" },
+			mapping = cmp.mapping.preset.cmdline(),
-                { name = "buffer" },
+			sources = cmp.config.sources({
-            }
+				{ name = "path" },
-        })
+			}, {
-        -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+				{ name = "cmdline" },
-        -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+			}),
-        cmp.setup.cmdline(':', {
+			matching = { disallow_symbol_nonprefix_matching = false },
-            mapping = cmp.mapping.preset.cmdline(),
+		})
-            sources = cmp.config.sources({
-                { name = 'path' },
-                { name = 'buffer' }
-            }, {
-                { name = 'cmdline' }
-            }),
-            matching = { disallow_symbol_nonprefix_matching = false }
-        })
 
+		local lsp = require("lspconfig")
 
-        vim.keymap.set({ "i", "s" }, "<C-K>", function() ls.expand() end, { silent = true })
+		lsp.emmet_language_server.setup({})
-        vim.keymap.set({ "i", "s" }, "<C-n>", 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-E>", function()
-            if ls.choice_active() then
-                ls.change_choice(1)
-            end
-        end, { silent = true })
 
-        require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/barink/snippets" })
+		lsp.lua_ls.setup({
-        require("luasnip.loaders.from_vscode").lazy_load()
+			capabilities = require("cmp_nvim_lsp").default_capabilities(),
-        -- Set up lspconfig.
+			settings = {
-        local capabilities = require("cmp_nvim_lsp").default_capabilities()
+				Lua = {
-        local lsp = require("lspconfig")
+					diagnostics = {
+						globals = { "vim" },
+					},
+				},
+			},
+		})
+		local ls = require("luasnip")
+		ls.config.set_config({
+			history = true,
+			updateevents = "TextChanged, TextChangedI",
+			enable_autosnippets = true,
+		})
 
-        local language_server = {
+		vim.keymap.set({ "i", "s" }, "<C-K>", function()
-            asm_lsp = true,
+			ls.expand()
-            mojo = true,
+		end, { silent = true })
-            zls = true,
+		vim.keymap.set({ "i", "s" }, "<C-L>", function()
-            emmet_language_server = true,
+			ls.jump(1)
-            rust_analyzer = true,
+		end, { silent = true })
-            --gdtoolkit = { flags = { debounce_text_changes = 150 }},
+		vim.keymap.set({ "i", "s" }, "<C-J>", function()
-            jdtls = true,
+			ls.jump(-1)
-            pylsp = true,
+		end, { silent = true })
-            phpactor = {
+		vim.keymap.set({ "i", "s" }, "<C-E>", function()
-                init_options = {
+			if ls.choice_active() then
-                    ["language_server_phpstan.enabled"] = false,
+				ls.change_choice(1)
-                    ["language_server_psalm.enabled"] = false,
+			end
-                }
+		end, { silent = true })
-            },
-            clangd = {
-                capabilities = capabilities,
-                root_dir = require('lspconfig').util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
-                cmd = { "clangd" },
-                filetypes = { "c", "cpp", "objc", "objcpp" },
-                settings = {
-                    clangd = {
-                        compilationDatabasePath = "compile-commands.json",
-                    },
-                }
-            },
-            ts_ls = true,
-            gopls = true,
-            intelephense = true,
-            lua_ls = {
-                config = {
-                    settings = {
-                        Lua = {
-                            runtime = {
-                                version = 'LuaJIT',
-                            },
-                            workspace = {
-                                checkThirdParty = false,
-                                library = {
-                                    vim.env.VIMRUNTIME
-                                }
-                            },
-                            diagnostics = {
-                                globals = { 'vim' }
-                            }
-                        }
-                    }
-                }
-            },
-        }
 
-        for name, config in pairs(language_server) do
+		require("luasnip.loaders.from_lua").load({ paths = "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\snippets" })
-            if config == true then
-                config = {}
-            end
-            config = vim.tbl_deep_extend("force", {}, { capabilities = capabilities }, config)
-            lsp[name].setup({})
-        end
-        vim.api.nvim_create_autocmd("LspAttach", {
-            callback = function(args)
-                local client = assert(vim.lsp.get_client_by_id(args.data.client_id), "must have valid client")
 
-                local settings = language_server[client.name]
+		-- Set up lspconfig.
-                if type(settings) ~= "table" then
+		local capabilities = require("cmp_nvim_lsp").default_capabilities()
-                    settings = {}
-                end
 
-                local builtin = require "telescope.builtin"
+		require("lspconfig")["asm_lsp"].setup({
+			capabilities = capabilities,
+		})
 
-                vim.opt_local.omnifunc = "v:lua.vim.lsp.omnifunc"
+		require("lspconfig")["zls"].setup({
-                vim.keymap.set("n", "gd", builtin.lsp_definitions, { buffer = -1 })
+			capabilities = capabilities,
-                vim.keymap.set("n", "gr", builtin.lsp_references, { buffer = -1 })
+		})
-                vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = -1 })
-                vim.keymap.set("n", "gT", vim.lsp.buf.type_definition, { buffer = -1 })
-                vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = -1 })
 
-                vim.keymap.set("n", "<LEADER>cr", vim.lsp.buf.rename, { buffer = -1 })
+		require("lspconfig")["rust_analyzer"].setup({
-                vim.keymap.set("n", "<LEADER>ca", vim.lsp.buf.code_action, { buffer = -1 })
+			capabilities = capabilities,
-                vim.keymap.set("n", "<LEADER>wd", builtin.lsp_document_symbols, { buffer = -1 })
+		})
-            end
+
-        })
+		require("lspconfig")["jdtls"].setup({
-    end,
+			capabilities = capabilities,
+		})
+
+		require("lspconfig")["bashls"].setup({
+			capabilities = capabilities,
+		})
+
+		require("lspconfig")["tsserver"].setup({
+			capabilities = capabilities,
+		})
+		require("lspconfig")["gopls"].setup({
+			capabilities = capabilities,
+		})
+	end,
 }

lua/barink/plugins/neo-tree.lua

@@ -1,9 +0,0 @@
-return {
-    "nvim-neo-tree/neo-tree.nvim",
-    branch = "v3.x",
-    dependencies = {
-        "nvim-lua/plenary.nvim",
-        "nvim-tree/nvim-web-devicons",
-        "MunifTanjim/nui.nvim"
-    },
-}

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

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

lua/barink/plugins/telescope.lua

@@ -6,7 +6,15 @@ return {
                 {'nvim-lua/plenary.nvim'},
                 {
                     'nvim-telescope/telescope-fzf-native.nvim',
-                    build ="cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
+                    build = function () if os == 'Windows_NT' then
+                        print("You are on Windows, Idiot!!!")
+                       return [[
+                                cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
+                                && cmake --build build --config Release 
+                                && cmake --install build --prefix build
+                                ]]  else
+                        return 'make' end
+                    end,
                 }
             },
             config = function()
@@ -14,15 +22,8 @@ return {
                 require('telescope').load_extension('fzf')
                 local builtin = require('telescope.builtin')
 
-                vim.keymap.set('n', '<leader>fd', builtin.find_files, {})
+                vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-                vim.keymap.set('n', '<leader>ft', builtin.git_files, {})
+                vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
-                vim.keymap.set('n', '<leader>fh', builtin.help_tags)
-                vim.keymap.set('n', '<leader>fb', builtin.buffers)
-                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/"}
-                end)
             end
         }
 }

lua/barink/plugins/todo-comments.lua

@@ -1,8 +0,0 @@
-return {
-    "folke/todo-comments.nvim",
-    dependencies = {
-        "nvim-lua/plenary.nvim"
-    },
-    opts = {
-    }
-}

lua/barink/plugins/tokyonight.lua

@@ -1,5 +1,4 @@
 return {
-    {
         "folke/tokyonight.nvim",
         lazy = false,
         priority = 1000,
@@ -13,15 +12,7 @@ return {
                 dim_inactive = false,
                 lualine_bold = false,
             })
-        end
+
-    },
+            vim.cmd [[colorscheme tokyonight]]
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        priority = 1000,
-        config = function()
-            require("catppuccin").setup()
-            vim.cmd.colorscheme('catppuccin')
         end
     }
-}

lua/barink/plugins/treesitter.lua

@@ -1,33 +1,14 @@
 return {
-    {
         "nvim-treesitter/nvim-treesitter",
         build = ":TSUpdate",
-        dependencies = {
-            {
-                "nvim-treesitter/playground",
-            },
-        },
         config = function()
-            require 'nvim-treesitter.install'.compilers = {'clang'}
             local configs = require("nvim-treesitter.configs")
 
             configs.setup({
-                playground  = {
+                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
-                    enable = true,
-                    disable = {},
-                    updatetime = 25,
-                    keybindings = {
-                        toggle_query_editor = 'o',
-                        toggle_hl_groups = 'i',
-                        update = 'R',
-                        show_help = '?'
-                    }
-                },
-                ensure_installed = { "python", "c", "lua", "vim", "vimdoc", "bash" },
                 sync_install = false,
                 highlight = { enable = true },
                 indent = { enable = true },
             })
         end
-        },
+    }
-        }

lua/barink/plugins/twilight.lua

@@ -1,6 +0,0 @@
-return {
-    {
-        "folke/twilight.nvim",
-        opts = {}
-    }
-}

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

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

lua/barink/plugins/vim-dadbod.lua

@@ -1,3 +1,4 @@
 return {
-    "tpope/vim-dadbod",
+    'tpope/vim-dadbod',
-}
+    }
+

lua/barink/plugins/vimbegood.lua

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

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/zen-mode.lua

@@ -1,4 +0,0 @@
-return {
-    "folke/zen-mode.nvim",
-    opts = {}
-}

lua/barink/vim.lua

@@ -21,17 +21,17 @@ vim.opt.termguicolors = true
 
 vim.opt.scrolloff = 8
 
-vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
+vim.g.netrw_browse_split = 0
-vim.opt.inccommand = 'split'
+vim.g.netrw_winsize = 25
+
+vim.opt.completeopt = {'menu', 'menuone', 'noselect' }
+
 vim.api.nvim_create_autocmd('LspAttach', {
-    callback = function(args)
+    callback = function (args)
         local client = vim.lsp.get_client_by_id(args.data.client_id)
         if client.server_capabilities.hoverProvider then
-            vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = args.buf })
+            vim.keymap.set('n', 'K', vim.lsp.buf.hover, {buffer = args.buf})
         end
     end,
 })
 
-vim.g.netrw_browse_split = 0
-vim.g.netrw_winsize = 25
-