From ee6393aa18915f135f9ed4ea80eafb477fda3efa Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Mon, 29 Apr 2024 20:58:31 +0200
Subject: [PATCH] Move rebuild aliases to the system level

---
 hosts/inspiron/default.nix        |  1 +
 hosts/north/default.nix           |  2 +-
 modules/home/shell/default.nix    |  1 -
 modules/home/shell/nixAliases.nix | 27 ---------------------------
 modules/system/default.nix        |  1 +
 modules/system/nix-helper.nix     | 20 ++++++++++++++++++++
 users/seb/home.nix                |  4 ----
 7 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 modules/home/shell/nixAliases.nix
 create mode 100644 modules/system/nix-helper.nix

diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index de141cc..597f910 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -29,6 +29,7 @@
         sops.enable = true;
         printing.enable = true;
         syncthing.enable = true;
+        nix-helper.enable = true;
     };
 
     boot.kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 7fb402c..42d57b8 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -25,10 +25,10 @@
         sops.enable = true;
         printing.enable = true;
         syncthing.enable = true;
+        nix-helper.enable = true;
     };
 
     boot.kernelPackages = pkgs.linuxPackages_latest;
 
-    programs.nh.enable = true;
     programs.steam.enable = true;
 }
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 275730b..cb3c679 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -9,7 +9,6 @@ in {
         ./starship.nix
         ./direnv.nix
         ./enhancement.nix
-        ./nixAliases.nix
     ];
 
     options.myConfig.shell = {
diff --git a/modules/home/shell/nixAliases.nix b/modules/home/shell/nixAliases.nix
deleted file mode 100644
index c238295..0000000
--- a/modules/home/shell/nixAliases.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    config,
-    lib,
-    ...
-}: let
-    cfg = config.myConfig.shell.nixAliases;
-in {
-    options.myConfig.shell.nixAliases = {
-        enable = lib.mkEnableOption "";
-        nh.enable = lib.mkEnableOption "";
-    };
-
-    config.home.shellAliases = let
-        rebuild =
-            if cfg.nh.enable
-            then "nh os"
-            else "nixos-rebuild --flake $FLAKE --use-remote-sudo";
-    in
-        lib.mkIf cfg.enable {
-            nr = "sudo -v && ${rebuild}";
-            nrs = "nr switch";
-            nrt = "nr test";
-            nrb = "nr boot";
-            nrrb = "nrb && reboot";
-            nu = "nix flake update";
-        };
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 8e20e94..cae4727 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -14,5 +14,6 @@
         ./boot-loader.nix
         ./printing.nix
         ./syncthing.nix
+        ./nix-helper.nix
     ];
 }
diff --git a/modules/system/nix-helper.nix b/modules/system/nix-helper.nix
new file mode 100644
index 0000000..bf038d4
--- /dev/null
+++ b/modules/system/nix-helper.nix
@@ -0,0 +1,20 @@
+{
+    config,
+    lib,
+    ...
+}: {
+    options.myConfig.nix-helper.enable = lib.mkEnableOption "";
+
+    config = lib.mkIf config.myConfig.nix-helper.enable {
+        programs.nh.enable = true;
+
+        environment.shellAliases = let
+            rebuild = "sudo -v && nh os";
+        in {
+            nrs = "${rebuild} switch";
+            nrt = "${rebuild} test";
+            nrb = "${rebuild} boot";
+            nrrb = "nrb && reboot";
+        };
+    };
+}
diff --git a/users/seb/home.nix b/users/seb/home.nix
index 6235858..27807de 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -16,10 +16,6 @@
         shell = {
             bash.enable = true;
             starship.enable = true;
-            nixAliases = {
-                enable = true;
-                nh.enable = osConfig.programs.nh.enable;
-            };
             enhancement.enable = true;
             direnv.enable = true;
         };