prototype

.gitea/workflows/check-flake.yaml

@@ -1,28 +0,0 @@
-name: Check Flake
-
-on: [push]
-
-env:
-  DEBIAN_FRONTEND: noninteractive
-  PATH: /run/current-system/sw/bin/
-
-jobs:
-  check-flake:
-    runs-on: nixos
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - run: attic -V
-
-      - name: Setup Attic Cache
-        uses: https://git.neet.dev/zuckerberg/attic-action@v0.2.5
-        with:
-          endpoint: ${{ secrets.ATTIC_ENDPOINT }}
-          cache: ${{ secrets.ATTIC_CACHE }}
-          token: ${{ secrets.ATTIC_TOKEN }}
-
-      - name: Check Flake
-        run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace

Makefile

@@ -1,27 +0,0 @@
-# Lockfile utils
-.PHONY: update-lockfile
-update-lockfile:
-	nix flake update --commit-lock-file
-
-.PHONY: update-lockfile-without-commit
-update-lockfile-without-commit:
-	nix flake update
-
-# Agenix utils
-.PHONY: edit-secret
-edit-secret:
-	cd secrets && agenix -e $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: rekey-secrets
-rekey-secrets:
-	cd secrets && agenix -r
-
-# NixOS utils
-.PHONY: clean-old-nixos-profiles
-clean-old-nixos-profiles:
-	doas nix-collect-garbage -d
-
-# Garbage Collect
-.PHONY: gc
-gc:
-	nix store gc

common/auto-update.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 # Modify auto-update so that it pulls a flake
 
@@ -6,10 +6,20 @@ let
   cfg = config.system.autoUpgrade;
 in
 {
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (lib.mkMerge [
-    system.autoUpgrade = {
+    {
-      flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
+      system.autoUpgrade = {
-      flags = [ "--recreate-lock-file" "--no-write-lock-file" ]; # ignore lock file, just pull the latest
+        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
-  };
+
+        # 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

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

common/boot/bios.nix

@@ -10,20 +10,18 @@ in
     device = mkOption {
       type = types.str;
     };
-    configurationLimit = mkOption {
-      default = 20;
-      type = types.int;
-    };
   };
 
   config = mkIf cfg.enable {
+    # Use GRUB 2 for BIOS
     boot.loader = {
       timeout = 2;
       grub = {
         enable = true;
         device = cfg.device;
+        version = 2;
         useOSProber = true;
-        configurationLimit = cfg.configurationLimit;
+        configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;
       };
     };

common/boot/default.nix

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

common/boot/efi.nix

@@ -7,23 +7,21 @@ in
 {
   options.efi = {
     enable = mkEnableOption "enable efi boot";
-    configurationLimit = mkOption {
-      default = 20;
-      type = types.int;
-    };
   };
 
   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;
-        configurationLimit = cfg.configurationLimit;
+        configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;
       };
     };

common/boot/kexec-luks.nix

@@ -0,0 +1,121 @@
+# 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

@@ -0,0 +1,74 @@
+# 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

@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }:
 
-# TODO: use tailscale instead of tor https://gist.github.com/antifuchs/e30d58a64988907f282c82231dde2cbc
-
 let
   cfg = config.remoteLuksUnlock;
 in

common/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./backups.nix
-    ./binary-cache.nix
     ./flakes.nix
     ./auto-update.nix
     ./shell.nix
@@ -12,13 +11,12 @@
     ./server
     ./pc
     ./machine-info
-    ./nix-builder.nix
     ./ssh.nix
   ];
 
   nix.flakes.enable = true;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "21.11";
 
   networking.useDHCP = false;
 
@@ -26,13 +24,7 @@
   networking.firewall.allowPing = true;
 
   time.timeZone = "America/Denver";
-  i18n = {
+  i18n.defaultLocale = "en_US.UTF-8";
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LANGUAGE = "en_US.UTF-8";
-      LC_ALL = "en_US.UTF-8";
-    };
-  };
 
   services.openssh = {
     enable = true;
@@ -61,9 +53,6 @@
     lm_sensors
     picocom
     lf
-    gnumake
-    tree
-    attic
   ];
 
   nixpkgs.config.allowUnfree = true;

common/flakes.nix

@@ -10,6 +10,7 @@ in
 
   config = mkIf cfg.enable {
     nix = {
+      package = pkgs.nixFlakes;
       extraOptions = ''
         experimental-features = nix-command flakes
       '';

common/network/pia-wireguard.nix

@@ -11,7 +11,6 @@
 # TODO implement this module such that the wireguard VPN doesn't have to live in a container
 # TODO don't add forward rules if the PIA port is the same as cfg.forwardedPort
 # TODO verify signatures of PIA responses
-# TODO `RuntimeMaxSec = "30d";` for pia-vpn-wireguard-init isn't allowed per the systemd logs. Find alternative.
 
 with builtins;
 with lib;
@@ -144,14 +143,14 @@ in
     systemd.services.pia-vpn-wireguard-init = {
       description = "Creates PIA VPN Wireguard Interface";
 
-      wants = [ "network-online.target" ];
+      requires = [ "network-online.target" ];
       after = [ "network.target" "network-online.target" ];
       before = [ containerServiceName ];
       requiredBy = [ containerServiceName ];
       partOf = [ containerServiceName ];
       wantedBy = [ "multi-user.target" ];
 
-      path = with pkgs; [ wireguard-tools jq curl iproute iputils ];
+      path = with pkgs; [ wireguard-tools jq curl iproute ];
 
       serviceConfig = {
         Type = "oneshot";
@@ -163,11 +162,6 @@ in
       };
 
       script = ''
-        echo Waiting for internet...
-        while ! ping -c 1 -W 1 1.1.1.1; do
-            sleep 1
-        done
-
         # Prepare to connect by generating wg secrets and auth'ing with PIA since the container
         # cannot do without internet to start with. NAT'ing the host's internet would address this
         # issue but is not ideal because then leaking network outside of the VPN is more likely.
@@ -220,7 +214,7 @@ in
     vpn-container.config.systemd.services.pia-vpn-wireguard = {
       description = "Initializes the PIA VPN WireGuard Tunnel";
 
-      wants = [ "network-online.target" ];
+      requires = [ "network-online.target" ];
       after = [ "network.target" "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 

common/network/vpn.nix

@@ -72,6 +72,9 @@ in
       config = {
         imports = allModules ++ [ cfg.config ];
 
+        # speeds up evaluation
+        nixpkgs.pkgs = pkgs;
+
         # networking.firewall.enable = mkForce false;
         networking.firewall.trustedInterfaces = [
           # completely trust internal interface to host

common/nix-builder.nix

@@ -1,60 +0,0 @@
-{ 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,6 +17,38 @@ 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

@@ -6,20 +6,19 @@ in
 {
   imports = [
     ./kde.nix
-    #    ./xfce.nix
+    ./xfce.nix
     ./yubikey.nix
     ./chromium.nix
-    ./firefox.nix
+    #    ./firefox.nix
     ./audio.nix
     #    ./torbrowser.nix
     ./pithos.nix
+    ./spotify.nix
     ./vscodium.nix
     ./discord.nix
     ./steam.nix
     ./touchpad.nix
     ./mount-samba.nix
-    ./udev.nix
-    ./virtualisation.nix
   ];
 
   options.de = {
@@ -38,24 +37,26 @@ in
       mumble
       tigervnc
       bluez-tools
+      vscodium
       element-desktop
       mpv
       nextcloud-client
       signal-desktop
+      minecraft
       gparted
       libreoffice-fresh
       thunderbird
-      spotify
+      spotifyd
+      spotify-qt
       arduino
       yt-dlp
       jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
-      lxqt.pavucontrol-qt
-      barrier
 
       # For Nix IDE
       nixpkgs-fmt
+      rnix-lsp
     ];
 
     # Networking
@@ -69,25 +70,12 @@ in
     ];
     # Printer discovery
     services.avahi.enable = true;
-    services.avahi.nssmdns4 = true;
+    services.avahi.nssmdns = true;
 
     programs.file-roller.enable = true;
 
     # Security
     services.gnome.gnome-keyring.enable = true;
     security.pam.services.googlebot.enableGnomeKeyring = true;
-
-    # Android dev
-    programs.adb.enable = true;
-
-    # Mount personal SMB stores
-    services.mount-samba.enable = true;
-
-    # allow building ARM derivations
-    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-    # for luks onlock over tor
-    services.tor.enable = true;
-    services.tor.client.enable = true;
   };
 }

common/pc/firefox.nix

@@ -20,6 +20,31 @@ let
   };
 
   firefox = pkgs.wrapFirefox somewhatPrivateFF {
+    desktopName = "Sneed Browser";
+
+    nixExtensions = [
+      (pkgs.fetchFirefoxAddon {
+        name = "ublock-origin";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3719054/ublock_origin-1.33.2-an+fx.xpi";
+        sha256 = "XDpe9vW1R1iVBTI4AmNgAg1nk7BVQdIAMuqd0cnK5FE=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "sponsorblock";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3720594/sponsorblock_skip_sponsorships_on_youtube-2.0.12.3-an+fx.xpi";
+        sha256 = "HRtnmZWyXN3MKo4AvSYgNJGkBEsa2RaMamFbkz+YzQg=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "KeePassXC-Browser";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3720664/keepassxc_browser-1.7.6-fx.xpi";
+        sha256 = "3K404/eq3amHhIT0WhzQtC892he5I0kp2SvbzE9dbZg=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "https-everywhere";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3716461/https_everywhere-2021.1.27-an+fx.xpi";
+        sha256 = "2gSXSLunKCwPjAq4Wsj0lOeV551r3G+fcm1oeqjMKh8=";
+      })
+    ];
+
     extraPolicies = {
       CaptivePortal = false;
       DisableFirefoxStudies = true;
@@ -49,6 +74,12 @@ let
         ExtensionRecommendations = false;
         SkipOnboarding = true;
       };
+      WebsiteFilter = {
+        Block = [
+          "http://paradigminteractive.io/"
+          "https://paradigminteractive.io/"
+        ];
+      };
     };
 
     extraPrefs = ''

common/pc/kde.nix

@@ -5,11 +5,15 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    services.displayManager.sddm.enable = true;
+    # kde plasma
-    services.displayManager.sddm.wayland.enable = true;
+    services.xserver = {
-    services.desktopManager.plasma6.enable = true;
+      enable = true;
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
+    };
 
     # kde apps
+    nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
     users.users.googlebot.packages = with pkgs; [
       # akonadi
       # kmail

common/pc/mount-samba.nix

@@ -13,8 +13,6 @@ let
   auth_opts = "sec=ntlmv2i,credentials=/run/agenix/smb-secrets";
   version_opts = "vers=3.1.1";
 
-  public_user_opts = "gid=${toString config.users.groups.users.gid}";
-
   opts = "${systemd_opts},${network_opts},${user_opts},${version_opts},${auth_opts}";
 in
 {
@@ -26,7 +24,7 @@ in
     fileSystems."/mnt/public" = {
       device = "//s0.koi-bebop.ts.net/public";
       fsType = "cifs";
-      options = [ "${opts},${public_user_opts}" ];
+      options = [ opts ];
     };
 
     fileSystems."/mnt/private" = {

common/pc/spotify.nix

@@ -0,0 +1,86 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.spotifyd;
+  toml = pkgs.formats.toml { };
+  spotifydConf = toml.generate "spotify.conf" cfg.settings;
+in
+{
+  disabledModules = [
+    "services/audio/spotifyd.nix"
+  ];
+
+  options = {
+    services.spotifyd = {
+      enable = mkEnableOption "spotifyd, a Spotify playing daemon";
+
+      settings = mkOption {
+        default = { };
+        type = toml.type;
+        example = { global.bitrate = 320; };
+        description = ''
+          Configuration for Spotifyd. For syntax and directives, see
+          <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
+        '';
+      };
+
+      users = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        description = ''
+          Usernames to be added to the "spotifyd" group, so that they
+          can start and interact with the userspace daemon.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    # username specific stuff because i'm lazy...
+    services.spotifyd.users = [ "googlebot" ];
+    users.users.googlebot.packages = with pkgs; [
+      spotify
+      spotify-tui
+    ];
+
+    users.groups.spotifyd = {
+      members = cfg.users;
+    };
+
+    age.secrets.spotifyd = {
+      file = ../../secrets/spotifyd.age;
+      group = "spotifyd";
+      mode = "0440"; # group can read
+    };
+
+    # spotifyd to read secrets and run as user service
+    services.spotifyd = {
+      settings.global = {
+        username_cmd = "sed '1q;d' /run/agenix/spotifyd";
+        password_cmd = "sed '2q;d' /run/agenix/spotifyd";
+        bitrate = 320;
+        backend = "pulseaudio";
+        device_name = config.networking.hostName;
+        device_type = "computer";
+        # on_song_change_hook = "command_to_run_on_playback_events"
+        autoplay = true;
+      };
+    };
+
+    systemd.user.services.spotifyd-daemon = {
+      enable = true;
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      description = "spotifyd, a Spotify playing daemon";
+      environment.SHELL = "/bin/sh";
+      serviceConfig = {
+        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --config-path ${spotifydConf}";
+        Restart = "always";
+        CacheDirectory = "spotifyd";
+      };
+    };
+  };
+}

common/pc/touchpad.nix

@@ -9,7 +9,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.libinput.enable = true;
+    services.xserver.libinput.enable = true;
-    services.libinput.touchpad.naturalScrolling = true;
+    services.xserver.libinput.touchpad.naturalScrolling = true;
   };
 }

common/pc/udev.nix

@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.de;
-in
-{
-  config = lib.mkIf cfg.enable {
-    services.udev.extraRules = ''
-      # depthai
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
-
-      # Moonlander
-      # Rules for Oryx web flashing and live training
-      KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
-      KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
-      # 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" ];
-    };
-  };
-}

common/pc/use-meson-v57.patch

@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index dace367..8c0e290 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,7 +8,7 @@ project(
+         'warning_level=0',
+     ],
+     license: 'MIT',
+-    meson_version: '>= 0.58.0',
++    meson_version: '>= 0.57.0',
+ )
+ 
+ cc = meson.get_compiler('c')
+@@ -47,8 +47,3 @@ shared_library(
+     gnu_symbol_visibility: 'hidden',
+ )
+ 
+-meson.add_devenv(environment({
+-    'NVD_LOG': '1',
+-    'LIBVA_DRIVER_NAME': 'nvidia',
+-    'LIBVA_DRIVERS_PATH': meson.project_build_root(),
+-}))

common/pc/virtualisation.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.de;
-in
-{
-  config = lib.mkIf cfg.enable {
-    # AppVMs
-    virtualisation.appvm.enable = true;
-    virtualisation.appvm.user = "googlebot";
-
-    # Use podman instead of docker
-    virtualisation.podman.enable = true;
-    virtualisation.podman.dockerCompat = true;
-
-    # virt-manager
-    virtualisation.libvirtd.enable = true;
-    programs.dconf.enable = true;
-    virtualisation.spiceUSBRedirection.enable = true;
-    environment.systemPackages = with pkgs; [ virt-manager ];
-    users.users.googlebot.extraGroups = [ "libvirtd" "adbusers" ];
-  };
-}

common/pc/vscodium.nix

@@ -4,20 +4,8 @@ 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/actualbudget.nix

@@ -1,87 +0,0 @@
-# Starting point:
-# https://github.com/aldoborrero/mynixpkgs/commit/c501c1e32dba8f4462dcecb57eee4b9e52038e27
-
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.services.actual-server;
-  stateDir = "/var/lib/${cfg.stateDirName}";
-in
-{
-  options.services.actual-server = {
-    enable = lib.mkEnableOption "Actual Server";
-
-    hostname = lib.mkOption {
-      type = lib.types.str;
-      default = "localhost";
-      description = "Hostname for the Actual Server.";
-    };
-
-    port = lib.mkOption {
-      type = lib.types.int;
-      default = 25448;
-      description = "Port on which the Actual Server should listen.";
-    };
-
-    stateDirName = lib.mkOption {
-      type = lib.types.str;
-      default = "actual-server";
-      description = "Name of the directory under /var/lib holding the server's data.";
-    };
-
-    upload = {
-      fileSizeSyncLimitMB = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
-        default = null;
-        description = "File size limit in MB for synchronized files.";
-      };
-
-      syncEncryptedFileSizeLimitMB = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
-        default = null;
-        description = "File size limit in MB for synchronized encrypted files.";
-      };
-
-      fileSizeLimitMB = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
-        default = null;
-        description = "File size limit in MB for file uploads.";
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.actual-server = {
-      description = "Actual Server";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.actual-server}/bin/actual-server";
-        Restart = "always";
-        StateDirectory = cfg.stateDirName;
-        WorkingDirectory = stateDir;
-        DynamicUser = true;
-        UMask = "0007";
-      };
-      environment = {
-        NODE_ENV = "production";
-        ACTUAL_PORT = toString cfg.port;
-
-        # Actual is actually very bad at configuring it's own paths despite that information being readily available
-        ACTUAL_USER_FILES = "${stateDir}/user-files";
-        ACTUAL_SERVER_FILES = "${stateDir}/server-files";
-        ACTUAL_DATA_DIR = stateDir;
-
-        ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeSyncLimitMB or "");
-        ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SIZE_LIMIT_MB = toString (cfg.upload.syncEncryptedFileSizeLimitMB or "");
-        ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeLimitMB or "");
-      };
-    };
-
-    services.nginx.virtualHosts.${cfg.hostname} = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/".proxyPass = "http://localhost:${toString cfg.port}";
-    };
-  };
-}

