diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 3d28cb1..d581f90 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,27 +1,28 @@
 {
-  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "deadcolumn.nvim": { "branch": "master", "commit": "6a144a32fd847a998095d2494f152e405c6ae7cb" },
+  "conform.nvim": { "branch": "master", "commit": "26c02e1155a4980900bdccabca4516f4c712aae9" },
+  "deadcolumn.nvim": { "branch": "master", "commit": "92c86f10bfba2717ca2280e2e759b047135d5288" },
+  "dropbar.nvim": { "branch": "master", "commit": "d08bf6b5e2b3bf160050b0f991c1831bf05a7523" },
   "git-messenger.vim": { "branch": "master", "commit": "fd124457378a295a5d1036af4954b35d6b807385" },
-  "gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazy.nvim": { "branch": "main", "commit": "202d8e92b3a74ac88eb3a7f1e40fb59b4c2a6535" },
   "lsp_signature.nvim": { "branch": "master", "commit": "62cadce83aaceed677ffe7a2d6a57141af7131ea" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" },
-  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" },
-  "nord.nvim": { "branch": "main", "commit": "57fb474a1d628bdf9d1e7964719464ed5675d7c7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ef73a4f2a1ddf0439eb97b46de2aab265ddba1cd" },
-  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
-  "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
+  "nord.nvim": { "branch": "main", "commit": "07647ad23e5b7fc1599a841dcd8f173b9aeb0419" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a89bfcfd0e44f898341ac8a80ba83ccf6218bef3" },
+  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
+  "nvim-tree.lua": { "branch": "master", "commit": "64e2192f5250796aa4a7f33c6ad888515af50640" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" },
+  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "refactoring.nvim": { "branch": "master", "commit": "6784b54587e6d8a6b9ea199318512170ffb9e418" },
   "stcursorword": { "branch": "main", "commit": "f6810ed5001eeee6061fdce77b292a5565823ded" },
-  "telescope-hierarchy.nvim": { "branch": "main", "commit": "2ba4840d8ba9288ca85dc34b01cf946aee0b8fca" },
+  "telescope-hierarchy.nvim": { "branch": "main", "commit": "b277da38d55663e3a260b581a193df3f36aa06b3" },
   "telescope-menufacture": { "branch": "main", "commit": "751aca3f022039874790024b3cf25d643e335612" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }
diff --git a/nvim/lua/config/init.lua b/nvim/lua/config/init.lua
index 74db3ca..04bba89 100644
--- a/nvim/lua/config/init.lua
+++ b/nvim/lua/config/init.lua
@@ -1,2 +1,3 @@
 require('config.lazy')
 require('config.rest')
+require('config.lsp')
diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua
new file mode 100644
index 0000000..c63713c
--- /dev/null
+++ b/nvim/lua/config/lsp.lua
@@ -0,0 +1,6 @@
+vim.diagnostic.config({
+    virtual_lines = {
+        current_line = true,
+    }
+})
+
diff --git a/nvim/lua/config/settings.lua b/nvim/lua/config/settings.lua
index 6fd60bf..35b3e3c 100644
--- a/nvim/lua/config/settings.lua
+++ b/nvim/lua/config/settings.lua
@@ -27,15 +27,15 @@ vim.o.clipboard = "unnamedplus"
 -- 		["*"] = paste,
 -- 	},
 -- }
--- vim.api.nvim_exec(
--- 	[[
---         augroup YankHighlight
---             autocmd!
---             autocmd TextYankPost * silent! lua vim.highlight.on_yank()
---         augroup end
---     ]],
--- 	false
--- )
+vim.api.nvim_exec(
+	[[
+        augroup YankHighlight
+            autocmd!
+            autocmd TextYankPost * silent! lua vim.highlight.on_yank()
+        augroup end
+    ]],
+	false
+)
 
 -- Restore cursor
 local restore_cursor_augroup = vim.api.nvim_create_augroup("restore_cursor_shape_on_exit", { clear = true })
diff --git a/nvim/lua/plugins_lsp/lsp.lua b/nvim/lua/plugins_lsp/lsp.lua
index dd05688..defd6dd 100644
--- a/nvim/lua/plugins_lsp/lsp.lua
+++ b/nvim/lua/plugins_lsp/lsp.lua
@@ -1,31 +1,12 @@
 return {
-	{
-		"williamboman/mason.nvim",
-		cmd = "Mason",
-	},
-	{
-		"williamboman/mason-lspconfig.nvim",
-		event = { "BufReadPre", "BufNewFile" },
-		config = function()
-			require("mason").setup()
-
-            if not vim.g.pre_load then
-                require("mason-lspconfig").setup({
-                    -- The first entry (without a key) will be the default handler
-                    -- and will be called for each installed server that doesn't have
-                    -- a dedicated handler.
-                    -- function(server_name) -- default handler (optional)
-                    -- 	require("lspconfig")[server_name].setup({})
-                    -- end,
-                    -- Next, you can provide a dedicated handler for specific servers.
-                    -- For example, a handler override for the `rust_analyzer`:
-                    -- ["rust_analyzer"] = function ()
-                    --     require("rust-tools").setup {}
-                    -- end
-                })
-            end
-		end,
-	},
+    {
+        "mason-org/mason-lspconfig.nvim",
+        opts = {},
+        dependencies = {
+            { "mason-org/mason.nvim", opts = {} },
+            "neovim/nvim-lspconfig",
+        },
+    },
 	{
 		"ray-x/lsp_signature.nvim",
 		event = "VeryLazy",
@@ -47,25 +28,22 @@ return {
 			})
 		end,
 	},
-	{
-		"neovim/nvim-lspconfig",
-	},
 	{
 		"stevearc/conform.nvim",
 		event = { "BufWritePre" },
 		cmd = { "ConformInfo" },
 		opts = function()
 			local mason_reg = require("mason-registry")
-
+		
 			local formatters = {}
 			local formatters_by_ft = {}
-
+		
 			-- add diff langue vs filetype
 			local keymap = {
 				["c++"] = "cpp",
 				["c#"] = "cs",
 			}
-
+		
 			-- add dif conform vs mason
 			local name_map = {
 				["cmakelang"] = "cmake_format",
@@ -79,7 +57,7 @@ return {
 				["sql-formatter"] = "sql_formatter",
 				["xmlformatter"] = "xmlformat",
 			}
-
+		
 			for _, pkg in pairs(mason_reg.get_installed_packages()) do
 				for _, type in pairs(pkg.spec.categories) do
 					-- only act upon a formatter
@@ -94,7 +72,7 @@ return {
 							-- this should be replaced by a function
 							-- that quieries the configured mason install path
 							local prefix = vim.fn.stdpath("data") .. "/mason/bin/"
-
+		
 							formatters[pkg.spec.name] = {
 								command = prefix .. bin,
 								args = { "$FILENAME" },
@@ -102,7 +80,7 @@ return {
 								require_cwd = false,
 							}
 						end
-
+		
 						-- finally add the formatter to it's compatible filetype(s)
 						for _, ft in pairs(pkg.spec.languages) do
 							local ftl = string.lower(ft)
@@ -121,7 +99,7 @@ return {
 					end
 				end
 			end
-
+		
 			return {
 				formatters = formatters,
 				formatters_by_ft = formatters_by_ft,