Removed AI config , moved away from lspconfig, added roslyn lsp and folke/flash

Highlight on yank
gitsigns
oil as default explorer

after/ftplugin/cpp.lua

@@ -0,0 +1,5 @@
+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/java.lua

@@ -1,24 +0,0 @@
---[[
--- 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()

after/ftplugin/php.lua

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

after/plugin/colors.lua

@@ -1,5 +1,5 @@
 function ColorMyPencils(color)
-    color = color or "tokyonight"
+    color = color or "catppuccin"
     vim.cmd.colorscheme(color)
 
     -- make transparent BG

lazy-lock.json

@@ -1,32 +1,56 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "catppuccin": { "branch": "main", "commit": "193e123cdbc4dd3e86db883d55349e9587f0ded6" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
-  "fidget.nvim": { "branch": "main", "commit": "933db4596e4bab1b09b6d48a10e21819e4cc458f" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
-  "gen.nvim": { "branch": "main", "commit": "87fbe811155b90eea58622614809705b966009ad" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
-  "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" },
+  "conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" },
-  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
+  "edgy.nvim": { "branch": "main", "commit": "8bfd2808994a988c975694122f68624b8a219f5f" },
-  "lazy.nvim": { "branch": "main", "commit": "3132d7d27d56d6bb4bdd0a09623d162b3cf1c588" },
+  "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
-  "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "mason-lspconfig": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
-  "nvim-cmp": { "branch": "main", "commit": "6ed1c93465c33f6a53b4c3f103bf9d1ab696382a" },
+  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
-  "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
+  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
+  "mason-lspconfig": { "branch": "main", "commit": "c55bd8a8fb191e24176c206a7af1dd51ce7276a5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "24662f92c18edd397ef12d635b11dbdedef2d094" },
+  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
-  "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
-  "nvim-treesitter": { "branch": "master", "commit": "a951dcb7ec253544b0150251008de8b06a0874cd" },
+  "neoconf.nvim": { "branch": "main", "commit": "3c1b589a73f4a73fed63d017626acd2c10d0a8f8" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
+  "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "tokyonight.nvim": { "branch": "main", "commit": "fbe3a27378fdd51a8ddd04f57012455436916a62" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "nvim-jdtls": { "branch": "master", "commit": "f73731b543f5971e0da9665eb1d7ceffe1fde71f" },
-  "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a2bd1cf7b0446a7414aaf373cea5e4ca804c9c69" },
-  "vim-fugitive": { "branch": "master", "commit": "2377e16e6641418565b934990cf49068855987c6" }
+  "nvim-navigator": { "branch": "master", "commit": "3979c931a85335fed1b0755992898b49d0d54678" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "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" },
+  "roslyn.nvim": { "branch": "main", "commit": "1ebc9393d3e577d9f68102f14d98b2e4e7f15644" },
+  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "twilight.nvim": { "branch": "main", "commit": "664e752f4a219801265cc3fc18782b457b58c1e1" },
+  "typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
+  "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
+  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "yazi.nvim": { "branch": "main", "commit": "3bd585a908d7555d9d08ca1bfe5cc2c70e13d8b1" },
+  "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
 }

lua/barink/init.lua

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

lua/barink/keys.lua

@@ -7,13 +7,7 @@ vim.keymap.set('n', '<leader>fa', vim.lsp.buf.format)
 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>le', ':Lexplore<CR>', { noremap = false, silent = true })
-local osname = vim.loop.os_uname().sysname
+vim.keymap.set('n', '<leader>l', ':Neotree<CR>', { noremap = false, silent = true })
-if osname == "Windows_NT" then
-    vim.keymap.set('n', '<leader>x', function() print("sorry this is windows!") end)
-elseif osname == "Linux" then
-    -- Linux only!!
-    vim.keymap.set('n', '<leader>x', "<cmd>!chmod +x %<CR>", { silent = true })
-end
 -- 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-k>', ':m \'<-2<CR>gv=gv', { noremap = true })
@@ -26,17 +20,55 @@ vim.keymap.set('n', '<A-S-k>', ':m .-2<CR>==', {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 })
 
+-- 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() end )
+vim.keymap.set('n', '<C-T>', function() require('trouble').toggle('diagnostics') end)
-vim.keymap.set('n', '<C-D>', function ()  vim.diagnostic.open_float() 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)
 -- Debugging
-vim.keymap.set('n', '<leader>sb', function () require('dap').toggle_breakpoint() end )
+vim.keymap.set('n', '<leader>b', function() require('dap').toggle_breakpoint() end)
-vim.keymap.set('n', '<leader>db', function () require('dapui').toggle() end )
+vim.keymap.set('n', '<F5>', function()
-vim.keymap.set('n', '<F5>', function () print("Start debug session" ) require('dap').continue() end )
+    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>")
+
+-- Easily hit escape in terminal mode.
+vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")
+
+-- Open a terminal at the bottom of the screen with a fixed height.
+vim.keymap.set("n", ",st", function()
+    vim.cmd.new()
+    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", "<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

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

lua/barink/plugins/Oil.lua

@@ -0,0 +1,15 @@
+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

@@ -1,17 +0,0 @@
-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

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

lua/barink/plugins/conform.lua

@@ -0,0 +1,31 @@
+return {
+    "stevearc/conform.nvim",
+    config = function()
+        require("conform").setup(
+            {
+                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 = {
+                    lsp_fallback = true,
+                },
+            })
+        -- 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

@@ -0,0 +1,16 @@
+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,14 +22,104 @@ 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",
+                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}"
               }
+            }
+            dap.adapters.delve = {
+                  type = 'server',
+                  port = '${port}',
+                  executable = {
+                    command = 'dlv',
+                    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

@@ -0,0 +1,29 @@
+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",
-        opts = {
+    config = function()
-            notification = {
+        local opts = {
-                window = { winblend = 0},
+        }
-            },
+        require("fidget").setup(opts)
-        },
+    end
 }

lua/barink/plugins/flash.lua

@@ -0,0 +1,12 @@
+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/git-worktree.lua

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

lua/barink/plugins/gitsigns.lua

@@ -0,0 +1,29 @@
+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/hardtime.lua

@@ -1,9 +0,0 @@
-return {
-    {
-        'm4xshen/hardtime.nvim',
-        dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim"},
-        opts = {
-            restriction_mode = "hint"
-        }
-    }
-}

lua/barink/plugins/harpoon.lua

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

lua/barink/plugins/lsp.lua

@@ -2,6 +2,10 @@ return
 {
     'neovim/nvim-lspconfig',
     dependencies = {
+        {
+            "folke/neoconf.nvim",
+            opts = {}
+        },
         "williamboman/mason-lspconfig",
         "williamboman/mason.nvim",
         "hrsh7th/cmp-nvim-lsp",
@@ -11,18 +15,39 @@ return
         "hrsh7th/nvim-cmp",
         {
             'L3MON4D3/LuaSnip',
-                 dependencies = 'hrsh7th/nvim-cmp',
+            dependencies = {
+                '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)
@@ -31,15 +56,14 @@ 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(),
-                    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                ['<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 = 'path' },
                 { name = 'nvim_lsp', keyword_length = 1 },
-                    { name = 'luasnip', option = { show_autosnippets = true}},
+                { name = 'luasnip' },
-                }, {
+                { name = 'path' },
                 { name = 'buffer',   keyword_length = 2 },
             }),
             window = {
@@ -57,80 +81,121 @@ return
             })
         })
 
-            -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+        cmp.setup.filetype({ "sql" }, {
-            cmp.setup.cmdline({ '/', '?' }, {
-                mapping = cmp.mapping.preset.cmdline(),
             sources = {
-                    { name = 'buffer' }
+                { name = "vim-dadbod-completion" },
+                { 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 lsp = require("lspconfig")
-            lsp.lua_ls.setup({
-                capabilities = require('cmp_nvim_lsp').default_capabilities(),
-                settings = {
-                    Lua = {
-                        diagnostics = {
-                            globals = { 'vim' }
-                        }
-                    }
-                }
-            })
-            local ls = require("luasnip")
-            ls.config.set_config({
-                history = true,
-                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-L>", function() ls.jump(1) end, {silent = true })
+        vim.keymap.set({ "i", "s" }, "<C-n>", 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-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= "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\snippets"})
+        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 capabilities = require("cmp_nvim_lsp").default_capabilities()
-
+        local lsp = vim.lsp.config
-            require('lspconfig')['asm_lsp'].setup({
+        local language_server = {
-                capabilities = capabilities
+            asm_lsp = true,
-            })
+            mojo = true,
-
+            zls = true,
-            require('lspconfig')['zls'].setup({
+            emmet_language_server = true,
-                capabilities = capabilities
+            rust_analyzer = true,
-            })
+            --gdtoolkit = { flags = { debounce_text_changes = 150 }},
-
+            jdtls = true,
-            require('lspconfig')['rust_analyzer'].setup({
+            pylsp = true,
-                capabilities = capabilities
+            phpactor = {
-            })
+                init_options = {
-
+                    ["language_server_phpstan.enabled"] = false,
-            require('lspconfig')['jdtls'].setup({
+                    ["language_server_psalm.enabled"] = false,
-                capabilities = capabilities
+                }
-            })
+            },
-
+            clangd = {
-            require('lspconfig')['bashls'].setup({
+                capabilities = capabilities,
-                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"),
-            })
+                cmd = { "clangd" },
-
+                filetypes = { "c", "cpp", "objc", "objcpp" },
-            require('lspconfig')['gopls'].setup({
+                settings = {
-                capabilities = capabilities
+                    clangd = {
-            })
+                        compilationDatabasePath = "compile-commands.json",
-        end
+                    },
+                }
+            },
+            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
+            if config == true then
+                config = {}
+            end
+            config = vim.tbl_deep_extend("force", {}, { capabilities = capabilities }, config)
+            vim.lsp.config(name, config)
+            vim.lsp.enable(name)
+        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]
+                if type(settings) ~= "table" then
+                    settings = {}
+                end
+
+                local builtin = require "telescope.builtin"
+
+                vim.opt_local.omnifunc = "v:lua.vim.lsp.omnifunc"
+                vim.keymap.set("n", "gd", builtin.lsp_definitions, { buffer = -1 })
+                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 })
+                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/neo-tree.lua

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,16 @@
+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/roslynLsp.lua

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

lua/barink/plugins/telescope.lua

@@ -6,15 +6,7 @@ return {
                 {'nvim-lua/plenary.nvim'},
                 {
                     'nvim-telescope/telescope-fzf-native.nvim',
-                    build = function () if os == 'Windows_NT' then
+                    build ="cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
-                        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()
@@ -22,8 +14,15 @@ return {
                 require('telescope').load_extension('fzf')
                 local builtin = require('telescope.builtin')
 
-                vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+                vim.keymap.set('n', '<leader>fd', builtin.find_files, {})
-                vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
+                vim.keymap.set('n', '<leader>ft', 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/theme.lua

@@ -1,4 +1,5 @@
 return {
+    {
         "folke/tokyonight.nvim",
         lazy = false,
         priority = 1000,
@@ -12,7 +13,15 @@ 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/todo-comments.lua

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

lua/barink/plugins/treesitter.lua

@@ -1,14 +1,33 @@
 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({
-                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
+                playground  = {
+                    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

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

lua/barink/plugins/typescriptTools.lua

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

lua/barink/plugins/undotree.lua

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

lua/barink/plugins/vim-dadbod.lua

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

lua/barink/plugins/vimbegood.lua

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

lua/barink/plugins/wezterm.lua

@@ -0,0 +1,13 @@
+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

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

lua/barink/vim.lua

@@ -21,11 +21,8 @@ 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)
@@ -35,3 +32,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
+vim.g.netrw_browse_split = 0
+vim.g.netrw_winsize = 25
+