Retroarch

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/2994d002dcff5353ca1ac48ec584c7f6589fe447' (2023-04-21)
  → 'github:ryantm/agenix/d8c973fd228949736dedf61b7f8cc1ece3236792' (2023-07-24)
• Added input 'agenix/home-manager':
    'github:nix-community/home-manager/32d3e39c491e2f91152c84f8ad8b003420eab0a1' (2023-04-22)
• Added input 'agenix/home-manager/nixpkgs':
    follows 'agenix/nixpkgs'
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/c2ea4e642dc50fd44b537e9860ec95867af30d39' (2023-04-21)
  → 'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
  → 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Updated input 'nix-index-database':
    'github:Mic92/nix-index-database/e3e320b19c192f40a5b98e8776e3870df62dee8a' (2023-04-25)
  → 'github:Mic92/nix-index-database/6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4' (2023-08-06)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/297187b30a19f147ef260abb5abd93b0706af238' (2023-04-30)
  → 'github:NixOS/nixpkgs/a4d0fe7270cc03eeb1aba4e8b343fe47bfd7c4d5' (2023-08-13)

.gitea/workflows/check-flake.yaml

@@ -0,0 +1,38 @@
+name: Check Flake
+
+on: [push]
+
+env:
+  DEBIAN_FRONTEND: noninteractive
+  PATH: /run/current-system/sw/bin/:/nix/var/nix/profiles/per-user/gitea-runner/profile/bin
+
+# defaults:
+#   run:
+#     shell: nix shell nixpkgs#nodejs-18_x
+
+jobs:
+  check-flake:
+    runs-on: nixos
+    steps:
+      # - run: node --version
+      # - name: Install basic dependencies
+      #   run: apt-get update && apt-get install -y --no-install-recommends sudo curl ca-certificates xz-utils
+
+      # - name: Install Nix
+      #   uses: https://github.com/cachix/install-nix-action@v20
+      #   with:
+      #     github_access_token: ${{ secrets.__GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: nix profile install nixpkgs#nodejs-18_x
+
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      # - name: Get ENV var names
+      #   run: printenv | cut -d'=' -f1
+
+      - name: Check Flake
+        run: nix flake check --show-trace

common/auto-update.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 # Modify auto-update so that it pulls a flake
 
@@ -6,20 +6,10 @@ let
   cfg = config.system.autoUpgrade;
 in
 {
-  config = lib.mkIf cfg.enable (lib.mkMerge [
+  config = lib.mkIf cfg.enable {
-    {
+    system.autoUpgrade = {
-      system.autoUpgrade = {
+      flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
-        flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
+      flags = [ "--recreate-lock-file" "--no-write-lock-file" ]; # ignore lock file, just pull the latest
-        flags = [ "--recreate-lock-file" "--no-write-lock-file" ]; # ignore lock file, just pull the latest
+    };
-
+  };
-        # dates = "03:40";
-        # kexecWindow = lib.mkDefault { lower = "01:00"; upper = "05:00"; };
-        # randomizedDelaySec = "45min";
-      };
-
-      system.autoUpgrade.allowKexec = lib.mkDefault true;
-
-      luks.enableKexec = cfg.allowKexec && builtins.length config.luks.devices > 0;
-    }
-  ]);
 }

common/binary-cache.nix

@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+
+{
+  nix = {
+    settings = {
+      substituters = [
+        "https://cache.nixos.org/"
+        "https://nix-community.cachix.org"
+        "http://s0.koi-bebop.ts.net:5000"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
+      ];
+    };
+  };
+}

common/boot/bios.nix

@@ -13,13 +13,11 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Use GRUB 2 for BIOS
     boot.loader = {
       timeout = 2;
       grub = {
         enable = true;
         device = cfg.device;
-        version = 2;
         useOSProber = true;
         configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;

common/boot/default.nix

@@ -5,8 +5,6 @@
     ./firmware.nix
     ./efi.nix
     ./bios.nix
-    ./kexec-luks.nix
-    ./luks.nix
     ./remote-luks-unlock.nix
   ];
 }

common/boot/efi.nix

@@ -10,14 +10,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Use GRUB2 for EFI
     boot.loader = {
       efi.canTouchEfiVariables = true;
       timeout = 2;
       grub = {
         enable = true;
         device = "nodev";
-        version = 2;
         efiSupport = true;
         useOSProber = true;
         #       memtest86.enable = true;

common/boot/kexec-luks.nix

@@ -1,121 +0,0 @@
-# Allows kexec'ing as an alternative to rebooting for machines that
-# have luks encrypted partitions that need to be mounted at boot.
-# These luks partitions will be automatically unlocked, no password,
-# or any interaction needed whatsoever.
-
-# This is accomplished by fetching the luks key(s) while the system is running,
-# then building a temporary initrd that contains the luks key(s), and kexec'ing.
-
-{ config, lib, pkgs, ... }:
-
-{
-  options.luks = {
-    enableKexec = lib.mkEnableOption "Enable support for transparent passwordless kexec while using luks";
-  };
-
-  config = lib.mkIf config.luks.enableKexec {
-    luks.fallbackToPassword = true;
-    luks.disableKeyring = true;
-
-    boot.initrd.luks.devices = lib.listToAttrs
-      (builtins.map
-        (item:
-          {
-            name = item;
-            value = {
-              masterKeyFile = "/etc/${item}.key";
-            };
-          })
-        config.luks.deviceNames);
-
-    systemd.services.prepare-luks-kexec-image = {
-      description = "Prepare kexec automatic LUKS unlock on kexec reboot without a password";
-
-      wantedBy = [ "kexec.target" ];
-      unitConfig.DefaultDependencies = false;
-      serviceConfig.Type = "oneshot";
-
-      path = with pkgs; [ file kexec-tools coreutils-full cpio findutils gzip xz zstd lvm2 xxd gawk ];
-
-      # based on https://github.com/flowztul/keyexec
-      script = ''
-        system=/nix/var/nix/profiles/system
-        old_initrd=$(readlink -f "$system/initrd")
-
-        umask 0077
-        CRYPTROOT_TMPDIR="$(mktemp -d --tmpdir=/dev/shm)"
-
-        cleanup() {
-          shred -fu "$CRYPTROOT_TMPDIR/initrd_contents/etc/"*.key || true
-          shred -fu "$CRYPTROOT_TMPDIR/new_initrd" || true
-          shred -fu "$CRYPTROOT_TMPDIR/secret/"* || true
-          rm -rf "$CRYPTROOT_TMPDIR"
-        }
-        # trap cleanup INT TERM EXIT
-
-        mkdir -p "$CRYPTROOT_TMPDIR"
-        cd "$CRYPTROOT_TMPDIR"
-
-        # Determine the compression type of the initrd image
-        compression=$(file -b --mime-type "$old_initrd" | awk -F'/' '{print $2}')
-
-        # Decompress the initrd image based on its compression type
-        case "$compression" in
-          gzip)
-            gunzip -c "$old_initrd" > initrd.cpio
-            ;;
-          xz)
-            unxz -c "$old_initrd" > initrd.cpio
-            ;;
-          zstd)
-            zstd -d -c "$old_initrd" > initrd.cpio
-            ;;
-          *)
-            echo "Unsupported compression type: $compression"
-            exit 1
-            ;;
-        esac
-
-        # Extract the contents of the cpio archive
-        mkdir -p initrd_contents
-        cd initrd_contents
-        cpio -idv < ../initrd.cpio
-
-        # Generate keys and add them to the extracted initrd filesystem
-        luksDeviceNames=(${builtins.concatStringsSep " " config.luks.deviceNames})
-        for item in "''${luksDeviceNames[@]}"; do
-          dmsetup --showkeys table "$item" | cut -d ' ' -f5 | xxd -ps -g1 -r > "./etc/$item.key"
-        done
-
-        # Add normal initrd secrets too
-        ${lib.concatStringsSep "\n" (lib.mapAttrsToList (dest: source:
-            let source' = if source == null then dest else builtins.toString source; in
-              ''
-                mkdir -p $(dirname "./${dest}")
-                cp -a ${source'} "./${dest}"
-              ''
-          ) config.boot.initrd.secrets)
-        }
-
-        # Create a new cpio archive with the modified contents
-        find . | cpio -o -H newc -v > ../new_initrd.cpio
-
-        # Compress the new cpio archive using the original compression type
-        cd ..
-        case "$compression" in
-          gzip)
-            gunzip -c new_initrd.cpio > new_initrd
-            ;;
-          xz)
-            unxz -c new_initrd.cpio > new_initrd
-            ;;
-          zstd)
-            zstd -c new_initrd.cpio > new_initrd
-            ;;
-        esac
-
-        kexec --load "$system/kernel" --append "init=$system/init ${builtins.concatStringsSep " " config.boot.kernelParams}" --initrd "$CRYPTROOT_TMPDIR/new_initrd"
-      '';
-    };
-  };
-}