common/server/atticd.nix

@@ -1,40 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.services.atticd;
-in
-{
-  config = lib.mkIf cfg.enable {
-    services.atticd = {
-      credentialsFile = "/run/agenix/atticd-credentials";
-
-      settings = {
-        listen = "[::]:28338";
-
-        # Speed things up
-        require-proof-of-possession = false;
-
-        chunking = {
-          # Disable chunking for performance (I have plenty of space)
-          nar-size-threshold = 0;
-
-          # Chunking is disabled due to poor performance so these values don't matter but are required anyway.
-          # One day, when I move away from ZFS maybe this will perform well enough.
-          # nar-size-threshold = 64 * 1024; # 64 KiB
-          min-size = 16 * 1024; # 16 KiB
-          avg-size = 64 * 1024; # 64 KiB
-          max-size = 256 * 1024; # 256 KiB
-        };
-
-        # Disable compression for performance (I have plenty of space)
-        compression.type = "none";
-
-        garbage-collection = {
-          default-retention-period = "6 months";
-        };
-      };
-    };
-
-    age.secrets.atticd-credentials.file = ../../secrets/atticd-credentials.age;
-  };
-}

common/server/dashy.nix

@@ -1,53 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.dashy;
-in
-{
-  options.services.dashy = {
-    enable = mkEnableOption "dashy";
-    imageTag = mkOption {
-      type = types.str;
-      default = "latest";
-    };
-    port = mkOption {
-      type = types.int;
-      default = 56815;
-    };
-    configFile = lib.mkOption {
-      type = lib.types.path;
-      description = "Path to the YAML configuration file";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    virtualisation.oci-containers.containers = {
-      dashy = {
-        image = "lissy93/dashy:${cfg.imageTag}";
-        environment = {
-          TZ = "${config.time.timeZone}";
-        };
-        ports = [
-          "127.0.0.1:${toString cfg.port}:80"
-        ];
-        volumes = [
-          "${cfg.configFile}:/app/public/conf.yml"
-        ];
-      };
-    };
-
-    services.nginx.enable = true;
-    services.nginx.virtualHosts."s0.koi-bebop.ts.net" = {
-      default = true;
-      addSSL = true;
-      serverAliases = [ "s0" ];
-      sslCertificate = "/secret/ssl/s0.koi-bebop.ts.net.crt";
-      sslCertificateKey = "/secret/ssl/s0.koi-bebop.ts.net.key";
-      locations."/" = {
-        proxyPass = "http://localhost:${toString cfg.port}";
-      };
-    };
-  };
-}

common/server/default.nix

@@ -10,6 +10,7 @@
     ./matrix.nix
     ./zerobin.nix
     ./gitea.nix
+    ./gitea-runner.nix
     ./privatebin/privatebin.nix
     ./radio.nix
     ./samba.nix
@@ -18,10 +19,5 @@
     ./nextcloud.nix
     ./iodine.nix
     ./searx.nix
-    ./gitea-actions-runner.nix
-    ./dashy.nix
-    ./librechat.nix
-    ./actualbudget.nix
-    ./atticd.nix
   ];
 }

common/server/gitea-actions-runner.nix

@@ -1,137 +0,0 @@
-{ config, pkgs, lib, allModules, ... }:
-
-# Gitea Actions Runner. Starts 'host' runner that runs directly on the host inside of a nixos container
-# This is useful for providing a real Nix/OS builder to gitea.
-# Warning, NixOS containers are not secure. For example, the container shares the /nix/store
-# Therefore, this should not be used to run untrusted code.
-# To enable, assign a machine the 'gitea-actions-runner' system role
-
-# TODO: skipping running inside of nixos container for now because of issues getting docker/podman running
-
-let
-  runnerRole = "gitea-actions-runner";
-  runners = config.machines.roles.${runnerRole};
-  thisMachineIsARunner = builtins.elem config.networking.hostName runners;
-
-  containerName = "gitea-runner";
-in
-{
-  config = lib.mkIf (thisMachineIsARunner && !config.boot.isContainer) {
-    # containers.${containerName} = {
-    #   ephemeral = true;
-    #   autoStart = true;
-
-    #   # for podman
-    #   enableTun = true;
-
-    #   # privateNetwork = true;
-    #   # hostAddress = "172.16.101.1";
-    #   # localAddress = "172.16.101.2";
-
-    #   bindMounts =
-    #     {
-    #       "/run/agenix/gitea-actions-runner-token" = {
-    #         hostPath = "/run/agenix/gitea-actions-runner-token";
-    #         isReadOnly = true;
-    #       };
-    #       "/var/lib/gitea-runner" = {
-    #         hostPath = "/var/lib/gitea-runner";
-    #         isReadOnly = false;
-    #       };
-    #     };
-
-    #   extraFlags = [
-    #     # Allow podman
-    #     ''--system-call-filter=thisystemcalldoesnotexistforsure''
-    #   ];
-
-    #   additionalCapabilities = [
-    #     "CAP_SYS_ADMIN"
-    #   ];
-
-    #   config = {
-    #     imports = allModules;
-
-    #     # speeds up evaluation
-    #     nixpkgs.pkgs = pkgs;
-
-    #     networking.hostName = lib.mkForce containerName;
-
-    #     # don't use remote builders
-    #     nix.distributedBuilds = lib.mkForce false;
-
-    #     environment.systemPackages = with pkgs; [
-    #       git
-    #       # Gitea Actions rely heavily on node. Include it because it would be installed anyway.
-    #       nodejs
-    #     ];
-
-    #     services.gitea-actions-runner.instances.inst = {
-    #       enable = true;
-    #       name = config.networking.hostName;
-    #       url = "https://git.neet.dev/";
-    #       tokenFile = "/run/agenix/gitea-actions-runner-token";
-    #       labels = [
-    #         "ubuntu-latest:docker://node:18-bullseye"
-    #         "nixos:host"
-    #       ];
-    #     };
-
-    #     # To allow building on the host, must override the the service's config so it doesn't use a dynamic user
-    #     systemd.services.gitea-runner-inst.serviceConfig.DynamicUser = lib.mkForce false;
-    #     users.users.gitea-runner = {
-    #       home = "/var/lib/gitea-runner";
-    #       group = "gitea-runner";
-    #       isSystemUser = true;
-    #       createHome = true;
-    #     };
-    #     users.groups.gitea-runner = { };
-
-    #     virtualisation.podman.enable = true;
-    #     boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-    #   };
-    # };
-
-    # networking.nat.enable = true;
-    # networking.nat.internalInterfaces = [
-    #   "ve-${containerName}"
-    # ];
-    # networking.ip_forward = true;
-
-    # don't use remote builders
-    nix.distributedBuilds = lib.mkForce false;
-
-    services.gitea-actions-runner.instances.inst = {
-      enable = true;
-      name = config.networking.hostName;
-      url = "https://git.neet.dev/";
-      tokenFile = "/run/agenix/gitea-actions-runner-token";
-      labels = [
-        "ubuntu-latest:docker://node:18-bullseye"
-        "nixos:host"
-      ];
-    };
-
-    environment.systemPackages = with pkgs; [
-      git
-      # Gitea Actions rely heavily on node. Include it because it would be installed anyway.
-      nodejs
-      attic
-    ];
-
-    # To allow building on the host, must override the the service's config so it doesn't use a dynamic user
-    systemd.services.gitea-runner-inst.serviceConfig.DynamicUser = lib.mkForce false;
-    users.users.gitea-runner = {
-      home = "/var/lib/gitea-runner";
-      group = "gitea-runner";
-      isSystemUser = true;
-      createHome = true;
-    };
-    users.groups.gitea-runner = { };
-
-    virtualisation.podman.enable = true;
-    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-    age.secrets.gitea-actions-runner-token.file = ../../secrets/gitea-actions-runner-token.age;
-  };
-}

common/server/gitea-runner.nix

