moved gaming configuration to /sys module, added a bunch of neovim plugins

modules/home/environment/gtk.nix

@@ -14,11 +14,11 @@
 
   gtk = {
     enable = true;
-		cursorTheme = {
-			name = "Bibata-Modern-Ice";
-			package = pkgs.bibata-cursors;
-			size = 16;
-		};
+	#cursorTheme = {
+	#	name = "Bibata-Modern-Ice";
+	#	package = pkgs.bibata-cursors;
+	#	size = 16;
+	#};
 	#font = {
 	#	name = "Iosevka Nerd Font";
 	#	package = pkgs.nerdfonts.override {fonts = ["Iosevka"];};

modules/home/programs/gaming/gaming_pkgs.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-	home.packages = with pkgs; [
-		snes9x-gtk
-	];
-}

modules/sys/software/default.nix

@@ -10,7 +10,7 @@
 }:  
 let
 	desktop_modules = if (host == "oganesson") then
-		[(import ./virtualization.nix)]
+		[(import ./virtualization.nix)] ++ [(import ./gaming)]
 		else [];
 in
 {

modules/sys/software/gaming/gaming_pkgs.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+	environment.systemPackages = with pkgs; [
+		snes9x-gtk
+	];
+}

modules/sys/software/nixvim/keymaps.nix

@@ -26,6 +26,11 @@
         key = "<F2>";
         mode = "t";
       }
+      {
+        action = "<cmd>COQnow<CR>";
+        key = "!cq";
+        mode = "n";
+      }
     ];
   };
 }

modules/sys/software/nixvim/plugins/barbar.nix

@@ -1,7 +1,7 @@
 {
   programs.nixvim = {
     plugins.barbar = {
-      enable = true;
+      enable = false;
       settings = {
         auto_hide = 1;
       };

modules/sys/software/nixvim/plugins/cmp.nix

@@ -8,5 +8,8 @@
         {name = "buffer";}
       ];
     };
+    plugins.cmp-nvim-lsp.enable = true;
+    plugins.cmp-nvim-lsp-document-symbol.enable = true;
+    plugins.cmp-nvim-lsp-signature-help.enable = true;
   };
 }

modules/sys/software/nixvim/plugins/coq.nix

@@ -3,7 +3,7 @@
     plugins.coq-nvim = {
       enable = true;
       settings = {
-        auto_start = true;
+        auto_start = false;
       };
     };
   };

modules/sys/software/nixvim/plugins/default.nix

@@ -1,6 +1,7 @@
 {
 	imports = [
 		./alpha.nix
+		./haskell.nix
 		./vim-matchup.nix
 		./coq.nix
 		./barbar.nix

modules/sys/software/nixvim/plugins/haskell.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }: {
+	programs.nixvim = {
+		extraPlugins = [
+			(pkgs.vimUtils.buildVimPlugin {
+        name = "haskell-tools.nvim";
+        src = pkgs.fetchFromGitHub {
+          owner = "mrcjkb";
+          repo = "haskell-tools.nvim";
+          rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c";
+          hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
+        };
+      })
+		];
+		plugins = {
+			haskell-scope-highlighting.enable = true;
+		};
+	};
+}

modules/sys/software/nixvim/plugins/lsp.nix

@@ -14,6 +14,10 @@
         nil_ls.enable = true;
         pyright.enable = true;
         sqls.enable = true;
+				hls = {
+					enable = true;
+					installGhc = true;
+				};
       };
     };
   };

modules/sys/software/nixvim/plugins/plugins.nix

@@ -1,24 +1,29 @@
 {
   programs.nixvim = {
     plugins = {
-      nvim-surround.enable = true;
-      indent-blankline.enable = true;
-      treesitter.enable = true;
-      lastplace.enable = true;
-      markdown-preview.enable = true;
-      gitsigns.enable = true;
-      web-devicons.enable = true;
-      endwise.enable = true;
-      marks.enable = true;
-      trouble.enable = true;
-      floaterm.enable = true;
-      fugitive.enable = true;
-      rustaceanvim.enable = true;
-      firenvim.enable = true;
-      dap = {
+			dap = {
         enable = true;
         extensions.dap-ui.enable = true;
       };
+			nix.enable = true;
+			neoscroll.enable = true;
+			endwise.enable = true;
+			firenvim.enable = true;
+			floaterm.enable = true;
+			fugitive.enable = true;
+			gitsigns.enable = true;
+			indent-blankline.enable = true;
+			lastplace.enable = true;
+			markdown-preview.enable = true;
+			marks.enable = true;
+			nvim-surround.enable = true;
+			rainbow-delimiters.enable = true;
+			render-markdown.enable = true;
+			rustaceanvim.enable = true;
+			treesitter.enable = true;
+			trim.enable = true;
+			trouble.enable = true;
+			web-devicons.enable = true;
     };
   };
 }

modules/sys/software/packages.nix

@@ -9,6 +9,7 @@
     alsa-utils
     bc
     cava
+		cabal-install
     clang
     clang-tools
     cmake