cleanup, zoxide moved

nixos/packages/applications.nix

@@ -6,14 +6,10 @@
   ...
 }: {
   options = {
-    applications.enable = lib.mkEnableOption "enable Graphical applications";
+    group.applications.enable = lib.mkEnableOption "Enable graphical applications";
   };
 
-  imports = [
-    ./applications/firefox.nix
-  ];
-
-  config = lib.mkIf config.applications.enable {
+  config = lib.mkIf config.group.applications.enable {
     home.packages =
       (with pkgs; [
         librewolf

nixos/packages/applications/firefox.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    firefox.enable = lib.mkEnableOption "enable Firefox module";
+    program.firefox.enable = lib.mkEnableOption "enable Firefox module";
   };
 
-  config = lib.mkIf config.firefox.enable {
+  config = lib.mkIf config.program.firefox.enable {
     programs.firefox = {
       enable = true;
 

nixos/packages/games.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    games.enable =
+    group.games.enable =
       lib.mkEnableOption "enables games";
   };
-  config = lib.mkIf config.games.enable {
+  config = lib.mkIf config.group.games.enable {
     home.packages = with pkgs; [
       vitetris
       steam

nixos/packages/hacking/hacking.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    hacking.enable = lib.mkEnableOption "enable Hacking module";
+    group.hacking.enable = lib.mkEnableOption "enable Hacking module";
   };
 
-  config = lib.mkIf config.hacking.enable {
+  config = lib.mkIf config.group.hacking.enable {
     home.packages = with pkgs; [
       ffuf
       wireshark

nixos/packages/packages.nix

@@ -9,15 +9,16 @@
     ./games.nix
     ./terminal_tools.nix
     ./applications.nix
+    ./applications/firefox.nix
   ];
 
-  terminal_tools.enable = lib.mkDefault true;
-  programming.enable = lib.mkDefault true;
-  games.enable = lib.mkDefault false;
-  firefox.enable = lib.mkDefault true;
-  applications.enable = lib.mkDefault true;
-  hacking.enable = lib.mkDefault true;
-  #programs.neovim.enable = true;
+  group.terminal_tools.enable = lib.mkDefault true;
+  group.programming.enable = lib.mkDefault true;
+  group.games.enable = lib.mkDefault false;
+  group.applications.enable = lib.mkDefault true;
+  group.hacking.enable = lib.mkDefault true;
+
+  program.firefox.enable = lib.mkDefault true;
 
   home.packages = with pkgs; [
       alejandra

nixos/packages/programming/programming.nix

@@ -6,7 +6,7 @@
 }: {
 
   options = {
-    programming.enable =
+    group.programming.enable =
       lib.mkEnableOption "enable programming toolset";
   };
 
@@ -15,7 +15,7 @@
     ./git.nix
   ];
 
-  config = lib.mkIf config.programming.enable {
+  config = lib.mkIf config.group.programming.enable {
     
     program.vscode.enable = lib.mkDefault true;
     program.git.enable = lib.mkDefault true;

nixos/packages/terminal_tools.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   options = {
-    terminal_tools.enable =
+    group.terminal_tools.enable =
       lib.mkEnableOption "enable terminal tools module";
   };
 
@@ -14,9 +14,10 @@
     ./tools/shell.nix
     ./tools/kitty.nix
     ./tools/tmux.nix
+    ./tools/zoxide.nix
   ];
 
-  config = lib.mkIf config.terminal_tools.enable {
+  config = lib.mkIf config.group.terminal_tools.enable {
     
     sh.bash = {
       enable = lib.mkDefault true;
@@ -26,6 +27,7 @@
     program = {
       kitty.enable = lib.mkDefault true;
       tmux.enable = lib.mkDefault true;
+      zoxide.enable = lib.mkDefault true;
     };
 
     programs = {
@@ -39,15 +41,9 @@
       btop.enable = true;
       fzf.enable = true;
       neovim.enable = true;
-      tmux.enable = true;
       spicetify.enable = true;
     };
 
-    programs.zoxide = {
-      enable = true;
-      enableBashIntegration = true;
-    };
-
     home.packages = with pkgs; [
       pfetch
       zoxide

nixos/packages/tools/tmux.nix

@@ -9,6 +9,9 @@
   };
 
   config = lib.mkIf config.program.tmux.enable {
+          
+    stylix.targets.tmux.enable = true;
+
     programs.tmux = {
       enable = true;
       clock24 = true;
@@ -31,10 +34,10 @@
           '';
         }
 
-        #pkgs.tmuxPlugins.tmux-fzf
         pkgs.tmuxPlugins.sensible
         pkgs.tmuxPlugins.yank
-        pkgs.tmuxPlugins.jump
+        #pkgs.tmuxPlugins.jump
+        #pkgs.tmuxPlugins.tmux-fzf
       ];
 
       extraConfig = ''

nixos/packages/tools/zoxide.nix

@@ -0,0 +1,13 @@
+{lib, config, ...}:
+{
+  options = {
+    program.zoxide.enable = lib.mkEnableOption "zoxide";
+  };
+
+  config = lib.mkIf config.program.zoxide.enable {
+    programs.zoxide = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+}