@@ -0,0 +1,98 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.gitea-runner;
+in
+{
+  options.services.gitea-runner = {
+    enable = lib.mkEnableOption "Enables gitea runner";
+    dataDir = lib.mkOption {
+      default = "/var/lib/gitea-runner";
+      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 {
+    virtualisation.docker.enable = true;
+
+    users.users.gitea-runner = {
+      description = "Gitea Runner Service";
+      home = cfg.dataDir;
+      useDefaultShell = true;
+      group = "gitea-runner";
+      isSystemUser = true;
+      createHome = true;
+      extraGroups = [
+        "docker" # allow creating docker containers
+      ];
+    };
+    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";
+
+      serviceConfig = {
+        WorkingDirectory = cfg.dataDir;
+        User = "gitea-runner";
+        Group = "gitea-runner";
+      };
+
+      requires = [ "network-online.target" ];
+      after = [ "network.target" "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      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/gitea.nix

@@ -12,14 +12,12 @@ in
   };
   config = lib.mkIf cfg.enable {
     services.gitea = {
+      domain = cfg.hostname;
+      rootUrl = "https://${cfg.hostname}/";
       appName = cfg.hostname;
-      lfs.enable = true;
+      # lfs.enable = true;
       # dump.enable = true;
       settings = {
-        server = {
-          ROOT_URL = "https://${cfg.hostname}/";
-          DOMAIN = cfg.hostname;
-        };
         other = {
           SHOW_FOOTER_VERSION = false;
         };
@@ -31,9 +29,6 @@ in
         };
         session = {
           COOKIE_SECURE = true;
-          PROVIDER = "db";
-          SESSION_LIFE_TIME = 259200; # 3 days
-          GC_INTERVAL_TIME = 259200; # 3 days
         };
         mailer = {
           ENABLED = true;
@@ -47,9 +42,6 @@ in
         actions = {
           ENABLED = true;
         };
-        indexer = {
-          REPO_INDEXER_ENABLED = true;
-        };
       };
       mailerPasswordFile = "/run/agenix/robots-email-pw";
     };
@@ -68,7 +60,7 @@ in
       enableACME = true;
       forceSSL = true;
       locations."/" = {
-        proxyPass = "http://localhost:${toString cfg.settings.server.HTTP_PORT}";
+        proxyPass = "http://localhost:${toString cfg.httpPort}";
       };
     };
   };

common/server/librechat.nix

@@ -1,62 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.librechat;
-in
-{
-  options.services.librechat = {
-    enable = mkEnableOption "librechat";
-    port = mkOption {
-      type = types.int;
-      default = 3080;
-    };
-    host = lib.mkOption {
-      type = lib.types.str;
-      example = "example.com";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    virtualisation.oci-containers.containers = {
-      librechat = {
-        image = "ghcr.io/danny-avila/librechat:v0.6.6";
-        environment = {
-          HOST = "0.0.0.0";
-          MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";
-          ENDPOINTS = "openAI,google,bingAI,gptPlugins";
-        };
-        environmentFiles = [
-          "/run/agenix/librechat-env-file"
-        ];
-        ports = [
-          "${toString cfg.port}:3080"
-        ];
-      };
-    };
-    age.secrets.librechat-env-file.file = ../../secrets/librechat-env-file.age;
-
-    services.mongodb.enable = true;
-    services.mongodb.bind_ip = "0.0.0.0";
-
-    # easier podman maintenance
-    virtualisation.oci-containers.backend = "podman";
-    virtualisation.podman.dockerSocket.enable = true;
-    virtualisation.podman.dockerCompat = true;
-
-    # For mongodb access
-    networking.firewall.trustedInterfaces = [
-      "podman0" # for librechat
-    ];
-
-    services.nginx.virtualHosts.${cfg.host} = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://localhost:${toString cfg.port}";
-        proxyWebsockets = true;
-      };
-    };
-  };
-}

common/server/mailserver.nix

@@ -37,10 +37,6 @@ 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"
@@ -55,18 +51,10 @@ in
         "joslyn@runyan.org"
         "damon@runyan.org"
         "jonas@runyan.org"
-        "simon@neet.dev"
       ];
-      forwards = {
+      certificateScheme = 3; # use let's encrypt for certs
-        "amazon@runyan.org" = [
-          "jeremy@runyan.org"
-          "cris@runyan.org"
-        ];
-      };
-      certificateScheme = "acme-nginx"; # 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

common/server/nextcloud.nix

@@ -8,12 +8,13 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud29;
+      package = pkgs.nextcloud25;
       hostName = "neet.cloud";
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";
       config.adminpassFile = "/run/agenix/nextcloud-pw";
       autoUpdateApps.enable = true;
+      enableBrokenCiphersForSSE = false;
     };
     age.secrets.nextcloud-pw = {
       file = ../../secrets/nextcloud-pw.age;

common/server/samba.nix

@@ -97,7 +97,7 @@
     # Printer discovery
     # (is this needed?)
     services.avahi.enable = true;
-    services.avahi.nssmdns4 = true;
+    services.avahi.nssmdns = true;
 
     # printer sharing
     systemd.tmpfiles.rules = [

common/shell.nix

@@ -34,8 +34,6 @@
     io_seq_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=write --size=2g --io_size=10g --blocksize=1024k --ioengine=libaio --fsync=10000 --iodepth=32 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
     io_rand_read = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randread --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=32 --runtime=60 --group_reporting; rm temp.file";
     io_rand_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randrw --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
-
-    llsblk = "lsblk -o +uuid,fsType";
   };
 
   nixpkgs.overlays = [

flake.lock

@@ -3,20 +3,16 @@
     "agenix": {
       "inputs": {
         "darwin": "darwin",
-        "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "systems": [
-          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1716561646,
+        "lastModified": 1682101079,
-        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
+        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+        "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
         "type": "github"
       },
       "original": {
@@ -25,34 +21,27 @@
         "type": "github"
       }
     },
-    "attic": {
+    "archivebox": {
       "inputs": {
-        "crane": "crane",
-        "flake-compat": [
-          "flake-compat"
-        ],
         "flake-utils": [
           "flake-utils"
         ],
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717279440,
+        "lastModified": 1648612759,
-        "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
+        "narHash": "sha256-SJwlpD2Wz3zFoX2mIYCQfwIOYHaOdeiWGFeDXsLGM84=",
-        "owner": "zhaofengli",
+        "ref": "refs/heads/master",
-        "repo": "attic",
+        "rev": "39d338b9b24159d8ef3309eecc0d32a2a9f102b5",
-        "rev": "717cc95983cdc357bc347d70be20ced21f935843",
+        "revCount": 2,
-        "type": "github"
+        "type": "git",
+        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
       },
       "original": {
-        "owner": "zhaofengli",
+        "type": "git",
-        "repo": "attic",
+        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
-        "type": "github"
       }
     },
     "blobs": {
@@ -71,27 +60,6 @@
         "type": "gitlab"
       }
     },
-    "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "attic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717025063,
-        "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "dailybuild_modules": {
       "inputs": {
         "flake-utils": [
@@ -108,11 +76,11 @@
         "rev": "1290ddd9a2ff2bf2d0f702750768312b80efcd34",
         "revCount": 19,
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
       }
     },
     "darwin": {
@@ -123,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
+        "lastModified": 1673295039,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
         "type": "github"
       },
       "original": {
@@ -139,22 +107,21 @@
     },
     "deploy-rs": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": "flake-compat",
-          "flake-compat"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
         "utils": [
-          "flake-utils"
+          "simple-nixos-mailserver",
+          "utils"
         ]
       },
       "locked": {
-        "lastModified": 1718194053,
+        "lastModified": 1682063650,
-        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39",
         "type": "github"
       },
       "original": {
@@ -166,11 +133,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1668681692,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
         "type": "github"
       },
       "original": {
@@ -181,16 +148,14 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": [
+        "systems": "systems"
-          "systems"
-        ]
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1681202837,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -199,27 +164,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1703113217,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -227,11 +171,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716772633,
+        "lastModified": 1681591833,
-        "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
+        "narHash": "sha256-lW+xOELafAs29yw56FG4MzNOFkh8VHC/X/tRs1wsGn8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
+        "rev": "68ec961c51f48768f72d2bbdb396ce65a316677e",
         "type": "github"
       },
       "original": {
@@ -240,52 +184,47 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1717248095,
-        "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "7b49d3967613d9aacac5b340ef158d493906ba79",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717144377,
+        "lastModified": 1682133240,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "narHash": "sha256-s6yRsI/7V+k/+rckp0+/2cs/UXnea3SEfMpy95QiGcc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "8dafae7c03d6aa8c2ae0a0612fbcb47e994e3fb8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-frigate": {
+    "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1695825837,
+        "lastModified": 1654936503,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "repo": "nixpkgs",
+        "ref": "nixos-22.05",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "indirect"
-        "type": "github"
+      }
+    },
+    "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": {
@@ -332,48 +271,38 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "attic": "attic",
+        "archivebox": "archivebox",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
-        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nix-index-database": "nix-index-database",
-        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-frigate": "nixpkgs-frigate",
+        "nixpkgs-hostapd-pr": "nixpkgs-hostapd-pr",
         "radio": "radio",
         "radio-web": "radio-web",
-        "simple-nixos-mailserver": "simple-nixos-mailserver",
+        "simple-nixos-mailserver": "simple-nixos-mailserver"
-        "systems": "systems"
       }
     },
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": [
-          "flake-compat"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_05": [
+        "nixpkgs-22_05": "nixpkgs-22_05",
-          "nixpkgs"
+        "utils": "utils"
-        ],
-        "utils": [
-          "flake-utils"
-        ]
       },
       "locked": {
-        "lastModified": 1718084203,
+        "lastModified": 1655930346,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "master",
+        "ref": "nixos-22.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -392,6 +321,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,91 +1,47 @@
 {
   inputs = {
-    # nixpkgs
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff";
-    nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e";
+    # nixpkgs-patch-howdy.flake = false;
 
-    # Common Utils Among flake inputs
+    flake-utils.url = "github:numtide/flake-utils";
-    systems.url = "github:nix-systems/default";
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.systems.follows = "systems";
-    };
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
 
-    # NixOS hardware
+    # mail server
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
+    simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Mail Server
+    # agenix
-    simple-nixos-mailserver = {
+    agenix.url = "github:ryantm/agenix";
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        nixpkgs-24_05.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        utils.follows = "flake-utils";
-      };
-    };
 
-    # Agenix
+    # radio
-    agenix = {
+    radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
-      url = "github:ryantm/agenix";
+    radio.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    radio.inputs.flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
+    radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
-        systems.follows = "systems";
+    radio-web.flake = false;
-      };
-    };
 
-    # Radio
+    # drastikbot
-    radio = {
+    dailybuild_modules.url = "git+https://git.neet.dev/zuckerberg/dailybuild_modules.git";
-      url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
+    dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
-    radio-web = {
-      url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
-      flake = false;
-    };
 
-    # Dailybot
+    # archivebox
-    dailybuild_modules = {
+    archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git";
-      url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
+    archivebox.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    archivebox.inputs.flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
 
-    # NixOS deployment
+    # nixos config deployment
-    deploy-rs = {
+    deploy-rs.url = "github:serokell/deploy-rs";
-      url = "github:serokell/deploy-rs";
+    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    deploy-rs.inputs.utils.follows = "simple-nixos-mailserver/utils";
-        nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        utils.follows = "flake-utils";
-      };
-    };
 
-    # Prebuilt nix-index database
+    # prebuilt nix-index database
-    nix-index-database = {
+    nix-index-database.url = "github:Mic92/nix-index-database";
-      url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
-    # Attic
+    nixpkgs-hostapd-pr.url = "https://github.com/NixOS/nixpkgs/pull/222536.patch";
-    attic = {
+    nixpkgs-hostapd-pr.flake = false;
-      url = "github:zhaofengli/attic";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        nixpkgs-stable.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        flake-compat.follows = "flake-compat";
-      };
-    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -104,13 +60,10 @@
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
+            archivebox.nixosModule
             nix-index-database.nixosModules.nix-index
-            attic.nixosModules.atticd
-            self.nixosModules.kernel-modules
             ({ lib, ... }: {
               config = {
-                nixpkgs.overlays = [ self.overlays.default ];
-
                 environment.systemPackages = [
                   agenix.packages.${system}.agenix
                 ];
@@ -133,7 +86,8 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
-                  ./patches/gamepadui.patch
+                  inputs.nixpkgs-hostapd-pr
+                  ./patches/kexec-luks.patch
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
@@ -145,8 +99,6 @@
 
               specialArgs = {
                 inherit allModules;
-                lib = self.lib;
-                nixos-hardware = inputs.nixos-hardware;
               };
             };
         in
@@ -175,9 +127,6 @@
           "aarch64-linux"."iso" = mkIso "aarch64-linux";
         };
 
-      overlays.default = import ./overlays { inherit inputs; };
-      nixosModules.kernel-modules = import ./overlays/kernel-modules;
-
       deploy.nodes =
         let
           mkDeploy = configName: arch: hostname: {
@@ -193,7 +142,5 @@
           machines;
 
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
-
-      lib = nixpkgs.lib.extend (final: prev: import ./lib { lib = nixpkgs.lib; });
     };
 }

lib/default.nix

@@ -1,56 +0,0 @@
-{ lib, ... }:
-
-with lib;
-
-{
-  # Passthrough trace for debugging
-  pTrace = v: traceSeq v v;
-  # find the total sum of a int list
-  sum = foldr (x: y: x + y) 0;
-  # splits a list of length two into two params then they're passed to a func
-  splitPair = f: pair: f (head pair) (last pair);
-  # Finds the max value in a list
-  maxList = foldr max 0;
-  # Sorts a int list. Greatest value first
-  sortList = sort (x: y: x > y);
-  # Cuts a list in half and returns the two parts in a list
-  cutInHalf = l: [ (take (length l / 2) l) (drop (length l / 2) l) ];
-  # Splits a list into a list of lists with length cnt
-  chunksOf = cnt: l:
-    if length l > 0 then
-      [ (take cnt l) ] ++ chunksOf cnt (drop cnt l)
-    else [ ];
-  # same as intersectLists but takes an array of lists to intersect instead of just two
-  intersectManyLists = ll: foldr intersectLists (head ll) ll;
-  # converts a boolean to a int (c style)
-  boolToInt = b: if b then 1 else 0;
-  # drops the last element of a list
-  dropLast = l: take (length l - 1) l;
-  # transposes a matrix
-  transpose = ll:
-    let
-      outerSize = length ll;
-      innerSize = length (elemAt ll 0);
-    in
-    genList (i: genList (j: elemAt (elemAt ll j) i) outerSize) innerSize;
-  # attriset recursiveUpdate but for a list of attrisets
-  combineAttrs = foldl recursiveUpdate { };
-  # visits every single attriset element of an attriset recursively
-  # and accumulates the result of every visit in a flat list
-  recurisveVisitAttrs = f: set:
-    let
-      visitor = n: v:
-        if isAttrs v then [ (f n v) ] ++ recurisveVisitAttrs f v
-        else [ (f n v) ];
-    in
-    concatLists (map (name: visitor name set.${name}) (attrNames set));
-  # merges two lists of the same size (similar to map but both lists are inputs per iteration)
-  mergeLists = f: a: imap0 (i: f (elemAt a i));
-  map2D = f: ll:
-    let
-      outerSize = length ll;
-      innerSize = length (elemAt ll 0);
-      getElem = x: y: elemAt (elemAt ll y) x;
-    in
-    genList (y: genList (x: f x y (getElem x y)) innerSize) outerSize;
-}

lockfile-update.sh

@@ -0,0 +1,4 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p bash
+
+nix flake update --commit-lock-file

machines/ephemeral/sdimg.nix

@@ -1,57 +0,0 @@
-{ config, modulesPath, pkgs, lib, ... }:
-
-let
-  pinecube-uboot = pkgs.buildUBoot {
-    defconfig = "pinecube_defconfig";
-    extraMeta.platforms = [ "armv7l-linux" ];
-    filesToInstall = [ "u-boot-sunxi-with-spl.bin" ];
-  };
-in
-{
-  imports = [
-    (modulesPath + "/installer/sd-card/sd-image.nix")
-    ./minimal.nix
-  ];
-
-  sdImage.populateFirmwareCommands = "";
-  sdImage.populateRootCommands = ''
-    mkdir -p ./files/boot
-    ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
-  '';
-  sdImage.postBuildCommands = ''
-    dd if=${pinecube-uboot}/u-boot-sunxi-with-spl.bin of=$img bs=1024 seek=8 conv=notrunc
-  '';
-
-  ###
-
-  networking.hostName = "pinecube";
-
-  boot.loader.grub.enable = false;
-  boot.loader.generic-extlinux-compatible.enable = true;
-  boot.consoleLogLevel = 7;
-
-  # cma is 64M by default which is waay too much and we can't even unpack initrd
-  boot.kernelParams = [ "console=ttyS0,115200n8" "cma=32M" ];
-
-  boot.kernelModules = [ "spi-nor" ]; # Not sure why this doesn't autoload. Provides SPI NOR at /dev/mtd0
-  boot.extraModulePackages = [ config.boot.kernelPackages.rtl8189es ];
-
-  zramSwap.enable = true; # 128MB is not much to work with
-
-  sound.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    ffmpeg
-    (v4l_utils.override { withGUI = false; })
-    usbutils
-  ];
-
-  services.getty.autologinUser = lib.mkForce "googlebot";
-  users.users.googlebot = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "video" ];
-    openssh.authorizedKeys.keys = config.machines.ssh.userKeys;
-  };
-
-  networking.wireless.enable = true;
-}

