Update to NixOS 25.11

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Suggest an improvement for this project
-title: ''
+title: ""
 labels: enhancement
-assignees: ''
+assignees: ""
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/ISSUE_TEMPLATE/service_disruption.md

@@ -1,9 +1,9 @@
 ---
 name: Service disruption report
 about: Use this to report service instabilities
-title: '<service-name>: '
+title: "<service-name>: "
 labels: bug
-assignees: ''
+assignees: ""
 ---
 
 **Affected service**

build/common.nix

@@ -15,14 +15,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nixpkgs.overlays = [
-    (_prev: final: {
-      # fails to find nix-main against nix 2.28.x
-      # https://github.com/NixOS/infra/pull/620#issuecomment-2784979947
-      nixos-option = final.nixos-option.override { nix = pkgs.nixVersions.nix_2_24; };
-    })
-  ];
-
   hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
   hardware.cpu.intel.updateMicrocode = true;

build/diffoscope.nix

@@ -11,7 +11,7 @@ let
     echo ""
     echo "non-determinism detected in $2; diff with previous round follows:"
     echo ""
-    time ${pkgs.utillinux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
+    time ${pkgs.util-linux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
     exit 0
   '';
 

build/flake-module.nix

@@ -23,6 +23,7 @@ in
     haumea = { };
     pluto = { };
     mimas = { };
+    titan = { };
   };
 
   flake = {
@@ -55,6 +56,16 @@ in
         ./mimas
       ];
     };
+
+    nixosConfigurations.titan = lib.nixosSystem {
+      system = "x86_64-linux";
+
+      specialArgs = { inherit inputs; };
+      modules = [
+        flakesModule
+        ./titan
+      ];
+    };
   };
 
   perSystem =

build/hydra-proxy.nix

@@ -34,7 +34,6 @@
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
-    recommendedZstdSettings = true;
 
     proxyTimeout = "900s";
 

build/mimas/firewall.nix

@@ -51,7 +51,7 @@ in
       Group = "nft-asblock";
       ExecStart = toString (
         [
-          (lib.getExe inputs.nft-prefix-import.packages.${pkgs.hostPlatform.system}.default)
+          (lib.getExe inputs.nft-prefix-import.packages.${pkgs.stdenv.hostPlatform.system}.default)
           "--table"
           "abuse"
           "--ipv4set"

build/pluto/prometheus/exporters/channel.nix

@@ -12,8 +12,8 @@ in
       (pkgs.python3.withPackages (
         pypkgs: with pypkgs; [
           requests
-          dateutil
-          prometheus_client
+          prometheus-client
+          python-dateutil
         ]
       ))
     ];

build/pluto/prometheus/exporters/github.nix

@@ -33,7 +33,7 @@ in
     path = [
       (pkgs.python3.withPackages (
         ps: with ps; [
-          prometheus_client
+          prometheus-client
           requests
         ]
       ))

build/pluto/prometheus/exporters/hydra.nix

@@ -16,7 +16,7 @@
           python = pkgs.python3.withPackages (
             ps: with ps; [
               requests
-              prometheus_client
+              prometheus-client
             ]
           );
         in

build/pluto/prometheus/exporters/nixos.nix

@@ -19,6 +19,7 @@
           labels.role = "database";
           targets = [
             "haumea.nixos.org:9300"
+            "titan.nixos.org:9300"
           ];
         }
       ];

build/pluto/prometheus/exporters/node.nix

@@ -16,6 +16,7 @@
             labels.role = "database";
             targets = [
               "haumea.nixos.org:9100"
+              "titan.nixos.org:9100"
             ];
           }
           {

build/pluto/prometheus/exporters/postgresql.nix

@@ -7,6 +7,7 @@
         {
           targets = [
             "haumea.nixos.org:9187"
+            "titan.nixos.org:9187"
             "tracker.security.nixos.org:9187"
           ];
         }

build/pluto/prometheus/exporters/rasdaemon.nix

@@ -12,6 +12,7 @@
               "mimas.nixos.org:10029"
               "haumea.nixos.org:10029"
               "pluto.nixos.org:10029"
+              "titan.nixos.org:10029"
 
               # builders
               "elated-minsky.builder.nixos.org:10029"

build/pluto/prometheus/exporters/zfs.nix

@@ -13,6 +13,7 @@
               "haumea.nixos.org:9134"
               "mimas.nixos.org:9134"
               "pluto.nixos.org:9134"
+              "titan.nixos.org:9134"
             ];
           }
         ];

build/titan/boot.nix

