From 006554f545f8dd42b498aaa05cf3037f27949110 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Thu, 5 Dec 2024 22:00:14 +0000
Subject: [PATCH] switch rebuild-nixos to smarter abbreviation

---
 modules/common/shell/nixpkgs.nix | 12 ++++++------
 modules/darwin/nixpkgs.nix       | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/common/shell/nixpkgs.nix b/modules/common/shell/nixpkgs.nix
index 61a36e2..4e631e4 100644
--- a/modules/common/shell/nixpkgs.nix
+++ b/modules/common/shell/nixpkgs.nix
@@ -16,7 +16,9 @@
         nps = "nix repl --expr 'import <nixpkgs>{}'";
         nixo = "man configuration.nix";
         nixh = "man home-configuration.nix";
-        nr = "rebuild-nixos";
+        nr = {
+          function = "rebuild-nixos";
+        };
         nro = "rebuild-nixos offline";
         hm = "rebuild-home";
       };
@@ -43,18 +45,16 @@
         rebuild-nixos = {
           body = ''
             if test "$argv[1]" = "offline"
-                set option "--option substitute false"
+                set option "--option substitute false "
             end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "doas nixos-rebuild switch $option --flake ${config.dotfilesPath}#${config.networking.hostName}"
-            commandline --function execute
+            echo "doas nixos-rebuild switch $option--flake ${config.dotfilesPath}#${config.networking.hostName}"
           '';
         };
         rebuild-home = {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
-            commandline --function execute
+            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
           '';
         };
       };
diff --git a/modules/darwin/nixpkgs.nix b/modules/darwin/nixpkgs.nix
index fb9b823..c439942 100644
--- a/modules/darwin/nixpkgs.nix
+++ b/modules/darwin/nixpkgs.nix
@@ -10,7 +10,9 @@
 
     programs.fish = {
       shellAbbrs = {
-        nr = lib.mkForce "rebuild-darwin";
+        nr = {
+          function = lib.mkForce "rebuild-darwin";
+        };
         nro = lib.mkForce "rebuild-darwin offline";
       };
       functions = {
@@ -20,15 +22,13 @@
                 set option "--option substitute false"
             end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#lookingglass"
-            commandline --function execute
+            echo "darwin-rebuild switch $option--flake ${config.dotfilesPath}#lookingglass"
           '';
         };
         rebuild-home = lib.mkForce {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
-            commandline --function execute
+            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
           '';
         };
       };