diff --git a/fish/fish/functions/!!.fish b/fish/fish/functions/!!.fish
index bf1636e..9475904 100644
--- a/fish/fish/functions/!!.fish
+++ b/fish/fish/functions/!!.fish
@@ -1,4 +1,4 @@
-function !! --wraps='nvim ./Lab3/FullAdder.srcs/sources_1/new' --description 'alias !! nvim ./Lab3/FullAdder.srcs/sources_1/new'
-  nvim ./Lab3/FullAdder.srcs/sources_1/new $argv
+function !! --wraps='nvim init.lua' --description 'alias !! nvim init.lua'
+  nvim init.lua $argv
         
 end
diff --git a/neovim/nvim/init.lua b/neovim/nvim/init.lua
index f0e6bf5..3b36f90 100644
--- a/neovim/nvim/init.lua
+++ b/neovim/nvim/init.lua
@@ -286,7 +286,7 @@ require("lazy").setup({
 		lazy = false, -- load at start
 		priority = 1000, -- load first
 		config = function()
-			vim.cmd([[colorscheme gruvbox-dark-medium]])
+			vim.cmd([[colorscheme gruvbox-dark-hard]])
 			vim.o.background = 'dark'
 			-- XXX: hi Normal ctermbg=NONE
 			-- Make comments more prominent -- they are important.
@@ -366,6 +366,10 @@ require("lazy").setup({
 	-- 		require('nvim-rooter').setup()
 	-- 	end
 	-- },
+	-- hopefully fix random crashes?
+	{
+	    'hrsh7th/vim-vsnip'
+	},
 	-- fzf support for ^p
 	{
 		'junegunn/fzf.vim',
@@ -405,52 +409,42 @@ require("lazy").setup({
 			-- Setup language servers.
 			local lspconfig = require('lspconfig')
 
+				-- Server-specific settings. See `:help lspconfig-setup`
+				settings = {
+					["rust-analyzer"] = {
+						cargo = {
+							features = "all"
+						},
+						checkOnSave = {
+						    enable = true,
+						},
+						check = {
+						    command = "clippy"
+						},
+						imports = {
+							group = {
+								enable = false,
+							},
+						},
+						completion = {
+							postfix = {
+							    -- Commened out to see if I like it more (arc) - 2024-10-03
+							    -- enable = false,
+							},
+						},
+					},
+				},
 			-- Rust
-			-- Commented out to see if we could stop rust-analyzer from crashing (arc) - 2025-02-26
-			lspconfig.rust_analyzer.setup {}
-			-- lspconfig.rust_analyzer.setup {
-			-- 	-- Server-specific settings. See `:help lspconfig-setup`
-			-- 	settings = {
-			-- 		["rust-analyzer"] = {
-			-- 			cargo = {
-			-- 				allFeatures = true,
-			-- 			},
-			-- 			imports = {
-			-- 				group = {
-			-- 					enable = false,
-			-- 				},
-			-- 			},
-			-- 			completion = {
-			-- 				postfix = {
-			-- 				    -- Commened out to see if I like it more (arc) - 2024-10-03
-			-- 				    -- enable = false,
-			-- 				},
-			-- 			},
-			-- 		},
-			-- 	},
-			-- }
+			vim.lsp.enable('rust_analyzer')
 			
-			-- C
-			lspconfig.clangd.setup {}
-
-			-- Bash LSP
-			local configs = require 'lspconfig.configs'
-			if not configs.bash_lsp and vim.fn.executable('bash-language-server') == 1 then
-				configs.bash_lsp = {
-					default_config = {
-						cmd = { 'bash-language-server', 'start' },
-						filetypes = { 'sh' },
-						root_dir = require('lspconfig').util.find_git_ancestor,
-						init_options = {
-							settings = {
-								args = {}
-							}
-						}
-					}
-				}
+			-- C/C++
+			if vim.fn.executable('clangd') == 1 then
+			    vim.lsp.enable('clangd')
 			end
-			if configs.bash_lsp then
-				lspconfig.bash_lsp.setup {}
+
+			-- Javascript
+			if vim.fn.executable('biome') == 1 then
+			    vim.lsp.enable('biome')
 			end
 
 			-- Global mappings.
@@ -600,11 +594,6 @@ require("lazy").setup({
 			vim.g.rust_clip_command = 'wl-copy'
 		end
 	},
-	-- C
-	-- {
-	-- 	'clangd.nvim',
-	-- 	ft = { "C" },
-	-- },
 	-- fish
 	'khaveesh/vim-fish-syntax',
 	-- markdown
@@ -626,6 +615,14 @@ 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",
+	    },
+	},
 })
 
 --[[
diff --git a/neovim/nvim/lazy-lock.json b/neovim/nvim/lazy-lock.json
index c30cab6..a58f94d 100644
--- a/neovim/nvim/lazy-lock.json
+++ b/neovim/nvim/lazy-lock.json
@@ -1,24 +1,26 @@
 {
-  "base16-nvim": { "branch": "main", "commit": "178bebdd6342c59151f6cfa2553d8e0f3f8b6a69" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "fzf": { "branch": "master", "commit": "77568e114ff531f4fe14cfaeab6febd53a99b1bc" },
-  "fzf.vim": { "branch": "master", "commit": "6cda389bdea953c9c66a3cfe57e40463ffd61ae9" },
-  "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
-  "leap.nvim": { "branch": "main", "commit": "8b826a9fc766bffd14288aee01847cb0d6c6c383" },
+  "base16-nvim": { "branch": "main", "commit": "e86be83754d6c64f9678f072b382354d0f829ede" },
+  "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" },
   "lightline.vim": { "branch": "master", "commit": "e358557e1a9f9fc860416c8eb2e34c0404078155" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "5b64964ed02098c85613ee3d20f96bed1dfb64cc" },
-  "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7c8cb61b21727a473663054edec4b83633d9e442" },
-  "nvim-treesitter": { "branch": "master", "commit": "4cf2da5c3a2dfd22e72713c66203d21883b149fd" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "15bb33cdb47e85278e168cad11acb1b6fa9c6488" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9276b82935bf6b951d08c864eb5ac3f85d6b743b" },
+  "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": "aca23ce53ebfe34e02c4fe07e29e9133a2026481" },
-  "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
-  "vim-terraform": { "branch": "master", "commit": "8912ca1be3025a1c9fab193618f3b99517e01973" },
-  "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
-  "yaml.nvim": { "branch": "main", "commit": "a7fc7a07076689a7b5f0f6d06347c1e221f0d1b0" }
+  "vim-matchup": { "branch": "master", "commit": "c478d4a72bbf397eff42743198f1939f6a264736" },
+  "vim-svelte": { "branch": "main", "commit": "f6df955ad86583e9751487eb7550fae9e53d2d6b" },
+  "vim-terraform": { "branch": "master", "commit": "520498fab16a3a11f2ae1b8cb65e0a1684bc317a" },
+  "vim-toml": { "branch": "main", "commit": "1b63257680eeb65677eb1ca5077809a982756d58" },
+  "vim-vsnip": { "branch": "master", "commit": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e" },
+  "yaml.nvim": { "branch": "main", "commit": "09bbf7d936606d97f2c1d2e51171a602bc76b65e" }
 }