diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 886ee80..a74e3ab 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -157,4 +157,5 @@ if vim.env.ZELLIJ ~= nil then
 end
 vim.diagnostic.config({
 	update_in_insert = false,
+	virtual_text = { current_line = true },
 })
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index cdaae41..c218d6c 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,56 +1,56 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
   "ansible-vim": { "branch": "master", "commit": "3329367d2e5f90d203c8d340c53fa83c60a1ad41" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" },
-  "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
-  "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" },
-  "crates.nvim": { "branch": "main", "commit": "b3b9ac6ed9618955b24bf9adede7530ef608495b" },
-  "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
+  "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
+  "crates.nvim": { "branch": "main", "commit": "5d8b1bef686db0fabe5f1bb593744b617e8f1405" },
+  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "freeze.nvim": { "branch": "main", "commit": "6460f282b01d4dafd69fbd8d4a38da56572227bc" },
-  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" },
-  "gleam.vim": { "branch": "main", "commit": "ad6c328d6460763ca6a338183f7f1bd54137ce80" },
-  "gopher.nvim": { "branch": "main", "commit": "f55c15ada8e02398000c04a96ef44d986cd01051" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4666d040b60d1dc0e474ccd9a3fd3c4d67b4767c" },
+  "gleam.vim": { "branch": "main", "commit": "7174886f4974629a4427b0c703d6ce77f39422c5" },
+  "gopher.nvim": { "branch": "main", "commit": "de585144ebde9f0516fb9b542dd42e90c7835b59" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
-  "lsp-trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "mini.icons": { "branch": "main", "commit": "12e7b5d47bfc1b4c5ba4278fb49ec9100138df14" },
-  "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" },
-  "nightfox.nvim": { "branch": "main", "commit": "d3e8b1acc095baf57af81bb5e89fe7c4359eb619" },
-  "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
-  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "lsp-trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
+  "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" },
+  "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
+  "neotest": { "branch": "master", "commit": "61d1951131e6770c815243d84a27ccd0436ec61c" },
+  "neotest-python": { "branch": "master", "commit": "ed9b4d794b89044cc32e5476e637936331473c6e" },
+  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" },
   "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