common/boot/luks.nix

@@ -1,74 +0,0 @@
-# Makes it a little easier to configure luks partitions for boot
-# Additionally, this solves a circular dependency between kexec luks
-# and NixOS's luks module.
-
-{ config, lib, ... }:
-
-let
-  cfg = config.luks;
-
-  deviceCount = builtins.length cfg.devices;
-
-  deviceMap = lib.imap
-    (i: item: {
-      device = item;
-      name =
-        if deviceCount == 1 then "enc-pv"
-        else "enc-pv${builtins.toString (i + 1)}";
-    })
-    cfg.devices;
-in
-{
-  options.luks = {
-    devices = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-
-    allowDiscards = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-    };
-
-    fallbackToPassword = lib.mkEnableOption
-      "Fallback to interactive passphrase prompt if the cannot be found.";
-
-    disableKeyring = lib.mkEnableOption
-      "When opening LUKS2 devices, don't use the kernel keyring";
-
-    # set automatically, don't touch
-    deviceNames = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-    };
-  };
-
-  config = lib.mkMerge [
-    {
-      assertions = [
-        {
-          assertion = deviceCount == builtins.length (builtins.attrNames config.boot.initrd.luks.devices);
-          message = ''
-            All luks devices must be specified using `luks.devices` not `boot.initrd.luks.devices`.
-          '';
-        }
-      ];
-    }
-    (lib.mkIf (deviceCount != 0) {
-      luks.deviceNames = builtins.map (device: device.name) deviceMap;
-
-      boot.initrd.luks.devices = lib.listToAttrs (
-        builtins.map
-          (item:
-            {
-              name = item.name;
-              value = {
-                device = item.device;
-                allowDiscards = cfg.allowDiscards;
-                fallbackToPassword = cfg.fallbackToPassword;
-                disableKeyring = cfg.disableKeyring;
-              };
-            })
-          deviceMap);
-    })
-  ];
-}

common/boot/remote-luks-unlock.nix

@@ -33,6 +33,11 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    # boot.initrd.luks.devices.${cfg.device.name} = {
+    #   device = cfg.device.path;
+    #   allowDiscards = cfg.device.allowDiscards;
+    # };
+
     # Unlock LUKS disk over ssh
     boot.initrd.network.enable = true;
     boot.initrd.kernelModules = cfg.kernelModules;

common/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ./backups.nix
+    ./binary-cache.nix
     ./flakes.nix
     ./auto-update.nix
     ./shell.nix
@@ -11,6 +12,7 @@
     ./server
     ./pc
     ./machine-info
+    ./nix-builder.nix
     ./ssh.nix
   ];
 

common/nix-builder.nix

@@ -0,0 +1,60 @@
+{ config, lib, ... }:
+
+let
+  builderRole = "nix-builder";
+  builderUserName = "nix-builder";
+
+  machinesByRole = role: lib.filterAttrs (hostname: cfg: builtins.elem role cfg.systemRoles) config.machines.hosts;
+  otherMachinesByRole = role: lib.filterAttrs (hostname: cfg: hostname != config.networking.hostName) (machinesByRole role);
+  thisMachineHasRole = role: builtins.hasAttr config.networking.hostName (machinesByRole role);
+
+  builders = machinesByRole builderRole;
+  thisMachineIsABuilder = thisMachineHasRole builderRole;
+
+  # builders don't include themselves as a remote builder
+  otherBuilders = lib.filterAttrs (hostname: cfg: hostname != config.networking.hostName) builders;
+in
+lib.mkMerge [
+  # configure builder
+  (lib.mkIf thisMachineIsABuilder {
+    users.users.${builderUserName} = {
+      description = "Distributed Nix Build User";
+      group = builderUserName;
+      isSystemUser = true;
+      createHome = true;
+      home = "/var/lib/nix-builder";
+      useDefaultShell = true;
+      openssh.authorizedKeys.keys = builtins.map
+        (builderCfg: builderCfg.hostKey)
+        (builtins.attrValues config.machines.hosts);
+    };
+    users.groups.${builderUserName} = { };
+
+    nix.settings.trusted-users = [
+      builderUserName
+    ];
+  })
+
+  # use each builder
+  {
+    nix.distributedBuilds = true;
+
+    nix.buildMachines = builtins.map
+      (builderCfg: {
+        hostName = builtins.elemAt builderCfg.hostNames 0;
+        system = builderCfg.arch;
+        protocol = "ssh-ng";
+        sshUser = builderUserName;
+        sshKey = "/etc/ssh/ssh_host_ed25519_key";
+        maxJobs = 3;
+        speedFactor = 10;
+        supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+      })
+      (builtins.attrValues otherBuilders);
+
+    # It is very likely that the builder's internet is faster or just as fast
+    nix.extraOptions = ''
+      builders-use-substitutes = true
+    '';
+  }
+]

common/pc/chromium.nix

@@ -17,38 +17,6 @@ let
       "PREFIX=$(out)"
     ];
   };
-
-  nvidia-vaapi-driver = pkgs.stdenv.mkDerivation rec {
-    pname = "nvidia-vaapi-driver";
-    version = "0.0.5";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "elFarto";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY=";
-    };
-
-    patches = [
-      ./use-meson-v57.patch
-    ];
-
-    nativeBuildInputs = with pkgs; [
-      meson
-      cmake
-      ninja
-      pkg-config
-    ];
-
-    buildInputs = with pkgs; [
-      nv-codec-headers-11-1-5-1
-      libva
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-bad
-      libglvnd
-    ];
-  };
-
 in
 {
   config = lib.mkIf cfg.enable {

common/pc/default.nix

@@ -37,7 +37,6 @@ in
       mumble
       tigervnc
       bluez-tools
-      vscodium
       element-desktop
       mpv
       nextcloud-client
@@ -53,6 +52,8 @@ in
       jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
+      lxqt.pavucontrol-qt
+      barrier
 
       # For Nix IDE
       nixpkgs-fmt

common/pc/kde.nix

@@ -20,5 +20,7 @@ in
       # plasma5Packages.kmail-account-wizard
       kate
     ];
+
+    services.xserver.desktopManager.plasma5.useQtScaling = true;
   };
 }

