fix cli tools config

modules/home/shell/default.nix

@@ -34,12 +34,13 @@ in
         yazi.enable = true;
         eza.enable = true;
         git.enable = true;
+        zoxide.enable = true;
       };
 
       home-manager.users.${user} = {
         home.packages = attrValues {
-          inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi;
+          inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag;
-          inherit (pkgs) bat fd zoxide;
+          inherit (pkgs) fd;
 
           rgFull = pkgs.ripgrep.override {withPCRE2 = true;};
         };
@@ -62,11 +63,6 @@ in
             nix-direnv.enable = true;
             config.whitelist.prefix = ["/home"];
           };
-
-          bat.enable = true;
-          eza.enable = true;
-          fzf.enable = true;
-          zoxide.enable = true;
         };
       };
     })

modules/home/shell/toolset/btop.nix

@@ -1,18 +1,20 @@
-{ config, options, lib, pkgs, user, ... }:
+{ config, lib, pkgs, user, ... }:
 let
-  inherit (lib.modules) mkIf;
+  inherit (lib) mkIf mkEnableOption;
   inherit (lib.strings) concatStringsSep;
-in
-{
-  options.modules.${user}.shell.toolset.btop = let
-    inherit (lib.options) mkEnableOption;
-  in { enable = mkEnableOption "system-monitor"; };
 
-  config = mkIf config.modules.${user}.shell.toolset.btop.enable {
+  cfg = config.modules.${user}.shell.toolset.btop;
-    home-manager.users.${user}.programs.btop = let
-      inherit (config.modules.themes) active;
 in
 {
+  options.modules.${user}.shell.toolset.btop = {
+    enable = mkEnableOption "system-monitor";
+  };
+
+  config = mkIf cfg.enable {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ btop ];
+
+      programs.btop = {
         enable = true;
         settings = {
           force_tty = false;
@@ -89,4 +91,5 @@ in
         };
       };
     };
+  };
 }

modules/home/shell/toolset/eza.nix

@@ -12,7 +12,10 @@ in
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.programs.eza = {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ eza ];
+
+      programs.eza = {
         enable = true;
         icons = "auto";
         git = true;
@@ -23,4 +26,5 @@ in
         ];
       };
     };
+  };
 }

modules/home/shell/toolset/fzf.nix

@@ -1,17 +1,19 @@
 { config, options, lib, pkgs, user, ... }:
 let
-  inherit (lib.attrsets) optionalAttrs;
+  inherit (lib) mkIf mkEnableOption;
-  inherit (lib.modules) mkIf;
+
+  defShell = config.modules.${user}.shell.default;
 in
 {
-  options.modules.${user}.shell.toolset.fzf = let
+  options.modules.${user}.shell.toolset.fzf = {
-    inherit (lib.options) mkEnableOption;
+    enable = mkEnableOption "TUI Fuzzy Finder.";
-  in { enable = mkEnableOption "TUI Fuzzy Finder."; };
+  };
 
   config = mkIf config.modules.${user}.shell.toolset.fzf.enable {
-    home-manager.users.${user}.programs.fzf = let
+    home-manager.users.${user} = {
-      defShell = config.modules.${user}.shell.default;
+      packages = with pkgs; [ fzf ];
-    in {
+
+      programs.fzf = {
         enable = true;
         enableBashIntegration = true;
         enableZshIntegration = defShell == "zsh";
@@ -31,4 +33,5 @@ in
         historyWidgetOptions = ["--sort" "--exact"];
       };
     };
+  };
 }

modules/home/shell/toolset/git.nix

@@ -14,7 +14,7 @@ in
 
     home-manager.users.${user} = {
       home.packages = attrValues {
-        inherit (pkgs) act dura lazygit;
+        inherit (pkgs) git act dura lazygit;
         inherit (pkgs.gitAndTools) gh git-open git-crypt;
       };
 

modules/home/shell/toolset/starship.nix

@@ -1,4 +1,4 @@
-{ config, lib, user, ... }:
+{ config, lib, pkgs, user, ... }:
 let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
@@ -9,7 +9,10 @@ in
   };
 
   config = mkIf config.modules.${user}.shell.toolset.starship.enable {
-    home-manager.users.${user}.programs.starship = {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ starship ];
+
+      programs.starship = {
         enable = true;
         settings = {
           format = "[╭](bold green) $username@$hostname$nix_shell: $directory$cmd_duration$git_branch$git_commit$git_state$git_status$line_break[╰](green bold)$character";
@@ -94,4 +97,5 @@ in
         };
       };
     };
+  };
 }

modules/home/shell/toolset/tmux.nix

@@ -8,7 +8,10 @@ in
   in { enable = mkEnableOption "terminal multiplexer"; };
 
   config = mkIf config.modules.${user}.shell.toolset.tmux.enable {
-    home-manager.users.${user}.programs.tmux = {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ tmux ];
+
+      programs.tmux = {
         enable = true;
         secureSocket = true;
         keyMode = "vi";
@@ -100,4 +103,5 @@ in
         '';
       };
     };
+  };
 }

modules/home/shell/toolset/yazi.nix

@@ -1,4 +1,4 @@
-{ config, lib, user, ... }:
+{ config, lib, pkgs, user, ... }:
 let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
@@ -11,8 +11,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.programs.yazi = {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ yazi ];
+
+      programs.yazi = {
         enable = true;
       };
     };
+  };
 }

modules/home/shell/toolset/zoxide.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, user, ... }:
+let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+
+  cfg = config.modules.${user}.shell.toolset.zoxide;
+in
+{
+  options.modules.${user}.shell.toolset.zoxide = {
+    enable = mkEnableOption "system-monitor";
+  };
+
+  config = mkIf cfg.enable {
+    home-manager.users.${user} = {
+      packages = with pkgs; [ zoxide ];
+
+      programs.zoxide = {
+        enable = true;
+      };
+    };
+  };
+}