5 files changed, 34 insertions, 5 deletions
diff --git a/users/seth/programs/neovim/config/init.lua b/users/seth/programs/neovim/config/init.lua
index 5555078..d19b85f 100644
--- a/users/seth/programs/neovim/config/init.lua
+++ b/users/seth/programs/neovim/config/init.lua
@@ -14,6 +14,5 @@ cmd("filetype plugin indent on")
 opt.termguicolors = true
 
 require("getchoo.keybinds")
-require("getchoo.general")
-require("getchoo.lsp")
 require("getchoo.filetypes")
+require("getchoo.plugins")
diff --git a/users/seth/programs/neovim/config/general.lua b/users/seth/programs/neovim/config/plugins/general.lua
index 349c191..349c191 100644
--- a/users/seth/programs/neovim/config/general.lua
+++ b/users/seth/programs/neovim/config/plugins/general.lua
diff --git a/users/seth/programs/neovim/config/plugins/init.lua b/users/seth/programs/neovim/config/plugins/init.lua
new file mode 100644
index 0000000..b123949
--- /dev/null
+++ b/users/seth/programs/neovim/config/plugins/init.lua
@@ -0,0 +1,2 @@
+require("getchoo.plugins.general")
+require("getchoo.plugins.lsp")
diff --git a/users/seth/programs/neovim/config/lsp.lua b/users/seth/programs/neovim/config/plugins/lsp.lua
index 0df0f2f..9aee630 100644
--- a/users/seth/programs/neovim/config/lsp.lua
+++ b/users/seth/programs/neovim/config/plugins/lsp.lua
@@ -51,6 +51,11 @@ require("cmp").setup({
 				fallback()
 			end
 		end, { "i", "s" }),
+		["<C-b>"] = mapping.scroll_docs(-4),
+		["<C-f>"] = mapping.scroll_docs(4),
+		["<C-Space>"] = mapping.complete(),
+		["<C-e>"] = mapping.abort(),
+		["<CR>"] = mapping.confirm({ select = true }),
 	}),
 
 	sources = cmp.config.sources({
@@ -67,7 +72,7 @@ require("cmp").setup({
 })
 
 ---- fidget
-require("fidget").setup({})
+require("fidget").setup()
 
 ---- lsp sources
 local null_ls = require("null-ls")
@@ -75,18 +80,34 @@ local diagnostics = null_ls.builtins.diagnostics
 local formatting = null_ls.builtins.formatting
 
 local sources = {
-	lsp_servers = { "rust_analyzer", "pyright", "bashls", "clangd" },
+	lsp_servers = {
+		"bashls",
+		"clangd",
+		"pyright",
+		"rust_analyzer",
+		"tsserver",
+		--"tailwindcss",
+		"nimls",
+	},
 	null_ls = {
+		diagnostics.actionlint,
 		diagnostics.alex,
 		diagnostics.codespell,
 		diagnostics.deadnix,
+		diagnostics.eslint,
+		diagnostics.markdownlint,
 		diagnostics.pylint,
 		diagnostics.shellcheck,
 		diagnostics.statix,
 		formatting.alejandra,
+		formatting.beautysh,
 		formatting.codespell,
+		formatting.just,
+		formatting.markdownlint,
+		formatting.nimpretty,
 		formatting.prettier,
 		formatting.rustfmt,
+		formatting.shellharden,
 		formatting.stylua,
 		formatting.yapf,
 	},
@@ -156,4 +177,4 @@ require("null-ls").setup({
 })
 
 ---- trouble
-require("trouble").setup({})
+require("trouble").setup()
diff --git a/users/seth/programs/neovim/default.nix b/users/seth/programs/neovim/default.nix
index 6d5809b..22f684d 100644
--- a/users/seth/programs/neovim/default.nix
+++ b/users/seth/programs/neovim/default.nix
@@ -3,19 +3,26 @@
     enable = true;
     defaultEditor = true;
     extraPackages = with pkgs; [
+      actionlint
       alejandra
+      beautysh
       codespell
       deadnix
+      just
       llvmPackages_15.clang
       llvmPackages_15.libclang
       nodePackages.alex
       nodePackages.bash-language-server
+      nodePackages.eslint
+      nodePackages.markdownlint-cli
       nodePackages.prettier
       nodePackages.pyright
+      nodePackages.typescript-language-server
       pylint
       rust-analyzer
       rustfmt
       shellcheck
+      shellharden
       statix
       stylua
       sumneko-lua-language-server