From 9a4b64345df0ff33d29ed68884fd1e13666c09d0 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 17 Apr 2024 10:58:45 +0200
Subject: [PATCH] Use the nix-helper for the nix aliases

---
 modules/home/shell/nixAliases.nix | 31 +++++++++++++++++++++----------
 users/seb/home.nix                |  5 ++++-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/modules/home/shell/nixAliases.nix b/modules/home/shell/nixAliases.nix
index b25ebfb..c238295 100644
--- a/modules/home/shell/nixAliases.nix
+++ b/modules/home/shell/nixAliases.nix
@@ -2,15 +2,26 @@
     config,
     lib,
     ...
-}: {
-    options.myConfig.shell.nixAliases.enable = lib.mkEnableOption "";
-
-    config.home.shellAliases = lib.mkIf config.myConfig.shell.nixAliases.enable {
-        nr = "sudo -v && nixos-rebuild --flake $FLAKE --use-remote-sudo";
-        nrs = "nr switch";
-        nrt = "nr test";
-        nrb = "nr boot";
-        nrrb = "nrb && reboot";
-        nu = "nix flake update";
+}: 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/users/seb/home.nix b/users/seb/home.nix
index d5e0741..d33e0b9 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -20,7 +20,10 @@
         shell = {
             bash.enable = true;
             starship.enable = true;
-            nixAliases.enable = true;
+            nixAliases = {
+                enable = true;
+                nh.enable = osConfig.nh.enable;
+            };
             enhancedCommands.enable = true;
             direnv.enable = true;
         };