diff --git a/fish/fish/functions/!!.fish b/fish/fish/functions/!!.fish
index 6c6e924..3bbe196 100644
--- a/fish/fish/functions/!!.fish
+++ b/fish/fish/functions/!!.fish
@@ -1,4 +1,3 @@
-function !! --wraps=nvim --description 'alias !! nvim'
-  nvim $argv
-        
+function !! --wraps='code .' --description 'alias !! code .'
+    code . $argv
 end
diff --git a/neovim/nvim/init.lua b/neovim/nvim/init.lua
index 3b36f90..596c61b 100644
--- a/neovim/nvim/init.lua
+++ b/neovim/nvim/init.lua
@@ -168,7 +168,7 @@ vim.keymap.set('i', '<F1>', '<Esc>')
 
 -- Use f2 to rename symbol (arc) - 2024-10-02
 vim.keymap.set('n', '<F2>', function () vim.lsp.buf.rename() end)
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------
 --
 -- autocommands
 --
@@ -347,7 +347,8 @@ require("lazy").setup({
 	{
 		'ggandor/leap.nvim',
 		config = function()
-			require('leap').create_default_mappings()
+		    vim.keymap.set({'n', 'x', 'o'}, 's', '<Plug>(leap)')
+		    vim.keymap.set('n',             'S', '<Plug>(leap-from-window)')
 		end
 	},
 	-- better %
@@ -417,6 +418,8 @@ require("lazy").setup({
 						},
 						checkOnSave = {
 						    enable = true,
+						    features = "all",
+						    command = "clippy"
 						},
 						check = {
 						    command = "clippy"
@@ -441,11 +444,14 @@ require("lazy").setup({
 			if vim.fn.executable('clangd') == 1 then
 			    vim.lsp.enable('clangd')
 			end
-
+			
 			-- Javascript
-			if vim.fn.executable('biome') == 1 then
-			    vim.lsp.enable('biome')
-			end
+			vim.lsp.enable("ts_ls")
+
+			-- Svelte
+			vim.lsp.enable("svelte")
+			-- Lua
+			vim.lsp.enable('lua_ls')
 
 			-- Global mappings.
 			-- See `:help vim.diagnostic.*` for documentation on any of the below functions
@@ -568,11 +574,6 @@ require("lazy").setup({
 		'hashivim/vim-terraform',
 		ft = { "hcl" },
 	},
-	-- svelte
-	{
-		'evanleck/vim-svelte',
-		ft = { "svelte" },
-	},
 	-- toml
 	'cespare/vim-toml',
 	-- yaml
@@ -615,16 +616,20 @@ require("lazy").setup({
 			vim.g.vim_markdown_auto_insert_bullets = 0
 		end
 	},
-	-- Typescript
-	{
-	   'tree-sitter/tree-sitter-typescript',
-	    ft = { "typescript", "javascript" },
-	    dependencies = {
-		    "nvim-treesitter/nvim-treesitter",
-	    },
-	},
 })
 
+-- Hypothetically makes hover work on hover - arc, aug 6, 2025
+-- Commented out because it prevents me from looking at errors, aug 7:
+-- vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {
+--   callback = function()
+--     -- Check if an LSP client is attached to the current buffer
+--     if vim.lsp.buf_is_attached(0) then
+--       vim.lsp.buf.hover()
+--     end
+--   end,
+--   desc = "Show LSP hover on cursor hold",
+-- })
+
 --[[
 
 leftover things from init.vim that i may still end up wanting
diff --git a/neovim/nvim/lazy-lock.json b/neovim/nvim/lazy-lock.json
index a58f94d..0d12ff1 100644
--- a/neovim/nvim/lazy-lock.json
+++ b/neovim/nvim/lazy-lock.json
@@ -1,26 +1,24 @@
 {
-  "base16-nvim": { "branch": "main", "commit": "e86be83754d6c64f9678f072b382354d0f829ede" },
+  "base16-nvim": { "branch": "main", "commit": "6e503dc07bf22317c7e755dc0569a2bad6cfd9ce" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
-  "fzf": { "branch": "master", "commit": "0c00b203e61bffbadbc499cbf68af6f89a5a3e29" },
-  "fzf.vim": { "branch": "master", "commit": "98dcd77a189a8a87052c20d1be8082aea60101b7" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "leap.nvim": { "branch": "main", "commit": "10c14af4ddfb34dbd7721f0bfb2b4d91f0558907" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "fzf": { "branch": "master", "commit": "535b610a6b0858364cfb12cee8b5ae7132883ea0" },
+  "fzf.vim": { "branch": "master", "commit": "879db51d0965515cdaef9b7f6bdeb91c65d2829e" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "leap.nvim": { "branch": "main", "commit": "614481baedb1c11df1d88338005b3e8c15349dcf" },
   "lightline.vim": { "branch": "master", "commit": "e358557e1a9f9fc860416c8eb2e34c0404078155" },
   "lsp_signature.nvim": { "branch": "master", "commit": "15bb33cdb47e85278e168cad11acb1b6fa9c6488" },
-  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9276b82935bf6b951d08c864eb5ac3f85d6b743b" },
+  "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b34fbdffdcb6295c7a25df6ba375452a2e73c32e" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
-  "tree-sitter-typescript": { "branch": "master", "commit": "75b3874edb2dc714fb1fd77a32013d0f8699989f" },
   "vim-fish-syntax": { "branch": "master", "commit": "e229becbf4bbee21cc78cd2cf24f57112e33c02a" },
-  "vim-markdown": { "branch": "master", "commit": "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51" },
-  "vim-matchup": { "branch": "master", "commit": "c478d4a72bbf397eff42743198f1939f6a264736" },
-  "vim-svelte": { "branch": "main", "commit": "f6df955ad86583e9751487eb7550fae9e53d2d6b" },
+  "vim-markdown": { "branch": "master", "commit": "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397" },
+  "vim-matchup": { "branch": "master", "commit": "1c276e12b49a83c1bdca74351187b8adea5da4b9" },
   "vim-terraform": { "branch": "master", "commit": "520498fab16a3a11f2ae1b8cb65e0a1684bc317a" },
   "vim-toml": { "branch": "main", "commit": "1b63257680eeb65677eb1ca5077809a982756d58" },
-  "vim-vsnip": { "branch": "master", "commit": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e" },
-  "yaml.nvim": { "branch": "main", "commit": "09bbf7d936606d97f2c1d2e51171a602bc76b65e" }
+  "vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" },
+  "yaml.nvim": { "branch": "main", "commit": "e70ee49f7aefc79dce020d3ffc3c9447b0c52236" }
 }