From f47b2f2e582e21eccebf50891745ab74429cb624 Mon Sep 17 00:00:00 2001
From: Nigel Barink <nigelbarink@hotmail.com>
Date: Tue, 26 Mar 2024 21:07:08 +0100
Subject: [PATCH] FEAT: Added lualine and harpoon FIX: Fixed fidget setup FIX:
 Added hopefully proper lsp config

---
 lazy-lock.json                   | 11 +++++++----
 lua/barink/plugins/fidget.lua    |  8 +++++---
 lua/barink/plugins/harpoon.lua   | 22 ++++++++++++++++++++++
 lua/barink/plugins/lsp.lua       | 22 +++++++++++++++++++++-
 lua/barink/plugins/lualine.lua   |  9 +++++++++
 lua/barink/plugins/telescope.lua | 18 +++++++++++-------
 6 files changed, 75 insertions(+), 15 deletions(-)
 create mode 100644 lua/barink/plugins/harpoon.lua
 create mode 100644 lua/barink/plugins/lualine.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 54ce946..8a8c3cd 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -5,15 +5,18 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "fidget.nvim": { "branch": "main", "commit": "933db4596e4bab1b09b6d48a10e21819e4cc458f" },
-  "lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" },
+  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
+  "lazy.nvim": { "branch": "main", "commit": "08954f723bf2d442ea020551e3acc956f4dc6dc7" },
+  "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
   "mason-lspconfig": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
   "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" },
   "nvim-lspconfig": { "branch": "master", "commit": "6e5c78ebc9936ca74add66bda22c566f951b6ee5" },
-  "nvim-treesitter": { "branch": "master", "commit": "5e4f959d5979730ddb2ee9ae60f5133081502b23" },
-  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
+  "nvim-treesitter": { "branch": "master", "commit": "7f3179315959bd762abd0f8dbe0361db805fb2d4" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
+  "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
   "telescope.nvim": { "branch": "master", "commit": "c2b8311dfacd08b3056b8f0249025d633a4e71a8" },
-  "tokyonight.nvim": { "branch": "main", "commit": "623c3cd60a8081b68edcaf544856c053249a659e" },
+  "tokyonight.nvim": { "branch": "main", "commit": "f4b415bfbce390866a83277db42cf6aa94230728" },
   "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" },
   "vim-fugitive": { "branch": "master", "commit": "193ba9b393931bad768c1d2eed688b0bcc240858" }
 }
\ No newline at end of file
diff --git a/lua/barink/plugins/fidget.lua b/lua/barink/plugins/fidget.lua
index 8d5b1c9..d534814 100644
--- a/lua/barink/plugins/fidget.lua
+++ b/lua/barink/plugins/fidget.lua
@@ -1,6 +1,8 @@
 return {
         "j-hui/fidget.nvim",
-        config = function()
-            require('fidget').setup({})
-        end
+        opts = {
+            notification = {
+                window = { winblend = 0},
+            },
+        },
     }
diff --git a/lua/barink/plugins/harpoon.lua b/lua/barink/plugins/harpoon.lua
new file mode 100644
index 0000000..d2c0ae0
--- /dev/null
+++ b/lua/barink/plugins/harpoon.lua
@@ -0,0 +1,22 @@
+return {
+    "ThePrimeagen/harpoon",
+    branch= "harpoon2",
+    dependencies = {{"nvim-lua/plenary.nvim"}},
+    config = function()
+        local harpoon = require("harpoon")
+        harpoon.setup()
+
+        vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
+        vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+
+        vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end)
+        vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end)
+        vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end)
+        vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end)
+
+
+        vim.keymap.set("n", "<C-S-Z>", function() harpoon:list():prev() end)
+        vim.keymap.set("n", "<C-S-X>", function() harpoon:list():next() end)
+
+    end
+}
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index 16055eb..4cf4844 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -1,4 +1,4 @@
-return 
+return
     {
         'neovim/nvim-lspconfig',
         dependencies = {
@@ -73,6 +73,26 @@ return
                 capabilities = capabilities
             })
 
+            require('lspconfig')['zls'].setup({
+                capabilities = capabilities
+            })
+
+            require('lspconfig')['lua_ls'].setup({
+                capabilities = capabilities
+            })
+
+            require('lspconfig')['rust_analyzer'].setup({
+                capabilities = capabilities
+            })
+
+            require('lspconfig')['jdtls'].setup({
+                capabilities = capabilities
+            })
+
+            require('lspconfig')['bashls'].setup({
+                capabilities = capabilities
+            })
+
             local lsp = require("lspconfig")
             lsp.lua_ls.setup({
                 capabilities = require('cmp_nvim_lsp').default_capabilities(),
diff --git a/lua/barink/plugins/lualine.lua b/lua/barink/plugins/lualine.lua
new file mode 100644
index 0000000..a4c1012
--- /dev/null
+++ b/lua/barink/plugins/lualine.lua
@@ -0,0 +1,9 @@
+return {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+    config = function()
+        require("lualine").setup({
+            theme = "ayu-mirage"
+        })
+    end
+}
diff --git a/lua/barink/plugins/telescope.lua b/lua/barink/plugins/telescope.lua
index 610c4df..9fc2fe2 100644
--- a/lua/barink/plugins/telescope.lua
+++ b/lua/barink/plugins/telescope.lua
@@ -1,10 +1,14 @@
 return {
-        "nvim-telescope/telescope.nvim",
-        dependencies = { 'nvim-lua/plenary.nvim' },
-        config = function()
-            local builtin = require('telescope.builtin')
+        {
+            "nvim-telescope/telescope.nvim",
+            dependencies = {
+                'nvim-lua/plenary.nvim',
+            },
+            config = function()
+                local builtin = require('telescope.builtin')
 
-            vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-            vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
-        end
+                vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+                vim.keymap.set('n', '<leader>fs', builtin.git_files, {})
+            end
+        }
 }