@@ -0,0 +1,30 @@
+{
+  boot = {
+    initrd.availableKernelModules = [
+      "ahci"
+      "xhci_pci"
+      "nvme"
+      "usbhid"
+    ];
+    kernelModules = [ "kvm-amd" ];
+    supportedFilesystems.zfs = true;
+    loader = {
+      efi.canTouchEfiVariables = false;
+      grub = {
+        enable = true;
+        efiSupport = true;
+        efiInstallAsRemovable = true;
+        mirroredBoots = [
+          {
+            devices = [ "nodev" ];
+            path = "/efi/a";
+          }
+          {
+            devices = [ "nodev" ];
+            path = "/efi/b";
+          }
+        ];
+      };
+    };
+  };
+}

build/titan/default.nix

@@ -0,0 +1,21 @@
+{
+  imports = [
+    ../common.nix
+    ./boot.nix
+    ./network.nix
+    ./postgresql.nix
+    ./zrepl.nix
+  ];
+
+  disko.devices = import ./disko.nix;
+
+  networking = {
+    hostId = "e1ce6466";
+    hostName = "titan";
+    domain = "nixos.org";
+  };
+
+  services.zfs.autoScrub.enable = true;
+
+  system.stateVersion = "25.11";
+}

build/titan/disko.nix

@@ -0,0 +1,78 @@
+let
+  layout = id: {
+    type = "gpt";
+    partitions = {
+      esp = {
+        type = "EF00";
+        size = "1G";
+        content = {
+          type = "filesystem";
+          format = "vfat";
+          mountpoint = "/efi/${id}";
+        };
+      };
+      zfs = {
+        size = "100%";
+        content = {
+          type = "zfs";
+          pool = "zroot";
+        };
+      };
+    };
+  };
+in
+{
+  disk = {
+    nvme0n1 = {
+      type = "disk";
+      device = "/dev/disk/by-id/nvme-MTFDKCC1T9TGP-1BK1DABYY_0925109FB623";
+      content = layout "a";
+    };
+    nvme1n1 = {
+      type = "disk";
+      device = "/dev/disk/by-id/nvme-MTFDKCC1T9TGP-1BK1DABYY_0925109FB922";
+      content = layout "b";
+    };
+  };
+
+  zpool.zroot = {
+    type = "zpool";
+    mode = "mirror";
+    options.ashift = "12";
+
+    rootFsOptions = {
+      acltype = "posixacl";
+      atime = "off";
+      compression = "zstd-3";
+      mountpoint = "none";
+      xattr = "sa";
+    };
+
+    datasets = {
+      "root" = {
+        type = "zfs_fs";
+        mountpoint = "/";
+      };
+      "nix" = {
+        type = "zfs_fs";
+        mountpoint = "/nix";
+      };
+      "pg" = {
+        type = "zfs_fs";
+        mountpoint = "/var/lib/postgresql";
+        options = {
+          logbias = "latency";
+          recordsize = "16K";
+          redundant_metadata = "most";
+        };
+      };
+      "reserved" = {
+        type = "zfs_fs";
+        options = {
+          canmount = "off";
+          refreservation = "16G"; # roughly one system closure
+        };
+      };
+    };
+  };
+}

build/titan/network.nix

@@ -0,0 +1,49 @@
+{
+  systemd.network = {
+    enable = true;
+    netdevs = {
+      "20-vlan4000" = {
+        netdevConfig = {
+          Kind = "vlan";
+          Name = "vlan4000";
+        };
+        vlanConfig.Id = 4000;
+      };
+    };
+    networks = {
+      "30-enp35s0" = {
+        matchConfig = {
+          MACAddress = "9c:6b:00:1f:aa:fd";
+          Type = "ether";
+        };
+        address = [
+          "159.69.62.224/26"
+          "2a01:4f8:231:e53::1/64"
+        ];
+        routes = [
+          { Gateway = "159.69.62.193"; }
+          { Gateway = "fe80::1"; }
+        ];
+        vlan = [
+          "vlan4000"
+        ];
+        networkConfig.Description = "WAN";
+        linkConfig.RequiredForOnline = true;
+      };
+      "30-vlan4000" = {
+        matchConfig.Name = "vlan4000";
+        networkConfig = {
+          DHCP = false;
+          IPv6AcceptRA = false;
+        };
+        linkConfig = {
+          MTUBytes = "1400";
+          RequiredForOnline = "routable";
+        };
+        address = [
+          "10.0.40.3/31"
+        ];
+      };
+    };
+  };
+}