diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 1c2cb61..cb7ef00 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -29,6 +29,7 @@
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "661eea1d6f8237097ae372578fbe7458d690a3ac" },
+  "diagflow.nvim": { "branch": "main", "commit": "6882a91ec0473fbc4a04881c9bf7eaeb08185cac" },
   "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
   "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
   "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
@@ -44,7 +45,9 @@
   "leap.nvim": { "branch": "main", "commit": "4394f67ccefc64cdb3258c9f22195ed65a13e874" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
   "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" },
+  "lsp-virtual-improved.nvim": { "branch": "master", "commit": "79c53ce05fdeb6590701db55da5832ab4a2c3387" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "433db11e818d07a5151e2c750ca8f09cc2aa3146" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
   "lush.nvim": { "branch": "main", "commit": "e8a58f36c256af65cda36878f6f2024a612154c3" },
@@ -52,6 +55,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" },
   "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
+  "modicator.nvim": { "branch": "main", "commit": "d22c02c007170ab432ca3e166a1da56297767e87" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
   "neodev.nvim": { "branch": "main", "commit": "34b93b809b781b8a1ad862142e40b11bae1dc0e9" },
   "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
diff --git a/git/.gitconfig b/git/.gitconfig
index 2be4cda..eb96ee5 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,8 +3,8 @@
 	email = cnieves@google.com
 [color]
 	ui = auto
-[url "ssh://git@github.com/"]
-	insteadOf = https://github.com/
+# [url "ssh://git@github.com/"]
+# 	insteadOf = https://github.com/
 [alias]
     gr = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
     # one-line log
diff --git a/vim/.vim/lua/plugins/lsp_lines.lua b/vim/.vim/lua/plugins/diagnostics.lua
similarity index 50%
rename from vim/.vim/lua/plugins/lsp_lines.lua
rename to vim/.vim/lua/plugins/diagnostics.lua
index 1759d8e..381ec29 100644
--- a/vim/.vim/lua/plugins/lsp_lines.lua
+++ b/vim/.vim/lua/plugins/diagnostics.lua
@@ -41,4 +41,42 @@ return {
 			desc = "Toggle LSP Lines",
 		},
 	},
+	{
+		"luozhiya/lsp-virtual-improved.nvim",
+		event = { "LspAttach" },
+		config = function()
+			require("lsp-virtual-improved").setup()
+		end,
+	},
+	{
+		"dgagn/diagflow.nvim",
+		opts = {
+			toggle_event = { "InsertEnter" },
+		},
+	},
+	{
+		"folke/trouble.nvim",
+		event = "VimEnter",
+		config = function()
+			-- Diagnostics
+			require("trouble").setup({
+				signs = {
+					-- icons / text used for a diagnostic
+					error = " ",
+					warning = " ",
+					hint = " ",
+					information = " ",
+					other = " ",
+				},
+				use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
+			})
+		end,
+		keys = {
+			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
+			{ "<leader>xw", "<cmd>:Trouble workspace_diagnostics<CR>" },
+			{ "<leader>xd", "<cmd>:Trouble document_diagnostics<CR>" },
+			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
+			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
+		},
+	},
 }
diff --git a/vim/.vim/lua/plugins/trouble.lua b/vim/.vim/lua/plugins/trouble.lua
deleted file mode 100644
index 62973db..0000000
--- a/vim/.vim/lua/plugins/trouble.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-	{
-		"luozhiya/lsp-virtual-improved.nvim",
-		event = { "LspAttach" },
-		config = function()
-			require("lsp-virtual-improved").setup()
-		end,
-	},
-	{
-		"dgagn/diagflow.nvim",
-		opts = {
-			toggle_event = { "InsertEnter" },
-		},
-	},
-	{
-		"folke/trouble.nvim",
-		event = "VimEnter",
-		config = function()
-			-- Diagnostics
-			require("trouble").setup({
-				signs = {
-					-- icons / text used for a diagnostic
-					error = " ",
-					warning = " ",
-					hint = " ",
-					information = " ",
-					other = " ",
-				},
-				use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
-			})
-		end,
-		keys = {
-			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
-			{ "<leader>xw", "<cmd>:Trouble workspace_diagnostics<CR>" },
-			{ "<leader>xd", "<cmd>:Trouble document_diagnostics<CR>" },
-			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
-			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
-		},
-	},
-}