From fd4887d53d27bcf0cbbba3bbd654e53433313dcd Mon Sep 17 00:00:00 2001
From: John Costa <johncosta027@gmail.com>
Date: Sun, 27 Jul 2025 21:42:46 +0100
Subject: [PATCH] feat: tidying up nvim configs

---
 config/nvim/init.lua             |  8 +-------
 config/nvim/lazy-lock.json       | 34 ++++++++++++++++++--------------
 config/nvim/lua/plugins/init.lua | 22 ++++++---------------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index b0a4bc40..377334df 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,18 +1,12 @@
 -- Leader
 vim.g.mapleader = " "
 
--- Guard (Linters + Formatters)
--- vim.g.guard_config = {
--- 	fmt_on_save = true,
--- 	lsp_as_default_formatter = true,
--- 	save_on_fmt = true,
--- }
-
 -- Sync system clipboard and neovim register
 vim.opt.clipboard = { "unnamedplus" }
 
 -- Save undo history
 vim.opt.undofile = true
+
 --
 -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
 vim.opt.ignorecase = true
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 62f2d910..f109c2ab 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,17 +1,21 @@
 {
-  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
-  "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" },
-  "guard-collection": { "branch": "main", "commit": "06da4a065b974bbedf1a5535232c90a3526f8a43" },
-  "guard.nvim": { "branch": "main", "commit": "bdbc43dadd530b0058708723db76e705a4542063" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
+  "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
   "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" },
-  "nvim-treesitter": { "branch": "master", "commit": "0179a89656b4ce395a4487c07ae385b8425524ae" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" },
-  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
-  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
-  "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
-  "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }
-}
\ No newline at end of file
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+  "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" },
+  "vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" }
+}
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index 2fd4b3ee..bb947f10 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -112,8 +112,13 @@ return {
 		config = function()
 			local lsp = require("lspconfig")
 
+			local clients = { "vtsls", "zls", "gopls", "tailwindcss", "ocamllsp", "svelte", "biome", "pylsp", "svelte" }
+
+			for _, value in pairs(clients) do
+				lsp[value].setup({})
+			end
+
 			lsp.lua_ls.setup({
-				capabilities = capabilities,
 				settings = {
 					Lua = {
 						diagnostics = { globals = { "vim", "require" } },
@@ -125,24 +130,12 @@ return {
 				},
 			})
 
-			lsp.vtsls.setup({})
-
-			lsp.zls.setup({})
-
 			lsp.rust_analyzer.setup({
 				diagnostic = {
 					-- Prevents the annoying popup for cancalled requests
 					refreshSupport = false,
 				},
 			})
-
-			lsp.gopls.setup({})
-			lsp.tailwindcss.setup({})
-			lsp.ocamllsp.setup({})
-			lsp.svelte.setup({})
-			lsp.biome.setup({})
-			lsp.pylsp.setup({})
-			lsp.svelte.setup({})
 		end,
 	},
 	{
@@ -167,7 +160,4 @@ return {
 		},
 		opts_extend = { "sources.default" },
 	},
-	{
-		"sindrets/diffview.nvim",
-	},
 }