clerie/nixfiles
1
0
Fork 0
Code

Update from master 2023-10-23T01:03+00:00

Browse Source
This commit is contained in:
Flake Update Bot 2023-10-23 03:03:02 +02:00
commit 7bdb65e9b5
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -70,6 +70,7 @@
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"; };
}; };

3
hosts/web-2/clerie.nix
View File

@ -20,6 +20,9 @@
}; };
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 = ''

4
pkgs/nixfiles/nixfiles-auto-install.sh
View File

@ -105,6 +105,10 @@ 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) > /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")