diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 1c8acb57..42ad0d64 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -8,7 +8,7 @@
       set EDITOR vim
       ssh-add > /dev/null &> /dev/null
       if not set -q TMUX && not set -q DISABLE_TMUX 
-        tmux attach || exec tmux new-session 
+        tmux attach || exec tmux new-session && exit
       end
     '';
       
diff --git a/nixos/common/software/cli/scripts/clean-hm.sh b/nixos/common/software/cli/scripts/clean-hm.sh
index 55a701f3..371c2e84 100644
--- a/nixos/common/software/cli/scripts/clean-hm.sh
+++ b/nixos/common/software/cli/scripts/clean-hm.sh
@@ -2,7 +2,8 @@
 set -euo pipefail
 
 ## Defaults
-keepGensDef=30; keepDaysDef=30
+keepGensDef=7 
+keepDaysDef=14
 keepGens=$keepGensDef; keepDays=$keepDaysDef
 
 ## Usage