nixos/networking: fix extraHosts generation

nixos/common.nix

@@ -99,22 +99,15 @@ in
 
     extraHosts =
       let
-        subdomains = [
+        subdomains = [ "git" ];
-          ""
+
-          ".git"
+        inherit (config.networking) fqdn;
-        ];
+        hosts = [ fqdn ] ++ map (sub: "${sub}.${fqdn}") subdomains;
       in
-      builtins.foldl' (
+      lib.concatMapStrings (host: ''
-        hosts-acc: domain-prefix:
+        127.0.0.1 ${host}
-        let
+        ::1 ${host}
-          host = "${domain-prefix}${config.networking.fqdn}";
+      '') hosts;
-        in
-        hosts-acc
-        + ''
-          127.0.0.1 ${host}
-          ::1 ${host}
-        ''
-      ) "" subdomains;
   };
 
   virtualisation.podman.enable = true;

nixos/hosts/tuxcord-acmetest/default.nix

@@ -1,11 +1,14 @@
 {
-  acme = {
+  imports = [
-    enable = true;
+    ./storage.nix
-    rfc2136.nameserver = "tuxcord.net";
+  ];
-  };
 
-  dns.enable = true;
   networking.fqdn = "nix.tuxcord.net";
 
+  acme.rfc2136.nameserver = "tuxcord.net";
+  dns.enable = true;
+
+  services.getty.autologinUser = "root";
+
   time.timeZone = "Europe/Madrid";
 }

nixos/hosts/tuxcord-acmetest/storage.nix

@@ -0,0 +1,6 @@
+{
+  fileSystems."/" = {
+    device = "/dev/vda";
+    fsType = "ext4";
+  };
+}

nixos/hosts/tuxcord-ca/storage.nix

@@ -32,6 +32,7 @@
         device = "/dev/xvda2";
         fsType = "btrfs";
         options = [ "subvol=@persist" ] ++ defaultOptions;
+        neededForBoot = true;
       };
     };
 }

nixos/hosts/tuxcord-test/default.nix

@@ -1,6 +1,12 @@
 {
+  imports = [
+    ./storage.nix
+  ];
+
+  networking.fqdn = "tuxcord.test";
+
   acme.enable = false;
   dns.enable = true;
 
-  networking.fqdn = "tuxcord.test";
+  services.getty.autologinUser = "root";
 }

nixos/hosts/tuxcord-test/storage.nix

@@ -0,0 +1,6 @@
+{
+  fileSystems."/" = {
+    device = "/dev/vda";
+    fsType = "ext4";
+  };
+}

nixos/impermanence.nix

@@ -55,8 +55,6 @@
     };
   };
 
-  fileSystems."/persist".neededForBoot = true;
-
   environment.persistence."/persist" = {
     enable = true;
     hideMounts = true;

nixos/openssh.nix

@@ -4,6 +4,7 @@
 
     settings = {
       ClientAliveInterval = 300;
+      X11Forwarding = true;
 
       KbdInteractiveAuthentication = false;
       PasswordAuthentication = false;

npins/sources.json

@@ -8,9 +8,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "a9f523c268062c0c4a8167b719be15e3e4b3ef88",
+      "revision": "b18dd7b863644debb0a843a5b21bb490bfe7d048",
       "url": null,
-      "hash": "0ql14xjz0prvy3rdx6zkbpsjxvx40ivdzrwzdgfsk07jg07aki05"
+      "hash": "18czfxaldy0zhjprdsqzxnzj3p9qlc4canwigr13iw2wisi4ww5y"
     }
   },
   "version": 5