diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix
index c696038c..d6aeb683 100644
--- a/home-manager/common/software/cli/bash.nix
+++ b/home-manager/common/software/cli/bash.nix
@@ -125,12 +125,18 @@
 
       # NixOS Related
       nix-clean-all() {
-        echo "Optimizing the nix store..."
-        sudo nix-store --optimize 
+        echo "Cleaning up home manager...      "
+        systemctl --user start clean-home-manager.service 2> /dev/null 
+        echo -ne " done"
+        echo "Optimizing the nix store...      "
+        sudo nix-store --optimize 2> /dev/null 
+        echo -ne " done"
         echo "nix-store:  Collecting Garbage..."
-        sudo nix-store --gc
-        echo "Collecting garbage..."
-        sudo nix-collect-garbage -d
+        sudo nix-store --gc 2> /dev/null 
+        echo -ne " done"
+        echo "Collecting garbage...            "
+        sudo nix-collect-garbage -d 2> /dev/null
+        echo -ne " done"
       }
     '';
     shellAliases = {
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 7c646465..c2509b6f 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -116,12 +116,18 @@
 
       # NixOS Related
       nix-clean-all = ''
-        echo "Optimizing the nix store..."
-        sudo nix-store --optimize 
+        echo "Cleaning up home manager...      "
+        systemctl --user start clean-home-manager.service 2> /dev/null 
+        echo -ne " done"
+        echo "Optimizing the nix store...      "
+        sudo nix-store --optimize 2> /dev/null 
+        echo -ne " done"
         echo "nix-store:  Collecting Garbage..."
-        sudo nix-store --gc
-        echo "Collecting garbage..."
-        sudo nix-collect-garbage -d
+        sudo nix-store --gc 2> /dev/null 
+        echo -ne " done"
+        echo "Collecting garbage...            "
+        sudo nix-collect-garbage -d 2> /dev/null
+        echo -ne " done"
       '';
 
       # BTRFS Related