From 1bb7a56d5cbf714a5c6fc1cbaf9423c86b490dc4 Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Mon, 15 Jul 2024 21:58:28 +0200
Subject: [PATCH 1/9] Bunch of updates to NVIM setup for Windows

Updated Settings
* Added new keymaps in keys.lua
* improved LSP setup

Plugins Removed
* codellama
* hardtime

Additional Plugins added
* Added edgy
* Added neo-tree
* Added todo-comments
* Added which-key
---
 lazy-lock.json                       | 56 +++++++++++++++-------------
 lua/barink/after/ftplugin/java.lua   | 14 +------
 lua/barink/keys.lua                  | 10 +----
 lua/barink/plugins/codellama.lua     | 17 ---------
 lua/barink/plugins/dap.lua           | 20 ++++++++++
 lua/barink/plugins/edgy.lua          |  9 +++++
 lua/barink/plugins/hardtime.lua      |  9 -----
 lua/barink/plugins/lsp.lua           | 28 ++++++++++++++
 lua/barink/plugins/neo-tree.lua      |  9 +++++
 lua/barink/plugins/telescope.lua     | 10 +----
 lua/barink/plugins/todo-comments.lua |  8 ++++
 lua/barink/plugins/treesitter.lua    | 21 ++++++++++-
 lua/barink/plugins/which-key.lua     | 15 ++++++++
 13 files changed, 144 insertions(+), 82 deletions(-)
 delete mode 100644 lua/barink/plugins/codellama.lua
 create mode 100644 lua/barink/plugins/edgy.lua
 delete mode 100644 lua/barink/plugins/hardtime.lua
 create mode 100644 lua/barink/plugins/neo-tree.lua
 create mode 100644 lua/barink/plugins/todo-comments.lua
 create mode 100644 lua/barink/plugins/which-key.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 395169c..f988bdf 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,32 +1,36 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "fidget.nvim": { "branch": "main", "commit": "933db4596e4bab1b09b6d48a10e21819e4cc458f" },
-  "gen.nvim": { "branch": "main", "commit": "87fbe811155b90eea58622614809705b966009ad" },
-  "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" },
-  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
-  "lazy.nvim": { "branch": "main", "commit": "3132d7d27d56d6bb4bdd0a09623d162b3cf1c588" },
-  "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
-  "mason-lspconfig": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
-  "nvim-cmp": { "branch": "main", "commit": "6ed1c93465c33f6a53b4c3f103bf9d1ab696382a" },
-  "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
-  "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
-  "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
-  "nvim-lspconfig": { "branch": "master", "commit": "24662f92c18edd397ef12d635b11dbdedef2d094" },
-  "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" },
-  "nvim-treesitter": { "branch": "master", "commit": "a951dcb7ec253544b0150251008de8b06a0874cd" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
-  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
+  "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
+  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "lazy.nvim": { "branch": "main", "commit": "33be7ac3173c7c20b94ce7e1b9734c1a1e85f292" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "mason-lspconfig": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
+  "neoconf.nvim": { "branch": "main", "commit": "04060950124f5901dd383566208b591a5bdb2929" },
+  "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
+  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
+  "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" },
+  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
+  "nvim-treesitter": { "branch": "master", "commit": "09700b88b41ed96391de3d2010d74dc54fd5c210" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
-  "tokyonight.nvim": { "branch": "main", "commit": "fbe3a27378fdd51a8ddd04f57012455436916a62" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
-  "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" },
-  "vim-fugitive": { "branch": "master", "commit": "2377e16e6641418565b934990cf49068855987c6" }
+  "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" },
+  "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" },
+  "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" },
+  "trouble.nvim": { "branch": "main", "commit": "88c3be40c061ce053ab326ce4fdcb973a1f785ff" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
+  "which-key.nvim": { "branch": "main", "commit": "7915964e73c30ba5657e9a762c6570925dad421b" }
 }
\ No newline at end of file
diff --git a/lua/barink/after/ftplugin/java.lua b/lua/barink/after/ftplugin/java.lua
index 3af7acd..4b73cc1 100644
--- a/lua/barink/after/ftplugin/java.lua
+++ b/lua/barink/after/ftplugin/java.lua
@@ -1,15 +1,5 @@
---[[
--- 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
+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)
 local config = {
     cmd = {Cmd},
     root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
diff --git a/lua/barink/keys.lua b/lua/barink/keys.lua
index 930d945..d2ba03f 100644
--- a/lua/barink/keys.lua
+++ b/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
-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
+vim.keymap.set('n', '<leader>l', ':Neotree<CR>', {noremap = false, 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-k>', ':m \'<-2<CR>gv=gv', {noremap = true})
@@ -31,7 +25,7 @@ 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', '<C-d>', function () vim.lsp.buf.code_action() end)
 -- Debugging
 vim.keymap.set('n', '<leader>sb', function () require('dap').toggle_breakpoint() end )
 vim.keymap.set('n', '<leader>db', function () require('dapui').toggle() end )
diff --git a/lua/barink/plugins/codellama.lua b/lua/barink/plugins/codellama.lua
deleted file mode 100644
index e4987cd..0000000
--- a/lua/barink/plugins/codellama.lua
+++ /dev/null
@@ -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,
-        },
-    }
-}
diff --git a/lua/barink/plugins/dap.lua b/lua/barink/plugins/dap.lua
index a7ddf18..ccd4d5b 100644
--- a/lua/barink/plugins/dap.lua
+++ b/lua/barink/plugins/dap.lua
@@ -22,6 +22,18 @@ return {
         },
         config = function ()
             local dap = require('dap')