machines/howl/default.nix

@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # don't use remote builders
-  nix.distributedBuilds = lib.mkForce false;
-
-  de.enable = true;
-  de.touchpad.enable = true;
-}

machines/howl/hardware-configuration.nix

@@ -1,58 +0,0 @@
-{ config, lib, pkgs, modulesPath, nixos-hardware, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    nixos-hardware.nixosModules.framework-13-7040-amd
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  hardware.framework.amd-7040.preventWakeOnAC = true;
-  services.fwupd.enable = true;
-  # fingerprint reader has initially shown to be more of a nuisance than a help
-  # it makes sddm log in fail most of the time and take several minutes to finish
-  services.fprintd.enable = false;
-
-  # boot
-  boot.loader.systemd-boot.enable = true;
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  # thunderbolt
-  services.hardware.bolt.enable = true;
-
-  # firmware
-  firmware.x86_64.enable = true;
-
-  # disks
-  remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/c801586b-f0a2-465c-8dae-532e61b83fee";
-    allowDiscards = true;
-  };
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/95db6950-a7bc-46cf-9765-3ea675ccf014";
-      fsType = "btrfs";
-    };
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/B087-2C20";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/49fbdf62-eef4-421b-aac3-c93494afd23c"; }];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

machines/howl/properties.nix

@@ -1,26 +0,0 @@
-{
-  hostNames = [
-    "howl"
-  ];
-
-  arch = "x86_64-linux";
-
-  systemRoles = [
-    "personal"
-  ];
-
-  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQi3q8jU6vRruExAL60J7GFO1gS8HsmXVJuKRT4ljrG";
-
-  userKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPnLt84bKhUgFxjQf10+Htro9Lo1Pabqm8mGalBUniv"
-  ];
-
-  deployKeys = [
-    # TODO
-  ];
-
-  remoteUnlock = {
-    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0N80r0Sl2WlJaUqfxZPkOtYyGumFazkIqq7eq3Gd2o";
-    onionHost = "ll6yjnkh4psmfwmtkmqoutl4gq4elqzbmjxv4s6gpgoavyi3kwhjvnqd.onion";
-  };
-}

machines/phil/default.nix

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

machines/phil/hardware-configuration.nix

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

machines/phil/properties.nix

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

machines/ponyo/default.nix

@@ -5,7 +5,10 @@
     ./hardware-configuration.nix
   ];
 
-  # system.autoUpgrade.enable = true;
+  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;
@@ -63,32 +66,17 @@
     };
   };
   pia.wireguard.badPortForwardPorts = [ ];
-  services.nginx.virtualHosts = {
+  services.nginx.virtualHosts."radio.runyan.org" = {
-    "radio.runyan.org" = {
+    enableACME = true;
-      enableACME = true;
+    forceSSL = true;
-      forceSSL = true;
+    locations = {
-      locations = {
+      "/stream.mp3" = {
-        "/stream.mp3" = {
+        proxyPass = "http://vpn.containers:8001/stream.mp3";
-          proxyPass = "http://vpn.containers:8001/stream.mp3";
+        extraConfig = ''
-          extraConfig = ''
+          add_header Access-Control-Allow-Origin *;
-            add_header Access-Control-Allow-Origin *;
+        '';
-          '';
-        };
-        "/".root = config.inputs.radio-web;
-      };
-    };
-    "radio.neet.space" = {
-      enableACME = true;
-      forceSSL = true;
-      locations = {
-        "/stream.mp3" = {
-          proxyPass = "http://vpn.containers:8001/stream.mp3";
-          extraConfig = ''
-            add_header Access-Control-Allow-Origin *;
-          '';
-        };
-        "/".root = config.inputs.radio-web;
       };
+      "/".root = config.inputs.radio-web;
     };
   };
 
@@ -111,7 +99,7 @@
     };
   };
   # pin postgresql for matrix (will need to migrate eventually)
-  services.postgresql.package = pkgs.postgresql_15;
+  services.postgresql.package = pkgs.postgresql_11;
 
   # iodine DNS-based vpn
   services.iodine.server.enable = true;
@@ -151,11 +139,4 @@
   # owncast live streaming
   services.owncast.enable = true;
   services.owncast.hostname = "live.neet.dev";
-
-  # librechat
-  services.librechat.enable = true;
-  services.librechat.host = "chat.neet.dev";
-
-  services.actual-server.enable = true;
-  services.actual-server.hostname = "actual.runyan.org";
 }

machines/ponyo/hardware-configuration.nix

@@ -16,16 +16,18 @@
   bios = {
     enable = true;
     device = "/dev/sda";
-    configurationLimit = 3; # Save room in /nix/store
   };
 
   remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
+
-  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"; # expanded disk
+  luks.devices = [
+    "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2"
+    "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"
+  ];
 
   fileSystems."/" =
     {
-      device = "/dev/mapper/enc-pv";
+      device = "/dev/mapper/enc-pv1";
       fsType = "btrfs";
     };
 

machines/ponyo/properties.nix

@@ -15,7 +15,6 @@
     "nextcloud"
     "dailybot"
     "gitea"
-    "librechat"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN";

machines/ray/default.nix

@@ -0,0 +1,55 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  # for luks onlock over tor
+  services.tor.enable = true;
+  services.tor.client.enable = true;
+
+  # services.howdy.enable = true;
+
+  hardware.openrazer.enable = true;
+  hardware.openrazer.users = [ "googlebot" ];
+  hardware.openrazer.devicesOffOnScreensaver = false;
+  users.users.googlebot.packages = [ pkgs.polychromatic ];
+
+  services.udev.extraRules = ''
+    # depthai
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
+
+    # Moonlander
+    # Rules for Oryx web flashing and live training
+    KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
+    # Wally Flashing rules for the Moonlander and Planck EZ
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+  '';
+  users.groups.plugdev = {
+    members = [ "googlebot" ];
+  };
+
+  # virt-manager
+  virtualisation.libvirtd.enable = true;
+  programs.dconf.enable = true;
+  virtualisation.spiceUSBRedirection.enable = true;
+  environment.systemPackages = with pkgs; [ virt-manager ];
+  users.users.googlebot.extraGroups = [ "libvirtd" ];
+
+  # allow building ARM derivations
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+  services.spotifyd.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  virtualisation.appvm.enable = true;
+  virtualisation.appvm.user = "googlebot";
+
+  services.mount-samba.enable = true;
+
+  de.enable = true;
+  de.touchpad.enable = true;
+}

machines/ray/hardware-configuration.nix

@@ -0,0 +1,59 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  # boot
+  efi.enable = true;
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+
+  # kernel
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  # firmware
+  firmware.x86_64.enable = true;
+  hardware.enableAllFirmware = true;
+
+  # gpu
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    modesetting.enable = true; # for nvidia-vaapi-driver
+    prime = {
+      reverseSync.enable = true;
+      offload.enableOffloadCmd = true;
+      nvidiaBusId = "PCI:1:0:0";
+      amdgpuBusId = "PCI:4:0:0";
+    };
+  };
+
+  # disks
+  remoteLuksUnlock.enable = true;
+  luks.devices = [ "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce" ];
+  fileSystems."/" =
+    {
+      device = "/dev/vg/root";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+  fileSystems."/home" =
+    {
+      device = "/dev/vg/root";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/2C85-2B59";
+      fsType = "vfat";
+    };
+  swapDevices =
+    [{ device = "/dev/vg/swap"; }];
+}

machines/ray/properties.nix

@@ -0,0 +1,22 @@
+{
+  hostNames = [
+    "ray"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "personal"
+    "deploy"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB";
+
+  userKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP"
+  ];
+
+  deployKeys = [
+    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEaGIwLiUa6wQLlEF+keQOIYy/tCmJvV6eENzUQjSqW2AAAABHNzaDo="
+  ];
+}

machines/router/hardware-configuration.nix

@@ -32,7 +32,7 @@
 
   # disks
   remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c";
+  luks.devices = [ "/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 = {
-          band = "2g";
+          hwMode = "g";
           noScan = true;
           channel = 6;
           countryCode = "US";
@@ -124,15 +124,15 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          settings = {
+          extraConfig = ''
-            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 = {
-          band = "5g";
+          hwMode = "a";
           noScan = true;
           channel = 128;
           countryCode = "US";
@@ -164,10 +164,10 @@ in
             #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
             # };
           };
-          settings = {
+          extraConfig = ''
-            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/dashy.yaml

@@ -1,249 +0,0 @@
-appConfig:
-  theme: vaporware
-  customColors:
-    material-dark-original:
-      primary: '#f36558'
-      background: '#39434C'
-      background-darker: '#eb615c'
-      material-light: '#f36558'
-      item-text-color: '#ff948a'
-      curve-factor: 5px
-  enableErrorReporting: false
-  layout: auto
-  iconSize: large
-  language: en
-  startingView: default
-  defaultOpeningMethod: sametab
-  statusCheck: true
-  statusCheckInterval: 20
-  faviconApi: faviconkit
-  routingMode: history
-  enableMultiTasking: false
-  webSearch:
-    disableWebSearch: false
-    searchEngine: duckduckgo
-    openingMethod: sametab
-    searchBangs: {}
-  enableFontAwesome: true
-  cssThemes: []
-  externalStyleSheet: []
-  hideComponents:
-    hideHeading: false
-    hideNav: false
-    hideSearch: false
-    hideSettings: false
-    hideFooter: false
-    hideSplashScreen: false
-  auth:
-    enableGuestAccess: false
-    users: []
-    enableKeycloak: false
-    keycloak: {}
-  allowConfigEdit: true
-  enableServiceWorker: false
-  disableContextMenu: false
-  disableUpdateChecks: false
-  disableSmartSort: false
-pageInfo:
-  title: s0
-  description: s0
-sections:
-  - name: Media & Entertainment
-    icon: fas fa-photo-video
-    displayData:
-      sortBy: most-used
-      cols: 1
-      rows: 1
-      collapsed: false
-      hideForGuests: false
-    items:
-      - &ref_0
-        title: Jellyfin
-        icon: hl-jellyfin
-        url: http://s0:8097
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://jellyfin.s0
-        id: 0_1956_jellyfin
-      - &ref_1
-        title: Sonarr
-        description: Manage TV
-        icon: hl-sonarr
-        url: http://s0:8989
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://sonarr.s0
-        id: 1_1956_sonarr
-      - &ref_2
-        title: Radarr
-        description: Manage Movies
-        icon: hl-radarr
-        url: http://s0:7878
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://radarr.s0
-        id: 2_1956_radarr
-      - &ref_3
-        title: Lidarr
-        description: Manage Music
-        icon: hl-lidarr
-        url: http://s0:8686
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://lidarr.s0
-        id: 3_1956_lidarr
-      - &ref_4
-        title: Prowlarr
-        description: Indexers
-        icon: hl-prowlarr
-        url: http://prowlarr.s0
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://prowlarr.s0
-        id: 4_1956_prowlarr
-      - &ref_5
-        title: Bazarr
-        description: Subtitles
-        icon: hl-bazarr
-        url: http://s0:6767
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://bazarr.s0
-        id: 5_1956_bazarr
-      - &ref_6
-        title: Navidrome
-        description: Play Music
-        icon: hl-navidrome
-        url: http://s0:4534
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://music.s0
-        id: 6_1956_navidrome
-      - &ref_7
-        title: Transmission
-        description: Torrenting
-        icon: hl-transmission
-        url: http://s0:9091
-        target: sametab
-        statusCheck: true
-        statusCheckUrl: http://transmission.s0
-        id: 7_1956_transmission
-    filteredItems:
-      - *ref_0
-      - *ref_1
-      - *ref_2
-      - *ref_3
-      - *ref_4
-      - *ref_5
-      - *ref_6
-      - *ref_7
-  - name: Network
-    icon: fas fa-network-wired
-    items:
-      - &ref_8
-        title: Gateway
-        description: openwrt
-        icon: hl-openwrt
-        url: http://openwrt.lan/
-        target: sametab
-        statusCheck: true
-        id: 0_746_gateway
-      - &ref_9
-        title: Wireless
-        description: openwrt (ish)
-        icon: hl-openwrt
-        url: http://PacketProvocateur.lan
-        target: sametab
-        statusCheck: true
-        id: 1_746_wireless
-    filteredItems:
-      - *ref_8
-      - *ref_9
-    displayData:
-      sortBy: default
-      rows: 1
-      cols: 1
-      collapsed: false
-      hideForGuests: false
-  - name: Services
-    icon: fas fa-monitor-heart-rate
-    items:
-      - &ref_10
-        title: Matrix
-        description: ''
-        icon: hl-matrix
-        url: https://chat.neet.space
-        target: sametab
-        statusCheck: true
-        id: 0_836_matrix
-      - &ref_11
-        title: Radio
-        description: Radio service
-        icon: generative
-        url: https://radio.runyan.org
-        target: sametab
-        statusCheck: true
-        id: 1_836_radio
-      - &ref_12
-        title: Mumble
-        description: voice.neet.space
-        icon: hl-mumble
-        url: https://voice.neet.space
-        target: sametab
-        statusCheck: false
-        id: 2_836_mumble
-      - &ref_13
-        title: IRC
-        description: irc.neet.dev
-        icon: hl-thelounge
-        url: https://irc.neet.dev
-        target: sametab
-        statusCheck: true
-        id: 3_836_irc
-      - &ref_14
-        title: Git
-        description: git.neet.dev
-        icon: hl-gitea
-        url: https://git.neet.dev
-        target: sametab
-        statusCheck: true
-        id: 4_836_git
-      - &ref_15
-        title: Nextcloud
-        description: neet.cloud
-        icon: hl-nextcloud
-        url: https://neet.cloud
-        target: sametab
-        statusCheck: true
-        id: 5_836_nextcloud
-      - &ref_16
-        title: Roundcube
-        description: mail.neet.dev
-        icon: hl-roundcube
-        url: https://mail.neet.dev
-        target: sametab
-        statusCheck: true
-        id: 6_836_roundcube
-      - &ref_17
-        title: Jitsi Meet
-        description: meet.neet.space
-        icon: hl-jitsimeet
-        url: https://meet.neet.space
-        target: sametab
-        statusCheck: true
-        id: 7_836_jitsimeet
-    filteredItems:
-      - *ref_10
-      - *ref_11
-      - *ref_12
-      - *ref_13
-      - *ref_14
-      - *ref_15
-      - *ref_16
-      - *ref_17
-    displayData:
-      sortBy: default
-      rows: 1
-      cols: 1
-      collapsed: false
-      hideForGuests: false

machines/storage/s0/default.nix

@@ -3,12 +3,9 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./home-automation.nix
   ];
 
-  networking.hostName = "s0";
+  system.autoUpgrade.enable = true;
-
-  # system.autoUpgrade.enable = true;
 
   services.iperf3.enable = true;
   services.iperf3.openFirewall = true;
@@ -23,6 +20,9 @@
   # samba
   services.samba.enable = true;
 
+  # disable suspend on lid close
+  services.logind.lidSwitch = "ignore";
+
   # navidrome
   services.navidrome = {
     enable = true;
@@ -32,6 +32,7 @@
       MusicFolder = "/data/samba/Public/Media/Music";
     };
   };
+  networking.firewall.allowedTCPPorts = [ config.services.navidrome.settings.Port ];
 
   # allow access to transmisson data
   users.users.googlebot.extraGroups = [ "transmission" ];
@@ -99,19 +100,13 @@
         # "speed-limit-up-enabled" = true;
 
         /* seeding limit */
-        "ratio-limit" = 3;
+        "ratio-limit" = 2;
         "ratio-limit-enabled" = true;
 
         "download-queue-enabled" = true;
         "download-queue-size" = 20; # gotta go fast
       };
     };