-  "nvim-lint": { "branch": "master", "commit": "fe051618be920ba857699890f6abd8f2ca264232" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" },
-  "nvim-treesitter": { "branch": "master", "commit": "5b8b126de02ebfd92e46ed5986b3e58e870b85de" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "e6cc783b74606d97ca9eff6494e3f5c2ca603a50" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3a3c6244553f13fdd92d312c82722b57ce6c4bec" },
-  "nvim-ts-rainbow": { "branch": "master", "commit": "8312b513ce930e7669a1721befbe56f2e1853301" },
-  "oil.nvim": { "branch": "master", "commit": "1fe476daf0b3c108cb8ee1fc1226cc282fa2c9c1" },
-  "ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" },
-  "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
-  "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" },
-  "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
-  "salt-vim": { "branch": "master", "commit": "6ca9e3500cc39dd417b411435d58a1b720b331cc" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
-  "tree-sitter-just": { "branch": "main", "commit": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-fugitive": { "branch": "master", "commit": "1d18c696c4284e9ce9467a5c04d3adf8af43f994" },
-  "vim-just": { "branch": "main", "commit": "8ed1e472b72b739bd852d2b9a2d688b3da015cf5" },
-  "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" },
-  "zig.vim": { "branch": "master", "commit": "15d6510b77a4efbb6ffcb151ed7e2ce4de4d06f6" }
+  "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "59f318a65d42a5c4037796886a8874fd57f774fc" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
+  "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
+  "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
+  "tree-sitter-just": { "branch": "main", "commit": "bb0c898a80644de438e6efe5d88d30bf092935cd" },
+  "undotree": { "branch": "master", "commit": "15d91b0afe04ea9ba5cd53e30190d1602af9a925" },
+  "vim-fugitive": { "branch": "master", "commit": "d3e2b58dec75fc6012fecc82ce0d33a45ed0560e" },
+  "vim-just": { "branch": "main", "commit": "c31036662e632acb6f9e7c318725ed9fe25bb82f" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "zig.vim": { "branch": "master", "commit": "4ae861f9bd8ce164b1546fdf70953bb2e6379537" }
 }
diff --git a/nvim/.config/nvim/lsp/gopls.lua b/nvim/.config/nvim/lsp/gopls.lua
new file mode 100644
index 0000000..5875814
--- /dev/null
+++ b/nvim/.config/nvim/lsp/gopls.lua
@@ -0,0 +1,22 @@
+return {
+	settings = {
+		gopls = {
+			gofumpt = true,
+			analyses = {
+				unusedparams = true,
+				shadow = true,
+				structtag = false,
+			},
+			staticcheck = true,
+			codelenses = { test = true },
+			hints = {
+				assignVariableTypes = true,
+				composeLiteralFields = true,
+				constantValues = true,
+				functionTypeParameter = true,
+				parameterNames = true,
+				rangeVariableTypes = true,
+			},
+		},
+	},
+}
diff --git a/nvim/.config/nvim/lsp/ltex.lua b/nvim/.config/nvim/lsp/ltex.lua
new file mode 100644
index 0000000..8ad2afd
--- /dev/null
+++ b/nvim/.config/nvim/lsp/ltex.lua
@@ -0,0 +1,5 @@
+return {
+	settings = {
+		enabled = { "markdown" },
+	},
+}
diff --git a/nvim/.config/nvim/lsp/lua_ls.lua b/nvim/.config/nvim/lsp/lua_ls.lua
new file mode 100644
index 0000000..347c581
--- /dev/null
+++ b/nvim/.config/nvim/lsp/lua_ls.lua
@@ -0,0 +1,25 @@
+return {
+	settings = {
+		Lua = {
+			runtime = {
+				-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+				version = "LuaJIT",
+			},
+			diagnostics = {
+				-- Get the language server to recognize the `vim` global and `awesome`
+				globals = { "vim", "use", "beautiful", "awful" },
+			},
+			workspace = {
+				-- Make the server aware of Neovim runtime files
+				library = vim.api.nvim_get_runtime_file("", true),
+				checkThirdParty = false,
+			},
+			hint = {
+				enable = true,
+			},
+			telemetry = {
+				enable = false,
+			},
+		},
+	},
+}
diff --git a/nvim/.config/nvim/lsp/nil_ls.lua b/nvim/.config/nvim/lsp/nil_ls.lua
new file mode 100644
index 0000000..c307410
--- /dev/null
+++ b/nvim/.config/nvim/lsp/nil_ls.lua
@@ -0,0 +1,9 @@
+return {
+	settings = {
+		["nil"] = {
+			formatting = {
+				command = { "nixpkgs-fmt" },
+			},
+		},
+	},
+}
diff --git a/nvim/.config/nvim/lsp/pyright.lua b/nvim/.config/nvim/lsp/pyright.lua
new file mode 100644
index 0000000..1c1bbf3
--- /dev/null
+++ b/nvim/.config/nvim/lsp/pyright.lua
@@ -0,0 +1,12 @@
+return {
+	settings = {
+		pyright = {
+			disableOrganizeImports = true,
+		},
+		python = {
+			analysis = {
+				ignore = "*",
+			},
+		},
+	},
+}
diff --git a/nvim/.config/nvim/lsp/superhtml.lua b/nvim/.config/nvim/lsp/superhtml.lua
new file mode 100644
index 0000000..9fb3d44
--- /dev/null
+++ b/nvim/.config/nvim/lsp/superhtml.lua
@@ -0,0 +1,3 @@
+return {
+	filetypes = { "html", "superhtml", "htm", "shtml" },
+}
diff --git a/nvim/.config/nvim/lsp/terraformls.lua b/nvim/.config/nvim/lsp/terraformls.lua
new file mode 100644
index 0000000..032abda
--- /dev/null
+++ b/nvim/.config/nvim/lsp/terraformls.lua
@@ -0,0 +1,7 @@
+return {
+	settings = {
+		terraform = {
+			path = "/etc/profiles/per-user/ethan/bin/tofu",
+		},
+	},
+}
diff --git a/nvim/.config/nvim/lua/custom/lsp.lua b/nvim/.config/nvim/lua/custom/lsp.lua
index d2c2829..162aafc 100644
--- a/nvim/.config/nvim/lua/custom/lsp.lua
+++ b/nvim/.config/nvim/lua/custom/lsp.lua
@@ -1,7 +1,5 @@
 vim.o.completeopt = "menuone,noinsert,noselect"
 local lspkind = require("lspkind")
-local nvim_lsp = require("lspconfig")
-local configs = require("lspconfig.configs")
 local cmp = require("cmp")
 local cmp_autopairs = require("nvim-autopairs.completion.cmp")
 local luasnip = require("luasnip")
@@ -9,7 +7,7 @@ cmp.setup({
 	sorting = {
 		priority_weight = 2,
 		comparators = {
-			require("copilot_cmp.comparators").prioritize,
+			-- require("copilot_cmp.comparators").prioritize,
 			cmp.config.compare.offset,
 			cmp.config.compare.exact,
 			cmp.config.compare.score,
@@ -59,7 +57,7 @@ cmp.setup({
 		end),
 	},
 	sources = cmp.config.sources({
-		{ name = "copilot", group_index = 2 },
+		-- { name = "copilot", group_index = 2 },
 		{ name = "nvim_lsp", group_index = 2 },
 		{ name = "nvim_lsp_signature_help", group_index = 2 },
 		{ name = "nvim_lsp_lua", group_index = 2 },
@@ -75,40 +73,19 @@ cmp.setup({
 cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
+vim.lsp.config("*", {
+	capabilities = capabilities,
+})
 
-if not configs.superhtml then
-	configs.superhtml = {
-		default_config = {
-			name = "superhtml",
-			cmd = { "superhtml", "lsp" },
-			filetypes = { "html", "superhtml", "htm", "shtml" },
-			root_dir = require("lspconfig.util").root_pattern(".git"),
-		},
-	}
-end
 -- A table of servers used for setting up LSP
 local servers = {
-	"ccls",
-	"ocamllsp",
-	"bashls",
-	"gleam",
+	-- "bashls",
 	"superhtml",
-	{
-		"pyright",
-		settings = {
-			pyright = {
-				disableOrganizeImports = true,
-			},
-			python = {
-				analysis = {
-					ignore = "*",
-				},
-			},
-		},
-	},
+	"pyright",
 	"nixd",
 	"zls",
 	"ruff",
+	"tflint",
 	{
 		"terraformls",
 		exec = "terraform-ls",
@@ -124,20 +101,10 @@ local servers = {
 	{
 		"nil_ls",
 		exec = "nil",
-		settings = {
-			["nil"] = {
-				formatting = {
-					command = { "nixpkgs-fmt" },
-				},
-			},
-		},
 	},
 	{
 		"ltex",
 		exec = "ltex-ls",
-		settings = {
-			enabled = { "markdown" },
-		},
 	},
 	{
 		"tsserver",
@@ -150,62 +117,14 @@ local servers = {
 	{
 		"lua_ls",
 		exec = "lua-language-server",
-		settings = {
-			Lua = {
-				runtime = {
-					-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-					version = "LuaJIT",
-				},
-				diagnostics = {
-					-- Get the language server to recognize the `vim` global and `awesome`
-					globals = { "vim", "use", "beautiful", "awful" },
-				},
-				workspace = {
-					-- Make the server aware of Neovim runtime files
-					library = vim.api.nvim_get_runtime_file("", true),
-					checkThirdParty = false,
-				},
-				hint = {
-					enable = true,
-				},
-				telemetry = {
-					enable = false,
-				},
-			},
-		},
-	},
-	{ "vimls", exec = "vim-language-server" },
-	{ "dockerls", exec = "docker-langserver" },
-	{
-		"gopls",
-		settings = {
-			gopls = {
-				gofumpt = true,
-				analyses = {
-					unusedparams = true,
-					shadow = true,
-					structtag = false,
-				},
-				staticcheck = true,
-				codelenses = { test = true },
-				hints = {
-					assignVariableTypes = true,
-					composeLiteralFields = true,
-					constantValues = true,
-					functionTypeParameter = true,
-					parameterNames = true,
-					rangeVariableTypes = true,
-				},
-			},
-		},
 	},
+	"gopls",
 }
 
 -- Only install servers that exist + use custom options
 for _, server in ipairs(servers) do
 	local exec = ""
 	local lsp = ""
-	local setup = { capabilities = capabilities }
 	if type(server) == "table" then
 		lsp = server[1]
 		if server.enable ~= nil and server.continue then
@@ -216,12 +135,6 @@ for _, server in ipairs(servers) do
 		else
 			exec = lsp
 		end
-		if server.settings ~= nil then
-			setup["settings"] = server.settings
-		end
-		if server.init_options ~= nil then
-			setup["init_options"] = server.init_options
-		end
 	else
 		lsp = server
 		exec = server
@@ -231,18 +144,33 @@ for _, server in ipairs(servers) do
 	local out = vim.api.nvim_exec2(command, { output = true })
 	local result = tonumber(out.output)
 	if result ~= 0 then
-		nvim_lsp[lsp].setup(setup)
+		vim.lsp.enable(lsp)
+		-- nvim_lsp[lsp].setup(setup)
 	end
 	::continue::
 end
 
 vim.g.rustaceanvim = {
 	server = {
-		capabilities = capabilities,
-		["rust-analyzer"] = {
-			diagnostics = {
-				enable = true,
-				enable_experimental = true,
+		on_attach = function(client, _)
+			client.server_capabilities.workspace.didChangeWatchedFiles = {
+				dynamicRegistration = false,
+			}
+		end,
+		default_settings = {
+			["rust-analyzer"] = {
+				files = {
+					watcherExclude = {
+						"**/.direnv/**",
+					},
+					excludeDirs = {
+						".direnv",
+						".github",
+					},
+				},
+				cargo = {
+					features = "all",
+				},
 			},
 		},
 	},
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index 55a08e8..18aa340 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -5,7 +5,7 @@ return {
 			formatters_by_ft = {
 				lua = { "stylua" },
 				python = { "ruff_format" },
-				terraform = { "terraform_fmt" },
+				terraform = { "tofu_fmt" },
 			},
 			format_on_save = {
 				timeout_ms = 500,
diff --git a/nvim/.config/nvim/lua/plugins/copilot.lua b/nvim/.config/nvim/lua/plugins/copilot.lua
deleted file mode 100644
index 4cfd88f..0000000
--- a/nvim/.config/nvim/lua/plugins/copilot.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-return {
-	{
-		"zbirenbaum/copilot.lua",
-		cmd = "Copilot",
-		event = "InsertEnter",
-		config = function()
-			require("copilot").setup({
-				suggestion = { enabled = false },
-				panel = { enabled = false },
-			})
-		end,
-	},
-	{
-		"zbirenbaum/copilot-cmp",
-		config = true,
-		after = { "copilot.lua" },
-	},
-}
diff --git a/nvim/.config/nvim/lua/plugins/coverage.lua b/nvim/.config/nvim/lua/plugins/coverage.lua
index 5a9a27d..943a664 100644
--- a/nvim/.config/nvim/lua/plugins/coverage.lua
+++ b/nvim/.config/nvim/lua/plugins/coverage.lua
@@ -2,8 +2,8 @@ return {
 	{
 		"andythigpen/nvim-coverage",
 		dependencies = { "nvim-lua/plenary.nvim", "EdenEast/nightfox.nvim" },
-		lazy = true,
-		ft = { "python" },
+		-- lazy = true,
+		ft = { "python", "rust" },
 		config = true,
 	},
 }
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua
index 740419f..1f0c956 100644
--- a/nvim/.config/nvim/lua/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@@ -8,7 +8,7 @@ return {
 	},
 	{
 		"mrcjkb/rustaceanvim",
-		version = "^4",
+		version = "^5",
 		ft = { "rust" },
 	},
 	{
@@ -53,7 +53,8 @@ return {
 		build = ":TSUpdate",
 	},
 	"nvim-treesitter/nvim-treesitter-textobjects",
-	"mrjones2014/nvim-ts-rainbow",
+	-- "mrjones2014/nvim-ts-rainbow",
+	"HiPhish/rainbow-delimiters.nvim",
 	"nvim-treesitter/nvim-treesitter-context",
 	-- Snippets
 	{
@@ -72,14 +73,23 @@ return {
 			-- vim.cmd.colorscheme("terafox")
 		end,
 	},
+	-- {
+	-- 	"rose-pine/neovim",
+	-- 	name = "rose-pine",
+	-- 	config = function()
+	-- 		require("rose-pine").setup({
+	-- 			variant = "moon",
+	-- 		})
+	-- 		vim.cmd.colorscheme("rose-pine")
+	-- 	end,
+	-- },
 	{
-		"rose-pine/neovim",
-		name = "rose-pine",
+		"folke/tokyonight.nvim",
+		lazy = false,
+		priority = 1000,
+		opts = {},
 		config = function()
-			require("rose-pine").setup({
-				variant = "moon",
-			})
-			vim.cmd.colorscheme("rose-pine")
+			vim.cmd.colorscheme("tokyonight-night")
 		end,
 	},
 	"stevearc/dressing.nvim",
diff --git a/nvim/.config/nvim/lua/plugins/ollama.lua b/nvim/.config/nvim/lua/plugins/ollama.lua
deleted file mode 100644
index a6f6e1c..0000000
--- a/nvim/.config/nvim/lua/plugins/ollama.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-return {
-	"nomnivore/ollama.nvim",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-	},
-
-	-- All the user commands added by the plugin
-	cmd = { "Ollama", "OllamaModel", "OllamaServe", "OllamaServeStop" },
-
-	keys = {
-		-- Sample keybind for prompt menu. Note that the <c-u> is important for selections to work properly.
-		{
-			"<leader>oo",
-			":<c-u>lua require('ollama').prompt()<cr>",
-			desc = "ollama prompt",
-			mode = { "n", "v" },
-		},
-
-		-- Sample keybind for direct prompting. Note that the <c-u> is important for selections to work properly.
-		-- {
-		-- 	"<leader>oG",
-		-- 	":<c-u>lua require('ollama').prompt('Generate_Code')<cr>",
-		-- 	desc = "ollama Generate Code",
-		-- 	mode = { "n", "v" },
-		-- },
-	},
-
-	---@type Ollama.Config
-	opts = {
-		model = "codegemma",
-		-- your configuration overrides
-	},
-}
diff --git a/nvim/.config/nvim/lua/plugins/salt.lua b/nvim/.config/nvim/lua/plugins/salt.lua
deleted file mode 100644
index 4ff2fd8..0000000
--- a/nvim/.config/nvim/lua/plugins/salt.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-	{
-		"saltstack/salt-vim",
-		ft = "sls",
-	},
-}
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index dff22fe..0dcddb0 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -4,14 +4,23 @@ return {
 		cmd = "Telescope",
 		dependencies = {
 			"nvim-lua/plenary.nvim",
+			"nvim-telescope/telescope-fzf-native.nvim",
 		},
+		branch = "0.1.x",
 		init = function()
-			require("telescope").setup({})
+			require("telescope").setup({
+				pickers = {
+					find_files = {
+						-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
+						find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" },
+					},
+				},
+			})
 			require("telescope").load_extension("fzf")
 			require("telescope").load_extension("harpoon")
 		end,
 
-		lazy = true,
+		-- lazy = true,
 		keys = {
 			{ "<leader>ff", require("telescope.builtin").find_files, desc = "Find File" },
 			{ "<leader>fg", require("telescope.builtin").live_grep, desc = "Live Grep" },