+            dap.configurations.cpp = {
+                {
+                name = "Launch",
+                type= "codelldb",
+                request = "launch",
+                program = function ()
+                    return vim.fn.input('Path to executable: ', vim.fn.getcwd() , 'file')
+                end,
+                cwd = '${workspaceFolder}/Framework',
+                stopOnEntry = false,
+                }
+            }
             dap.configurations.java = {
               {
                 type = 'java';
@@ -60,6 +72,14 @@ return {
                     args = {'dap', '-l', '127.0.0.1:${port}'},
                   }
                 }
+            dap.adapters.codelldb = {
+                type= 'server',
+                port = '${port}',
+                executable = {
+                    command = 'C:/Users/Nigel/Appdata/Local/nvim-data/mason/bin/codelldb.cmd',
+                    args = {"--port", "${port}"}
+                }
+            }
         end
     }
 }
diff --git a/lua/barink/plugins/edgy.lua b/lua/barink/plugins/edgy.lua
new file mode 100644
index 0000000..dc0e6c7
--- /dev/null
+++ b/lua/barink/plugins/edgy.lua
@@ -0,0 +1,9 @@
+return {
+    "folke/edgy.nvim",
+    event = "VeryLazy",
+    opts = {},
+    init = function ()
+        vim.opt.laststatus = 3
+        vim.opt.splitkeep = "screen"
+    end
+}
diff --git a/lua/barink/plugins/hardtime.lua b/lua/barink/plugins/hardtime.lua
deleted file mode 100644
index dc39d23..0000000
--- a/lua/barink/plugins/hardtime.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-    {
-        'm4xshen/hardtime.nvim',
-        dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim"},
-        opts = {
-            restriction_mode = "hint"
-        }
-    }
-}
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 162cf42..6fcdfe0 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/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",
@@ -111,6 +115,26 @@ return
             require('lspconfig')['asm_lsp'].setup({
                 capabilities = capabilities
             })
+            local root_files = {
+                'premake5.lua',
+                '.clang-tidy',
+                '.clang-format',
+                'compile_commands',
+                'compile_commands.json',
+                'compile_flags.txt',
+                'configure.ac',
+                '.git'
+            }
+            local util = require('lspconfig.util')
+            require('lspconfig')['clangd'].setup({
+                capabilities = capabilities,
+                filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
+                cmd = { 'clangd' },
+                single_file_support = true,
+                root_dir = function (fname)
+                    return util.root_pattern(unpack(root_files))(fname)
+                end
+            })
 
             require('lspconfig')['zls'].setup({
                 capabilities = capabilities
@@ -131,6 +155,10 @@ return
             require('lspconfig')['gopls'].setup({
                 capabilities = capabilities
             })
+
+            require('lspconfig')['tsserver'].setup({
+                capabilities = capabilities
+            })
         end
     }
 
diff --git a/lua/barink/plugins/neo-tree.lua b/lua/barink/plugins/neo-tree.lua
new file mode 100644
index 0000000..5d1acc2
--- /dev/null
+++ b/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"
+    },
+}
diff --git a/lua/barink/plugins/telescope.lua b/lua/barink/plugins/telescope.lua
index 52cd44e..87db0b3 100644
--- a/lua/barink/plugins/telescope.lua
+++ b/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
-                        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,
+                    build ="cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
                 }
             },
             config = function()
diff --git a/lua/barink/plugins/todo-comments.lua b/lua/barink/plugins/todo-comments.lua
new file mode 100644
index 0000000..8702948
--- /dev/null
+++ b/lua/barink/plugins/todo-comments.lua
@@ -0,0 +1,8 @@
+return {
+    "folke/todo-comments.nvim",
+    dependencies = {
+        "nvim-lua/plenary.nvim"
+    },
+    opts = {
+    }
+}
diff --git a/lua/barink/plugins/treesitter.lua b/lua/barink/plugins/treesitter.lua
index 0b0b99e..4e32cfd 100644
--- a/lua/barink/plugins/treesitter.lua
+++ b/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({
+                playground  = {
+                    enable = true,
+                    disable = {},
+                    updatetime = 25,
+                    keybindings = {
+                        toggle_query_editor = 'o',
+                        toggle_hl_groups = 'i',
+                        update = 'R',
+                        show_help = '?'
+                    }
+                },
                 ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
                 sync_install = false,
                 highlight = { enable = true },
                 indent = { enable = true },
             })
         end
-    }
+        },
+        }
diff --git a/lua/barink/plugins/which-key.lua b/lua/barink/plugins/which-key.lua
new file mode 100644
index 0000000..4696062
--- /dev/null
+++ b/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)",
+        }
+    }
+}

From 6b6613aeeaddcdfb11d66b6fc3852a68d3c21b98 Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Mon, 23 Sep 2024 10:37:41 +0200
Subject: [PATCH 2/9] Added additional plugins