common/pc/vscodium.nix

@@ -4,8 +4,20 @@ let
   cfg = config.de;
 
   extensions = with pkgs.vscode-extensions; [
-    #    bbenoist.Nix # nix syntax support
+    bbenoist.nix # nix syntax support
-    #    arrterian.nix-env-selector  # nix dev envs
+    arrterian.nix-env-selector # nix dev envs
+    dart-code.dart-code
+    dart-code.flutter
+    golang.go
+    jnoortheen.nix-ide
+    ms-vscode.cpptools
+  ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+    {
+      name = "platformio-ide";
+      publisher = "platformio";
+      version = "3.1.1";
+      sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q=";
+    }
   ];
 
   vscodium-with-extensions = pkgs.vscode-with-extensions.override {

common/server/gitea-runner.nix

@@ -11,12 +11,6 @@ in
       type = lib.types.str;
       description = lib.mdDoc "gitea runner data directory.";
     };
-    instanceUrl = lib.mkOption {
-      type = lib.types.str;
-    };
-    registrationTokenFile = lib.mkOption {
-      type = lib.types.path;
-    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -35,13 +29,6 @@ in
     };
     users.groups.gitea-runner = { };
 
-    # registration token
-    services.gitea-runner.registrationTokenFile = "/run/agenix/gitea-runner-registration-token";
-    age.secrets.gitea-runner-registration-token = {
-      file = ../../secrets/gitea-runner-registration-token.age;
-      owner = "gitea-runner";
-    };
-
     systemd.services.gitea-runner = {
       description = "Gitea Runner";
 
@@ -57,40 +44,7 @@ in
 
       path = with pkgs; [ gitea-actions-runner ];
 
-      # based on https://gitea.com/gitea/act_runner/src/branch/main/run.sh
       script = ''
-        . ${cfg.registrationTokenFile}
-
-        if [[ ! -s .runner ]]; then
-          try=$((try + 1))
-          success=0
-
-          LOGFILE="$(mktemp)"
-
-          # The point of this loop is to make it simple, when running both act_runner and gitea in docker,
-          # for the act_runner to wait a moment for gitea to become available before erroring out.  Within
-          # the context of a single docker-compose, something similar could be done via healthchecks, but
-          # this is more flexible.
-          while [[ $success -eq 0 ]] && [[ $try -lt ''${10:-10} ]]; do
-            act_runner register \
-              --instance "${cfg.instanceUrl}" \
-              --token    "$GITEA_RUNNER_REGISTRATION_TOKEN" \
-              --name     "${config.networking.hostName}" \
-              --no-interactive > $LOGFILE 2>&1
-
-            cat $LOGFILE
-
-            cat $LOGFILE | grep 'Runner registered successfully' > /dev/null
-            if [[ $? -eq 0 ]]; then
-              echo "SUCCESS"
-              success=1
-            else
-              echo "Waiting to retry ..."
-              sleep 5
-            fi
-          done
-        fi
-
         exec act_runner daemon
       '';
     };

common/server/mailserver.nix

@@ -37,6 +37,10 @@ in
           # catchall for all domains
           aliases = map (domain: "@${domain}") domains;
         };
+        "cris@runyan.org" = {
+          hashedPasswordFile = "/run/agenix/cris-hashed-email-pw";
+          aliases = [ "chris@runyan.org" ];
+        };
         "robot@runyan.org" = {
           aliases = [
             "no-reply@neet.dev"
@@ -52,9 +56,16 @@ in
         "damon@runyan.org"
         "jonas@runyan.org"
       ];
+      forwards = {
+        "amazon@runyan.org" = [
+          "jeremy@runyan.org"
+          "cris@runyan.org"
+        ];
+      };
       certificateScheme = 3; # use let's encrypt for certs
     };
     age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age;
+    age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age;
     age.secrets.hashed-robots-email-pw.file = ../../secrets/hashed-robots-email-pw.age;
 
     # sendmail to use xxx@domain instead of xxx@mail.domain

flake.lock

@@ -3,16 +3,17 @@
     "agenix": {
       "inputs": {
         "darwin": "darwin",
+        "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1682101079,
+        "lastModified": 1690228878,
-        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
         "type": "github"
       },
       "original": {
@@ -21,29 +22,6 @@
         "type": "github"
       }
     },
-    "archivebox": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1648612759,
-        "narHash": "sha256-SJwlpD2Wz3zFoX2mIYCQfwIOYHaOdeiWGFeDXsLGM84=",
-        "ref": "refs/heads/master",
-        "rev": "39d338b9b24159d8ef3309eecc0d32a2a9f102b5",
-        "revCount": 2,
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
-      }
-    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -117,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682063650,
+        "lastModified": 1686747123,
-        "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=",
+        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39",
+        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
         "type": "github"
       },
       "original": {
@@ -151,11 +129,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1689068808,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -164,6 +142,27 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1682203081,
+        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -171,11 +170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681591833,
+        "lastModified": 1691292840,
-        "narHash": "sha256-lW+xOELafAs29yw56FG4MzNOFkh8VHC/X/tRs1wsGn8=",
+        "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "68ec961c51f48768f72d2bbdb396ce65a316677e",
+        "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4",
         "type": "github"
       },
       "original": {
@@ -186,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682133240,
+        "lastModified": 1691888369,
-        "narHash": "sha256-s6yRsI/7V+k/+rckp0+/2cs/UXnea3SEfMpy95QiGcc=",
+        "narHash": "sha256-fBS5YOyiziv7tmR+yCJHr1Tm15Ve4PO1syyJwE9Xnuc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8dafae7c03d6aa8c2ae0a0612fbcb47e994e3fb8",
+        "rev": "a4d0fe7270cc03eeb1aba4e8b343fe47bfd7c4d5",
         "type": "github"
       },
       "original": {
@@ -215,18 +214,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-hostapd-pr": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-1rGQKcB1jeRPc1n021ulyOVkA6L6xmNYKmeqQ94+iRc=",
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch"
-      }
-    },
     "radio": {
       "inputs": {
         "flake-utils": [
@@ -271,13 +258,11 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "archivebox": "archivebox",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
         "flake-utils": "flake-utils",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-hostapd-pr": "nixpkgs-hostapd-pr",
         "radio": "radio",
         "radio-web": "radio-web",
         "simple-nixos-mailserver": "simple-nixos-mailserver"

flake.nix

@@ -1,8 +1,6 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/master";
-    # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff";
-    # nixpkgs-patch-howdy.flake = false;
 
     flake-utils.url = "github:numtide/flake-utils";
 
@@ -26,11 +24,6 @@
     dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
     dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
 
-    # archivebox
-    archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git";
-    archivebox.inputs.nixpkgs.follows = "nixpkgs";
-    archivebox.inputs.flake-utils.follows = "flake-utils";
-
     # nixos config deployment
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
@@ -39,9 +32,6 @@
     # prebuilt nix-index database
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixpkgs-hostapd-pr.url = "https://github.com/NixOS/nixpkgs/pull/222536.patch";
-    nixpkgs-hostapd-pr.flake = false;
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -60,7 +50,6 @@
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
-            archivebox.nixosModule
             nix-index-database.nixosModules.nix-index
             ({ lib, ... }: {
               config = {
@@ -86,8 +75,7 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
-                  inputs.nixpkgs-hostapd-pr
+                  # no patches to nixpkgs at this time
-                  ./patches/kexec-luks.patch
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });

machines/phil/default.nix

@@ -5,10 +5,6 @@
     ./hardware-configuration.nix
   ];
 
-  services.gitea-runner = {
+  networking.hostName = "phil";
-    enable = true;
+  services.gitea-runner.enable = true;
-    instanceUrl = "https://git.neet.dev";
-  };
-
-  system.autoUpgrade.enable = true;
 }

machines/phil/hardware-configuration.nix

@@ -20,7 +20,10 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  luks.devices = [ "/dev/disk/by-uuid/d26c1820-4c39-4615-98c2-51442504e194" ];
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/d26c1820-4c39-4615-98c2-51442504e194";
+    allowDiscards = true;
+  };
 
   fileSystems."/" =
     {

machines/phil/properties.nix

@@ -9,6 +9,7 @@
   systemRoles = [
     "server"
     "gitea-runner"
+    "nix-builder"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2";

machines/ponyo/default.nix

@@ -6,9 +6,6 @@
   ];
 
   system.autoUpgrade.enable = true;
-  # I want to manually trigger kexec updates for now on ponyo
-  system.autoUpgrade.allowKexec = false;
-  luks.enableKexec = true;
 
   # p2p mesh network
   services.tailscale.exitNode = true;

machines/ponyo/hardware-configuration.nix

@@ -19,15 +19,12 @@
   };
 
   remoteLuksUnlock.enable = true;
-
+  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
-  luks.devices = [
+  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"; # expanded disk
-    "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2"
-    "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"
-  ];
 
   fileSystems."/" =
     {
-      device = "/dev/mapper/enc-pv1";
+      device = "/dev/mapper/enc-pv";
       fsType = "btrfs";
     };
 

machines/ray/default.nix

@@ -9,6 +9,9 @@
   services.tor.enable = true;
   services.tor.client.enable = true;
 
+  # don't use remote builders
+  nix.distributedBuilds = lib.mkForce false;
+
   # services.howdy.enable = true;
 
   hardware.openrazer.enable = true;
@@ -27,6 +30,7 @@
     # Wally Flashing rules for the Moonlander and Planck EZ
     SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
   '';
+  services.udev.packages = [ pkgs.platformio ];
   users.groups.plugdev = {
     members = [ "googlebot" ];
   };
@@ -52,4 +56,9 @@
 
   de.enable = true;
   de.touchpad.enable = true;
+
+  networking.firewall.allowedTCPPorts = [
+    # barrier
+    24800
+  ];
 }

