diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index feec229..ff47d3d 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -56,6 +56,7 @@ in {
       # space-cadet-pinball # Broken
       sparrow
       steam-run
+      thunderbird
       ungoogled-chromium
       unrar
       vagrant
@@ -73,6 +74,14 @@ in {
     kdeconnect.enable = true;
     partition-manager.enable = true;
     gamemode.enable = true;
+    nh = {
+      enable = true;
+      clean = {
+        enable = true;
+        extraArgs = "--keep-since 7d";
+      };
+      flake = "/home/user/Projects/nix-config";
+    };
   };
 
   fonts = {
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 3d651ca..bda9111 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -20,7 +20,6 @@
   };
 
   programs = {
-
     password-store.package = pkgs.pass-wayland;
 
     mangohud = {
@@ -40,9 +39,9 @@
     fish = {
       functions = {
         sysrebuild =
-          "sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#' 2>&1 | nom";
+          "nh os switch --ask /home/user/Projects/personal/nix-config";
         sysrebuild-boot =
-          "sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#' 2>&1 | nom";
+          "nh os boot --ask /home/user/Projects/personal/nix-config";
         sysupdate =
           "nix flake update --commit-lock-file /home/user/Projects/personal/nix-config";
         syscleanup =