shell-tools update

modules/programs/zsh.nix

@@ -108,46 +108,29 @@ in
 
           HOSTNAME=$(hostname -s)
 
-          ${aliasStr}
-
           eval "$(direnv hook zsh)"
+
+          ${aliasStr}
         '';
         extraPackages = with pkgs; [
-          self'.packages.my-eza
-          self'.packages.gdu
-          busybox
-          fd
-          ripgrep
-          hostname
-          iproute2
-          direnv
           lazydocker
-          nh
+          self'.packages.shell-tools
         ];
       }).wrapper;
 
     packages.starship = (inputs.wrappers.wrapperModules.starship.apply {
       inherit pkgs;
-      settings = lib.mkMerge [
-        (lib.importTOML (pkgs.fetchurl {
+      settings = lib.recursiveUpdate (lib.importTOML (pkgs.fetchurl {
           url = https://starship.rs/presets/toml/catppuccin-powerline.toml;
           sha256 = "0bd8zx0bpri63rnb9dva0rav75d3i2wrzw44h63m75hq5220r26g";
-        }))
-        {
+        })) {
           palette = "catppuccin_mocha";
-          add_newline = lib.mkForce true;
-          line_break.disabled = lib.mkForce false;
-          git_status.diverged = lib.mkForce "⇕⇡\${ahead_count}⇣\${behind_count}";
-          cmd_duration.format = lib.mkForce "󰔛 $duration";
-          python.disabled = lib.mkForce true;
-        }
-      ];
+          add_newline = true;
+          line_break.disabled = false;
+          git_status.diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+          cmd_duration.format = "󰔛 $duration";
+          # python.disabled = true;
+        };
     }).wrapper;
-
-    packages.gdu = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.gdu;
-      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
-    };
   };
 }