- Added gitsigns.nvim
- Added Treesitter.nvim
- Added Undotree.nvim
- Added vimbegood.nvim
---
 lazy-lock.json                    | 2 ++
 lua/barink/plugins/gitsigns.lua   | 4 ++++
 lua/barink/plugins/treesitter.lua | 2 +-
 lua/barink/plugins/undotree.lua   | 7 ++++++-
 lua/barink/plugins/vimbegood.lua  | 4 ++++
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 lua/barink/plugins/gitsigns.lua
 create mode 100644 lua/barink/plugins/vimbegood.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index f988bdf..7002000 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,6 +6,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "lazy.nvim": { "branch": "main", "commit": "33be7ac3173c7c20b94ce7e1b9734c1a1e85f292" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@@ -31,6 +32,7 @@
   "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" },
   "trouble.nvim": { "branch": "main", "commit": "88c3be40c061ce053ab326ce4fdcb973a1f785ff" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
   "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
   "which-key.nvim": { "branch": "main", "commit": "7915964e73c30ba5657e9a762c6570925dad421b" }
 }
\ No newline at end of file
diff --git a/lua/barink/plugins/gitsigns.lua b/lua/barink/plugins/gitsigns.lua
new file mode 100644
index 0000000..4a7e525
--- /dev/null
+++ b/lua/barink/plugins/gitsigns.lua
@@ -0,0 +1,4 @@
+return {
+    'lewis6991/gitsigns.nvim',
+    opt = {}
+}
diff --git a/lua/barink/plugins/treesitter.lua b/lua/barink/plugins/treesitter.lua
index 4e32cfd..90dff70 100644
--- a/lua/barink/plugins/treesitter.lua
+++ b/lua/barink/plugins/treesitter.lua
@@ -23,7 +23,7 @@ return {
                         show_help = '?'
                     }
                 },
-                ensure_installed = { "c", "lua", "vim", "vimdoc", "bash" },
+                ensure_installed = { "python", "c", "lua", "vim", "vimdoc", "bash" },
                 sync_install = false,
                 highlight = { enable = true },
                 indent = { enable = true },
diff --git a/lua/barink/plugins/undotree.lua b/lua/barink/plugins/undotree.lua
index c04453f..288e38d 100644
--- a/lua/barink/plugins/undotree.lua
+++ b/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
+}
diff --git a/lua/barink/plugins/vimbegood.lua b/lua/barink/plugins/vimbegood.lua
new file mode 100644
index 0000000..16f6b70
--- /dev/null
+++ b/lua/barink/plugins/vimbegood.lua
@@ -0,0 +1,4 @@
+return {
+    'ThePrimeagen/vim-be-good',
+}
+

From 12b89714dcd563e16f32941f4a41fdb507313541 Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Mon, 23 Sep 2024 10:38:23 +0200
Subject: [PATCH 3/9] Moved lsp configurations per language to ftplugins folder

---
 lua/barink/after/ftplugin/asm.lua        |  3 ++
 lua/barink/after/ftplugin/bash.lua       |  3 ++
 lua/barink/after/ftplugin/cpp.lua        | 20 ++++++++
 lua/barink/after/ftplugin/go.lua         |  5 +-
 lua/barink/after/ftplugin/java.lua       |  6 +++
 lua/barink/after/ftplugin/javascript.lua |  3 ++
 lua/barink/after/ftplugin/lua.lua        | 15 +++++-
 lua/barink/after/ftplugin/python.lua     |  6 +++
 lua/barink/after/ftplugin/rust.lua       |  6 +++
 lua/barink/after/ftplugin/zig.lua        |  6 +++
 lua/barink/plugins/lsp.lua               | 60 +-----------------------
 11 files changed, 72 insertions(+), 61 deletions(-)
 create mode 100644 lua/barink/after/ftplugin/asm.lua
 create mode 100644 lua/barink/after/ftplugin/bash.lua
 create mode 100644 lua/barink/after/ftplugin/cpp.lua
 create mode 100644 lua/barink/after/ftplugin/javascript.lua
 create mode 100644 lua/barink/after/ftplugin/python.lua
 create mode 100644 lua/barink/after/ftplugin/rust.lua
 create mode 100644 lua/barink/after/ftplugin/zig.lua

