neovim update

src/system/machines/desktop/home.nix

@@ -29,6 +29,7 @@
           enable = true;
           dev.enable = true;
           irc.enable = true;
+          neovim.enable = true;
           vim.enable = false;
         };
 
@@ -38,7 +39,6 @@
           browsers.enable = true;
           corn.enable = true;
           fun.enable = true;
-          neovim.enable = true;
           utils.enable = true;
           writing.enable = true;
         };

src/user/modules/gui/modules/default.nix

@@ -5,7 +5,6 @@
     ./corn
     ./fun
     ./utils
-    ./neovim
     ./writing
   ];
 }

src/user/modules/utils/modules/default.nix

@@ -3,6 +3,7 @@
     ./dev
     ./email
     ./irc
+    ./neovim
     ./vim
   ];
 }

src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua

@@ -66,10 +66,8 @@ lsp.setup_servers({
 	"diagnosticls",
 	"lua_ls",
 	"marksman",
-	"purescriptls",
 	"tailwindcss",
 	"bashls",
-	"dhall_lsp_server",
 	"volar",
   "clangd",
 })
@@ -81,7 +79,6 @@ lsp.setup()
 local cmp_nvim_lsp = require "cmp_nvim_lsp"
 
 require("lspconfig").clangd.setup {
-  on_attach = on_attach,
   capabilities = cmp_nvim_lsp.default_capabilities(),
   cmd = {
     "clangd",

src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua

@@ -25,7 +25,7 @@ require("lazy").setup({
 		-- version = "*", -- try installing the latest stable version for plugins that support semver
 	},
 	install = { colorscheme = { "github-theme" } },
-	checker = { enabled = true }, -- automatically check for plugin updates
+	checker = { enabled = false }, -- automatically check for plugin updates
 	performance = {
 		rtp = {
 			-- disable some rtp plugins

src/user/modules/utils/modules/neovim/config/pkgs.nix

@@ -7,7 +7,6 @@ let
     sumneko-lua-language-server stylua
     haskell-language-server hlint
     nodePackages."@tailwindcss/language-server"
-    dhall-lsp-server
   ];
 
   lsp' = with pkgs.nodePackages; [
@@ -16,9 +15,13 @@ let
     bash-language-server
     diagnostic-languageserver
     pyright
-    purescript-language-server
     volar
   ];
 
+  extraPackages = with pkgs; [
+    lazygit
+    gcc
+  ];
+
 in
-  lsp ++ lsp'
+  extraPackages ++ lsp ++ lsp'

src/user/modules/utils/modules/neovim/default.nix

@@ -2,26 +2,22 @@
 
 with lib;
 let
-  cfg = config.modules.user.gui.neovim;
+  cfg = config.modules.user.utils.neovim;
 
 in
-{ options.modules.user.gui.neovim = { enable = mkEnableOption "user.gui.neovim"; };
+{ options.modules.user.utils.neovim = { enable = mkEnableOption "user.utils.neovim"; };
   config = mkIf cfg.enable {
     programs.neovim = {
       enable = true;
       defaultEditor = true;
       vimAlias = true;
       vimdiffAlias = true;
-      extraPackages = import ./config/servers.nix { inherit pkgs; };
+      extraPackages = import ./config/pkgs.nix { inherit pkgs; };
     };
 
     home.file.".config/nvim" = {
       source = ./config/lazyvim;
       recursive = true;
     };
-    home.packages = with pkgs; [
-      lazygit
-      #gcc
-    ];
   };
 }