From 758321adc37ec0a8294913cbdbd4d786d524a453 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 5 Jul 2022 19:40:54 -0400
Subject: [PATCH] more commandline changes

---
 modules/darwin/dotfiles.nix | 5 ++---
 modules/editor/dotfiles.nix | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/darwin/dotfiles.nix b/modules/darwin/dotfiles.nix
index 8412e1b..3788398 100644
--- a/modules/darwin/dotfiles.nix
+++ b/modules/darwin/dotfiles.nix
@@ -13,9 +13,8 @@
             if test "$argv[1]" = "offline"
                 set option "--option substitute false"
             end
-            commandline --replace "git -C ${config.dotfilesPath} add --all"
-            commandline --append "
-            darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook"
+            git -C ${config.dotfilesPath} add --all
+            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook"
             commandline --function execute
           '';
         };
diff --git a/modules/editor/dotfiles.nix b/modules/editor/dotfiles.nix
index 04d086e..320bf26 100644
--- a/modules/editor/dotfiles.nix
+++ b/modules/editor/dotfiles.nix
@@ -27,11 +27,9 @@
             if test "$argv[1]" = "offline"
                 set option "--option substitute false"
             end
-            pushd ${config.dotfilesPath}
-            git add --all
-            popd
+            git -C ${config.dotfilesPath} add --all
             commandline -r "doas nixos-rebuild switch $option --flake ${config.dotfilesPath}"
-            commandline -f execute
+            commandline --function execute
           '';
         };
       };