diff --git a/lua/barink/after/ftplugin/asm.lua b/lua/barink/after/ftplugin/asm.lua
new file mode 100644
index 0000000..47b5fa9
--- /dev/null
+++ b/lua/barink/after/ftplugin/asm.lua
@@ -0,0 +1,3 @@
+require('lspconfig')['asm_lsp'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/bash.lua b/lua/barink/after/ftplugin/bash.lua
new file mode 100644
index 0000000..3f180eb
--- /dev/null
+++ b/lua/barink/after/ftplugin/bash.lua
@@ -0,0 +1,3 @@
+require('lspconfig')['bashls'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/cpp.lua b/lua/barink/after/ftplugin/cpp.lua
new file mode 100644
index 0000000..89f95d7
--- /dev/null
+++ b/lua/barink/after/ftplugin/cpp.lua
@@ -0,0 +1,20 @@
+local root_files = {
+    'premake5.lua',
+    '.clang-tidy',
+    '.clang-format',
+    'compile_commands',
+    'compile_commands.json',
+    'compile_flags.txt',
+    'configure.ac',
+    '.git'
+}
+local util = require('lspconfig.util')
+require('lspconfig')['clangd'].setup({
+    capabilities = capabilities,
+    filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
+    cmd = { 'clangd' },
+    single_file_support = true,
+    root_dir = function (fname)
+        return util.root_pattern(unpack(root_files))(fname)
+    end
+})
diff --git a/lua/barink/after/ftplugin/go.lua b/lua/barink/after/ftplugin/go.lua
index 39d684f..f2b9ec0 100644
--- a/lua/barink/after/ftplugin/go.lua
+++ b/lua/barink/after/ftplugin/go.lua
@@ -1,5 +1,8 @@
+require('lspconfig')['gopls'].setup({
+    capabilities = capabilities
+})
+
 local dap = require("dap")
-print("You opened a Golang file")
 
 dap.adapters.delve = {
   type = 'server',
diff --git a/lua/barink/after/ftplugin/java.lua b/lua/barink/after/ftplugin/java.lua
index 4b73cc1..7d9fd91 100644
--- a/lua/barink/after/ftplugin/java.lua
+++ b/lua/barink/after/ftplugin/java.lua
@@ -12,3 +12,9 @@ local config = {
 require('jdtls').start_or_attach(config)
 require('jdtls').setup_dap({hotcodreplace='auto'})
 require('jdtls.dap').setup_dap_main_class_configs()
+
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+require('lspconfig')['jdtls'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/javascript.lua b/lua/barink/after/ftplugin/javascript.lua
new file mode 100644
index 0000000..42a249f
--- /dev/null
+++ b/lua/barink/after/ftplugin/javascript.lua
@@ -0,0 +1,3 @@
+require('lspconfig')['tsserver'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/lua.lua b/lua/barink/after/ftplugin/lua.lua
index fef868a..a6bf0bc 100644
--- a/lua/barink/after/ftplugin/lua.lua
+++ b/lua/barink/after/ftplugin/lua.lua
@@ -1 +1,14 @@
-print("You opened a LUA file..")
+
+
+local lsp = require("lspconfig")
+lsp.lua_ls.setup({
+    capabilities = require('cmp_nvim_lsp').default_capabilities(),
+    settings = {
+        Lua = {
+            diagnostics = {
+                globals = { 'vim' }
+            }
+        }
+    }
+})
+
diff --git a/lua/barink/after/ftplugin/python.lua b/lua/barink/after/ftplugin/python.lua
new file mode 100644
index 0000000..d29246c
--- /dev/null
+++ b/lua/barink/after/ftplugin/python.lua
@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['pyright'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/rust.lua b/lua/barink/after/ftplugin/rust.lua
new file mode 100644
index 0000000..ef610b1
--- /dev/null
+++ b/lua/barink/after/ftplugin/rust.lua
@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['rust_analyzer'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/after/ftplugin/zig.lua b/lua/barink/after/ftplugin/zig.lua
new file mode 100644
index 0000000..d4150fe
--- /dev/null
+++ b/lua/barink/after/ftplugin/zig.lua
@@ -0,0 +1,6 @@
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require('lspconfig')['zls'].setup({
+    capabilities = capabilities
+})
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 6fcdfe0..93e738f 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -40,9 +40,9 @@ return
                     ['<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 = 'path' },
                     { name = 'nvim_lsp', keyword_length = 1 },
                     { name = 'luasnip', option = { show_autosnippets = true}},
+                    { name = 'path' },
                 }, {
                     { name = 'buffer', keyword_length = 2 },
                 }),
@@ -80,17 +80,6 @@ return
                 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,
@@ -112,53 +101,6 @@ return
             -- Set up lspconfig.
             local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
-            require('lspconfig')['asm_lsp'].setup({
-                capabilities = capabilities
-            })
-            local root_files = {
-                'premake5.lua',
-                '.clang-tidy',
-                '.clang-format',
-                'compile_commands',
-                'compile_commands.json',
-                'compile_flags.txt',
-                'configure.ac',
-                '.git'
-            }
-            local util = require('lspconfig.util')
-            require('lspconfig')['clangd'].setup({
-                capabilities = capabilities,
-                filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
-                cmd = { 'clangd' },
-                single_file_support = true,
-                root_dir = function (fname)
-                    return util.root_pattern(unpack(root_files))(fname)
-                end
-            })
-
-            require('lspconfig')['zls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['rust_analyzer'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['jdtls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['bashls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['gopls'].setup({
-                capabilities = capabilities
-            })
-
-            require('lspconfig')['tsserver'].setup({
-                capabilities = capabilities
-            })
         end
     }
 

From 71f08e66aad5173db698b7d021b842efb241410c Mon Sep 17 00:00:00 2001
From: Nigel Barink <nigelbarink@hotmail.com>
Date: Thu, 26 Sep 2024 14:46:07 +0200
Subject: [PATCH 4/9] Merge Windows config

---
 lazy-lock.json                    | 52 +++++++++++++++----------------
 lua/barink/plugins/dap.lua        | 35 ++++++++++++++++++---
 lua/barink/plugins/edgy.lua       | 38 ++++++++++++++++------
 lua/barink/plugins/lsp.lua        | 38 ++++++++++++++++++++--
 lua/barink/plugins/tokyonight.lua | 46 +++++++++++++++++----------
 lua/barink/vim.lua                | 12 +++++++
 6 files changed, 162 insertions(+), 59 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 7002000..cec8a7b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,38 +1,38 @@
 {
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "33be7ac3173c7c20b94ce7e1b9734c1a1e85f292" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
-  "neoconf.nvim": { "branch": "main", "commit": "04060950124f5901dd383566208b591a5bdb2929" },
-  "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
-  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
-  "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" },
-  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
-  "nvim-treesitter": { "branch": "master", "commit": "09700b88b41ed96391de3d2010d74dc54fd5c210" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" },
+  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "mason-lspconfig": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
+  "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" },
-  "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" },
-  "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" },
-  "trouble.nvim": { "branch": "main", "commit": "88c3be40c061ce053ab326ce4fdcb973a1f785ff" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
-  "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
-  "which-key.nvim": { "branch": "main", "commit": "7915964e73c30ba5657e9a762c6570925dad421b" }
-}
\ No newline at end of file
+  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
+  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
+}
diff --git a/lua/barink/plugins/dap.lua b/lua/barink/plugins/dap.lua
index ccd4d5b..0552b34 100644
--- a/lua/barink/plugins/dap.lua
+++ b/lua/barink/plugins/dap.lua
@@ -34,13 +34,40 @@ return {
                 stopOnEntry = false,
                 }
             }
+            dap.adapters.lldb = {
+                type = 'executable',
+                command = "C:\\Program Files\\LLVM\\bin\\lldb-dap.exe",
+                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';
-                request = 'launch';
-                name = "Launch file";
-                program = "java ${file}";
+                type = 'java',
+                request = 'launch',
+                name = "Launch file",
+                program = "java ${file}",
               }}
+           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",
diff --git a/lua/barink/plugins/edgy.lua b/lua/barink/plugins/edgy.lua
index dc0e6c7..f387301 100644
--- a/lua/barink/plugins/edgy.lua
+++ b/lua/barink/plugins/edgy.lua
@@ -1,9 +1,29 @@
-return {
-    "folke/edgy.nvim",
-    event = "VeryLazy",
-    opts = {},
-    init = function ()
-        vim.opt.laststatus = 3
-        vim.opt.splitkeep = "screen"
-    end
-}
+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,
+    }
+}
+
+
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 93e738f..9212a5a 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -98,9 +98,41 @@ return
 
             require("luasnip.loaders.from_lua").load({paths= "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\snippets"})
 
