diff --git a/home-manager/jimbo_desktop.nix b/home-manager/jimbo_desktop.nix
index 62d1b55..64bbbfb 100644
--- a/home-manager/jimbo_desktop.nix
+++ b/home-manager/jimbo_desktop.nix
@@ -43,11 +43,9 @@
     shellAliases = let
       auth = import ./common/auth.nix;
     in {
-      nixdate = ''
-        ${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDesktop;
-        home-manager switch --flake /etc/nixos/.#jimbo@JimDesktop;
-        notify-send "NixOS switch finished."
-      '';
+      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimDesktop";
+      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimDesktop";
+      nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'";
     };
   };
 
diff --git a/home-manager/jimbo_server.nix b/home-manager/jimbo_server.nix
index 7f13a3d..4acfca8 100644
--- a/home-manager/jimbo_server.nix
+++ b/home-manager/jimbo_server.nix
@@ -11,10 +11,9 @@
     shellAliases = let
       auth = import ./common/auth.nix;
     in {
-      nixdate = ''
-        ${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimServer;
-        home-manager switch --flake /etc/nixos/.#jimbo@JimServer;
-      '';
+      sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#JimServer";
+      homedate = "home-manager switch --flake /etc/nixos/.#jimbo@JimServer";
+      nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'";
     };
   };
 }
diff --git a/home-manager/jimbo_ssh.nix b/home-manager/jimbo_ssh.nix
index f3e3021..35b588d 100644
--- a/home-manager/jimbo_ssh.nix
+++ b/home-manager/jimbo_ssh.nix
@@ -10,9 +10,7 @@
     shellAliases = let
       auth = import ./common/auth.nix;
     in {
-      nixdate = ''
-        home-manager switch --flake ~/.home-manager/.#jimbo@SSH --extra-experimental-features "nix-command flakes"
-      '';
+      homedate = "home-manager switch --flake ~/.home-manager/.#jimbo@SSH --extra-experimental-features 'nix-command flakes'";
     };
   };
 }