2 files changed, 22 insertions, 14 deletions

diff --git a/nix/rebuild-system.nix b/nix/rebuild-system.nix
index ea19a6b..9e8f602 100644
--- a/nix/rebuild-system.nix
+++ b/nix/rebuild-system.nix
@@ -1,21 +1,28 @@
 { stdenv
 , fetchgit
 , makeWrapper
-, git
+, zsh, git
 }:
 
 stdenv.mkDerivation rec {
-  inherit git;
   name = "rebuild-system-${version}";
-  version = "0.1";
+  version = "0.2";
   src = ../rebuild-system;
+
   buildInputs = [ makeWrapper ];
-  phases = ["installPhase"];
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  inherit zsh git;
+
+  buildPhase = ''
+    substituteAll $src rebuild-system
+  '';
+  
   installPhase = ''
     mkdir -p $out/bin
-    cp $src $out/bin/rebuild-system
-    chmod +x $out/bin/rebuild-system
-    wrapProgram $out/bin/rebuild-system \
-      --prefix PATH : ${git}/bin
+
+    install -m 755 -t $out/bin \
+      rebuild-system
   '';
 }
diff --git a/rebuild-system b/rebuild-system
index 8f116e3..cd99ae5 100644
--- a/rebuild-system
+++ b/rebuild-system
@@ -1,11 +1,12 @@
-#!/usr/bin/env bash
+#!@zsh@/bin/zsh
 
-if [[ "$USER" != "root" ]]; then
+set -o errexit
+
+if [[ $(whoami) != "root" ]]; then
     exec sudo -- $0 $@
 fi
 
-path=/etc/nixos
+configPath=$(nix-instantiate --eval --expr '<nixos-config>')
 
-git -C $path pull && \
-    git -C $path submodule update && \
-    nixos-rebuild $@
+@git@/bin/git -C ${configPath:h} pull
+nixos-rebuild $@