+
             -- Set up lspconfig.
-            local capabilities = require('cmp_nvim_lsp').default_capabilities()
+            local capabilities = require("cmp_nvim_lsp").default_capabilities()
+            local lsp = require("lspconfig")
 
-        end
-    }
+            local language_server = { 
+                asm_lsp= true,
+                zls = true,
+                rust_analyzer = true,
+                jdtls = true,
+                pylsp = 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",
+                        },
+                    }
+                },
+                tsserver = true,
+                gopls = true
+            }
 
+            for name, config in pairs(language_server) do
+                if config == true then
+                    config = {}
+                end
+                config = vim.tbl_deep_extend("force", {}, {
+                    capabilities = capabilities,
+            }, config)
+            lsp[name].setup({})
+            end
+
+	end,
+}
diff --git a/lua/barink/plugins/tokyonight.lua b/lua/barink/plugins/tokyonight.lua
index a5fef0d..deed102 100644
--- a/lua/barink/plugins/tokyonight.lua
+++ b/lua/barink/plugins/tokyonight.lua
@@ -1,18 +1,30 @@
-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,
-            })
+-- 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
+--     }
 
-            vim.cmd [[colorscheme tokyonight]]
-        end
-    }
+return {
+    { 
+    "catppuccin/nvim",
+    name="catppuccin",
+    priority=1000,
+    config = function () 
+        require("catppuccin").setup()
+        vim.cmd.colorscheme = "catppuccin"
+    end 
+}
+}
diff --git a/lua/barink/vim.lua b/lua/barink/vim.lua
index 8b73673..4f5a67a 100644
--- a/lua/barink/vim.lua
+++ b/lua/barink/vim.lua
@@ -35,3 +35,15 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
+--[[
+-- 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
+})]]--
+
+
+

From 0411f4b928155d43573f2ebb2a51057eea6acba6 Mon Sep 17 00:00:00 2001
From: Nigel Barink <nigelbarink@hotmail.com>
Date: Thu, 26 Sep 2024 16:05:29 +0200
Subject: [PATCH 5/9] Moved snippets folder, Added Oil and conform to windows
 config, improved lsp and telescope config

---
 lazy-lock.json                     |  2 ++
 lua/barink/plugins/Oil.lua         | 14 ++++++++
 lua/barink/plugins/conform.lua     | 21 ++++++++++++
 lua/barink/plugins/lsp.lua         | 51 ++++++++++++++++++++++++------
 lua/barink/plugins/telescope.lua   | 11 +++++--
 lua/{ => barink}/snippets/all.lua  |  0
 lua/{ => barink}/snippets/java.lua |  0
 lua/{ => barink}/snippets/lua.lua  |  0
 8 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 lua/barink/plugins/Oil.lua
 create mode 100644 lua/barink/plugins/conform.lua
 rename lua/{ => barink}/snippets/all.lua (100%)
 rename lua/{ => barink}/snippets/java.lua (100%)
 rename lua/{ => barink}/snippets/lua.lua (100%)

diff --git a/lazy-lock.json b/lazy-lock.json
index cec8a7b..4cebdce 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -5,6 +5,7 @@
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
   "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
   "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
@@ -25,6 +26,7 @@
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" },
   "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