-    # https://github.com/NixOS/nixpkgs/issues/258793
-    systemd.services.transmission.serviceConfig = {
-      RootDirectoryStartOnly = lib.mkForce (lib.mkForce false);
-      RootDirectory = lib.mkForce (lib.mkForce "");
-    };
-
     users.groups.public_data.gid = 994;
     users.users.public_data = {
       isSystemUser = true;
@@ -149,75 +144,22 @@
 
   # nginx
   services.nginx.enable = true;
-  services.nginx.virtualHosts."bazarr.s0" = {
+  services.nginx.virtualHosts."bazarr.s0".locations."/".proxyPass = "http://vpn.containers:6767";
-    listen = [{ addr = "0.0.0.0"; port = 6767; } { addr = "0.0.0.0"; port = 80; }];
+  services.nginx.virtualHosts."radarr.s0".locations."/".proxyPass = "http://vpn.containers:7878";
-    locations."/".proxyPass = "http://vpn.containers:6767";
+  services.nginx.virtualHosts."lidarr.s0".locations."/".proxyPass = "http://vpn.containers:8686";
-  };
+  services.nginx.virtualHosts."sonarr.s0".locations."/".proxyPass = "http://vpn.containers:8989";
-  services.nginx.virtualHosts."radarr.s0" = {
+  services.nginx.virtualHosts."prowlarr.s0".locations."/".proxyPass = "http://vpn.containers:9696";
-    listen = [{ addr = "0.0.0.0"; port = 7878; } { addr = "0.0.0.0"; port = 80; }];
+  services.nginx.virtualHosts."music.s0".locations."/".proxyPass = "http://localhost:4533";
-    locations."/".proxyPass = "http://vpn.containers:7878";
+  services.nginx.virtualHosts."jellyfin.s0".locations."/" = {
-  };
+    proxyPass = "http://localhost:8096";
-  services.nginx.virtualHosts."lidarr.s0" = {
+    proxyWebsockets = true;
-    listen = [{ addr = "0.0.0.0"; port = 8686; } { addr = "0.0.0.0"; port = 80; }];
-    locations."/".proxyPass = "http://vpn.containers:8686";
-  };
-  services.nginx.virtualHosts."sonarr.s0" = {
-    listen = [{ addr = "0.0.0.0"; port = 8989; } { addr = "0.0.0.0"; port = 80; }];
-    locations."/".proxyPass = "http://vpn.containers:8989";
-  };
-  services.nginx.virtualHosts."prowlarr.s0" = {
-    listen = [{ addr = "0.0.0.0"; port = 9696; } { addr = "0.0.0.0"; port = 80; }];
-    locations."/".proxyPass = "http://vpn.containers:9696";
-  };
-  services.nginx.virtualHosts."music.s0" = {
-    listen = [{ addr = "0.0.0.0"; port = 4534; } { addr = "0.0.0.0"; port = 80; }];
-    locations."/".proxyPass = "http://localhost:4533";
-  };
-  services.nginx.virtualHosts."jellyfin.s0" = {
-    listen = [{ addr = "0.0.0.0"; port = 8097; } { addr = "0.0.0.0"; port = 80; }];
-    locations."/" = {
-      proxyPass = "http://localhost:8096";
-      proxyWebsockets = true;
-    };
   };
   services.nginx.virtualHosts."jellyfin.neet.cloud".locations."/" = {
     proxyPass = "http://localhost:8096";
     proxyWebsockets = true;
   };
-  services.nginx.virtualHosts."transmission.s0" = {
+  services.nginx.virtualHosts."transmission.s0".locations."/" = {
-    listen = [{ addr = "0.0.0.0"; port = 9091; } { addr = "0.0.0.0"; port = 80; }];
+    proxyPass = "http://vpn.containers:9091";
-    locations."/" = {
+    proxyWebsockets = true;
-      proxyPass = "http://vpn.containers:9091";
-      proxyWebsockets = true;
-    };
   };
-
-  networking.firewall.allowedTCPPorts = [
-    6767
-    7878
-    8686
-    8989
-    9696
-    4534
-    8097
-    9091
-    8443 # unifi
-  ];
-
-  virtualisation.oci-containers.backend = "podman";
-  virtualisation.podman.dockerSocket.enable = true; # TODO needed?
-  services.dashy = {
-    enable = true;
-    configFile = ./dashy.yaml;
-  };
-
-  services.unifi = {
-    enable = true;
-    openFirewall = true;
-    unifiPackage = pkgs.unifi8;
-  };
-
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
-
-  services.atticd.enable = true;
 }

machines/storage/s0/hardware-configuration.nix

@@ -25,20 +25,26 @@
 
   # luks
   remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv1".device = "/dev/disk/by-uuid/d52e99a9-8825-4d0a-afc1-8edbef7e0a86";
+  luks.devices = [
-  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/f7275585-7760-4230-97de-36704b9a2aa3";
+    "/dev/disk/by-uuid/d52e99a9-8825-4d0a-afc1-8edbef7e0a86"
-  boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38";
+    "/dev/disk/by-uuid/f7275585-7760-4230-97de-36704b9a2aa3"
-  boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/e2c7402a-e72c-4c4a-998f-82e4c10187bc";
+    "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38"
+    "/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";
       fsType = "zfs";
       options = [ "zfsutil" "X-mount.mkdir" ];
     };
+  fileSystems."/home" =
+    {
+      device = "rpool/nixos/home";
+      fsType = "zfs";
+      options = [ "zfsutil" "X-mount.mkdir" ];
+    };
   fileSystems."/var/lib" =
     {
       device = "rpool/nixos/var/lib";
@@ -51,6 +57,13 @@
       fsType = "zfs";
       options = [ "zfsutil" "X-mount.mkdir" ];
     };
+
+  fileSystems."/data" =
+    {
+      device = "rpool/nixos/data";
+      fsType = "zfs";
+      options = [ "zfsutil" "X-mount.mkdir" ];
+    };
   fileSystems."/boot" =
     {
       device = "/dev/disk/by-uuid/4FB4-738E";
@@ -59,7 +72,6 @@
   swapDevices = [ ];
 
   networking.interfaces.eth0.useDHCP = true;
-  networking.interfaces.eth1.useDHCP = true;
 
   powerManagement.cpuFreqGovernor = "powersave";
 }

machines/storage/s0/home-automation.nix

@@ -1,188 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  frigateHostname = "frigate.s0";
-  frigatePort = 61617;
-
-  mkEsp32Cam = address: {
-    ffmpeg = {
-      input_args = "";
-      inputs = [{
-        path = address;
-        roles = [ "detect" "record" ];
-      }];
-
-      output_args.record = "-f segment -pix_fmt yuv420p -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v libx264 -preset ultrafast -an ";
-    };
-    rtmp.enabled = false;
-    snapshots = {
-      enabled = true;
-      bounding_box = true;
-    };
-    record = {
-      enabled = true;
-      retain.days = 10; # Keep video for 10 days
-      events.retain = {
-        default = 30; # Keep video with detections for 30 days
-        mode = "active_objects";
-      };
-    };
-    detect = {
-      enabled = true;
-      width = 800;
-      height = 600;
-      fps = 10;
-    };
-    objects = {
-      track = [ "person" ];
-    };
-  };
-in
-{
-  networking.firewall.allowedTCPPorts = [
-    # 1883 # mqtt
-    55834 # mqtt zigbee frontend
-    frigatePort
-    4180 # oauth proxy
-  ];
-
-  services.frigate = {
-    enable = true;
-    hostname = frigateHostname;
-    settings = {
-      mqtt = {
-        enabled = true;
-        host = "localhost:1883";
-      };
-      cameras = {
-        dahlia-cam = mkEsp32Cam "http://dahlia-cam.lan:8080";
-      };
-      # ffmpeg = {
-      #   hwaccel_args = "preset-vaapi";
-      # };
-      detectors.coral = {
-        type = "edgetpu";
-        device = "pci";
-      };
-    };
-  };
-
-  # AMD GPU for vaapi
-  systemd.services.frigate.environment.LIBVA_DRIVER_NAME = "radeonsi";
-
-  # Coral TPU for frigate
-  services.udev.packages = [ pkgs.libedgetpu ];
-  users.groups.apex = { };
-  systemd.services.frigate.environment.LD_LIBRARY_PATH = "${pkgs.libedgetpu}/lib";
-  systemd.services.frigate.serviceConfig = {
-    SupplementaryGroups = "apex";
-  };
-  # Coral PCIe driver
-  kernel.enableGasketKernelModule = true;
-
-  # Allow accessing frigate UI on a specific port in addition to by hostname
-  services.nginx.virtualHosts.${frigateHostname} = {
-    listen = [{ addr = "0.0.0.0"; port = frigatePort; } { addr = "0.0.0.0"; port = 80; }];
-  };
-
-  services.esphome = {
-    enable = true;
-    address = "0.0.0.0";
-    openFirewall = true;
-  };
-  # TODO remove after upgrading nixos version
-  systemd.services.esphome.serviceConfig.ProcSubset = lib.mkForce "all";
-  systemd.services.esphome.serviceConfig.ProtectHostname = lib.mkForce false;
-  systemd.services.esphome.serviceConfig.ProtectKernelLogs = lib.mkForce false;
-  systemd.services.esphome.serviceConfig.ProtectKernelTunables = lib.mkForce false;
-
-  # TODO lock down
-  services.mosquitto = {
-    enable = true;
-    listeners = [
-      {
-        acl = [ "pattern readwrite #" ];
-        omitPasswordAuth = true;
-        settings.allow_anonymous = true;
-      }
-    ];
-  };
-
-  services.zigbee2mqtt = {
-    enable = true;
-    settings = {
-      homeassistant = true;
-      permit_join = false;
-      serial = {
-        port = "/dev/ttyACM0";
-      };
-      mqtt = {
-        server = "mqtt://localhost:1883";
-        # base_topic = "zigbee2mqtt";
-      };
-      frontend = {
-        host = "0.0.0.0";
-        port = 55834;
-      };
-    };
-  };
-
-  services.home-assistant = {
-    enable = true;
-    openFirewall = true;
-    configWritable = true;
-    extraComponents = [
-      "esphome"
-      "met"
-      "radio_browser"
-      "wled"
-      "mqtt"
-    ];
-    # config = null;
-    config = {
-      # Includes dependencies for a basic setup
-      # https://www.home-assistant.io/integrations/default_config/
-      default_config = { };
-    };
-  };
-
-  # TODO need services.oauth2-proxy.cookie.domain ?
-  services.oauth2-proxy =
-    let
-      nextcloudServer = "https://neet.cloud/";
-    in
-    {
-      enable = true;
-
-      httpAddress = "http://0.0.0.0:4180";
-
-      nginx.domain = frigateHostname;
-      # nginx.virtualHosts = [
-      #   frigateHostname
-      # ];
-
-      email.domains = [ "*" ];
-
-      cookie.secure = false;
-
-      provider = "nextcloud";
-
-      # redirectURL = "http://s0:4180/oauth2/callback"; # todo forward with nginx?
-      clientID = "4FfhEB2DNzUh6wWhXTjqQQKu3Ibm6TeYpS8TqcHe55PJC1DorE7vBZBELMKDjJ0X";
-      keyFile = "/run/agenix/oauth2-proxy-env";
-
-      loginURL = "${nextcloudServer}/index.php/apps/oauth2/authorize";
-      redeemURL = "${nextcloudServer}/index.php/apps/oauth2/api/v1/token";
-      validateURL = "${nextcloudServer}/ocs/v2.php/cloud/user?format=json";
-
-      # todo --cookie-refresh
-
-      extraConfig = {
-        # cookie-csrf-per-request = true;
-        # cookie-csrf-expire = "5m";
-        # user-id-claim = "preferred_username";
-      };
-    };
-
-  age.secrets.oauth2-proxy-env.file = ../../../secrets/oauth2-proxy-env.age;
-}

machines/storage/s0/properties.nix

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

machines/zoidberg/default.nix

@@ -1,109 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  de.enable = true;
-
-  # Login DE Option: Steam
-  programs.steam.gamescopeSession.enable = true;
-  # programs.gamescope.capSysNice = true;
-
-  # Login DE Option: Kodi
-  services.xserver.desktopManager.kodi.enable = true;
-  services.xserver.desktopManager.kodi.package =
-    (
-      pkgs.kodi.passthru.withPackages (kodiPackages: with kodiPackages; [
-        jellyfin
-        joystick
-      ])
-    );
-  services.mount-samba.enable = true;
-
-  # Login DE Option: RetroArch
-  services.xserver.desktopManager.retroarch.enable = true;
-  services.xserver.desktopManager.retroarch.package = pkgs.retroarchFull;
-
-  # wireless xbox controller support
-  hardware.xone.enable = true;
-  boot.kernelModules = [ "xone-wired" "xone-dongle" ];
-  hardware.enableRedistributableFirmware = true;
-  hardware.enableAllFirmware = true;
-
-  # ROCm
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-  ];
-  systemd.tmpfiles.rules = [
-    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
-  ];
-
-  # System wide barrier instance
-  # systemd.services.barrier-sddm = {
-  #   description = "Barrier mouse/keyboard share";
-  #   requires = [ "display-manager.service" ];
-  #   after = [ "network.target" "display-manager.service" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
-  #     Restart = "always";
-  #     RestartSec = 10;
-  #     # todo use user/group
-  #   };
-  #   path = with pkgs; [ barrier doas ];
-  #   script = ''
-  #     # Wait for file to show up. "display-manager.service" finishes a bit too soon
-  #     while ! [ -e /run/sddm/* ]; do sleep 1; done;
-  #     export XAUTHORITY=$(ls /run/sddm/*)
-  #     # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
-  #     barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
-  #   '';
-  # };
-
-  # Login into X11 plasma so barrier works well
-  services.displayManager.defaultSession = "plasma";
-
-  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;
-    inherit (config.users.users.googlebot) hashedPassword packages;
-    uid = 1002;
-  };
-
-  # Auto login into Plasma in john zoidberg account
-  services.displayManager.sddm.settings = {
-    Autologin = {
-      Session = "plasma";
-      User = "john";
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    jellyfin-media-player
-    config.services.xserver.desktopManager.kodi.package
-    spotify
-    retroarchFull
-  ];
-
-  # Command and Conquer Ports
-  networking.firewall.allowedUDPPorts = [ 4321 27900 ];
-  networking.firewall.allowedTCPPorts = [ 6667 28910 29900 29920 ];
-
-  nixpkgs.config.rocmSupport = true;
-  services.ollama = {
-    enable = true;
-    acceleration = "rocm";
-  };
-}

