diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index a838199..074a565 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -44,11 +44,11 @@ local on_attach = function(ev)
 	end, opts)
 	vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, opts)
 	vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, opts)
-	vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, opts)
+	vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
 	vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
 	vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, opts)
-	vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
-	vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
+	vim.keymap.set("n", "[d", function () vim.diagnostic.jump {count = -1, float = true} end, opts)
+	vim.keymap.set("n", "]d", function () vim.diagnostic.jump {count = 1, float = true} end, opts)
 	vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts)
 	vim.keymap.set("n", "<space>f",
 		function() vim.lsp.buf.format { async = true } end, opts)
diff --git a/nvim/lua/lsp/janet_lsp.lua b/nvim/lua/lsp/janet_lsp.lua
index c3f4b56..d864707 100644
--- a/nvim/lua/lsp/janet_lsp.lua
+++ b/nvim/lua/lsp/janet_lsp.lua
@@ -2,7 +2,7 @@ return {
 	cmd = {
 		"janet",
 		"-i",
-		"/home/noah/repos/janet-lsp/jpm_tree/lib/janet-lsp.jimage",
+		"/Users/noah/repos/janet-lsp/build/janet-lsp.jimage",
 		"--stdio",
 	}
 }
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 136cffb..34bb19c 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -121,7 +121,7 @@ require("lazy").setup({
 			},
 		}, -- Git stuff
 		-- GitGutter, shows inline difs
-		"airblade/vim-gitgutter",
+		--"airblade/vim-gitgutter",
 		{
 			"NeogitOrg/neogit",
 			dependencies = {
@@ -277,27 +277,9 @@ require("lazy").setup({
 		{ "rktjmp/hotpot.nvim",     lazy = true, ft = "fennel", config = true },
 		{ "Olical/nfnl",            lazy = true, ft = "fennel", config = true }, -- Rust stuff
 		{
-			"simrat39/rust-tools.nvim",
-			lazy = true,
-			ft = { "rust" },
-			config = function()
-				local rt = require("rust-tools")
-				rt.setup({
-					server = {
-						on_attach = function(_, bufnr)
-							-- Hover actions
-							vim.keymap.set("n", "<C-space>",
-								rt.hover_actions.hover_actions,
-								{ buffer = bufnr })
-							-- Code action groups
-							vim.keymap.set("n", "<Leader>a",
-								rt.code_action_group.code_action_group,
-								{ buffer = bufnr })
-						end
-					}
-				})
-			end,
-			dependencies = { "nvim-lua/plenary.nvim" }
+			"mrcjkb/rustaceanvim",
+			lazy = false,
+			version = "^6"
 		},
 		{ "mfussenegger/nvim-dap", lazy = true, ft = { "c", "rust" } },
 		{