+  "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
diff --git a/lua/barink/plugins/Oil.lua b/lua/barink/plugins/Oil.lua
new file mode 100644
index 0000000..a9acfc0
--- /dev/null
+++ b/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
+    }
+}
diff --git a/lua/barink/plugins/conform.lua b/lua/barink/plugins/conform.lua
new file mode 100644
index 0000000..1b4fa8b
--- /dev/null
+++ b/lua/barink/plugins/conform.lua
@@ -0,0 +1,21 @@
+return {
+    "stevearc/conform.nvim",
+    event = { "BufWritePre"},
+    cmd = { "ConformInfo"},
+    opts = {
+        formatters_by_ft = {
+            php = { "pint"},
+            lua = { "stylua"},
+            javascript = { "prettierd", "prettier", stop_after_first = true },
+            typescript = { "prettierd", "prettier", stop_after_first = true },
+        },
+        format_on_save = { timeout_ms = 500 },
+        default_format_ops = {
+            lsp_format = "fallback"
+        },
+    },
+    config = function ()
+       require("conform").setup()
+    end
+}
+
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 9212a5a..db41a56 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -96,14 +96,14 @@ return
                 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= "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\barink\\snippets"})
 
 
             -- Set up lspconfig.
             local capabilities = require("cmp_nvim_lsp").default_capabilities()
             local lsp = require("lspconfig")
 
-            local language_server = { 
+            local language_server = {
                 asm_lsp= true,
                 zls = true,
                 rust_analyzer = true,
@@ -111,28 +111,59 @@ return
                 pylsp = true,
                 clangd = {
                 capabilities = capabilities,
-                root_dir = 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 = { 
-                    clangd = { 
+                settings = {
+                    clangd = {
                         compilationDatabasePath = "compile-commands.json",
                         },
                     }
                 },
                 tsserver = true,
-                gopls = true
+                gopls = true,
+                lua_ls = {
+                    settings = {
+                        Lua = {
+                            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)
-            lsp[name].setup({})
+                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]
+                    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,
 }
diff --git a/lua/barink/plugins/telescope.lua b/lua/barink/plugins/telescope.lua
index 87db0b3..eaa0654 100644
--- a/lua/barink/plugins/telescope.lua
+++ b/lua/barink/plugins/telescope.lua
@@ -14,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>fs', builtin.git_files, {})
+                vim.keymap.set('n', '<leader>fd', builtin.find_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 = "~/AppData/Local/nvim/lua/barink/"}
+                end)
             end
         }
 }
diff --git a/lua/snippets/all.lua b/lua/barink/snippets/all.lua
similarity index 100%
rename from lua/snippets/all.lua
rename to lua/barink/snippets/all.lua
diff --git a/lua/snippets/java.lua b/lua/barink/snippets/java.lua
similarity index 100%
rename from lua/snippets/java.lua
rename to lua/barink/snippets/java.lua
diff --git a/lua/snippets/lua.lua b/lua/barink/snippets/lua.lua
similarity index 100%
rename from lua/snippets/lua.lua
rename to lua/barink/snippets/lua.lua

From 5e814303f7af964e1839ddce5e21d68391ed5c01 Mon Sep 17 00:00:00 2001
From: Nigel Barink <nigelbarink@hotmail.com>
Date: Thu, 26 Sep 2024 16:31:23 +0200
Subject: [PATCH 6/9] Add Intelephense

---
 lua/barink/plugins/lsp.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index db41a56..7ecc5ff 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -122,6 +122,7 @@ return
                 },
                 tsserver = true,
                 gopls = true,
