diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-06 23:37:34 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-09-06 23:39:15 +0200 |
| commit | 184e9f34be51e05cc1b8390aa190d9ef6dfae855 (patch) | |
| tree | ef26de4b7ee7929eaa7ea062989310904c24b1e4 /modules | |
| parent | 020d666957200fa9b13fc788c7a29dd02d0aef4b (diff) | |
nix: include user channels in NIX_PATH
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/examples/lnl.nix | 1 | ||||
| -rw-r--r-- | modules/nix/default.nix | 1 | ||||
| -rw-r--r-- | modules/system/activation-checks.nix | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index 48286aa..3753e8f 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -285,6 +285,7 @@ "nixpkgs=$HOME/.nix-defexpr/nixpkgs" "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" + "$HOME/.nix-defexpr/channels" ]; nixpkgs.config.allowUnfree = true; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index fb52538..eea899c 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -286,6 +286,7 @@ in [ # Include default path <darwin-config>. "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" + "$HOME/.nix-defexpr/channels" ]; description = '' The default Nix expression search path, used by the Nix diff --git a/modules/system/activation-checks.nix b/modules/system/activation-checks.nix index 91c74b5..7c885d8 100644 --- a/modules/system/activation-checks.nix +++ b/modules/system/activation-checks.nix @@ -49,8 +49,8 @@ let if ! test -e "$darwinPath"; then echo "[1;31merror: Changed <darwin> but target does not exist, aborting activation[0m" >&2 echo "Add the darwin repo as a channel or set nix.nixPath:" >&2 - echo "$ sudo nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin" >&2 - echo "$ sudo nix-channel --update" >&2 + echo "$ nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin" >&2 + echo "$ nix-channel --update" >&2 echo >&2 echo "or set" >&2 echo >&2 @@ -63,8 +63,8 @@ let if ! test -e "$nixpkgsPath"; then echo "[1;31merror: Changed <nixpkgs> but target does not exist, aborting activation[0m" >&2 echo "Add a nixpkgs channel or set nix.nixPath:" >&2 - echo "$ sudo nix-channel --add http://nixos.org/channels/nixpkgs-unstable nixpkgs" >&2 - echo "$ sudo nix-channel --update" >&2 + echo "$ nix-channel --add http://nixos.org/channels/nixpkgs-unstable nixpkgs" >&2 + echo "$ nix-channel --update" >&2 echo >&2 echo "or set" >&2 echo >&2 |