Compare commits
No commits in common. "5529345d8ea58f6a45023c449bbdf3ea3bbb4f13" and "793d9300ee2ff3b08c6e5006400b28423e359ed5" have entirely different histories.
5529345d8e
...
793d9300ee
@ -70,7 +70,6 @@
|
|||||||
storage-2 = { name = "storage-2"; };
|
storage-2 = { name = "storage-2"; };
|
||||||
web-2 = { name = "web-2"; };
|
web-2 = { name = "web-2"; };
|
||||||
zinc = { name = "zinc"; };
|
zinc = { name = "zinc"; };
|
||||||
# nixfiles-auto-install: add new host above
|
|
||||||
_iso = { name = "_iso"; };
|
_iso = { name = "_iso"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -20,9 +20,6 @@
|
|||||||
};
|
};
|
||||||
locations."= /ssh/known_hosts" = {
|
locations."= /ssh/known_hosts" = {
|
||||||
alias = pkgs.writeText "known_hosts" (import ../../lib/ssh-known-hosts.nix);
|
alias = pkgs.writeText "known_hosts" (import ../../lib/ssh-known-hosts.nix);
|
||||||
extraConfig = ''
|
|
||||||
types { } default_type "text/plain; charset=utf-8";
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
locations."~ ^/.well-known/openpgpkey/hu/[a-z0-9]+/?$" = {
|
locations."~ ^/.well-known/openpgpkey/hu/[a-z0-9]+/?$" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
@ -105,10 +105,6 @@ nixfiles-generate-config --root /mnt --hostname "${hostname}"
|
|||||||
|
|
||||||
sed -i "s~# boot\.loader\.grub\.device = \"/dev/sda\";~boot\.loader\.grub\.device = \"${device}\";~g" "/mnt/etc/nixos/hosts/${hostname}/configuration.nix"
|
sed -i "s~# boot\.loader\.grub\.device = \"/dev/sda\";~boot\.loader\.grub\.device = \"${device}\";~g" "/mnt/etc/nixos/hosts/${hostname}/configuration.nix"
|
||||||
|
|
||||||
if ! grep -w "${hostname}" <(nix eval "/mnt/etc/nixos#clerie.hosts" --apply 'hosts: builtins.concatStringsSep "\n" (builtins.attrNames hosts)' --raw 2> /dev/null) 2>1 > /dev/null then
|
|
||||||
sed -i "s/\(\s*\)# nixfiles-auto-install: add new host above/\1${hostname} = { name = \"${hostname}\"};\n&/g" /mnt/etc/nixos/flake.nix
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[I] Install NixOS"
|
echo "[I] Install NixOS"
|
||||||
|
|
||||||
NIX_CONFIG=$(printf "extra-experimental-features = flakes nix-command\nextra-substituters = https://nix-cache.clerie.de\nextra-trusted-public-keys = nix-cache.clerie.de:bAt1GJTS9BOTcXFWj3nURrSlcjqikCev9yDvqArMP5g=\n")
|
NIX_CONFIG=$(printf "extra-experimental-features = flakes nix-command\nextra-substituters = https://nix-cache.clerie.de\nextra-trusted-public-keys = nix-cache.clerie.de:bAt1GJTS9BOTcXFWj3nURrSlcjqikCev9yDvqArMP5g=\n")
|
||||||
|
Loading…
Reference in New Issue
Block a user