machines/zoidberg/hardware-configuration.nix

@@ -1,46 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  # boot
-  boot.loader.systemd-boot.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-Mass_Storage_Device_121220160204-0:0-part2";
-    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

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

overlays/actualbudget/default.nix

@@ -1,39 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-, python3
-, nodejs
-, runtimeShell
-}:
-buildNpmPackage rec {
-  pname = "actual-server";
-  version = "24.3.0";
-
-  src = fetchFromGitHub {
-    owner = "actualbudget";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-y51Dhdn84AWR/gM4LnAzvBIBpvKwUiclnPnwzkRoJ0I=";
-  };
-
-  npmDepsHash = "sha256-/UM2Tz8t4hi621HtXSu0LTDIzZ9SWMqKXqKfPwkdpE8=";
-
-  patches = [
-    ./migrations-should-use-pkg-path.patch
-  ];
-
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
-  '';
-
-  dontNpmBuild = true;
-
-  postInstall = ''
-    mkdir -p $out/bin
-    cat <<EOF > $out/bin/actual-server
-    #!${runtimeShell}
-    exec ${nodejs}/bin/node $out/lib/node_modules/actual-sync/app.js "\$@"
-    EOF
-    chmod +x $out/bin/actual-server
-  '';
-}

overlays/actualbudget/migrations-should-use-pkg-path.patch

@@ -1,47 +0,0 @@
-diff --git a/src/load-config.js b/src/load-config.js
-index d3cc5dd..cfcad8a 100644
---- a/src/load-config.js
-+++ b/src/load-config.js
-@@ -3,7 +3,8 @@ import path from 'node:path';
- import { fileURLToPath } from 'node:url';
- import createDebug from 'debug';
- 
--const debug = createDebug('actual:config');
-+// const debug = createDebug('actual:config');
-+const debug = console.log;
- const debugSensitive = createDebug('actual-sensitive:config');
- 
- const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-@@ -90,6 +91,7 @@ const finalConfig = {
-   serverFiles: process.env.ACTUAL_SERVER_FILES || config.serverFiles,
-   userFiles: process.env.ACTUAL_USER_FILES || config.userFiles,
-   webRoot: process.env.ACTUAL_WEB_ROOT || config.webRoot,
-+  dataDir: process.env.ACTUAL_DATA_DIR || config.dataDir,
-   https:
-     process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT
-       ? {
-diff --git a/src/migrations.js b/src/migrations.js
-index 964e1f2..3a341d7 100644
---- a/src/migrations.js
-+++ b/src/migrations.js
-@@ -1,6 +1,12 @@
- import migrate from 'migrate';
- import path from 'node:path';
- import config from './load-config.js';
-+import { fileURLToPath } from 'url';
-+
-+const __filename = fileURLToPath(import.meta.url);
-+const __dirname = path.dirname(__filename);
-+const appRoot = path.dirname(__dirname);
-+const migrationsDirectory = path.join(appRoot, "migrations");
- 
- export default function run(direction = 'up') {
-   console.log(
-@@ -13,6 +19,7 @@ export default function run(direction = 'up') {
-         stateStore: `${path.join(config.dataDir, '.migrate')}${
-           config.mode === 'test' ? '-test' : ''
-         }`,
-+        migrationsDirectory,
-       },
-       (err, set) => {
-         if (err) {

overlays/default.nix

@@ -1,22 +0,0 @@
-{ inputs }:
-final: prev:
-
-let
-  system = prev.system;
-  frigatePkgs = inputs.nixpkgs-frigate.legacyPackages.${system};
-in
-{
-  # It seems that libedgetpu needs to be built with the newer version of tensorflow in nixpkgs
-  # but I am lazy so I instead just downgrade by using the old nixpkgs
-  libedgetpu = frigatePkgs.callPackage ./libedgetpu { };
-  frigate = frigatePkgs.frigate;
-
-  actual-server = prev.callPackage ./actualbudget { };
-  unifi8 = prev.unifi.overrideAttrs (oldAttrs: rec {
-    version = "8.1.113";
-    src = prev.fetchurl {
-      url = "https://dl.ui.com/unifi/8.1.113/unifi_sysvinit_all.deb";
-      sha256 = "1knm+l8MSb7XKq2WIbehAnz7loRPjgnc+R98zpWKEAE=";
-    };
-  });
-}

overlays/kernel-modules/default.nix

@@ -1,19 +0,0 @@
-{ config, lib, ... }:
-
-# Adds additional kernel modules to the nixos system
-# Not actually an overlay but a module. Has to be this way because kernel
-# modules are tightly coupled to the kernel version they were built against.
-# https://nixos.wiki/wiki/Linux_kernel
-
-let
-  cfg = config.kernel;
-
-  gasket = config.boot.kernelPackages.callPackage ./gasket.nix { };
-in
-{
-  options.kernel.enableGasketKernelModule = lib.mkEnableOption "Enable Gasket Kernel Module";
-
-  config = lib.mkIf cfg.enableGasketKernelModule {
-    boot.extraModulePackages = [ gasket ];
-  };
-}

overlays/kernel-modules/gasket.nix

@@ -1,36 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, kernel }:
-
-stdenv.mkDerivation rec {
-  pname = "gasket";
-  version = "1.0-18-unstable-2023-09-05";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "gasket-driver";
-    rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c";
-    sha256 = "sha256-O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8=";
-  };
-
-  makeFlags = kernel.makeFlags ++ [
-    "-C"
-    "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "M=$(PWD)"
-  ];
-  buildFlags = [ "modules" ];
-
-  installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
-  installTargets = [ "modules_install" ];
-
-  sourceRoot = "${src.name}/src";
-  hardeningDisable = [ "pic" "format" ];
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  meta = with lib; {
-    description = "The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.";
-    homepage = "https://github.com/google/gasket-driver";
-    license = licenses.gpl2;
-    maintainers = [ lib.maintainers.kylehendricks ];
-    platforms = platforms.linux;
-    broken = versionOlder kernel.version "5.15";
-  };
-}

overlays/libedgetpu/default.nix

@@ -1,72 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, libusb1
-, abseil-cpp
-, flatbuffers
-, xxd
-}:
-
-let
-  flatbuffers_1_12 = flatbuffers.overrideAttrs (oldAttrs: rec {
-    version = "1.12.0";
-    NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=maybe-uninitialized";
-    cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DFLATBUFFERS_BUILD_SHAREDLIB=ON" ];
-    NIX_CXXSTDLIB_COMPILE = "-std=c++17";
-    configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ "--enable-shared" ];
-    src = fetchFromGitHub {
-      owner = "google";
-      repo = "flatbuffers";
-      rev = "v${version}";
-      sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg=";
-    };
-  });
-
-in
-stdenv.mkDerivation rec {
-  pname = "libedgetpu";
-  version = "grouper";
-
-  src = fetchFromGitHub {
-    owner = "google-coral";
-    repo = pname;
-    rev = "release-${version}";
-    sha256 = "sha256-73hwItimf88Iqnb40lk4ul/PzmCNIfdt6Afi+xjNiBE=";
-  };
-
-  patches = [ ./libedgetpu-stddef.diff ];
-
-  makeFlags = [ "-f" "makefile_build/Makefile" "libedgetpu" ];
-
-  buildInputs = [
-    libusb1
-    abseil-cpp
-    flatbuffers_1_12
-  ];
-
-  nativeBuildInputs = [
-    xxd
-  ];
-
-  NIX_CXXSTDLIB_COMPILE = "-std=c++17";
-
-  TFROOT = "${fetchFromGitHub {
-    owner = "tensorflow";
-    repo = "tensorflow";
-    rev = "v2.7.4";
-    sha256 = "sha256-liDbUAdaVllB0b74aBeqNxkYNu/zPy7k3CevzRF5dk0=";
-  }}";
-
-  enableParallelBuilding = false;
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp out/direct/k8/libedgetpu.so.1.0 $out/lib
-    ln -s $out/lib/libedgetpu.so.1.0 $out/lib/libedgetpu.so.1
-    mkdir -p $out/lib/udev/rules.d
-    cp debian/edgetpu-accelerator.rules $out/lib/udev/rules.d/99-edgetpu-accelerator.rules
-
-    # PCIe rule
-    echo 'SUBSYSTEM=="apex", MODE="0660", GROUP="apex"' > $out/lib/udev/rules.d/65-apex.rules
-  '';
-}

overlays/libedgetpu/libedgetpu-stddef.diff

