nixos-build: don't provide <secrets> to prefetch
This commit is contained in:
parent
dfad67c00d
commit
cef42fc9b5
|
@ -14,15 +14,9 @@ nixos_config=$config_root/modules/$host
|
|||
secrets_nix=$secrets_root/$host/nix
|
||||
secrets_rsync=$secrets_root/$host/rsync
|
||||
|
||||
(
|
||||
# Notice NIX_PATH used from host
|
||||
# Notice secrets required to evaluate configuration
|
||||
NIX_PATH=$NIX_PATH:nixos-config=$nixos_config
|
||||
NIX_PATH=$NIX_PATH:secrets=$secrets_nix
|
||||
export NIX_PATH
|
||||
|
||||
# Notice how host's NIX_PATH is used to prefetch nixpkgs.
|
||||
NIXOS_CONFIG=$nixos_config \
|
||||
prefetch nixpkgs tmp/nixpkgs/$host
|
||||
)
|
||||
|
||||
nix-build \
|
||||
-I "$nixpkgs" \
|
||||
|
|
|
@ -7,7 +7,7 @@ in
|
|||
{
|
||||
imports =
|
||||
[
|
||||
<secrets/hashedPasswords.nix>
|
||||
{ users.extraUsers = import <secrets/extraUsers.nix>; }
|
||||
./networking.nix
|
||||
./users.nix
|
||||
../common/nixpkgs.nix
|
||||
|
|
|
@ -7,7 +7,7 @@ in
|
|||
{
|
||||
imports =
|
||||
[
|
||||
<secrets/hashedPasswords.nix>
|
||||
{ users.extraUsers = import <secrets/extraUsers.nix>; }
|
||||
./networking.nix
|
||||
./users.nix
|
||||
../common/nixpkgs.nix
|
||||
|
|
|
@ -7,7 +7,7 @@ in
|
|||
{
|
||||
imports =
|
||||
[
|
||||
<secrets/hashedPasswords.nix>
|
||||
{ users.extraUsers = import <secrets/extraUsers.nix>; }
|
||||
./networking.nix
|
||||
./users.nix
|
||||
../common/nixpkgs.nix
|
||||
|
|
|
@ -211,7 +211,7 @@ in
|
|||
|
||||
{
|
||||
imports = [
|
||||
<secrets/hashedPasswords.nix>
|
||||
{ users.extraUsers = import <secrets/extraUsers.nix>; }
|
||||
];
|
||||
|
||||
users.defaultUserShell = "/run/current-system/sw/bin/bash";
|
||||
|
|
Loading…
Reference in a new issue