machines/ray/hardware-configuration.nix

@@ -36,7 +36,10 @@
 
   # disks
   remoteLuksUnlock.enable = true;
-  luks.devices = [ "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce" ];
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
+    allowDiscards = true;
+  };
   fileSystems."/" =
     {
       device = "/dev/vg/root";

machines/router/hardware-configuration.nix

@@ -32,7 +32,7 @@
 
   # disks
   remoteLuksUnlock.enable = true;
-  luks.devices = [ "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c" ];
+  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c";
   fileSystems."/" =
     {
       device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce";

machines/router/router.nix

@@ -92,7 +92,7 @@ in
       radios = {
         # 2.4GHz
         wlp4s0 = {
-          hwMode = "g";
+          band = "2g";
           noScan = true;
           channel = 6;
           countryCode = "US";
@@ -124,15 +124,15 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          extraConfig = ''
+          settings = {
-            he_oper_centr_freq_seg0_idx=8
+            he_oper_centr_freq_seg0_idx = 8;
-            vht_oper_centr_freq_seg0_idx=8
+            vht_oper_centr_freq_seg0_idx = 8;
-          '';
+          };
         };
 
         # 5GHz
         wlan1 = {
-          hwMode = "a";
+          band = "5g";
           noScan = true;
           channel = 128;
           countryCode = "US";
@@ -164,10 +164,10 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          extraConfig = ''
+          settings = {
-            vht_oper_centr_freq_seg0_idx=114
+            vht_oper_centr_freq_seg0_idx = 114;
-            he_oper_centr_freq_seg0_idx=114
+            he_oper_centr_freq_seg0_idx = 114;
-          '';
+          };
         };
       };
     };

machines/storage/s0/default.nix

@@ -5,7 +5,22 @@
     ./hardware-configuration.nix
   ];
 
-  system.autoUpgrade.enable = true;
+  networking.hostName = "s0";
+
+  # system.autoUpgrade.enable = true;
+
+  # gitea runner and allow it to build ARM derivations
+  services.gitea-runner.enable = true;
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+  nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache
+
+  # binary cache
+  services.nix-serve = {
+    enable = true;
+    openFirewall = true;
+    secretKeyFile = "/run/agenix/binary-cache-private-key";
+  };
+  age.secrets.binary-cache-private-key.file = ../../../secrets/binary-cache-private-key.age;
 
   services.iperf3.enable = true;
   services.iperf3.openFirewall = true;

machines/storage/s0/hardware-configuration.nix

@@ -25,14 +25,14 @@
 
   # luks
   remoteLuksUnlock.enable = true;
-  luks.devices = [
+  boot.initrd.luks.devices."enc-pv1".device = "/dev/disk/by-uuid/d52e99a9-8825-4d0a-afc1-8edbef7e0a86";
-    "/dev/disk/by-uuid/d52e99a9-8825-4d0a-afc1-8edbef7e0a86"
+  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/f7275585-7760-4230-97de-36704b9a2aa3";
-    "/dev/disk/by-uuid/f7275585-7760-4230-97de-36704b9a2aa3"
+  boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38";
-    "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38"
+  boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/e2c7402a-e72c-4c4a-998f-82e4c10187bc";
-    "/dev/disk/by-uuid/e2c7402a-e72c-4c4a-998f-82e4c10187bc"
-  ];
 
   # mounts
+  services.zfs.autoScrub.enable = true;
+  services.zfs.trim.enable = true;
   fileSystems."/" =
     {
       device = "rpool/nixos/root";

machines/storage/s0/properties.nix

@@ -9,6 +9,7 @@
     "storage"
     "server"
     "pia"
+    "binary-cache"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";

machines/zoidberg/default.nix

@@ -0,0 +1,46 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  # services.spotifyd.enable = true;
+
+  # wireless xbox controller support
+  hardware.xpadneo.enable = true;
+
+  services.mount-samba.enable = true;
+
+  de.enable = true;
+
+  # kodi
+  services.xserver.desktopManager.kodi.enable = true;
+  services.xserver.desktopManager.kodi.package =
+    (
+      pkgs.kodi.passthru.withPackages (kodiPackages: with kodiPackages; [
+        jellyfin
+        joystick
+      ])
+    );
+
+  services.xserver.desktopManager.retroarch.enable = true;
+  services.xserver.desktopManager.retroarch.package = pkgs.retroarchFull;
+
+  users.users.cris = {
+    isNormalUser = true;
+    hashedPassword = "$y$j9T$LMGwHVauFWAcAyWSSmcuS/$BQpDyjDHZZbvj54.ijvNb03tr7IgX9wcjYCuCxjSqf6";
+    uid = 1001;
+    packages = with pkgs; [
+      maestral
+      maestral-gui
+    ] ++ config.users.users.googlebot.packages;
+  };
+
+  # Dr. John A. Zoidberg
+  users.users.john = {
+    isNormalUser = true;
+    hashedPassword = "";
+    uid = 1002;
+  };
+}