@@ -1,12 +0,0 @@
-diff --git a/api/allocated_buffer.h b/api/allocated_buffer.h
-index 97740f0..7bc0547 100644
---- a/api/allocated_buffer.h
-+++ b/api/allocated_buffer.h
-@@ -16,6 +16,7 @@
- #define DARWINN_API_ALLOCATED_BUFFER_H_
- 
- #include <functional>
-+#include <cstddef>
- 
- namespace platforms {
- namespace darwinn {

patches/gamepadui.patch

@@ -1,13 +0,0 @@
-diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
-index 29c449c16946..f6c728eb7f0c 100644
---- a/nixos/modules/programs/steam.nix
-+++ b/nixos/modules/programs/steam.nix
-@@ -11,7 +11,7 @@ let
-   in
-     pkgs.writeShellScriptBin "steam-gamescope" ''
-       ${builtins.concatStringsSep "\n" exports}
--      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
-+      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
-     '';
- 
-   gamescopeSessionFile =

patches/kexec-luks.patch

@@ -0,0 +1,264 @@
+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/atticd-credentials.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hPp1nw tMy5kLAcQD62yAfEVJ4LQZjs0kkEEQOfM4HN9yj3hBY
-JvlklGTxxfAZbP+alm3nxLxqhmcu2mTKwRU5WaapL9w
--> ssh-ed25519 w3nu8g ZGzufldXq7kmIpqFecbkpDxiykWZ207k0+09I2dmxEM
-SK25e5HBe4b5reGXXfCjIFbFGzfu32RFjY++/yteRVc
---- xZOe1syYAcVRDhiNRv+CsfFgoQbiANA6vNCon+5NExc
--·ñ1Å,C-.M§Áè?ÐêóµµàY|u+
-‹	³Ø<C2B3>÷ŽæÒ¡ôm†Œûäfß]=érøÜüÎAg¤€æSú:Ð8•S¦LiœùªsêÁâ9JŠð<>¸ÏæñÄÐÃ<ûAz¹[ý§xï<78>:‡'U*<2A>wÀ™D/…±VpM~!õ,* ¿”µ¡øk¥Ö´ßEíîïh› {¢p$¾R`ÿ”

secrets/cris-hashed-email-pw.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 6AT2/g WZ9p/pCsEDpKbgGDLcTtisn25kExQX9iv+tL3wyPwiY
-vom2z9QRIQSFB0+4/7lSWUEB0eoAG+08nXgiUg/OSX4
--> ssh-ed25519 w3nu8g ECLZwCRJVJqyUMf70EOl2/3ExTruKaxCSQlY5fBZqxk
-VemnmGpzx1VprkybW1hPlkfmiDaNcBDoEzX0mDZgmu0
--> ssh-ed25519 dMQYog QiPsbFE8MtXnRNBwkUEC+6grqXEbDstEtxYR8uJks2w
-O3JWQGppFeZEd6o3W0KVTEIyNVGeLxKfTYTlgsAEVHQ
---- RncZzBFEyMAkpZRWrPORA0DPHuCTNswmWG5CMNnfm4A
-	ñ/¼ÔËõôŒ8nàÅ¥«¸7hîtä?T˜=‘%zˆ°[¤ÝØ!(…uÔdÇuò@
-×¢EbƒyŽ¦ù¦D=Ü!‹„XþtÞÔ:#¦þþãÞXÈX@ú_M‘

secrets/gitea-actions-runner-token.age

@@ -1,11 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 WBT1Hw PbGwwDeulHF6kdh073rq0RvD1hlx6spnKNgKU+QeDAw
-7dITwSQ2p1LZuaVEzLxcGOhB97MQT2zGoRrnNUMcOFk
--> ssh-ed25519 hPp1nw Dn+5Fpme+JmRZKkCkqtCuD87p+sDYDA6OZ2aUmBkCRs
-Dgg3orXF4RYT/fHtc2tRuIhOQu48zICMqgPyV47vpf4
--> ssh-ed25519 w3nu8g dghNLDH1Tm+sm42HXDhrLFtmU4iDF1yCGrO2VSgzZjo
-71scUVrGr4c4dunAFJYKd+uJ6aYJpSWBAk9swbv+IzM
--> ssh-ed25519 dMQYog Wnl1+rh0Q3YD2s1UD0OYVm39wY/Uw1NRK3K7EFhFMls
-wXF6QBonlCalS1vI9cxzWgv1Gi+yAtYn6HrYCfpl5Nw
---- rLOoGk0iX+wuNd1CKv7g2PRd2Ic+8JHCQhrVBaF9zbE
-<EFBFBD>òüüˤ/A¦Ì(ØiHC¸@¢Þð‰h`ˆ3ªá´'	¬ÚöáDì>ð¿¤~¸ÿÁö?ÑÃMêÙ@<40>t°(“Ò@ö׿^xÆMÉ}

secrets/hashed-email-pw.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g 98/m3t8axoVBE6WzdxBtRhV2uSQKSCXwQjyxfWXPmQk
+-> ssh-ed25519 6AT2/g 93Az2iuqeWL6H/S3XDPXFoEPcrY/n/z9mlSNb5wABkU
-AxV0FTvqbWfk/gf65d05PcotbEnYr4PgDQnsaYxP/MU
+LpMPjpDtBrY2aHpqHwT5AY7vtsYHNcOjpz+LFY4TGCg
--> ssh-ed25519 w3nu8g jys7B4COD4iINANeSCD3BqGFoghxTmsbuXoOOIiP+wQ
+-> ssh-ed25519 dMQYog 4qT0aF1IHsTtN1avMPWYG5Az2xmEZhVUhqcwyNFdfU4
-b7eSN5fe4szfliINOr7ZQ7AoSsIK5akmIQ6uLDabcIE
++wD0hE035JqYdDgJmkvNXwJyMzXrquA+RsD8QdK3xP8
--> ssh-ed25519 dMQYog ToNUqTPYmxpz9OUcC94egELcPfHQHCErfHN6l9kSrRY
+-> !vfM7-grease
-2KoSVoWp+FH29YfH57ri2KOvhkuqYew1+PXm99e0BaI
+7nQGFFUWY9UIjfrb+/VfaG0zJ21zmDnDh5khs/0tioJevrrrlhub9Bz8iM/Jsfxy
---- Cjk3E/MjgCF45aLlFeyoGiaUEZk/QuKtsvPb6GpzD8Q
+KUhwV8O8tL/5+30RFSlFRaAB6xPCGg24Yq6E
-m°å>‹“~czÆê匦†``ÜÏqX«š'ÁÎ%ôwÔž~×ÄL·eä'a±]û‹0ò´LÉÀ‰%ÍY‚TÊÓc9f¡W¶Ã^¤9ÊõÙÝ2®™æ¶ÆBÌa ƒ™ 
+--- jVsDtz2xpvK/XCHcdN5JVZx5zSxyEAM6D/xJIgN4YfY
+Ñì°ßév.rK,Æ$ 

secrets/hashed-robots-email-pw.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g 3E1kcHjq89rNd4NN6n3AcG2f5teA8+Rmt1NXNwatwnk
+-> ssh-ed25519 6AT2/g O0XP3tiD5bv5aFK54eTpo4I6oXHk+P0/zyy5A1GQlwg
-trLztKaYvmhNJYiT+SHZipePcZcSCDprNCugSjtVFjs
+0D5I+dRmW6Ak7VvQrNDa4NiHgBtD4sAS87U9iXKHrRs
--> ssh-ed25519 w3nu8g bR2A/UCxtD2POHI4Ky/rvfC23ZbGTGnBZc/1XtRq+3s
+-> ssh-ed25519 dMQYog pofEwx9ktCWDTYGp/rXwxq1ZkMLaR4q4JTWJxHl6rRw
-UyX6/DEC9boQb/Ktgw47DzsPo64Tn0LoITax95JdskE
+CoUEZHQaQd4wFi6pcZPZfhPACXI9qgrB1xAuSilGJpI
--> ssh-ed25519 dMQYog haLpVq9+Tq2FytfsXTwLvCk1ZUQsZ4JCiRLPFAb0SCg
+-> /5^-grease e yP^gopW&
-vZ5e8P1uEDTVS83MsWwh1j0tON9FeVc5F1O6wzwX5Vw
+8qWOBZeGzhSSfGdjHDOGhs2MoZEQneLFMj8DsBqTrnttzgjtg8VSwuMD2JA3yiA5
---- ZnZiddI8Uqr7da1gSahlryY004ii9G2mJS8C4u+lv6o
+43u5T24PCzhKor8puT830nMU3HfQ3FA1RtiUpu1FWPA
-
+--- gJaY0whK+GQ+F6m3jCfeGkPbJoIkGxmcJ++XVseDeWI
-¹e£g“-}Þ[&`Ú<E0LË÷-gõ_E<5F>W¹?íèJž¸ñ-ɵ#ÝŽ‚íJÙñZÔõŒ4Š3ñ\÷0ðómÝTúf9žºÛÆ@àÅ©;
+'½<14>¤	kª†süVûÊ
-øù©œÉ‰A–úß
+ƒ$÷"Ãý|ÕÞÆ^n“ÑàÆÜ hï~2Tô±Ì<>6/ ˆjÈO<C388>þõvMŠôé/e¯XÆr~GÚ&oèn;=,îÂÿô½ï2]?j

secrets/hostapd-pw-CXNK00BF9176.age

@@ -1,7 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 w3nu8g ER07FH17Wm9op5F4pCftNK76f+nNjtA6zQc/2dLyAHI
+-> ssh-ed25519 VyYH/Q X+fXLJz227KkBLu45rb9mUkkIpENSMtZeEJjl6qj5Xw
-nxxq/8tS3ENJhAEIhJCiSi7dV+68AmcEMh9zvZoWpdY
+AFAFnvsiogoMMwsAJO0DDoaizL9lmCLsF4QHDjmubr0
--> ssh-ed25519 dMQYog JelCfh+akP7C/i1kimq3fC5PRQa9gHbmBaOnjKu+PDw
+-> ssh-ed25519 dMQYog P84+7TBcMFSALTn6FR/aXyqFE9DfOzp38ImkdWj7nE0
-GVTwo7MzkpCereZRh0HVjGYmtdMY1gHowMZtUQl7XQw
+PqOn1OL9Zt0x1pBIYOSKkkS//mbk1OX5pnDGp+OLYeI
---- p2l83t3bEdBrrp1ctaqqKhwB4l2McgZqZTtc2SXgd8Q
+-> @?-grease
-ø±ôeÆd\Yå4lXVF§U©<55>þM||)دÔûú•¶Ü8¿>ëž­%ðóJ$à´Õè
+3JvpmcTxdTgvv6vPL8dXEwjR+g
+--- aMYF1SbC+p01YWmg24+Ih78VPQcwzGU/P1cEfgRvXV8
+Ÿ	@$™sžQ¼z<15><>®xkÊNfÛuÕ;§¿ ÎvI0•ªÇÎ^4.?, 8…çî

secrets/iodine.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g Knb25oYknkiXyMqVBR3T0sFSO4hDjWUTq3xIml/b4ig
+-> ssh-ed25519 6AT2/g yTW46JmDIftcOqogIDjheXJf2sw/dG2WEJxfCXU/LDk
-n7xamnrZ+SCWiKqniF3r2JvH4G8q2pJaHzF0riNEDf4
+0Co5/Rn22kmdcPr61ZOrmZJbPFHx2wJ8/YkbDjcjqKo
--> ssh-ed25519 w3nu8g 7+2R5RpLjBf4jjj3S8ibMquUWgRMrifziGQubwuLrhA
+-> ssh-ed25519 dMQYog RtZT0PwVL4kxUHilOhH2GBp8Z9WfyBkaxB62pjKpHA4
-3jLCalnbA3Z2jr8Zs+qrpzSoi3Jv6E5OV2binpr3Kk4
+muMlIt8VYQftMYacfdnQFeejfWpKTEG5gxbFNy97GTc
--> ssh-ed25519 dMQYog Nh2e7me0tiG7ZwQK8669VS0LCYFSH+b33I9tr8uI5CY
+-> 4|)`7yq-grease P#\5k8 +f
-7Gs1N9eZa1CGR9pczzugHbqnghqevX7kQCOeqR4q0eI
+jMegn6ATsj2Ai9B5Xmy+tay1nppwxvF1IGJH+hLNanYMsTIDZypM6UsNdzYQ/3mw
---- OzW+omJsZA/b4DMF4hdQga7JVgiEYluZok3r8JM258I
+VZ9ooy8TKUgAJ7jsd6IrKw
-*³²ÝPŽ†AcèÈ1·@Át¸e÷nf&ù#I7‡a‰Ûâc†ÃÀ<C383>êbDâ–~aõ]1w=Á
+--- tLaPQWJA0Hh5MrxfhaySURgY02K16IlzvsxKpOWGva0
+5?lﾇ'ｼ!ｹｺ<EFBDB9><EFBDBA>ﾜｷ匪Nxｽ+<2B>A9ﾟﾑﾘl/ｸﾞ諟ﾎ|旙<>Sｵ&ｺｻ､繃<>Q;_<>K

secrets/pia-login.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g MGKlbzVOk5+czgAOerwl+eIyOifXJm/q4UgQUXVpx1c
+-> ssh-ed25519 6AT2/g J3H9xUUwUMB7VkHHGtsZaCm/GiyqTFUrEmsuwcrgrhE
-43l6s4+5TSMQyO9tAg7v9Y5OdXOjKYz56lbr9Jm2r+o
+tn+zbj5cISZzkUzJcu7JlaqhE4Dr4fhczSJU2kV91AU
--> ssh-ed25519 hPp1nw aOxni4sFPPgedUkBOuOyEWfFPJrhdTJnivIaWt5RJxM
+-> ssh-ed25519 hPp1nw 370YNPQn4mqeHjOvnIXkm+BzbrRNHkFICJaJhHCSHDQ
-KNaxijzSMp7EjYKwWiAP66nPYYZK3/VXL8u+3uJt6bg
+WLhDRA8jp50aKkY8t9GvyAHoLxYQD2Bhw3y01hwhoOA
--> ssh-ed25519 w3nu8g qTAzEzQbFze35AtbvkYREw3wa7ApDN5u7RSZUXrEpms
+-> ssh-ed25519 dMQYog 1dwQN8hmbLY54OnRTXtcwAXHoYLLNV0IK/rQQ9ZgV2A
-Dy0uGF458A9RJMvDl2XKOkEABbbRgT+eIgvb6ZOEQqg
+gP2HQinVYW72oJRFW69qAeF/iNEEtJqya1iRMOugNKk
--> ssh-ed25519 dMQYog 5DfYuGeWuN0/CO6WWbFIi7LaKl23FXYVdPROM+TFpCA
+-> ~-grease 2%p4s G:$f41y " vZ87PA*|
-PDBdDn+YUMKYNKFkCEfXesmkB/XUxZRK3ddQt0kqQ7g
++hI029392lrjxlsXUI8opFVcUK+JOjgBYGMH
---- JOeG87EVD+QBx6n+rMoPTOni0PyoG7xx4a2USNiapYI
+--- juX+tgNpNr8it5QnbcBkR9u88vZkC47L5fIlZQNxPYg
-Zsý{ÅiÁ_
QÂ\+ô@@Üò߸ù&_š5­$¿Gt2¢rF“y×ÄQ§Iaž7ôÙÉzàgf­%O(µÙ,VéÂ}ÿn|û'J¸2ø¨óQÑB
+,J}¸œ}Y§˜B%ˆo~3M×½HÊ—]ºˆû©ðÔ¤–žËn0cVs(´;axc#o™Üüv'kˆù#]o<>N`ÆœøÁ´Ì¿<C38C>˜¼ûp<>ÒšKàøk†0(

secrets/rekey.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+
+agenix -r
+git commit . -m "Rekey secrets"

secrets/restic-password.age

@@ -1,23 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 N7drjg Njjfv0Etdr9U27s+wznqw5YmnKcj3lISQ2vudDPj7F0
+-> ssh-ed25519 yHDAQw LyoiocIPWoX81W5lD5OBD5P48QC3CtVHmpATJTfz70Y
-bw3SSPfReGSmJ5tQPv+niYn7USyZZffxvgs3J5VxiWw
+fnRfSV68RLkMc+W6WX5aqxMQxDz7UviTNQqB5KAtKYs
--> ssh-ed25519 yHDAQw DVlCM84Q1P087cmlS+NzH/i2noLprEbfqSpvFS3Pzig
+-> ssh-ed25519 dMQYog nQ49ARJDvvVmZEQu1YlYKGba5Dh5U4bGKsLAZfPDqUg
-PooFRhm8ofoTAT1UxJ3Y+0RMqK3CriwqpGrrKGfFYTs
+9Rs0zISa1FDT3ngBBwp5vXi8aR+a/Z+BrGIEKVUJWkQ
--> ssh-ed25519 jQaHAA rfoKG06gXsXPVfNql5Kk5OBebaXsRd4vCirzPB2y0jk
+-> ssh-ed25519 fwBF+g Zap6yPIuauggXP00/It4kYJV2G539vUblQsfwgVzVHg
-T0xv0iiWSi+FscI/OX6sT137VuiWpAS+P9XsMBT9K7Q
+83K5JgUeHjf6lYv8H3YvsbBzrFOgsQyqLVm4h5Be5gE
--> ssh-ed25519 w3nu8g 869dCSpsCphoOPZ0z6rzbI5QKieIA4M9tAyVP40P2hY
+-> ssh-ed25519 6AT2/g 7QlvTxNNubo2dRwVwfjxr+9MOge9XIsrJVLeAtpkewg
-N705ablrfdQWK2aEOFCkmdEQQmwJVcqVXOkhYIp1Z3o
+lxzXO7PIKNzrKwj0KhyHetavLM3zqjbXu4h/S7tDJns
--> ssh-ed25519 dMQYog ry0Qkn4YSLctLRzp1fZQ6EnbeGvv3Gge2UOsYBwbk2A
+-> ssh-ed25519 VyYH/Q tfgTbXGhdOru7FyVWPVf9tBLcuLZJQWnWZkL8yOjQyg
-LO1eyrU0rQJdAjZKCBr+WH2EP/juXcS7Iwrl8tZIMOM
+HIKUKzWhEM0PD+EKpI5asIwQF3Lx8CYeURVce2QAMZU
--> ssh-ed25519 WBT1Hw NbtlJrLEcf4yO/akQyE7b9TdyM2e6m8Aj9/MzV7SliY
+-> ssh-ed25519 hPp1nw xHd4/TCZAi/zwSL0fj7FVGHkykKAmvh29tJReIAUDFg
-JBWsIu/Aycys+uUxC2xSTE2gC0YUpC7Jkkxa0E0TfRI
+/TrZ77mu8vGmudrrPkDgQPiLr2o84lDrsVgY31xMHUQ
--> ssh-ed25519 6AT2/g kvri9lMh7mXuJTFh15sRPhkz8+75i2YYcdZL12cLPnI
+-> ssh-ed25519 dMQYog 20tuoqjWl4dQBpEKiiSrbEmwW9ZLml3F8MS7riyu1GI
-hsJETu9Xhbfhzzf6Z3YIKFLGN+Eczgn8EqEBPQl7a1s
+I/jrnGVCw37hxoKnf/yGPlvGlXPXy+c1sz1ouY44KF8
--> ssh-ed25519 hPp1nw sJtNVroSF/uQNwvnbLE8vXw+1e4LMu3Gurm+KM+0IwE
+-> 0UxZ/o4-grease V+d
-wlYZUEnr1Q3TlxUAUrKAMdVWUbVWy+3+q2fw+ssIoFs
+VgDtDiYRn+VzFbhXGHjOTbdN/V/vSW7STbKquW96A68DRzKH6yDn/4Ia4tX469eA
--> ssh-ed25519 w3nu8g gA7oDI/02jl+TjMjSUHZqevmHb6gSinWF4KtjDJgFF0
+y6swdFIvbsPFnldalFKxKhHqjKRSJPLAKeWECe/I
-KDgSWaZi99/PkKT8g5bTVHvu8EVcPBlF79APxeorABM
+--- ZEnygego6ke0cW4acYxInaRQXXOaKoSNklgTn7KPOfg
--> ssh-ed25519 dMQYog PDdSuky8g5OoqyF4K5N6SSa3ln6O8vlvL4viGqJ8mUc
+ZÔPÊ|>ªîÃÆÍË<C38D>+:NdÌñ*Pû¢i+¾¡ä§²çÙ3ôGÛ	J´”Ž÷bkc<>ìF<‡’Ö0zá€Í½÷<C2BD>`W/2 ƒ<>4‚¯{O"‘áüF°jS^f_¸£€
-LWanrtAIfekuzhr+AGR8e34CD41vPI0BA8YA8YkcyBA
---- LENK2A8P2SxCmpQSI3QNCNz2RDhGwCqLQGybmD73ka8
-Ö{¹˜ô'Þú”|ã
êã«ŵÔjã.ùÄnG=ñY‰gï•‹c$T¬

secrets/robots-email-pw.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g bnExFj2dEhR0Jbf5Zs/4MqxIdPjeb1Dc7duQUHKfylw
+-> ssh-ed25519 6AT2/g QHqc7SI3Z2k1atMtYR9aFBJKf0oElbI9dd1vcQbchxg
-SV+oJGt24n7CAi4+N9CGZ+SlEgcuAlbLymmmLKffg88
+4bklX308iFaN35PYgA0rqO5ZoXDdgPkB9SO87AgwOwk
--> ssh-ed25519 w3nu8g UO35HobolhH4PRxhGQNxziel7pRhf3VOoGeRbMKH2Fc
+-> ssh-ed25519 dMQYog lF9CFZYQC1ELLuQ1mffIdN6WzHK6/gZzyrv5Ur5my1A
-uphjyV1UmrUxrqMqL6tc3UeFdTILKiVOPVM9uJlUsIU
+4MowtIVjMECAfAKxMxtwVi6kt1h8dLAkYItTeZtzNe8
--> ssh-ed25519 dMQYog v27Ibyt+wTVR/zh5ZH1xyPbgCsrqGug24eVOJ+KdY3E
+-> nRNy(o-grease &%h@^ BlVF[M? YjD3^0 |ey
-I5n+fUhGiHcg0vHTilTszjvFinqCY0ZLcwumiXXwzXE
+atUcl9jHhtLgHLr7qkguIZZtMjbqndHsq1UCkKzl/NhEXmlCp37PKq1vIbF81/Aj
---- jo6rKqQQTeJQusZM69EsvJFPCIHRTeN4OL1kwzapaJY
+RG+Cc0A9H5WsJ9OjmyDiU8r4P42fmdd0ocu7nSxMMhUbr1LvcPM+WxUZGPtV3gc
-m¸¡üi=féKúöœ“³·Û	¾¢¬î“9²Íq™²nTôyΤ@23p–‰ˆfêwˆ0 t1ºΕ<<3C>‹ÅE%Á¢ëFIø‹½>#C
+--- LkZ3ouICKivFii191r+z57Ikz2wB8zTcicE3DoVOkPE
+žÜòØyäµW_*yÇ6i³¨¼®JZ†£­æÆ‹g¦ƒz÷²Ú<18><>³­NÇG>ŒÏÃÈ!ð‰>²éâ›``Ù•¤ÜéÒJN$ÚHêŸÑy›o_›×

secrets/secrets.nix

@@ -14,13 +14,12 @@ 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;
 
-  # nix binary cache
+  # gitea
-  "atticd-credentials.age".publicKeys = binary-cache;
+  "gitea-runner-registration-token.age".publicKeys = gitea-runner;
 
   # vpn
   "iodine.age".publicKeys = iodine;
@@ -28,24 +27,18 @@ with roles;
 
   # cloud
   "nextcloud-pw.age".publicKeys = nextcloud;
-  "smb-secrets.age".publicKeys = personal ++ media-center;
+  "smb-secrets.age".publicKeys = personal;
-  "oauth2-proxy-env.age".publicKeys = server;
 
   # services
   "searx.age".publicKeys = nobody;
+  "spotifyd.age".publicKeys = personal;
   "wolframalpha.age".publicKeys = dailybot;
 
   # hostapd
-  "hostapd-pw-experimental-tower.age".publicKeys = nobody;
+  "hostapd-pw-experimental-tower.age".publicKeys = wireless;
-  "hostapd-pw-CXNK00BF9176.age".publicKeys = nobody;
+  "hostapd-pw-CXNK00BF9176.age".publicKeys = wireless;
 
   # backups
   "backblaze-s3-backups.age".publicKeys = personal ++ server;
   "restic-password.age".publicKeys = personal ++ server;
-
-  # gitea actions runner
-  "gitea-actions-runner-token.age".publicKeys = gitea-actions-runner;
-
-  # Librechat
-  "librechat-env-file.age".publicKeys = librechat;
 }

secrets/smb-secrets.age

@@ -1,19 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 N7drjg x2s9QZ7Ijvg4t2peGng9/zX1ZmnGggsvWHJFHEktCgw
+-> ssh-ed25519 yHDAQw PhR4X0TShLFSW0ukaV2RhC+aNDc3wUg5KzD4x91K7jI
-o64an6DJ6Be8Jlhzn9ciQTByRAK5f2ckankCRH3y+Uw
+oY3NkfLrlYzoj4qV8Y2N+RPUveycUxTn7jX5gtKEaFo
--> ssh-ed25519 yHDAQw HYHo6anhKDnD74ab04Ql4RB8+WBA6EavYASX7532NCE
+-> ssh-ed25519 dMQYog YOOjjLAm6cO6jkfOhqbtb0MiVzML/pm9CVgfdlDmdSk
-aTp2V9g18yzUTq1ezqETj6jM2Yb1Bt5+JNkrIDT2Djs
+xnrXzif2IA7Ai1sGkaZKrOxcjMBER5KhsxYd8dk9qgI
--> ssh-ed25519 jQaHAA xGKcIQOkO/i4E2ZWZ+O4sAp7ADqCRqfRQHhKQu6yWh4
+-> rs-grease 6 V\t
-RJnqK/t0YQrIej8fRDJGjOtQD7VvgJRfCUWR0/UYcSY
+o8H+k1mjy1DY0YLxaOaYVgZe+bA93TiD1Bz6H7KSxwX+Hsem5ijjSaBiBVvpuQwK
--> ssh-ed25519 w3nu8g P9DQy19TvDCi3nfOhFj73bNZEtUs1BrLubt5/BtLoU4
+1emVGY1WhOXWc3Zpb7kwohY
-Sx41bk41dQYa3eoBayUMRIHqMWaRiwXm8BqErDBSbDw
+--- 1TIT9uR1Plo7w2XEnJSIpmZUF7wfDKCDF2SPCii50iM
--> ssh-ed25519 dMQYog OWU92PMFo9tGtlkK9zlmMFhh81TGkYlcX1PrxZl35yc
+\ùN"åÃÄíñ¨á:ùg´#ߊóù•ˆY½5QåÕ[ÿ¤Å´#\øÈå›ÇËv ‹#ïÐ!Økp§Bò—å‘Ö¯<C396>Ö<1E>ÐpMq³Üäǯ-Úݼ(çߌ)\Æ<><C386>Öô¨ê'1s°G–²e^ @Ž~
-owDk8wWXETS+iybhTMDmQH+eBuzZRDJIlVGCwu4LqTI
--> ssh-ed25519 jQaHAA MzA8dSYZ/Ysp4ogKEEu84mal8779RgkT4Gy6rBEw+kM
-m75x/b83aP5G1vg7EXlcLizcm16fEAUAD+VNcdTMnnQ
--> ssh-ed25519 w3nu8g AAA3Me3KJgLvtQvyxLvlQ7pCnv7w73ja6Z2+3A82eGs
-+yCW7qCdjk0fiQJmH8poMoc7APKyX/PY7zZyAG1O+Yg
--> ssh-ed25519 dMQYog Dd8e6srT+EIl2PH0RP1bQVsDx+HCQjhFndx5TFyhfx8
-j7Met77pWZzK9cMTt29gWB+d9YFVH5T9qs+ulHS3kAo
---- MgOK/g5hOVkGuUNDBSgVeGc9+ndjxLEA7nKSfLJMr4s
-~Ÿ‹¬&”™)<29>ŠG®Ÿ¨‡'UÐÞzc¾uFGì(<ò¯ùçV"ƒÕ3þH0x0$•<>w$YvO3	"Ï×ðV~ÀŠ¸HÁ~XÛ]GœÆqµ®ã÷œ¢y'ãÓ*–Dê±ÏúœÕk#\ðAï<41>5ë{«Fe\~

secrets/spotifyd.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 yHDAQw R1weIMur0s9HsBBwNn+XyBNfAB8CrQf6QEzIJFklcG8
+DTK0seypjzSX1B2ce2IWyYwygBeeKlbFpYgzH7i1DHA
+-> ssh-ed25519 dMQYog DU9sxA0/cG/O9EG3JYFjL1d2OiqOSZvFjZ1S2zTTWDw
+nGlUCvjpUp50ykTIUzSQ19uj2tiVMPo1Ois8xFSWB58
+-> z%z.3-grease lF#S
+H+5548VgikG9upeHi2GIQ3U71TC0ds+dn8yWOoixHnRhiYZRIhODffjI3D8T18gk
+1mjtW+c34E+ALRkSIf5iWwChJxsomS6LiMS3sqtJg4c
+--- o2hgAcfMDZyGIehN07CO7OjSCrmwUDRTrwxAKmGcfAY
+<<3C>¹ CÜGàÝ<C3A0>Ï0<C38F>

secrets/wolframalpha.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g Kw5/he5m/XAJUNv8XEJQU+e+Ou7hCYluMXXWlHiePXY
+-> ssh-ed25519 6AT2/g xp04CsJvlYhBZS5W/MSDLWGiNCegAjg4XPv43wU5u0g
-GkhJOzSlcC9S7bs8FuDNMvMaFU3+fQ5z+o+Pb8wllp8
+i6q0YgKOFGaHOKVYMppNtcvjCFfHHqOS9M+oh2mqc1M
--> ssh-ed25519 w3nu8g fUORtXN1ygOeV42jveCosGXR/Y6R6OG6DK7LPDBEAk8
+-> ssh-ed25519 dMQYog Mk90WFb+fYCFV7afu3+VbuAtOlvRAgpJGFGqn4ZWGjE
-yFpoasbY/sl6BQp0LVBQnInA4Kxd8A8meEObU1KD108
+wHeScgV248lHiL0B/QEraD4QOBudezhJPrppY50u7S8
--> ssh-ed25519 dMQYog 75qVEe6/1yOV4DDLAOGaufs3ojx1/Sc1fIQOe+Oirz0
+-> G/9-grease
-iDFsr6/30AHKH6hUs/WTpHEM8WQ03QMlGbtQkGrnVCU
+0hCyP7pGu5xkk4eWJTpLWy6f8Zuo8wmgBSNFK7bgzfYdW29mdOrO2Ey3Oa2Gvtji
---- islx8t7a6bShXGxvYeDVuUxkmAMtpUfr0Gp7aYrJUkI
+rze9v27gMUFRXOqPHNmaSjAneCwtcqTMReV+LZr9q9FN6qZnzAE
-2Ûí4¤†7Õ
+--- /SN6cSyrvbDEHTiIvv4MdoVkIjz3yZkvtr2SVBE1rRk
-?Õw€À<E282AC>JÁÆØv	¨º9’,ËxÅŠò¨‰¦Æ¦ñnäH?>I­
+
=„ñ1fJ…XÍô‹~ÃÝÆD¬c¹aFâ¨@ݹc=89;¿sôv®Ïú´‘

update.sh

@@ -0,0 +1,6 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p bash
+
+git pull
+nix flake update # intentionally ignore the lockfile
+sudo nixos-rebuild switch --flake .