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

flake.nix

@@ -70,6 +70,7 @@
       storage-2 = { name = "storage-2"; };
       web-2 = { name = "web-2"; };
       zinc = { name = "zinc"; };
+      # nixfiles-auto-install: add new host above
       _iso = { name = "_iso"; };
     };
 

hosts/web-2/clerie.nix

@@ -20,6 +20,9 @@
       };
       locations."= /ssh/known_hosts" = {
         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]+/?$" = {
         extraConfig = ''

pkgs/nixfiles/nixfiles-auto-install.sh

@@ -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"
 
+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"
 
 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")