+                intelephense = true,
                 lua_ls = {
                     settings = {
                         Lua = {

From 5c8aeff7296759c728ab4e78c9b51c1f95d4eaa4 Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Fri, 27 Sep 2024 20:31:36 +0200
Subject: [PATCH 7/9] Remove afte/ftplugin folder

---
 lua/barink/after/ftplugin/asm.lua        |  3 --
 lua/barink/after/ftplugin/bash.lua       |  3 --
 lua/barink/after/ftplugin/cpp.lua        | 20 ------------
 lua/barink/after/ftplugin/go.lua         | 39 ------------------------
 lua/barink/after/ftplugin/java.lua       | 20 ------------
 lua/barink/after/ftplugin/javascript.lua |  3 --
 lua/barink/after/ftplugin/lua.lua        | 14 ---------
 lua/barink/after/ftplugin/python.lua     |  6 ----
 lua/barink/after/ftplugin/rust.lua       |  6 ----
 lua/barink/after/ftplugin/zig.lua        |  6 ----
 10 files changed, 120 deletions(-)
 delete mode 100644 lua/barink/after/ftplugin/asm.lua
 delete mode 100644 lua/barink/after/ftplugin/bash.lua
 delete mode 100644 lua/barink/after/ftplugin/cpp.lua
 delete mode 100644 lua/barink/after/ftplugin/go.lua
 delete mode 100644 lua/barink/after/ftplugin/java.lua
 delete mode 100644 lua/barink/after/ftplugin/javascript.lua
 delete mode 100644 lua/barink/after/ftplugin/lua.lua
 delete mode 100644 lua/barink/after/ftplugin/python.lua
 delete mode 100644 lua/barink/after/ftplugin/rust.lua
 delete mode 100644 lua/barink/after/ftplugin/zig.lua

diff --git a/lua/barink/after/ftplugin/asm.lua b/lua/barink/after/ftplugin/asm.lua
deleted file mode 100644
index 47b5fa9..0000000
--- a/lua/barink/after/ftplugin/asm.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require('lspconfig')['asm_lsp'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/bash.lua b/lua/barink/after/ftplugin/bash.lua
deleted file mode 100644
index 3f180eb..0000000
--- a/lua/barink/after/ftplugin/bash.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require('lspconfig')['bashls'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/cpp.lua b/lua/barink/after/ftplugin/cpp.lua
deleted file mode 100644
index 89f95d7..0000000
--- a/lua/barink/after/ftplugin/cpp.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local root_files = {
-    'premake5.lua',
-    '.clang-tidy',
-    '.clang-format',
-    'compile_commands',
-    'compile_commands.json',
-    'compile_flags.txt',
-    'configure.ac',
-    '.git'
-}
-local util = require('lspconfig.util')
-require('lspconfig')['clangd'].setup({
-    capabilities = capabilities,
-    filetypes= { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' },
-    cmd = { 'clangd' },
-    single_file_support = true,
-    root_dir = function (fname)
-        return util.root_pattern(unpack(root_files))(fname)
-    end
-})
diff --git a/lua/barink/after/ftplugin/go.lua b/lua/barink/after/ftplugin/go.lua
deleted file mode 100644
index f2b9ec0..0000000
--- a/lua/barink/after/ftplugin/go.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-require('lspconfig')['gopls'].setup({
-    capabilities = capabilities
-})
-
-local dap = require("dap")
-
-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}"
-  }
-}
diff --git a/lua/barink/after/ftplugin/java.lua b/lua/barink/after/ftplugin/java.lua
deleted file mode 100644
index 7d9fd91..0000000
--- a/lua/barink/after/ftplugin/java.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-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)
-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()
-
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-require('lspconfig')['jdtls'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/javascript.lua b/lua/barink/after/ftplugin/javascript.lua
deleted file mode 100644
index 42a249f..0000000
--- a/lua/barink/after/ftplugin/javascript.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require('lspconfig')['tsserver'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/lua.lua b/lua/barink/after/ftplugin/lua.lua
deleted file mode 100644
index a6bf0bc..0000000
--- a/lua/barink/after/ftplugin/lua.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-local lsp = require("lspconfig")
-lsp.lua_ls.setup({
-    capabilities = require('cmp_nvim_lsp').default_capabilities(),
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { 'vim' }
-            }
-        }
-    }
-})
-
diff --git a/lua/barink/after/ftplugin/python.lua b/lua/barink/after/ftplugin/python.lua
deleted file mode 100644
index d29246c..0000000
--- a/lua/barink/after/ftplugin/python.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['pyright'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/rust.lua b/lua/barink/after/ftplugin/rust.lua
deleted file mode 100644
index ef610b1..0000000
--- a/lua/barink/after/ftplugin/rust.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['rust_analyzer'].setup({
-    capabilities = capabilities
-})
diff --git a/lua/barink/after/ftplugin/zig.lua b/lua/barink/after/ftplugin/zig.lua
deleted file mode 100644
index d4150fe..0000000
--- a/lua/barink/after/ftplugin/zig.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-require('lspconfig')['zls'].setup({
-    capabilities = capabilities
-})

From 0167c8dbb415c689e9631e2317c9102d50dd543c Mon Sep 17 00:00:00 2001
From: nigel barink <nigelbarink@hotmail.com>
Date: Fri, 27 Sep 2024 20:32:53 +0200
Subject: [PATCH 8/9] Setting up conform, Adding phpactor lsp

---
 lua/barink/plugins/conform.lua    | 14 ++++++++++++++
 lua/barink/plugins/lsp.lua        |  8 +++++++-
 lua/barink/plugins/tokyonight.lua |  8 ++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lua/barink/plugins/conform.lua b/lua/barink/plugins/conform.lua
index 1b4fa8b..fecf484 100644
--- a/lua/barink/plugins/conform.lua
+++ b/lua/barink/plugins/conform.lua
@@ -16,6 +16,20 @@ return {
     },
     config = function ()
        require("conform").setup()
+       -- 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
 }
 
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index db41a56..8649746 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -109,6 +109,12 @@ return
                 rust_analyzer = true,
                 jdtls = true,
                 pylsp = true,
+                phpactor = {
+                    init_options = {
+                        ["language_server_phpstan.enabled"] = false,
+                        ["language_server_psalm.enabled"] = false,
+                    }
+                },
                 clangd = {
                 capabilities = capabilities,
                 root_dir = require('lspconfig').util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
@@ -120,7 +126,7 @@ return
                         },
                     }
                 },
