From b302575eaa5559319a77c0c64b6c978069715e14 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 7 Sep 2019 13:15:53 +0000 Subject: activate: default to current system --- activate | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'activate') diff --git a/activate b/activate index 34ee918ce475..f5d4b0997ff0 100755 --- a/activate +++ b/activate @@ -9,14 +9,18 @@ set -ueo pipefail d="$(dirname $0)" if [ "$#" -eq 0 ]; then - echo -e "\e[31;1merror:\e[0m must specify a system definition" >&2 - echo "Available system definitions are:" >&2 - find $d/sys -name '*.nix' | awk -F / '{print "- " $NF}' | sed 's/\.nix$//' >&2 - exit 1 -fi + sys="$(hostname -s)" -sys="$1" -shift + if ! [ -f "sys/$sys.nix" ]; then + echo -e "\e[31;1merror:\e[0m must specify a system definition" >&2 + echo "Available system definitions are:" >&2 + find $d/sys -name '*.nix' | awk -F / '{print "- " $NF}' | sed 's/\.nix$//' >&2 + exit 1 + fi +else + sys="$1" + shift +fi export NIX_PATH=nixos-config=$d/sys/$sys.nix:$d link="$(mktemp -d)/result" -- cgit 1.4.1