machines/zoidberg/hardware-configuration.nix

@@ -0,0 +1,46 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  # boot
+  efi.enable = true;
+  boot.loader.timeout = lib.mkForce 15;
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+
+  # kernel
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # disks
+  remoteLuksUnlock.enable = true;
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/04231c41-2f13-49c0-8fce-0357eea67990";
+    allowDiscards = true;
+
+    # Fetch key from USB drive
+    keyFileSize = 4096;
+    keyFile = "/dev/disk/by-id/usb-USB_Flash_Disk_10622352-0:0";
+    fallbackToPassword = true;
+  };
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/39ee326c-a42f-49f3-84d9-f10091a903cd";
+      fsType = "btrfs";
+    };
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/954B-AB3E";
+      fsType = "vfat";
+    };
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/44e36954-9f1c-49ae-af07-72b240f93a95"; }];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

machines/zoidberg/properties.nix

@@ -0,0 +1,14 @@
+{
+  hostNames = [
+    "zoidberg"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "personal"
+    "media-center"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvdC1EiLqSNVmk5L1p7cWRIrrlelbK+NMj6tEBrwqIq";
+}

patches/kexec-luks.patch

@@ -1,264 +0,0 @@
-diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
-index b8f36538e70..cc320a04c70 100644
---- a/nixos/modules/system/boot/luksroot.nix
-+++ b/nixos/modules/system/boot/luksroot.nix
-@@ -146,6 +146,7 @@ let
-     csopen = "cryptsetup luksOpen ${dev.device} ${dev.name}"
-            + optionalString dev.allowDiscards " --allow-discards"
-            + optionalString dev.bypassWorkqueues " --perf-no_read_workqueue --perf-no_write_workqueue"
-+           + optionalString dev.disableKeyring " --disable-keyring"
-            + optionalString (dev.header != null) " --header=${dev.header}";
-     cschange = "cryptsetup luksChangeKey ${dev.device} ${optionalString (dev.header != null) "--header=${dev.header}"}";
-     fido2luksCredentials = dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential;
-@@ -243,6 +244,26 @@ let
-                do_open_passphrase
-             fi
-         fi
-+        '' else if (dev.masterKeyFile != null) then ''
-+        if wait_target "key file" ${dev.masterKeyFile}; then
-+            ${csopen} --master-key-file=${dev.masterKeyFile}
-+            cs_status=$?
-+            if [ $cs_status -ne 0 ]; then
-+              echo "Key File ${dev.masterKeyFile} failed!"
-+              if ! try_empty_passphrase; then
-+                ${if dev.fallbackToPassword then "echo" else "die"} "${dev.masterKeyFile} is unavailable"
-+                echo " - failing back to interactive password prompt"
-+                do_open_passphrase
-+              fi
-+            fi
-+        else
-+            # If the key file never shows up we should also try the empty passphrase
-+            if ! try_empty_passphrase; then
-+               ${if dev.fallbackToPassword then "echo" else "die"} "${dev.masterKeyFile} is unavailable"
-+               echo " - failing back to interactive password prompt"
-+               do_open_passphrase
-+            fi
-+        fi
-         '' else ''
-            if ! try_empty_passphrase; then
-               do_open_passphrase
-@@ -625,6 +646,15 @@ in
-             '';
-           };
- 
-+          masterKeyFile = mkOption {
-+            default = null;
-+            type = types.nullOr types.str;
-+            description = lib.mdDoc ''
-+              The name of the file (can be a raw device or a partition) that
-+              should be used as the master decryption key for the encrypted device.
-+            '';
-+          };
-+
-           tryEmptyPassphrase = mkOption {
-             default = false;
-             type = types.bool;
-@@ -700,6 +730,15 @@ in
-             '';
-           };
- 
-+          disableKeyring = mkOption {
-+            default = false;
-+            type = types.bool;
-+            description = lib.mdDoc ''
-+              Disables using the kernel keyring for LUKS2 disks.
-+              This is already the default behavior for LUKS1
-+            '';
-+          };
-+
-           fallbackToPassword = mkOption {
-             default = false;
-             type = types.bool;
-diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
-index 29e3e313336..050bf09c208 100644
---- a/nixos/modules/tasks/auto-upgrade.nix
-+++ b/nixos/modules/tasks/auto-upgrade.nix
-@@ -4,7 +4,8 @@ with lib;
- 
- let cfg = config.system.autoUpgrade;
- 
--in {
-+in
-+{
- 
-   options = {
- 
-@@ -22,7 +23,7 @@ in {
-       };
- 
-       operation = mkOption {
--        type = types.enum ["switch" "boot"];
-+        type = types.enum [ "switch" "boot" ];
-         default = "switch";
-         example = "boot";
-         description = lib.mdDoc ''
-@@ -86,14 +87,14 @@ in {
-         '';
-       };
- 
--      allowReboot = mkOption {
-+      allowKexec = mkOption {
-         default = false;
-         type = types.bool;
-         description = lib.mdDoc ''
--          Reboot the system into the new generation instead of a switch
-+          kexec the system into the new generation instead of a switch
-           if the new generation uses a different kernel, kernel modules
-           or initrd than the booted system.
--          See {option}`rebootWindow` for configuring the times at which a reboot is allowed.
-+          See {option}`kexecWindow` for configuring the times at which a kexec is allowed.
-         '';
-       };
- 
-@@ -109,25 +110,25 @@ in {
-         '';
-       };
- 
--      rebootWindow = mkOption {
-+      kexecWindow = mkOption {
-         description = lib.mdDoc ''
-           Define a lower and upper time value (in HH:MM format) which
--          constitute a time window during which reboots are allowed after an upgrade.
--          This option only has an effect when {option}`allowReboot` is enabled.
--          The default value of `null` means that reboots are allowed at any time.
-+          constitute a time window during which kexecs are allowed after an upgrade.
-+          This option only has an effect when {option}`allowKexec` is enabled.
-+          The default value of `null` means that kexecs are allowed at any time.
-         '';
-         default = null;
-         example = { lower = "01:00"; upper = "05:00"; };
-         type = with types; nullOr (submodule {
-           options = {
-             lower = mkOption {
--              description = lib.mdDoc "Lower limit of the reboot window";
-+              description = lib.mdDoc "Lower limit of the kexec window";
-               type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
-               example = "01:00";
-             };
- 
-             upper = mkOption {
--              description = lib.mdDoc "Upper limit of the reboot window";
-+              description = lib.mdDoc "Upper limit of the kexec window";
-               type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}";
-               example = "05:00";
-             };
-@@ -165,12 +166,12 @@ in {
-     }];
- 
-     system.autoUpgrade.flags = (if cfg.flake == null then
--        [ "--no-build-output" ] ++ optionals (cfg.channel != null) [
--          "-I"
--          "nixpkgs=${cfg.channel}/nixexprs.tar.xz"
--        ]
--      else
--        [ "--flake ${cfg.flake}" ]);
-+      [ "--no-build-output" ] ++ optionals (cfg.channel != null) [
-+        "-I"
-+        "nixpkgs=${cfg.channel}/nixexprs.tar.xz"
-+      ]
-+    else
-+      [ "--flake ${cfg.flake}" ]);
- 
-     systemd.services.nixos-upgrade = {
-       description = "NixOS Upgrade";
-@@ -195,54 +196,56 @@ in {
-         config.programs.ssh.package
-       ];
- 
--      script = let
--        nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
--        date     = "${pkgs.coreutils}/bin/date";
--        readlink = "${pkgs.coreutils}/bin/readlink";
--        shutdown = "${config.systemd.package}/bin/shutdown";
--        upgradeFlag = optional (cfg.channel == null) "--upgrade";
--      in if cfg.allowReboot then ''
--        ${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)}
--        booted="$(${readlink} /run/booted-system/{initrd,kernel,kernel-modules})"
--        built="$(${readlink} /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})"
--
--        ${optionalString (cfg.rebootWindow != null) ''
--          current_time="$(${date} +%H:%M)"
--
--          lower="${cfg.rebootWindow.lower}"
--          upper="${cfg.rebootWindow.upper}"
--
--          if [[ "''${lower}" < "''${upper}" ]]; then
--            if [[ "''${current_time}" > "''${lower}" ]] && \
--               [[ "''${current_time}" < "''${upper}" ]]; then
--              do_reboot="true"
-+      script =
-+        let
-+          nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
-+          date = "${pkgs.coreutils}/bin/date";
-+          readlink = "${pkgs.coreutils}/bin/readlink";
-+          systemctl_kexec = "${config.systemd.package}/bin/systemctl kexec";
-+          upgradeFlag = optional (cfg.channel == null) "--upgrade";
-+        in
-+        if cfg.allowKexec then ''
-+          ${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)}
-+          booted="$(${readlink} /run/booted-system/{initrd,kernel,kernel-modules})"
-+          built="$(${readlink} /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})"
-+
-+          ${optionalString (cfg.kexecWindow != null) ''
-+            current_time="$(${date} +%H:%M)"
-+
-+            lower="${cfg.kexecWindow.lower}"
-+            upper="${cfg.kexecWindow.upper}"
-+
-+            if [[ "''${lower}" < "''${upper}" ]]; then
-+              if [[ "''${current_time}" > "''${lower}" ]] && \
-+                 [[ "''${current_time}" < "''${upper}" ]]; then
-+                do_kexec="true"
-+              else
-+                do_kexec="false"
-+              fi
-             else
--              do_reboot="false"
-+              # lower > upper, so we are crossing midnight (e.g. lower=23h, upper=6h)
-+              # we want to reboot if cur > 23h or cur < 6h
-+              if [[ "''${current_time}" < "''${upper}" ]] || \
-+                 [[ "''${current_time}" > "''${lower}" ]]; then
-+                do_kexec="true"
-+              else
-+                do_kexec="false"
-+              fi
-             fi
-+          ''}
-+
-+          if [ "''${booted}" = "''${built}" ]; then
-+            ${nixos-rebuild} ${cfg.operation} ${toString cfg.flags}
-+          ${optionalString (cfg.kexecWindow != null) ''
-+            elif [ "''${do_kexec}" != true ]; then
-+              echo "Outside of configured kexec window, skipping."
-+          ''}
-           else
--            # lower > upper, so we are crossing midnight (e.g. lower=23h, upper=6h)
--            # we want to reboot if cur > 23h or cur < 6h
--            if [[ "''${current_time}" < "''${upper}" ]] || \
--               [[ "''${current_time}" > "''${lower}" ]]; then
--              do_reboot="true"
--            else
--              do_reboot="false"
--            fi
-+            ${systemctl_kexec}
-           fi
--        ''}
--
--        if [ "''${booted}" = "''${built}" ]; then
--          ${nixos-rebuild} ${cfg.operation} ${toString cfg.flags}
--        ${optionalString (cfg.rebootWindow != null) ''
--          elif [ "''${do_reboot}" != true ]; then
--            echo "Outside of configured reboot window, skipping."
--        ''}
--        else
--          ${shutdown} -r +1
--        fi
--      '' else ''
--        ${nixos-rebuild} ${cfg.operation} ${toString (cfg.flags ++ upgradeFlag)}
--      '';
-+        '' else ''
-+          ${nixos-rebuild} ${cfg.operation} ${toString (cfg.flags ++ upgradeFlag)}
-+        '';
- 
-       startAt = cfg.dates;
- 

secrets/binary-cache-private-key.age

@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPp1nw eORh0m8mAPd3H/wjnHocuh/xheMuhLgWyzepL9RNii0
+154IPIdkb8WpYgX/fj5jraQY5mN7udg3iaZ3VJB+3X8
+-> ssh-ed25519 dMQYog 0eg1j3jL736OwjeMB55z52A6P34mSEYL6ulrn72blj0
+UdFKIbrzAKCzZhYfH41z64cwkQRp1RZztYgknIEfoDc
+-> K/&@p'&{-grease yb~ xHlc7m _t xm{3f
+Gi2UGm5YXyByJuH6rRRBle/D5T7GS4FDt7Kv8aBKe8dfwUCu65OcvoaXzjm08EKA
+m0yx
+--- f79zGG5kBOul/cF0NJu1+f/NmaI0h/JcuHDano/1ghU
+U¥÷7°åó
ʤï1måÔE\{^£$ŸÕCx~2"±8¶Æõ?&öó°„ÂË‹(áä±
+…aÝÀyßÝ쥘g¬â†øÇ	CYX}’Ö

secrets/cris-hashed-email-pw.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 6AT2/g MmInWcw6GlfzvN9kxFtTVWMX+UX9PHO5V35TzRcmex0
+dSMoGNuJMpRwyWTAnjHpO9mJBCxsJ77M5fWA0F1gR6s
+-> ssh-ed25519 dMQYog ua3OPiErZcVRNGf/uxv7PiBBFOKAUkaSSIV4UCMu5Wc
+L8kYIzyEXcAxAlPQbqasgiaQi7JARhja6vM6WzvdMrs
+-> CIn-grease !G{f,9h( Hjn\ \hTpE MAP<)J
+0u+eQDvbxgI6aDT7xqdwOX3A34E2T4Ft9bSF6KBpHqucHib9tA5lJHgtXwgkpa/P
+nbaJDnRWbM/AL7nnT7XpdLVO2r7w2ish4ALBgPvXxH/0iUXqvQk1B/E
+--- +aKXbSfk6VkxqtTn+fI8VhcgO7Dw0jNSUJOJlqCbEGM
+á? Þ÷Ùþq}` ¿Žiämó<>.6Û{I

secrets/hostapd-pw-CXNK00BF9176.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 VyYH/Q X+fXLJz227KkBLu45rb9mUkkIpENSMtZeEJjl6qj5Xw
+-> ssh-ed25519 VyYH/Q evYn+9ipH4t4cT2lZOiwnGqSkU+bbdVw80S0rgAqt00
-AFAFnvsiogoMMwsAJO0DDoaizL9lmCLsF4QHDjmubr0
+Vr24AqHOqH5DQYYlyS0X+k6TnczKHRDGZCeoLOJkybE
--> ssh-ed25519 dMQYog P84+7TBcMFSALTn6FR/aXyqFE9DfOzp38ImkdWj7nE0
+-> ssh-ed25519 dMQYog 23GqNi0N24EtnRV25Ick+aurPOngZ2Zd279LmZH15WY
-PqOn1OL9Zt0x1pBIYOSKkkS//mbk1OX5pnDGp+OLYeI
+FEo0GyymjnPrSjf608SyCH22FvaqEixyVcbXdQ+Z3zA
--> @?-grease
+-> (Rd{ky@}-grease D f/KA]Pe
-3JvpmcTxdTgvv6vPL8dXEwjR+g
+8Ip1fddb0BYUwg62FSmUBp7O+TILFaCtWHcxheEyUlXPoY9TGTaySl6Znw9Mksde
---- aMYF1SbC+p01YWmg24+Ih78VPQcwzGU/P1cEfgRvXV8
+q2aAHn8
-Ÿ	@$™sžQ¼z<15><>®xkÊNfÛuÕ;§¿ ÎvI0•ªÇÎ^4.?, 8…çî
+--- ibLXcq9R/5X2jFKBABgsUcDiBjjuoA9SrCuFbGOiNBI
+¸Ó;ù½XôóÀ	m£hŽ²ý%펗
+6â×k@nWÃäT®‘0

secrets/hostapd-pw-experimental-tower.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 VyYH/Q biHhTmstx4FJmstCt7pYUjQlwZpgbFkZVlpzQu2Lf1w
+-> ssh-ed25519 VyYH/Q 64dqV1h1JUR4j42fb1I5jhXGaY/qZeSKm1rBzQgbbw8
-K2lHbhdETesM86K6fKk91/2Z0LRQcwVtnXxYOtVCCaE
+pJnxiMQ736hEEx674n1mZGzgLhRISKjZnHKh7NoVGVQ
--> ssh-ed25519 dMQYog cyeabgOaV3nLPdLYs4G1g41bMAEBnHlEXoeW+A7NLFw
+-> ssh-ed25519 dMQYog z95pFmJuZTdFphdWJwLK7NSNQC0PqXw+aFtzt17xv0I
-FRGdlHVQ81JjjYQ/PRoAq+JRMZ28rSBEUko8VHKNeDM
+IET4jLrUiJAXsvOWkh2jWGdDgnib7fW90389V7P4C0w
--> cyfV-grease +X51me hk_`YB> 6DFo`? V
+-> 2-grease \vwS,
-/EoPdwBCc9S2GafKdhDnPZE06kxZBlzAob0Eb2qEMuwzVJF+7LesiK0ilpSrzdPU
+mEdgxTI1rxUMuAOhUUoitN0tfN4c6BU
-cVN1ka2+k4pH7os/QUuu6oW9r3SxCw
+--- Efo4U1RV0Mcd2th5AoXpy8XL2LejIH4GaOKBPCSuQEE
---- FJOYm8/TVXlxV+9Ih376xWyJlKz2uk8KzPoY5FpIJjo
+ÍCLd…
-C`Ñ” -“Ýþo’YIEœ_.y˜XãÝÈË›iþëµFØW±…Š¨Im5ŽA“õ*÷}Àßêkî”þ9ûzë

secrets/iodine.age

@@ -1,10 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g yTW46JmDIftcOqogIDjheXJf2sw/dG2WEJxfCXU/LDk
+-> ssh-ed25519 6AT2/g UG+Ub0bZK74/Ifa/YkZOc6B3cPl6oI7M4Ev1zxkFEh0
-0Co5/Rn22kmdcPr61ZOrmZJbPFHx2wJ8/YkbDjcjqKo
+z71vjnEqhL3kuLePbP0nKQNwU0mrCOO386wLdUhH5tU
--> ssh-ed25519 dMQYog RtZT0PwVL4kxUHilOhH2GBp8Z9WfyBkaxB62pjKpHA4
+-> ssh-ed25519 dMQYog t8H6XoIhhE4H9g4913sWgZ5BaYK04uk7Mj0FYnOdtTo
-muMlIt8VYQftMYacfdnQFeejfWpKTEG5gxbFNy97GTc
+U4Ygto4z3l4dcCsnGxnRo1YGBl6YZ5y5pnVBJXCSrOc
--> 4|)`7yq-grease P#\5k8 +f
+-> Bad-grease <$Y
-jMegn6ATsj2Ai9B5Xmy+tay1nppwxvF1IGJH+hLNanYMsTIDZypM6UsNdzYQ/3mw
+1xw
-VZ9ooy8TKUgAJ7jsd6IrKw
+--- wiGO0H6gfd+3D/+V/rMNLGkDk6FPFUihXi43J82LAkg
---- tLaPQWJA0Hh5MrxfhaySURgY02K16IlzvsxKpOWGva0
+³8>`®À
s«»pú¨€¿U#ü™º¯KV%jbwïxN¸@
-5?lﾇ'ｼ!ｹｺ<EFBDB9><EFBDBA>ﾜｷ匪Nxｽ+<2B>A9ﾟﾑﾘl/ｸﾞ諟ﾎ|旙<>Sｵ&ｺｻ､繃<>Q;_<>K
+Žî@œª€iæ
+Ow\º(@@Tòìèzá

secrets/nextcloud-pw.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g hXS7zxzYhlu5GrUAEAnaO+CizpbifjDxIwoAK55cjV0
+-> ssh-ed25519 6AT2/g ZfG2BGntlwCXJgQsYqvoPsQe5Y0JLLs4Vanm2NEciV4
-xU7Z52cjARU8tmd1AJ9v8+QTQzfL/mNxP/f/bJAzYvo
+iEBfqquq6Kqnmj6djNQHSMlpyiFP+TM/mXSa+X4jJJ8
--> ssh-ed25519 dMQYog 8PEp5TmEOumhWUZvko42sOKpkqOCW9/zCrMqn+fJ2ws
+-> ssh-ed25519 dMQYog r5DtWLdIDn58h5bwpvBMMP2VK/sm0B+qW1p8kpkVC38
-wJo8x6+hyU8iJkTqGVecZ88hG661F3ZvEvVqpJzox5w
+N1ABWvmnHjipSd/2XaNPDPOzB4hzmwmOhOACfAeHYOY
--> x-grease tdW'\ +(>9 da%@^H6
+-> PfP*-grease >7 7pu;\o@ g
-q04xwjRaNOBfNhAvik762vJHio/qTfR6qQW4QsD+wzEidRYRggNdQwTl+G4jkWAu
+ZduZJ2nqJZ0RQXwxBjDZdQ49Q1xO2bTM0TSPbC/5WbIwPlBeN79CT46lSi/l+evk
-fx0xZeiI5qVm6WG8lg
+UE6c9mUXNZvNdeUyyLzonENN0YSVW0ikQtRdKZwBsM0OTYWBGxkKx2fmasW3nQ
---- pHx5BdqI3HubR9wAtPyfMaYbr8uqRwOS1qFJhtC4wuM
+--- VPIFJ2C3BP6OZGP5rZC3Gzu7D0hhNcF23OMM6d/9Jmo
-Èv°ºg9sÉÉ¡§6:`Nlëªø`.‘•ÓÍPebÅSNn<>å­Ä8C<<3C>¥a=-¨Gh¤ò.ªfHm<48>»æUëç
PGpS}µxýùã#ÎT
+xÆ2¹id5̬=J¬¦;S«³F`ù¬.Åi(Û“¬÷°øZjÉ`뢓>«ÁøÙÔ˜‰&€ÃM§:\g¿!£áÂ^ñDhr,[J²}

secrets/pia-login.age

@@ -1,11 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g J3H9xUUwUMB7VkHHGtsZaCm/GiyqTFUrEmsuwcrgrhE
+-> ssh-ed25519 6AT2/g gPeZnJ8arK6xAGnEK9uTcGfwBI1pYjjv6VX4o9EBIns
-tn+zbj5cISZzkUzJcu7JlaqhE4Dr4fhczSJU2kV91AU
+sKFfqnafLachTKE93Pb7gsZ5gdKis64N64BK5128LKg
--> ssh-ed25519 hPp1nw 370YNPQn4mqeHjOvnIXkm+BzbrRNHkFICJaJhHCSHDQ
+-> ssh-ed25519 hPp1nw e2taazZ3R6EBCbgh6Gg0Dc9p1K7zp5R7n9LIkWF/Wj8
-WLhDRA8jp50aKkY8t9GvyAHoLxYQD2Bhw3y01hwhoOA
++/VkcMDL1HNJhbc6/OxpiUe1dlO0lrc1hgkD/RrYXjY
--> ssh-ed25519 dMQYog 1dwQN8hmbLY54OnRTXtcwAXHoYLLNV0IK/rQQ9ZgV2A
+-> ssh-ed25519 dMQYog znMKkv1O7F/EeAyvTfULUn/pWdai2NI0uBfWn/02xg0
-gP2HQinVYW72oJRFW69qAeF/iNEEtJqya1iRMOugNKk
+45W9s4Vo8J+xOTGec9h6s0ra9ZSUA6JkorAAyqqlPfg
--> ~-grease 2%p4s G:$f41y " vZ87PA*|
+-> T/!XI-grease GJ_O'
-+hI029392lrjxlsXUI8opFVcUK+JOjgBYGMH
+mAOW54Txa2H9WdEMog0g1XQjkC5z0wQIoqNlnbsjCSvM1UaPiiu6vJOJKCmJb1Z6
---- juX+tgNpNr8it5QnbcBkR9u88vZkC47L5fIlZQNxPYg
+3wyLN6lCIjkR
-,J}¸œ}Y§˜B%ˆo~3M×½HÊ—]ºˆû©ðÔ¤–žËn0cVs(´;axc#o™Üüv'kˆù#]o<>N`ÆœøÁ´Ì¿<C38C>˜¼ûp<>ÒšKàøk†0(
+--- yX7lzKnDkn+KkRVTumffcd/SJSznR5n6JtUgWkSSohk
+ãQô^àèyW; â§]Š+u>¥3wŒz±¨oêM:ã™øêúÀöŸÃ9,xv×KÁÜXT-K8rÔAç(@Ø-|³
+:PÈ<50>‡*H
6€'¹&Ôi

secrets/searx.age

@@ -1,8 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 dMQYog yPsN2a4x6jsVoICJQrP5sJEiZEuLFcPMAAUOWIlAFAw
+-> ssh-ed25519 dMQYog 82ZRseC994TzEUg20LuFD4kToykRtk7NISGrolHJO1Y
-A4cPt0h2miu6maXCZqNDi3eBH+wz089PkTedPgjhVGQ
+rbSPACXEjLSHKYpZzGNGTKIjFSFCsoXA3Y8CIcPv8rg
--> )0CM-grease {H^$`
+-> z/-grease zQd~R\dJ
-z45BS81IhE6Xqdtz/idIzEExM7T8Sb7zl6NH6ODSJ7p6nRM
+SeA2ve/+W285dHnBIfGbOFPLt4/ORrI6HeGeTnkackymUAh23+Ur581Duhjo3T3B
---- 9P/MF94zA5XDi+jwUMKHqVFqGCgGaYMaryevwvI5gsk
+j53tPUXXTwuXKpd4Ga0xpmr44Yo
-½èá=¸,ööîó£ oá¯H¸uVÊ·HãŸè–25êÿ<C3AA>î1&£
C‰IŠä.áDs!¥Íh?öPuo$"ª­-’m}Ñ!úi<•'
+--- /mQNdS7QAVSNQQ1RRjD9dxMYFjI6UBgqHIA+hvHRPOU
-wT»‘¼÷À([‘UÿH6¦Úï9×67Z_ÄÅ·³…ܱÀ”Rü?„{^ÄH/{C©ùd?nð¢ã÷œÈ
+Ëæ:^½AqÏvR­kÀaˆc–u\éùë¾:ã
ë©<C3AB>˜jzç¶Öÿ'ÉDÚ¬=éÞ_îÐoÃYgbâfîL\ÇN`)Šdkó„˜ižbHß<>$°¨}2”)X<>Ú<EFBFBD>ÓS=8`ªaÄ\»Uȇ’‚¸Óµ¸º¾¹Çß?¤<LêÞä€Ñ;·

secrets/secrets.nix

@@ -14,12 +14,14 @@ with roles;
 {
   # email
   "hashed-email-pw.age".publicKeys = email-server;
+  "cris-hashed-email-pw.age".publicKeys = email-server;
   "sasl_relay_passwd.age".publicKeys = email-server;
   "hashed-robots-email-pw.age".publicKeys = email-server;
   "robots-email-pw.age".publicKeys = gitea;
 
-  # gitea
+  # nix binary cache
-  "gitea-runner-registration-token.age".publicKeys = gitea-runner;
+  # public key: s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU=
+  "binary-cache-private-key.age".publicKeys = binary-cache;
 
   # vpn
   "iodine.age".publicKeys = iodine;
@@ -27,7 +29,7 @@ with roles;
 
   # cloud
   "nextcloud-pw.age".publicKeys = nextcloud;
-  "smb-secrets.age".publicKeys = personal;
+  "smb-secrets.age".publicKeys = personal ++ media-center;
 
   # services
   "searx.age".publicKeys = nobody;

secrets/wolframalpha.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g xp04CsJvlYhBZS5W/MSDLWGiNCegAjg4XPv43wU5u0g
+-> ssh-ed25519 6AT2/g 3xkROcKh6I/oVGRwnvJ9Dy36JvYmsJQZq2DBvYC4Dz4
-i6q0YgKOFGaHOKVYMppNtcvjCFfHHqOS9M+oh2mqc1M
+JunaGg8zg2SJZmBnuV0ZcDSc8vsMHgTd1RbDn8giy+Y
--> ssh-ed25519 dMQYog Mk90WFb+fYCFV7afu3+VbuAtOlvRAgpJGFGqn4ZWGjE
+-> ssh-ed25519 dMQYog JG8QC1thl+CMlxoI1Y+ZUj0dQ3FXF4cquk7tdzfaS0E
-wHeScgV248lHiL0B/QEraD4QOBudezhJPrppY50u7S8
+zW7jyrXhVvyIq7HXfcRqkyZdg/wkWwNfPk5KbI2jH7I
--> G/9-grease
+-> $"v%-grease `Xo|a eIFIq 7hBk?8%1
-0hCyP7pGu5xkk4eWJTpLWy6f8Zuo8wmgBSNFK7bgzfYdW29mdOrO2Ey3Oa2Gvtji
+ZoNiAXY1HE1GEQPd1aJirTitFgXf3HKcV2H6HxRpzWysUd1DGOsF/jScUO36JgIP
-rze9v27gMUFRXOqPHNmaSjAneCwtcqTMReV+LZr9q9FN6qZnzAE
+sY8FA22PjyUv7g
---- /SN6cSyrvbDEHTiIvv4MdoVkIjz3yZkvtr2SVBE1rRk
+--- zFpfG3JQpSmE108GMEWLjGWMJe7cXVn3NN9vs8iDY3E
-
=„ñ1fJ…XÍô‹~ÃÝÆD¬c¹aFâ¨@ݹc=89;¿sôv®Ïú´‘
+8f,ÕªÒÅðÚÏ*}V¥Æ@j†3ÿïCèM*@}ìy2Øì9€Éè ìN|y›æ