sync

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",
+	    },
+	},
 })
 
 --[[