From a1fade8411b445c3d64be915ce11313ac610f01c Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Mon, 25 Jan 2021 09:23:51 -0700 Subject: [PATCH] shell: use DEVSHELL_ROOT --- shell/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/shell/default.nix b/shell/default.nix index 682e3617..31e01c24 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -14,21 +14,21 @@ let if [[ -z "$1" ]]; then echo "Usage: $(basename "$0") [ iso | up | install {host} | {host} [switch|boot|test] ]" elif [[ "$1" == "up" ]]; then - mkdir -p up + mkdir -p $DEVSHELL_ROOT/up hostname=$(hostname) - nixos-generate-config --dir up/$hostname + nixos-generate-config --dir $DEVSHELL_ROOT/up/$hostname echo \ "{ imports = [ ../up/$hostname/configuration.nix ]; - }" > hosts/up-$hostname.nix - git add -f up/$hostname - git add -f hosts/up-$hostname.nix + }" > $DEVSHELL_ROOT/hosts/up-$hostname.nix + git add -f $DEVSHELL_ROOT/up/$hostname + git add -f $DEVSHELL_ROOT/hosts/up-$hostname.nix elif [[ "$1" == "iso" ]]; then nix build $DEVSHELL_ROOT#nixosConfigurations.niximg.${build}.isoImage "${"\${@:2}"}" elif [[ "$1" == "install" ]]; then - sudo nixos-install --flake ".#$2" "${"\${@:3}"}" + sudo nixos-install --flake "$DEVSHELL_ROOT#$2" "${"\${@:3}"}" else - sudo nixos-rebuild --flake ".#$1" "${"\${@:2}"}" + sudo nixos-rebuild --flake "$DEVSHELL_ROOT#$1" "${"\${@:2}"}" fi '';