-                tsserver = true,
+                ts_ls = true,
                 gopls = true,
                 lua_ls = {
                     settings = {
diff --git a/lua/barink/plugins/tokyonight.lua b/lua/barink/plugins/tokyonight.lua
index deed102..08fbd67 100644
--- a/lua/barink/plugins/tokyonight.lua
+++ b/lua/barink/plugins/tokyonight.lua
@@ -18,13 +18,13 @@
 --     }
 
 return {
-    { 
+    {
     "catppuccin/nvim",
     name="catppuccin",
     priority=1000,
-    config = function () 
+    config = function ()
         require("catppuccin").setup()
-        vim.cmd.colorscheme = "catppuccin"
-    end 
+        vim.cmd ('colorscheme catppuccin-mocha')
+    end
 }
 }

From 98dd2510c9f28159b1963fe1b63f3b530bed9167 Mon Sep 17 00:00:00 2001
From: Nigel Barink <nigelbarink@hotmail.com>
Date: Fri, 27 Sep 2024 21:08:13 +0200
Subject: [PATCH 9/9] Added DBUI, noice, zen-mode and comments. Changed
 Tokyonight.lua to theme.lua

---
 lazy-lock.json                                   | 12 ++++++++++--
 lua/barink/init.lua                              |  1 -
 lua/barink/plugins/comments.lua                  |  9 +++++++++
 lua/barink/plugins/dadbod-ui.lua                 | 16 ++++++++++++++++
 lua/barink/plugins/fidget.lua                    |  8 --------
 lua/barink/plugins/git-worktree.lua              | 14 ++++++++++++++
 lua/barink/plugins/lsp.lua                       |  1 +
 lua/barink/plugins/noice.lua                     | 11 +++++++++++
 lua/barink/plugins/{tokyonight.lua => theme.lua} |  4 ++--
 lua/barink/plugins/twilight.lua                  |  6 ++++++
 lua/barink/plugins/vim-dadbod.lua                |  3 +++
 lua/barink/plugins/zen-mode.lua                  |  4 ++++
 12 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 lua/barink/plugins/comments.lua
 create mode 100644 lua/barink/plugins/dadbod-ui.lua
 delete mode 100644 lua/barink/plugins/fidget.lua
 create mode 100644 lua/barink/plugins/git-worktree.lua
 create mode 100644 lua/barink/plugins/noice.lua
 rename lua/barink/plugins/{tokyonight.lua => theme.lua} (93%)
 create mode 100644 lua/barink/plugins/twilight.lua
 create mode 100644 lua/barink/plugins/vim-dadbod.lua
 create mode 100644 lua/barink/plugins/zen-mode.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 4cebdce..7fbffc2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,4 +1,5 @@
 {
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -7,7 +8,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
-  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
   "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" },
@@ -16,6 +17,7 @@
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" },
+  "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
   "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
@@ -24,6 +26,7 @@
   "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
   "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" },
   "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
   "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
@@ -33,8 +36,13 @@
   "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
+  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
+  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
   "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
-  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
+  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
+  "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }
diff --git a/lua/barink/init.lua b/lua/barink/init.lua
index ac71066..86db5db 100644
--- a/lua/barink/init.lua
+++ b/lua/barink/init.lua
@@ -1,6 +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({
diff --git a/lua/barink/plugins/comments.lua b/lua/barink/plugins/comments.lua
new file mode 100644
index 0000000..ed2b9c0
--- /dev/null
+++ b/lua/barink/plugins/comments.lua
@@ -0,0 +1,9 @@
+return {
+    'numToStr/Comment.nvim',
+    lazy = false,
+    opts = {
+    },
+    config = function()
+        require("Comment").setup()
+    end
+}
diff --git a/lua/barink/plugins/dadbod-ui.lua b/lua/barink/plugins/dadbod-ui.lua
new file mode 100644
index 0000000..e3565ef
--- /dev/null
+++ b/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
+}
diff --git a/lua/barink/plugins/fidget.lua b/lua/barink/plugins/fidget.lua
deleted file mode 100644
index d534814..0000000
--- a/lua/barink/plugins/fidget.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-        "j-hui/fidget.nvim",
-        opts = {
-            notification = {
-                window = { winblend = 0},
-            },
-        },
-    }
diff --git a/lua/barink/plugins/git-worktree.lua b/lua/barink/plugins/git-worktree.lua
new file mode 100644
index 0000000..0651b59
--- /dev/null
+++ b/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
+    }
+}
+
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index c4bfbd9..7c788cc 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -106,6 +106,7 @@ return
             local language_server = {
                 asm_lsp= true,
                 zls = true,
+                emmet_language_server = true,
                 rust_analyzer = true,
                 jdtls = true,
                 pylsp = true,
diff --git a/lua/barink/plugins/noice.lua b/lua/barink/plugins/noice.lua
new file mode 100644
index 0000000..61ebecf
--- /dev/null
+++ b/lua/barink/plugins/noice.lua
@@ -0,0 +1,11 @@
+return {
+    "folke/noice.nvim",
+    event = "VeryLazy",
+    opts = {
+    },
+    dependencies = {
+        "MunifTanjim/nui.nvim",
+        "rcarriga/nvim-notify",
+    },
+
+}
diff --git a/lua/barink/plugins/tokyonight.lua b/lua/barink/plugins/theme.lua
similarity index 93%
rename from lua/barink/plugins/tokyonight.lua
rename to lua/barink/plugins/theme.lua
index 08fbd67..6c5e379 100644
--- a/lua/barink/plugins/tokyonight.lua
+++ b/lua/barink/plugins/theme.lua
@@ -24,7 +24,7 @@ return {
     priority=1000,
     config = function ()
         require("catppuccin").setup()
-        vim.cmd ('colorscheme catppuccin-mocha')
+        vim.cmd.colorscheme('catppuccin')
     end
-}
+    }
 }
diff --git a/lua/barink/plugins/twilight.lua b/lua/barink/plugins/twilight.lua
new file mode 100644
index 0000000..9dab6c3
--- /dev/null
+++ b/lua/barink/plugins/twilight.lua
@@ -0,0 +1,6 @@
+return {
+    {
+        "folke/twilight.nvim",
+        opts = {}
+    }
+}
diff --git a/lua/barink/plugins/vim-dadbod.lua b/lua/barink/plugins/vim-dadbod.lua
new file mode 100644
index 0000000..e49f4b7
--- /dev/null
+++ b/lua/barink/plugins/vim-dadbod.lua
@@ -0,0 +1,3 @@
+return {
+    "tpope/vim-dadbod",
+}
diff --git a/lua/barink/plugins/zen-mode.lua b/lua/barink/plugins/zen-mode.lua
new file mode 100644
index 0000000..eb74732
--- /dev/null
+++ b/lua/barink/plugins/zen-mode.lua
@@ -0,0 +1,4 @@
+return {
+    "folke/zen-mode.nvim",
+    opts = {}
+}