WIP RPI hotspot fallback gateway

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9' (2024-05-24)
  → 'github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41' (2024-08-10)
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/3867348fa92bc892eba5d9ddb2d7a97b9e127a8a' (2024-06-12)
  → 'github:serokell/deploy-rs/aa07eb05537d4cd025e2310397a6adcedfe72c76' (2024-09-27)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'nix-index-database':
    'github:Mic92/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac' (2024-05-27)
  → 'github:Mic92/nix-index-database/5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259' (2024-10-07)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7b49d3967613d9aacac5b340ef158d493906ba79' (2024-06-01)
  → 'github:NixOS/nixos-hardware/b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28' (2024-10-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/805a384895c696f802a9bf5bf4720f37385df547' (2024-05-31)
  → 'github:NixOS/nixpkgs/ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6' (2024-10-06)
• Updated input 'simple-nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/29916981e7b3b5782dc5085ad18490113f8ff63b' (2024-06-11)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/af7d3bf5daeba3fc28089b015c0dd43f06b176f2' (2024-08-05)
• Removed input 'simple-nixos-mailserver/utils'

.gitea/workflows/check-flake.yaml

@@ -0,0 +1,19 @@
+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
+
+      - name: Check Flake
+        run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace

Makefile

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

README.md

@@ -6,7 +6,6 @@
     - `/network` - config for tailscale, and NixOS container with automatic vpn tunneling via PIA
     - `/pc` - config that a graphical desktop computer should have. Use `de.enable = true;` to enable everthing.
     - `/server` - config that creates new nixos services or extends existing ones to meet my needs
-    - `/ssh.nix` - all ssh public host and user keys for all `/machines`
 - `/machines` - all my NixOS machines along with their machine unique configuration for hardware and services
     - `/kexec` - a special machine for generating minimal kexec images. Does not import `/common`
 - `/secrets` - encrypted shared secrets unlocked through `/machines` ssh host keys

TODO.md

@@ -73,6 +73,8 @@
 - offsite backup yubikey, pw db, and ssh key with /secrets access
 
 ### Misc
+- for automated kernel upgrades on luks systems, need to kexec with initrd that contains luks key
+  - https://github.com/flowztul/keyexec/blob/master/etc/default/kexec-cryptroot
 - https://github.com/pop-os/system76-scheduler
 - improve email a little bit https://helloinbox.email
 - remap razer keys https://github.com/sezanzeb/input-remapper

common/auto-update.nix

@@ -9,7 +9,7 @@ in
   config = lib.mkIf cfg.enable {
     system.autoUpgrade = {
       flake = "git+https://git.neet.dev/zuckerberg/nix-config.git";
-      flags = [ "--recreate-lock-file" ]; # ignore lock file, just pull the latest
+      flags = [ "--recreate-lock-file" "--no-write-lock-file" ]; # ignore lock file, just pull the latest
     };
   };
 }

common/binary-cache.nix

@@ -0,0 +1,29 @@
+{ config, lib, ... }:
+
+let
+
+in
+{
+  options.enableExtraSubstituters = lib.mkEnableOption "Enable extra substituters";
+
+  config = lib.mkMerge [
+    {
+      enableExtraSubstituters = lib.mkDefault true;
+    }
+    (lib.mkIf config.enableExtraSubstituters {
+      nix = {
+        settings = {
+          substituters = [
+            "https://cache.nixos.org/"
+            "https://nix-community.cachix.org"
+            "http://s0.koi-bebop.ts.net:5000"
+          ];
+          trusted-public-keys = [
+            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+            "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
+          ];
+        };
+      };
+    })
+  ];
+}

common/boot/bios.nix

@@ -10,18 +10,20 @@ 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 = 20;
+        configurationLimit = cfg.configurationLimit;
         theme = pkgs.nixos-grub2-theme;
       };
     };

common/boot/efi.nix

@@ -7,21 +7,23 @@ 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 = 20;
+        configurationLimit = cfg.configurationLimit;
         theme = pkgs.nixos-grub2-theme;
       };
     };

common/boot/remote-luks-unlock.nix

@@ -1,5 +1,7 @@
 { config, pkgs, lib, ... }:
 
+# TODO: use tailscale instead of tor https://gist.github.com/antifuchs/e30d58a64988907f282c82231dde2cbc
+
 let
   cfg = config.remoteLuksUnlock;
 in
@@ -33,11 +35,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    # boot.initrd.luks.devices.${cfg.device.name} = {
-    #   device = cfg.device.path;
-    #   allowDiscards = cfg.device.allowDiscards;
-    # };
-
     # Unlock LUKS disk over ssh
     boot.initrd.network.enable = true;
     boot.initrd.kernelModules = cfg.kernelModules;

common/default.nix

@@ -1,13 +1,9 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-let
-  ssh = import ./ssh.nix;
-  sshUserKeys = ssh.users;
-  sshHigherTrustKeys = ssh.higherTrustUserKeys;
-in
 {
   imports = [
     ./backups.nix
+    ./binary-cache.nix
     ./flakes.nix
     ./auto-update.nix
     ./shell.nix
@@ -15,19 +11,28 @@ in
     ./boot
     ./server
     ./pc
+    ./machine-info
+    ./nix-builder.nix
+    ./ssh.nix
   ];
 
   nix.flakes.enable = true;
 
-  system.stateVersion = "21.11";
+  system.stateVersion = "23.11";
 
-  networking.useDHCP = false;
+  networking.useDHCP = lib.mkDefault true;
 
   networking.firewall.enable = true;
   networking.firewall.allowPing = true;
 
-  time.timeZone = "America/Denver";
-  i18n.defaultLocale = "en_US.UTF-8";
+  time.timeZone = "America/Los_Angeles";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LANGUAGE = "en_US.UTF-8";
+      LC_ALL = "en_US.UTF-8";
+    };
+  };
 
   services.openssh = {
     enable = true;
@@ -56,6 +61,8 @@ in
     lm_sensors
     picocom
     lf
+    gnumake
+    tree
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -68,12 +75,12 @@ in
       "dialout" # serial
     ];
     shell = pkgs.fish;
-    openssh.authorizedKeys.keys = sshUserKeys;
+    openssh.authorizedKeys.keys = config.machines.ssh.userKeys;
     hashedPassword = "$6$TuDO46rILr$gkPUuLKZe3psexhs8WFZMpzgEBGksE.c3Tjh1f8sD0KMC4oV89K2pqAABfl.Lpxu2jVdr5bgvR5cWnZRnji/r/";
     uid = 1000;
   };
   users.users.root = {
-    openssh.authorizedKeys.keys = sshHigherTrustKeys;
+    openssh.authorizedKeys.keys = config.machines.ssh.deployKeys;
   };
   nix.settings = {
     trusted-users = [ "root" "googlebot" ];

common/flakes.nix

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

common/machine-info/default.nix

@@ -0,0 +1,200 @@
+# Gathers info about each machine to constuct overall configuration
+# Ex: Each machine already trusts each others SSH fingerprint already
+
+{ config, lib, pkgs, ... }:
+
+let
+  machines = config.machines.hosts;
+in
+{
+  imports = [
+    ./ssh.nix
+    ./roles.nix
+  ];
+
+  options.machines = {
+
+    hosts = lib.mkOption {
+      type = lib.types.attrsOf
+        (lib.types.submodule {
+          options = {
+
+            hostNames = lib.mkOption {
+              type = lib.types.listOf lib.types.str;
+              description = ''
+                List of hostnames for this machine. The first one is the default so it is the target of deployments.
+                Used for automatically trusting hosts for ssh connections.
+              '';
+            };
+
+            arch = lib.mkOption {
+              type = lib.types.enum [ "x86_64-linux" "aarch64-linux" ];
+              description = ''
+                The architecture of this machine.
+              '';
+            };
+
+            systemRoles = lib.mkOption {
+              type = lib.types.listOf lib.types.str; # TODO: maybe use an enum?
+              description = ''
+                The set of roles this machine holds. Affects secrets available. (TODO add service config as well using this info)
+              '';
+            };
+
+            hostKey = lib.mkOption {
+              type = lib.types.str;
+              description = ''
+                The system ssh host key of this machine. Used for automatically trusting hosts for ssh connections
+                and for decrypting secrets with agenix.
+              '';
+            };
+
+            remoteUnlock = lib.mkOption {
+              default = null;
+              type = lib.types.nullOr (lib.types.submodule {
+                options = {
+
+                  hostKey = lib.mkOption {
+                    type = lib.types.str;
+                    description = ''
+                      The system ssh host key of this machine used for luks boot unlocking only.
+                    '';
+                  };
+
+                  clearnetHost = lib.mkOption {
+                    default = null;
+                    type = lib.types.nullOr lib.types.str;
+                    description = ''
+                      The hostname resolvable over clearnet used to luks boot unlock this machine
+                    '';
+                  };
+
+                  onionHost = lib.mkOption {
+                    default = null;
+                    type = lib.types.nullOr lib.types.str;
+                    description = ''
+                      The hostname resolvable over tor used to luks boot unlock this machine
+                    '';
+                  };
+
+                };
+              });
+            };
+
+            userKeys = lib.mkOption {
+              default = [ ];
+              type = lib.types.listOf lib.types.str;
+              description = ''
+                The list of user keys. Each key here can be used to log into all other systems as `googlebot`.
+
+                TODO: consider auto populating other programs that use ssh keys such as gitea
+              '';
+            };
+
+            deployKeys = lib.mkOption {
+              default = [ ];
+              type = lib.types.listOf lib.types.str;
+              description = ''
+                The list of deployment keys. Each key here can be used to log into all other systems as `root`.
+              '';
+            };
+
+            configurationPath = lib.mkOption {
+              type = lib.types.path;
+              description = ''
+                The path to this machine's configuration directory.
+              '';
+            };
+
+          };
+        });
+    };
+  };
+
+  config = {
+    assertions = (lib.concatLists (lib.mapAttrsToList
+      (
+        name: cfg: [
+          {
+            assertion = builtins.length cfg.hostNames > 0;
+            message = ''
+              Error with config for ${name}
+              There must be at least one hostname.
+            '';
+          }
+          {
+            assertion = builtins.length cfg.systemRoles > 0;
+            message = ''
+              Error with config for ${name}
+              There must be at least one system role.
+            '';
+          }
+          {
+            assertion = cfg.remoteUnlock == null || cfg.remoteUnlock.hostKey != cfg.hostKey;
+            message = ''
+              Error with config for ${name}
+              Unlock hostkey and hostkey cannot be the same because unlock hostkey is in /boot, unencrypted.
+            '';
+          }
+          {
+            assertion = cfg.remoteUnlock == null || (cfg.remoteUnlock.clearnetHost != null || cfg.remoteUnlock.onionHost != null);
+            message = ''
+              Error with config for ${name}
+              At least one of clearnet host or onion host must be defined.
+            '';
+          }
+          {
+            assertion = cfg.remoteUnlock == null || cfg.remoteUnlock.clearnetHost == null || builtins.elem cfg.remoteUnlock.clearnetHost cfg.hostNames == false;
+            message = ''
+              Error with config for ${name}
+              Clearnet unlock hostname cannot be in the list of hostnames for security reasons.
+            '';
+          }
+          {
+            assertion = cfg.remoteUnlock == null || cfg.remoteUnlock.onionHost == null || lib.strings.hasSuffix ".onion" cfg.remoteUnlock.onionHost;
+            message = ''
+              Error with config for ${name}
+              Tor unlock hostname must be an onion address.
+            '';
+          }
+          {
+            assertion = builtins.elem "personal" cfg.systemRoles || builtins.length cfg.userKeys == 0;
+            message = ''
+              Error with config for ${name}
+              There must be at least one userkey defined for personal machines.
+            '';
+          }
+          {
+            assertion = builtins.elem "deploy" cfg.systemRoles || builtins.length cfg.deployKeys == 0;
+            message = ''
+              Error with config for ${name}
+              Only deploy machines are allowed to have deploy keys for security reasons.
+            '';
+          }
+        ]
+      )
+      machines));
+
+    # Set per machine properties automatically using each of their `properties.nix` files respectively
+    machines.hosts =
+      let
+        properties = dir: lib.concatMapAttrs
+          (name: path: {
+            ${name} =
+              import path
+              //
+              { configurationPath = builtins.dirOf path; };
+          })
+          (propertiesFiles dir);
+        propertiesFiles = dir:
+          lib.foldl (lib.mergeAttrs) { } (propertiesFiles' dir);
+        propertiesFiles' = dir:
+          let
+            propFiles = lib.filter (p: baseNameOf p == "properties.nix") (lib.filesystem.listFilesRecursive dir);
+            dirName = path: builtins.baseNameOf (builtins.dirOf path);
+          in
+          builtins.map (p: { "${dirName p}" = p; }) propFiles;
+      in
+      properties ../../machines;
+  };
+}

common/machine-info/moduleless.nix

@@ -0,0 +1,15 @@
+# Allows getting machine-info outside the scope of nixos configuration
+
+{ nixpkgs ? import <nixpkgs> { }
+, assertionsModule ? <nixpkgs/nixos/modules/misc/assertions.nix>
+}:
+
+{
+  machines =
+    (nixpkgs.lib.evalModules {
+      modules = [
+        ./default.nix
+        assertionsModule
+      ];
+    }).config.machines;
+}

common/machine-info/roles.nix

@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+# Maps roles to their hosts
+
+{
+  options.machines.roles = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.listOf lib.types.str);
+  };
+
+  config = {
+    machines.roles = lib.zipAttrs
+      (lib.mapAttrsToList
+        (host: cfg:
+          lib.foldl (lib.mergeAttrs) { }
+            (builtins.map (role: { ${role} = host; })
+              cfg.systemRoles))
+        config.machines.hosts);
+  };
+}

common/machine-info/ssh.nix

@@ -0,0 +1,44 @@
+{ config, lib, ... }:
+
+let
+  machines = config.machines;
+
+  sshkeys = keyType: lib.foldl (l: cfg: l ++ cfg.${keyType}) [ ] (builtins.attrValues machines.hosts);
+in
+{
+  options.machines.ssh = {
+    userKeys = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = ''
+        List of user keys aggregated from all machines.
+      '';
+    };
+
+    deployKeys = lib.mkOption {
+      default = [ ];
+      type = lib.types.listOf lib.types.str;
+      description = ''
+        List of deploy keys aggregated from all machines.
+      '';
+    };
+
+    hostKeysByRole = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.listOf lib.types.str);
+      description = ''
+        Machine host keys divided into their roles.
+      '';
+    };
+  };
+
+  config = {
+    machines.ssh.userKeys = sshkeys "userKeys";
+    machines.ssh.deployKeys = sshkeys "deployKeys";
+
+    machines.ssh.hostKeysByRole = lib.mapAttrs
+      (role: hosts:
+        builtins.map
+          (host: machines.hosts.${host}.hostKey)
+          hosts)
+      machines.roles;
+  };
+}

common/network/default.nix

@@ -7,7 +7,6 @@ let
 in
 {
   imports = [
-    ./hosts.nix
     ./pia-openvpn.nix
     ./pia-wireguard.nix
     ./ping.nix

common/network/hosts.nix

@@ -1,66 +0,0 @@
-{ config, lib, ... }:
-
-let
-  system = (import ../ssh.nix).system;
-
-  # hostnames that resolve on clearnet for LUKS unlocking
-  unlock-clearnet-hosts = {
-    ponyo = "unlock.ponyo.neet.dev";
-    phil = "unlock.phil.neet.dev";
-    s0 = "s0";
-  };
-
-  # hostnames that resolve on tor for LUKS unlocking
-  unlock-onion-hosts = {
-    liza = "5synsrjgvfzywruomjsfvfwhhlgxqhyofkzeqt2eisyijvjvebnu2xyd.onion";
-    router = "jxx2exuihlls2t6ncs7rvrjh2dssubjmjtclwr2ysvxtr4t7jv55xmqd.onion";
-    ponyo = "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion";
-    s0 = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
-  };
-in
-{
-  programs.ssh.knownHosts = {
-    ponyo = {
-      hostNames = [ "ponyo" "ponyo.neet.dev" "git.neet.dev" ];
-      publicKey = system.ponyo;
-    };
-    ponyo-unlock = {
-      hostNames = [ unlock-clearnet-hosts.ponyo unlock-onion-hosts.ponyo ];
-      publicKey = system.ponyo-unlock;
-    };
-    phil = {
-      hostNames = [ "phil" "phil.neet.dev" ];
-      publicKey = system.phil;
-    };
-    phil-unlock = {
-      hostNames = [ unlock-clearnet-hosts.phil ];
-      publicKey = system.phil-unlock;
-    };
-    router = {
-      hostNames = [ "router" "192.168.1.228" ];
-      publicKey = system.router;
-    };
-    router-unlock = {
-      hostNames = [ unlock-onion-hosts.router ];
-      publicKey = system.router-unlock;
-    };
-    ray = {
-      hostNames = [ "ray" ];
-      publicKey = system.ray;
-    };
-    s0 = {
-      hostNames = [ "s0" ];
-      publicKey = system.s0;
-    };
-    s0-unlock = {
-      hostNames = [ unlock-onion-hosts.s0 ];
-      publicKey = system.s0-unlock;
-    };
-  };
-
-  # prebuilt cmds for easy ssh LUKS unlock
-  environment.shellAliases =
-    lib.concatMapAttrs (host: addr: { "unlock-over-tor_${host}" = "torsocks ssh root@${addr}"; }) unlock-onion-hosts
-    //
-    lib.concatMapAttrs (host: addr: { "unlock_${host}" = "ssh root@${addr}"; }) unlock-clearnet-hosts;
-}

common/network/pia-openvpn.nix

@@ -108,6 +108,6 @@ in
         };
       };
     };
-    age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf;
+    age.secrets."pia-login.conf".file = ../../secrets/pia-login.age;
   };
 }

common/network/pia-wireguard.nix

@@ -11,6 +11,7 @@
 # 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;
@@ -143,14 +144,14 @@ in
     systemd.services.pia-vpn-wireguard-init = {
       description = "Creates PIA VPN Wireguard Interface";
 
-      requires = [ "network-online.target" ];
+      wants = [ "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 ];
+      path = with pkgs; [ wireguard-tools jq curl iproute iputils ];
 
       serviceConfig = {
         Type = "oneshot";
@@ -162,6 +163,11 @@ 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.
@@ -214,7 +220,7 @@ in
     vpn-container.config.systemd.services.pia-vpn-wireguard = {
       description = "Initializes the PIA VPN WireGuard Tunnel";
 
-      requires = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       after = [ "network.target" "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
@@ -352,6 +358,6 @@ in
       };
     };
 
-    age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf;
+    age.secrets."pia-login.conf".file = ../../secrets/pia-login.age;
   };
 }

common/network/vpn.nix

@@ -72,9 +72,6 @@ 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

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

common/pc/audio.nix

@@ -17,44 +17,14 @@ in
       alsa.support32Bit = true;
       pulse.enable = true;
       jack.enable = true;
+    };
 
-      # use the example session manager (no others are packaged yet so this is enabled by default,
-      # no need to redefine it in your config for now)
-      #media-session.enable = true;
-
-      config.pipewire = {
-        "context.objects" = [
-          {
-            # A default dummy driver. This handles nodes marked with the "node.always-driver"
-            # properyty when no other driver is currently active. JACK clients need this.
-            factory = "spa-node-factory";
-            args = {
-              "factory.name" = "support.node.driver";
-              "node.name" = "Dummy-Driver";
-              "priority.driver" = 8000;
-            };
-          }
-          {
-            factory = "adapter";
-            args = {
-              "factory.name" = "support.null-audio-sink";
-              "node.name" = "Microphone-Proxy";
-              "node.description" = "Microphone";
-              "media.class" = "Audio/Source/Virtual";
-              "audio.position" = "MONO";
-            };
-          }
-          {
-            factory = "adapter";
-            args = {
-              "factory.name" = "support.null-audio-sink";
-              "node.name" = "Main-Output-Proxy";
-              "node.description" = "Main Output";
-              "media.class" = "Audio/Sink";
-              "audio.position" = "FL,FR";
-            };
-          }
-        ];
+    services.pipewire.extraConfig.pipewire."92-fix-wine-audio" = {
+      context.properties = {
+        default.clock.rate = 48000;
+        default.clock.quantum = 2048;
+        default.clock.min-quantum = 512;
+        default.clock.max-quantum = 2048;
       };
     };
 

common/pc/chromium.nix

@@ -17,38 +17,6 @@ let
       "PREFIX=$(out)"
     ];
   };
-
-  nvidia-vaapi-driver = pkgs.stdenv.mkDerivation rec {
-    pname = "nvidia-vaapi-driver";
-    version = "0.0.5";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "elFarto";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY=";
-    };
-
-    patches = [
-      ./use-meson-v57.patch
-    ];
-
-    nativeBuildInputs = with pkgs; [
-      meson
-      cmake
-      ninja
-      pkg-config
-    ];
-
-    buildInputs = with pkgs; [
-      nv-codec-headers-11-1-5-1
-      libva
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-bad
-      libglvnd
-    ];
-  };
-
 in
 {
   config = lib.mkIf cfg.enable {
@@ -73,7 +41,7 @@ in
         "SpellcheckLanguage" = [ "en-US" ];
       };
       defaultSearchProviderSuggestURL = null;
-      defaultSearchProviderSearchURL = " https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
+      defaultSearchProviderSearchURL = "https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
     };
 
     # hardware accelerated video playback (on intel)
@@ -84,7 +52,7 @@ in
         # ungoogled = true;
         # --enable-native-gpu-memory-buffers # fails on AMD APU
         # --enable-webrtc-vp9-support
-        commandLineArgs = "--use-vulkan --use-gl=desktop --enable-zero-copy --enable-hardware-overlays --enable-features=VaapiVideoDecoder,CanvasOopRasterization --ignore-gpu-blocklist --enable-accelerated-mjpeg-decode --enable-accelerated-video  --enable-gpu-rasterization";
+        commandLineArgs = "--use-vulkan";
       };
     };
     # todo vulkan in chrome

common/pc/default.nix

@@ -6,19 +6,20 @@ 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 = {
@@ -37,26 +38,24 @@ in
       mumble
       tigervnc
       bluez-tools
-      vscodium
       element-desktop
       mpv
       nextcloud-client
       signal-desktop
-      minecraft
       gparted
       libreoffice-fresh
       thunderbird
-      spotifyd
-      spotify-qt
+      spotify
       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
@@ -70,12 +69,28 @@ in
     ];
     # Printer discovery
     services.avahi.enable = true;
-    services.avahi.nssmdns = true;
+    services.avahi.nssmdns4 = 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;
+
+    # Enable wayland support in various chromium based applications
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
   };
 }

common/pc/firefox.nix

@@ -20,31 +20,6 @@ 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;
@@ -74,12 +49,6 @@ let
         ExtensionRecommendations = false;
         SkipOnboarding = true;
       };
-      WebsiteFilter = {
-        Block = [
-          "http://paradigminteractive.io/"
-          "https://paradigminteractive.io/"
-        ];
-      };
     };
 
     extraPrefs = ''

common/pc/kde.nix

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

common/pc/mount-samba.nix

@@ -13,6 +13,8 @@ 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
 {
@@ -24,7 +26,7 @@ in
     fileSystems."/mnt/public" = {
       device = "//s0.koi-bebop.ts.net/public";
       fsType = "cifs";
-      options = [ opts ];
+      options = [ "${opts},${public_user_opts}" ];
     };
 
     fileSystems."/mnt/private" = {

common/pc/spotify.nix

@@ -1,86 +0,0 @@
-{ 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.xserver.libinput.enable = true;
-    services.xserver.libinput.touchpad.naturalScrolling = true;
+    services.libinput.enable = true;
+    services.libinput.touchpad.naturalScrolling = true;
   };
 }

common/pc/udev.nix

@@ -0,0 +1,25 @@
+{ 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

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

@@ -0,0 +1,23 @@
+{ 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,8 +4,28 @@ let
   cfg = config.de;
 
   extensions = with pkgs.vscode-extensions; [
-    #    bbenoist.Nix # nix syntax support
-    #    arrterian.nix-env-selector  # nix dev envs
+    bbenoist.nix # nix syntax support
+    arrterian.nix-env-selector # nix dev envs
+    dart-code.dart-code
+    dart-code.flutter
+    golang.go
+    jnoortheen.nix-ide
+    ms-vscode.cpptools
+    rust-lang.rust-analyzer
+    vadimcn.vscode-lldb
+  ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+    {
+      name = "platformio-ide";
+      publisher = "platformio";
+      version = "3.1.1";
+      sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q=";
+    }
+    {
+      name = "wgsl-analyzer";
+      publisher = "wgsl-analyzer";
+      version = "0.8.1";
+      sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y=";
+    }
   ];
 
   vscodium-with-extensions = pkgs.vscode-with-extensions.override {

common/server/actualbudget.nix

@@ -0,0 +1,87 @@
+# 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/dashy.nix

@@ -0,0 +1,41 @@
+{ 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"
+        ];
+      };
+    };
+  };
+}

common/server/default.nix

@@ -18,5 +18,10 @@
     ./nextcloud.nix
     ./iodine.nix
     ./searx.nix
+    ./gitea-actions-runner.nix
+    ./dashy.nix
+    ./librechat.nix
+    ./actualbudget.nix
+    ./unifi.nix
   ];
 }

common/server/gitea-actions-runner.nix

@@ -0,0 +1,136 @@
+{ 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
+    ];
+
+    # 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.nix

@@ -12,12 +12,14 @@ 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;
         };
@@ -29,6 +31,9 @@ in
         };
         session = {
           COOKIE_SECURE = true;
+          PROVIDER = "db";
+          SESSION_LIFE_TIME = 259200; # 3 days
+          GC_INTERVAL_TIME = 259200; # 3 days
         };
         mailer = {
           ENABLED = true;
@@ -39,6 +44,12 @@ in
           USER = "robot@runyan.org";
           FROM = "no-reply@neet.dev";
         };
+        actions = {
+          ENABLED = true;
+        };
+        indexer = {
+          REPO_INDEXER_ENABLED = true;
+        };
       };
       mailerPasswordFile = "/run/agenix/robots-email-pw";
     };
@@ -57,7 +68,7 @@ in
       enableACME = true;
       forceSSL = true;
       locations."/" = {
-        proxyPass = "http://localhost:${toString cfg.httpPort}";
+        proxyPass = "http://localhost:${toString cfg.settings.server.HTTP_PORT}";
       };
     };
   };

common/server/librechat.nix

@@ -0,0 +1,63 @@
+{ 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";
+          REFRESH_TOKEN_EXPIRY = toString (1000 * 60 * 60 * 24 * 30); # 30 days
+        };
+        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

@@ -33,10 +33,14 @@ in
       inherit domains;
       loginAccounts = {
         "jeremy@runyan.org" = {
-          hashedPasswordFile = "/run/agenix/email-pw";
+          hashedPasswordFile = "/run/agenix/hashed-email-pw";
           # 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"
@@ -51,10 +55,19 @@ in
         "joslyn@runyan.org"
         "damon@runyan.org"
         "jonas@runyan.org"
+        "simon@neet.dev"
+        "ellen@runyan.org"
       ];
-      certificateScheme = 3; # use let's encrypt for certs
+      forwards = {
+        "amazon@runyan.org" = [
+          "jeremy@runyan.org"
+          "cris@runyan.org"
+        ];
+      };
+      certificateScheme = "acme-nginx"; # use let's encrypt for certs
     };
-    age.secrets.email-pw.file = ../../secrets/email-pw.age;
+    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,13 +8,23 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud25;
+      package = pkgs.nextcloud30;
       hostName = "neet.cloud";
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";
       config.adminpassFile = "/run/agenix/nextcloud-pw";
       autoUpdateApps.enable = true;
-      enableBrokenCiphersForSSE = false;
+      extraApps = with config.services.nextcloud.package.packages.apps; {
+        # Want
+        inherit end_to_end_encryption mail spreed;
+
+        # Might use
+        inherit bookmarks calendar cookbook deck memories onlyoffice qownnotesapi;
+
+        # Try out
+        # inherit maps music news notes phonetrack polls forms;
+      };
+      extraAppsEnable = true;
     };
     age.secrets.nextcloud-pw = {
       file = ../../secrets/nextcloud-pw.age;

common/server/nginx.nix

@@ -4,6 +4,10 @@ let
   cfg = config.services.nginx;
 in
 {
+  options.services.nginx = {
+    openFirewall = lib.mkEnableOption "Open firewall ports 80 and 443";
+  };
+
   config = lib.mkIf cfg.enable {
     services.nginx = {
       recommendedGzipSettings = true;
@@ -12,6 +16,8 @@ in
       recommendedTlsSettings = true;
     };
 
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    services.nginx.openFirewall = lib.mkDefault true;
+
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 80 443 ];
   };
 }

common/server/samba.nix

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

common/server/unifi.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.unifi;
+in
+{
+  options.services.unifi = {
+    # Open select Unifi ports instead of using openFirewall to avoid opening access to unifi's control panel
+    openMinimalFirewall = lib.mkEnableOption "Open bare minimum firewall ports";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.unifi.unifiPackage = pkgs.unifi8;
+
+    networking.firewall = lib.mkIf cfg.openMinimalFirewall {
+      allowedUDPPorts = [
+        3478 # STUN
+        10001 # used for device discovery.
+      ];
+      allowedTCPPorts = [
+        8080 # Used for device and application communication.
+      ];
+    };
+  };
+}

common/shell.nix

@@ -34,6 +34,8 @@
     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 = [

common/ssh.nix

@@ -1,44 +1,38 @@
-rec {
-  users = [
+{ config, lib, pkgs, ... }:
+
+{
+  programs.ssh.knownHosts = lib.filterAttrs (n: v: v != null) (lib.concatMapAttrs
+    (host: cfg: {
+      ${host} = {
+        hostNames = cfg.hostNames;
+        publicKey = cfg.hostKey;
+      };
+      "${host}-remote-unlock" =
+        if cfg.remoteUnlock != null then {
+          hostNames = builtins.filter (h: h != null) [ cfg.remoteUnlock.clearnetHost cfg.remoteUnlock.onionHost ];
+          publicKey = cfg.remoteUnlock.hostKey;
+        } else null;
+    })
+    config.machines.hosts);
+
+  # prebuilt cmds for easy ssh LUKS unlock
+  environment.shellAliases =
+    let
+      unlockHosts = unlockType: lib.concatMapAttrs
+        (host: cfg:
+          if cfg.remoteUnlock != null && cfg.remoteUnlock.${unlockType} != null then {
+            ${host} = cfg.remoteUnlock.${unlockType};
+          } else { })
+        config.machines.hosts;
+    in
+    lib.concatMapAttrs (host: addr: { "unlock-over-tor_${host}" = "torsocks ssh root@${addr}"; }) (unlockHosts "onionHost")
+    //
+    lib.concatMapAttrs (host: addr: { "unlock_${host}" = "ssh root@${addr}"; }) (unlockHosts "clearnetHost");
+
+  # TODO: Old ssh keys I will remove some day...
+  machines.ssh.userKeys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVR/R3ZOsv7TZbICGBCHdjh1NDT8SnswUyINeJOC7QG"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0dcqL/FhHmv+a1iz3f9LJ48xubO7MZHy35rW9SZOYM"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSkKiRUUmnErOKGx81nyge/9KqjkPh8BfDk0D3oP586" # nat
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP" # ray
-  ];
-  system = {
-    ponyo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN";
-    ponyo-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC9LQuuImgWlkjDhEEIbM1wOd+HqRv1RxvYZuLXPSdRi";
-    ray = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB";
-    phil = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlOs6mTZCSJL/XM6NysHN0ZNQAyj2GEwBV2Ze6NxRmr";
-    phil-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAqy9X/m67oXJBX+OMdIqpiLONYc5aQ2nHeEPAaj/vgN";
-    router = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFr2IHmWFlaLaLp5dGoSmFEYKA/eg2SwGXAogaOmLsHL";
-    router-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOw5dTPmtKqiPBH6VKyz5MYBubn8leAh5Eaw7s/O85c";
-    s0 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";
-    s0-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNiceeFMos5ZXcYem4yFxh8PiZNNnuvhlyLbQLrgIZH";
-  };
-
-  higherTrustUserKeys = [
-    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEaGIwLiUa6wQLlEF+keQOIYy/tCmJvV6eENzUQjSqW2AAAABHNzaDo=" # ray fido
-  ];
-
-  # groups
-  systems = with system; [
-    ponyo
-    phil
-    ray
-    router
-    s0
-  ];
-  personal = with system; [
-    ray
-  ];
-  servers = with system; [
-    ponyo
-    phil
-    router
-    s0
-  ];
-  storage = with system; [
-    s0
   ];
 }

flake.lock

@@ -3,45 +3,26 @@
     "agenix": {
       "inputs": {
         "darwin": "darwin",
+        "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1675176355,
-        "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "archivebox": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
         ],
-        "nixpkgs": [
-          "nixpkgs"
+        "systems": [
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1648612759,
-        "narHash": "sha256-SJwlpD2Wz3zFoX2mIYCQfwIOYHaOdeiWGFeDXsLGM84=",
-        "ref": "refs/heads/master",
-        "rev": "39d338b9b24159d8ef3309eecc0d32a2a9f102b5",
-        "revCount": 2,
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/archivebox.git"
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
       }
     },
     "blobs": {
@@ -76,11 +57,11 @@
         "rev": "1290ddd9a2ff2bf2d0f702750768312b80efcd34",
         "revCount": 19,
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
       }
     },
     "darwin": {
@@ -91,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -107,21 +88,22 @@
     },
     "deploy-rs": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
         "utils": [
-          "simple-nixos-mailserver",
-          "utils"
+          "flake-utils"
         ]
       },
       "locked": {
-        "lastModified": 1674127017,
-        "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
         "type": "github"
       },
       "original": {
@@ -133,11 +115,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -147,12 +129,17 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -161,6 +148,27 @@
         "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": [
@@ -168,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677382901,
-        "narHash": "sha256-2idFWlTVG+qUZkU2/W50amGSIxmN56igIkMAXKbv4S4=",
+        "lastModified": 1728263287,
+        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "4306fa7c12e098360439faac1a2e6b8e509ec97c",
+        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
         "type": "github"
       },
       "original": {
@@ -181,47 +189,52 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nixos-hardware": {
       "locked": {
-        "lastModified": 1677823547,
-        "narHash": "sha256-xD2qco8Pw8HAXgjf9OSi2H2N20WaTrtvgcl21525kVE=",
+        "lastModified": 1728056216,
+        "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
         "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "78c4d33c16092e535bc4ba1284ba49e3e138483a",
+        "repo": "nixos-hardware",
+        "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "ref": "master",
-        "repo": "nixpkgs",
+        "repo": "nixos-hardware",
         "type": "github"
       }
     },
-    "nixpkgs-22_05": {
+    "nixpkgs": {
       "locked": {
-        "lastModified": 1654936503,
-        "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
+        "lastModified": 1728193676,
+        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
+        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-22.05",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
-    "nixpkgs-hostapd-pr": {
-      "flake": false,
+    "nixpkgs-frigate": {
       "locked": {
-        "narHash": "sha256-1rGQKcB1jeRPc1n021ulyOVkA6L6xmNYKmeqQ94+iRc=",
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch"
+        "lastModified": 1695825837,
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "github"
       },
       "original": {
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch"
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "github"
       }
     },
     "radio": {
@@ -268,54 +281,60 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "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-hostapd-pr": "nixpkgs-hostapd-pr",
+        "nixpkgs-frigate": "nixpkgs-frigate",
         "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-22_05": "nixpkgs-22_05",
-        "utils": "utils"
+        "nixpkgs-24_05": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1655930346,
-        "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
+        "lastModified": 1722877200,
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-22.05",
+        "ref": "master",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
     },
-    "utils": {
+    "systems": {
       "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     }

flake.nix

@@ -1,140 +1,186 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
-    # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff";
-    # nixpkgs-patch-howdy.flake = false;
+    # nixpkgs
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e";
 
-    flake-utils.url = "github:numtide/flake-utils";
+    # Common Utils Among flake inputs
+    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;
+    };
 
-    # mail server
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
-    simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
+    # NixOS hardware
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    # agenix
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    # Mail Server
+    simple-nixos-mailserver = {
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-24_05.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+      };
+    };
 
-    # radio
-    radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
-    radio.inputs.nixpkgs.follows = "nixpkgs";
-    radio.inputs.flake-utils.follows = "flake-utils";
-    radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
-    radio-web.flake = false;
+    # Agenix
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
+    };
 
-    # drastikbot
-    dailybuild_modules.url = "git+https://git.neet.dev/zuckerberg/dailybuild_modules.git";
-    dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
-    dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
+    # Radio
+    radio = {
+      url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+    radio-web = {
+      url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
+      flake = false;
+    };
 
-    # archivebox
-    archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git";
-    archivebox.inputs.nixpkgs.follows = "nixpkgs";
-    archivebox.inputs.flake-utils.follows = "flake-utils";
+    # Dailybot
+    dailybuild_modules = {
+      url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
 
-    # nixos config deployment
-    deploy-rs.url = "github:serokell/deploy-rs";
-    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
-    deploy-rs.inputs.utils.follows = "simple-nixos-mailserver/utils";
+    # NixOS deployment
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+        utils.follows = "flake-utils";
+      };
+    };
 
-    # prebuilt nix-index database
-    nix-index-database.url = "github:Mic92/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixpkgs-hostapd-pr.url = "https://github.com/NixOS/nixpkgs/pull/222536.patch";
-    nixpkgs-hostapd-pr.flake = false;
+    # Prebuilt nix-index database
+    nix-index-database = {
+      url = "github:Mic92/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, ... }@inputs: {
+  outputs = { self, nixpkgs, ... }@inputs:
+    let
+      machines = (import ./common/machine-info/moduleless.nix
+        {
+          inherit nixpkgs;
+          assertionsModule = "${nixpkgs}/nixos/modules/misc/assertions.nix";
+        }).machines.hosts;
+    in
+    {
+      nixosConfigurations =
+        let
+          modules = system: hostname: with inputs; [
+            ./common
+            simple-nixos-mailserver.nixosModule
+            agenix.nixosModules.default
+            dailybuild_modules.nixosModule
+            nix-index-database.nixosModules.nix-index
+            self.nixosModules.kernel-modules
+            ({ lib, ... }: {
+              config = {
+                nixpkgs.overlays = [ self.overlays.default ];
 
-    nixosConfigurations =
-      let
-        modules = system: with inputs; [
-          ./common
-          simple-nixos-mailserver.nixosModule
-          agenix.nixosModules.default
-          dailybuild_modules.nixosModule
-          archivebox.nixosModule
-          nix-index-database.nixosModules.nix-index
-          ({ lib, ... }: {
-            config.environment.systemPackages = [
-              agenix.packages.${system}.agenix
-            ];
+                environment.systemPackages = [
+                  agenix.packages.${system}.agenix
+                ];
 
-            # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
-            options.inputs = lib.mkOption { default = inputs; };
-            options.currentSystem = lib.mkOption { default = system; };
-          })
-        ];
+                networking.hostName = hostname;
+              };
 
-        mkSystem = system: nixpkgs: path:
-          let
-            allModules = modules system;
+              # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
+              options.inputs = lib.mkOption { default = inputs; };
+              options.currentSystem = lib.mkOption { default = system; };
+            })
+          ];
 
-            # allow patching nixpkgs, remove this hack once this is solved: https://github.com/NixOS/nix/issues/3920
-            patchedNixpkgsSrc = nixpkgs.legacyPackages.${system}.applyPatches {
-              name = "nixpkgs-patched";
-              src = nixpkgs;
-              patches = [
-                inputs.nixpkgs-hostapd-pr
-              ];
+          mkSystem = system: nixpkgs: path: hostname:
+            let
+              allModules = modules system hostname;
+
+              # allow patching nixpkgs, remove this hack once this is solved: https://github.com/NixOS/nix/issues/3920
+              patchedNixpkgsSrc = nixpkgs.legacyPackages.${system}.applyPatches {
+                name = "nixpkgs-patched";
+                src = nixpkgs;
+                patches = [
+                  ./patches/gamepadui.patch
+                ];
+              };
+              patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
+
+            in
+            patchedNixpkgs.lib.nixosSystem {
+              inherit system;
+              modules = allModules ++ [ path ];
+
+              specialArgs = {
+                inherit allModules;
+                lib = self.lib;
+                nixos-hardware = inputs.nixos-hardware;
+              };
             };
-            patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
+        in
+        nixpkgs.lib.mapAttrs
+          (hostname: cfg:
+            mkSystem cfg.arch nixpkgs cfg.configurationPath hostname)
+          machines;
 
-          in
-          patchedNixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = allModules ++ [ path ];
-
-            specialArgs = {
-              inherit allModules;
-            };
-          };
-      in
-      {
-        "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix;
-        # "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix;
-        "ponyo" = mkSystem "x86_64-linux" nixpkgs ./machines/ponyo/configuration.nix;
-        "phil" = mkSystem "aarch64-linux" nixpkgs ./machines/phil/configuration.nix;
-        "router" = mkSystem "x86_64-linux" nixpkgs ./machines/router/configuration.nix;
-        "s0" = mkSystem "x86_64-linux" nixpkgs ./machines/storage/s0/configuration.nix;
-      };
-
-    packages =
-      let
-        mkKexec = system:
-          (nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./machines/ephemeral/kexec.nix ];
-          }).config.system.build.kexec_tarball;
-        mkIso = system:
-          (nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./machines/ephemeral/iso.nix ];
-          }).config.system.build.isoImage;
-      in
-      {
-        "x86_64-linux"."kexec" = mkKexec "x86_64-linux";
-        "x86_64-linux"."iso" = mkIso "x86_64-linux";
-        "aarch64-linux"."kexec" = mkKexec "aarch64-linux";
-        "aarch64-linux"."iso" = mkIso "aarch64-linux";
-      };
-
-    deploy.nodes =
-      let
-        mkDeploy = configName: hostname: {
-          inherit hostname;
-          magicRollback = false;
-          sshUser = "root";
-          profiles.system.path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.${configName};
+      packages =
+        let
+          mkKexec = system:
+            (nixpkgs.lib.nixosSystem {
+              inherit system;
+              modules = [ ./machines/ephemeral/kexec.nix ];
+            }).config.system.build.kexec_tarball;
+          mkIso = system:
+            (nixpkgs.lib.nixosSystem {
+              inherit system;
+              modules = [ ./machines/ephemeral/iso.nix ];
+            }).config.system.build.isoImage;
+        in
+        {
+          "x86_64-linux"."kexec" = mkKexec "x86_64-linux";
+          "x86_64-linux"."iso" = mkIso "x86_64-linux";
+          "aarch64-linux"."kexec" = mkKexec "aarch64-linux";
+          "aarch64-linux"."iso" = mkIso "aarch64-linux";
         };
 
-      in
-      {
-        s0 = mkDeploy "s0" "s0";
-        router = mkDeploy "router" "router";
-        ponyo = mkDeploy "ponyo" "ponyo.neet.dev";
-      };
+      overlays.default = import ./overlays { inherit inputs; };
+      nixosModules.kernel-modules = import ./overlays/kernel-modules;
 
-    checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
-  };
+      deploy.nodes =
+        let
+          mkDeploy = configName: arch: hostname: {
+            inherit hostname;
+            magicRollback = false;
+            sshUser = "root";
+            profiles.system.path = inputs.deploy-rs.lib.${arch}.activate.nixos self.nixosConfigurations.${configName};
+          };
+        in
+        nixpkgs.lib.mapAttrs
+          (hostname: cfg:
+            mkDeploy hostname cfg.arch (builtins.head cfg.hostNames))
+          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

@@ -0,0 +1,56 @@
+{ 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

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

machines/ephemeral/minimal.nix

@@ -1,8 +1,10 @@
-{ pkgs, modulesPath, ... }:
+{ config, pkgs, modulesPath, ... }:
 
 {
   imports = [
     (modulesPath + "/installer/cd-dvd/channel.nix")
+    ../../common/machine-info
+    ../../common/ssh.nix
   ];
 
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "e1000" "e1000e" "virtio_pci" "r8169" ];
@@ -16,6 +18,8 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+  system.stateVersion = "21.11";
+
   # hardware.enableAllFirmware = true;
   # nixpkgs.config.allowUnfree = true;
 
@@ -38,10 +42,12 @@
 
   services.openssh = {
     enable = true;
-    challengeResponseAuthentication = false;
-    passwordAuthentication = false;
+    settings = {
+      KbdInteractiveAuthentication = false;
+      PasswordAuthentication = false;
+    };
   };
 
   services.getty.autologinUser = "root";
-  users.users.root.openssh.authorizedKeys.keys = (import ../../common/ssh.nix).users;
+  users.users.root.openssh.authorizedKeys.keys = config.machines.ssh.userKeys;
 }

machines/ephemeral/sdimg.nix

@@ -0,0 +1,57 @@
+{ 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/hotspot/default.nix

@@ -0,0 +1,69 @@
+{ config, pkgs, lib, ... }:
+
+let
+  internal = "end0";
+  wireless = "wlan0";
+  internal-gateway-ip = "192.168.0.1";
+  internal-ip-lower = "192.168.0.10";
+  internal-ip-upper = "192.168.0.100";
+in
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  enableExtraSubstituters = false;
+
+  # networking.interfaces.${internal}.ipv4.addresses = [{
+  #   address = internal-gateway-ip;
+  #   prefixLength = 24;
+  # }];
+
+  # DHCP on all interfaces except for the internal interface
+  networking.useDHCP = true;
+  networking.interfaces.${internal}.useDHCP = true;
+  networking.interfaces.${wireless}.useDHCP = true;
+
+  # Enable NAT
+  networking.ip_forward = true;
+  networking.nat = {
+    enable = true;
+    internalInterfaces = [ internal ];
+    externalInterface = wireless;
+  };
+
+  networking.wireless = {
+    enable = true;
+    networks = {
+      "Pixel_6054".psk = "@PSK_Pixel_6054@";
+    };
+    interfaces = [ wireless ];
+    environmentFile = "/run/agenix/hostspot-passwords";
+  };
+  age.secrets.hostspot-passwords.file = ../../secrets/hostspot-passwords.age;
+
+  # dnsmasq for internal interface
+  services.dnsmasq = {
+    enable = true;
+    settings = {
+      server = [ "1.1.1.1" "8.8.8.8" ];
+      dhcp-range = "${internal-ip-lower},${internal-ip-upper},24h";
+      dhcp-option = [
+        "option:router,${internal-gateway-ip}"
+        "option:broadcast,10.0.0.255"
+        "option:ntp-server,0.0.0.0"
+      ];
+    };
+  };
+
+  networking.firewall.interfaces.${internal}.allowedTCPPorts = [
+    53 # dnsmasq
+  ];
+
+  # Make it appear we are not using phone tethering to the ISP
+  networking.firewall = {
+    extraCommands = ''
+      iptables -t mangle -A POSTROUTING -o ${wireless} -j TTL --ttl-set 65
+    '';
+  };
+}

machines/hotspot/hardware-configuration.nix

@@ -0,0 +1,27 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
+    initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ];
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable = true;
+    };
+  };
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}

machines/hotspot/properties.nix

@@ -0,0 +1,13 @@
+{
+  hostNames = [
+    "hotspot"
+  ];
+
+  arch = "aarch64-linux";
+
+  systemRoles = [
+    "hotspot"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAION4IUAef687RIzWrP4HEZnpdSJswt06QmrdRMDPHHGY";
+}

machines/howl/default.nix

@@ -0,0 +1,13 @@
+{ 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

@@ -0,0 +1,58 @@
+{ 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

@@ -0,0 +1,26 @@
+{
+  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/hardware-configuration.nix

@@ -9,6 +9,7 @@
       (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
+  # because grub just doesn't work for some reason
   boot.loader.systemd-boot.enable = true;
 
   remoteLuksUnlock.enable = true;
@@ -20,24 +21,24 @@
   boot.extraModulePackages = [ ];
 
   boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/9f1727c7-1e95-47b9-9807-8f38531eed47";
+    device = "/dev/disk/by-uuid/d26c1820-4c39-4615-98c2-51442504e194";
     allowDiscards = true;
   };
 
   fileSystems."/" =
     {
-      device = "/dev/mapper/vg-root";
+      device = "/dev/disk/by-uuid/851bfde6-93cd-439e-9380-de28aa87eda9";
       fsType = "btrfs";
     };
 
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/EC6B-53AA";
+      device = "/dev/disk/by-uuid/F185-C4E5";
       fsType = "vfat";
     };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/b916094f-cf2a-4be7-b8f1-674ba6473061"; }];
+    [{ device = "/dev/disk/by-uuid/d809e3a1-3915-405a-a200-4429c5efdf87"; }];
 
   networking.interfaces.enp0s6.useDHCP = lib.mkDefault true;
 

machines/phil/properties.nix

@@ -0,0 +1,20 @@
+{
+  hostNames = [
+    "phil"
+    "phil.neet.dev"
+  ];
+
+  arch = "aarch64-linux";
+
+  systemRoles = [
+    "server"
+    "nix-builder"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2";
+
+  remoteUnlock = {
+    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0RodotOXLMy/w70aa096gaNqPBnfgiXR5ZAH4+wGzd";
+    clearnetHost = "unlock.phil.neet.dev";
+  };
+}

machines/ponyo/default.nix

@@ -5,9 +5,7 @@
     ./hardware-configuration.nix
   ];
 
-  networking.hostName = "ponyo";
-
-  system.autoUpgrade.enable = true;
+  # system.autoUpgrade.enable = true;
 
   # p2p mesh network
   services.tailscale.exitNode = true;
@@ -65,17 +63,32 @@
     };
   };
   pia.wireguard.badPortForwardPorts = [ ];
-  services.nginx.virtualHosts."radio.runyan.org" = {
-    enableACME = true;
-    forceSSL = true;
-    locations = {
-      "/stream.mp3" = {
-        proxyPass = "http://vpn.containers:8001/stream.mp3";
-        extraConfig = ''
-          add_header Access-Control-Allow-Origin *;
-        '';
+  services.nginx.virtualHosts = {
+    "radio.runyan.org" = {
+      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;
+      };
+    };
+    "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;
     };
   };
 
@@ -89,7 +102,7 @@
       host = "chat.neet.space";
     };
     jitsi-meet = {
-      enable = true;
+      enable = false; # disabled until vulnerable libolm dependency is removed/fixed
       host = "meet.neet.space";
     };
     turn = {
@@ -98,21 +111,13 @@
     };
   };
   # pin postgresql for matrix (will need to migrate eventually)
-  services.postgresql.package = pkgs.postgresql_11;
+  services.postgresql.package = pkgs.postgresql_15;
 
   # iodine DNS-based vpn
   services.iodine.server.enable = true;
 
   # proxied web services
   services.nginx.enable = true;
-  services.nginx.virtualHosts."jellyfin.neet.cloud" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://s0.koi-bebop.ts.net";
-      proxyWebsockets = true;
-    };
-  };
   services.nginx.virtualHosts."navidrome.neet.cloud" = {
     enableACME = true;
     forceSSL = true;
@@ -138,4 +143,11 @@
   # 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,6 +16,7 @@
   bios = {
     enable = true;
     device = "/dev/sda";
+    configurationLimit = 3; # Save room in /nix/store
   };
 
   remoteLuksUnlock.enable = true;

machines/ponyo/properties.nix

@@ -0,0 +1,29 @@
+{
+  hostNames = [
+    "ponyo"
+    "ponyo.neet.dev"
+    "git.neet.dev"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "server"
+    "email-server"
+    "iodine"
+    "pia"
+    "nextcloud"
+    "dailybot"
+    "gitea"
+    "librechat"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN";
+
+  remoteUnlock = {
+    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC9LQuuImgWlkjDhEEIbM1wOd+HqRv1RxvYZuLXPSdRi";
+
+    clearnetHost = "unlock.ponyo.neet.dev";
+    onionHost = "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion";
+  };
+}

machines/ray/configuration.nix

@@ -1,57 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "ray";
-
-  # 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

@@ -1,65 +0,0 @@
-# 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;
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
-    allowDiscards = true;
-  };
-  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"; }];
-
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
-}

machines/router/default.nix

@@ -11,8 +11,6 @@
   # https://github.com/skogsbrus/os/blob/master/sys/router.nix
   # http://trac.gateworks.com/wiki/wireless/wifi 
 
-  networking.hostName = "router";
-
   system.autoUpgrade.enable = true;
 
   services.tailscale.exitNode = true;

machines/router/properties.nix.disabled

@@ -0,0 +1,21 @@
+{
+  hostNames = [
+    "router"
+    "192.168.1.228"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "server"
+    "wireless"
+    "router"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFr2IHmWFlaLaLp5dGoSmFEYKA/eg2SwGXAogaOmLsHL";
+
+  remoteUnlock = {
+    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOw5dTPmtKqiPBH6VKyz5MYBubn8leAh5Eaw7s/O85c";
+    onionHost = "jxx2exuihlls2t6ncs7rvrjh2dssubjmjtclwr2ysvxtr4t7jv55xmqd.onion";
+  };
+}

machines/router/router.nix

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

machines/storage/s0/configuration.nix

@@ -1,167 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "s0";
-
-  system.autoUpgrade.enable = true;
-
-  services.iperf3.enable = true;
-  services.iperf3.openFirewall = true;
-
-  # p2p mesh network
-  services.tailscale.exitNode = true;
-
-  # for education purposes only
-  services.pykms.enable = true;
-  services.pykms.openFirewallPort = true;
-
-  # samba
-  services.samba.enable = true;
-
-  # disable suspend on lid close
-  services.logind.lidSwitch = "ignore";
-
-  # navidrome
-  services.navidrome = {
-    enable = true;
-    settings = {
-      Address = "0.0.0.0";
-      Port = 4533;
-      MusicFolder = "/data/samba/Public/Media/Music";
-    };
-  };
-  networking.firewall.allowedTCPPorts = [ config.services.navidrome.settings.Port ];
-
-  # allow access to transmisson data
-  users.users.googlebot.extraGroups = [ "transmission" ];
-  users.groups.transmission.gid = config.ids.gids.transmission;
-
-  vpn-container.enable = true;
-  vpn-container.mounts = [
-    "/var/lib"
-    "/data/samba/Public"
-  ];
-  vpn-container.config = {
-    # servarr services
-    services.prowlarr.enable = true;
-    services.sonarr.enable = true;
-    services.sonarr.user = "public_data";
-    services.sonarr.group = "public_data";
-    services.bazarr.enable = true;
-    services.bazarr.user = "public_data";
-    services.bazarr.group = "public_data";
-    services.radarr.enable = true;
-    services.radarr.user = "public_data";
-    services.radarr.group = "public_data";
-    services.lidarr.enable = true;
-    services.lidarr.user = "public_data";
-    services.lidarr.group = "public_data";
-
-    services.transmission = {
-      enable = true;
-      performanceNetParameters = true;
-      user = "public_data";
-      group = "public_data";
-      settings = {
-        /* directory settings */
-        # "watch-dir" = "/srv/storage/Transmission/To-Download";
-        # "watch-dir-enabled" = true;
-        "download-dir" = "/data/samba/Public/Media/Transmission";
-        "incomplete-dir" = "/var/lib/transmission/.incomplete";
-        "incomplete-dir-enabled" = true;
-
-        /* web interface, accessible from local network */
-        "rpc-enabled" = true;
-        "rpc-bind-address" = "0.0.0.0";
-        "rpc-whitelist" = "127.0.0.1,192.168.*.*,172.16.*.*";
-        "rpc-host-whitelist" = "void,192.168.*.*,172.16.*.*";
-        "rpc-host-whitelist-enabled" = false;
-
-        "port-forwarding-enabled" = true;
-        "peer-port" = 50023;
-        "peer-port-random-on-start" = false;
-
-        "encryption" = 1;
-        "lpd-enabled" = true; /* local peer discovery */
-        "dht-enabled" = true; /* dht peer discovery in swarm */
-        "pex-enabled" = true; /* peer exchange */
-
-        /* ip blocklist */
-        "blocklist-enabled" = true;
-        "blocklist-updates-enabled" = true;
-        "blocklist-url" = "https://github.com/Naunter/BT_BlockLists/raw/master/bt_blocklists.gz";
-
-        /* download speed settings */
-        # "speed-limit-down" = 1200;
-        # "speed-limit-down-enabled" = false;
-        # "speed-limit-up" = 500;
-        # "speed-limit-up-enabled" = true;
-
-        /* seeding limit */
-        "ratio-limit" = 2;
-        "ratio-limit-enabled" = true;
-
-        "download-queue-enabled" = true;
-        "download-queue-size" = 20; # gotta go fast
-      };
-    };
-    users.groups.public_data.gid = 994;
-    users.users.public_data = {
-      isSystemUser = true;
-      group = "public_data";
-      uid = 994;
-    };
-  };
-  pia.wireguard.badPortForwardPorts = [
-    9696 # prowlarr
-    8989 # sonarr
-    6767 # bazarr
-    7878 # radarr
-    8686 # lidarr
-    9091 # transmission web
-  ];
-
-  # jellyfin
-  # jellyfin cannot run in the vpn container and use hardware encoding
-  # I could not figure out how to allow the container to access the encoder
-  services.jellyfin.enable = true;
-  users.users.${config.services.jellyfin.user}.extraGroups = [ "public_data" ];
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      vaapiIntel
-      vaapiVdpau
-      libvdpau-va-gl
-      intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
-    ];
-  };
-
-  # nginx
-  services.nginx.enable = true;
-  services.nginx.virtualHosts."bazarr.s0".locations."/".proxyPass = "http://vpn.containers:6767";
-  services.nginx.virtualHosts."radarr.s0".locations."/".proxyPass = "http://vpn.containers:7878";
-  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."prowlarr.s0".locations."/".proxyPass = "http://vpn.containers:9696";
-  services.nginx.virtualHosts."music.s0".locations."/".proxyPass = "http://localhost:4533";
-  services.nginx.virtualHosts."jellyfin.s0".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".locations."/" = {
-    proxyPass = "http://vpn.containers:9091";
-    proxyWebsockets = true;
-  };
-}

machines/storage/s0/dashy.yaml

@@ -0,0 +1,241 @@
+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: https://jellyfin.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 0_1956_jellyfin
+      - &ref_1
+        title: Sonarr
+        description: Manage TV
+        icon: hl-sonarr
+        url: https://sonarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 1_1956_sonarr
+      - &ref_2
+        title: Radarr
+        description: Manage Movies
+        icon: hl-radarr
+        url: https://radarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 2_1956_radarr
+      - &ref_3
+        title: Lidarr
+        description: Manage Music
+        icon: hl-lidarr
+        url: https://lidarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 3_1956_lidarr
+      - &ref_4
+        title: Prowlarr
+        description: Indexers
+        icon: hl-prowlarr
+        url: https://prowlarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 4_1956_prowlarr
+      - &ref_5
+        title: Bazarr
+        description: Subtitles
+        icon: hl-bazarr
+        url: https://bazarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 5_1956_bazarr
+      - &ref_6
+        title: Navidrome
+        description: Play Music
+        icon: hl-navidrome
+        url: https://music.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 6_1956_navidrome
+      - &ref_7
+        title: Transmission
+        description: Torrenting
+        icon: hl-transmission
+        url: https://transmission.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        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

@@ -0,0 +1,276 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./frigate.nix
+    ./home-automation.nix
+  ];
+
+  networking.hostName = "s0";
+
+  # system.autoUpgrade.enable = true;
+
+  nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache
+
+  # binary cache
+  services.nix-serve = {
+    enable = true;
+    openFirewall = true;
+    secretKeyFile = "/run/agenix/binary-cache-private-key";
+  };
+  age.secrets.binary-cache-private-key.file = ../../../secrets/binary-cache-private-key.age;
+  users.users.cache-push = {
+    isNormalUser = true;
+    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB" ];
+  };
+  nix.settings = {
+    trusted-users = [ "cache-push" ];
+  };
+
+  services.iperf3.enable = true;
+  services.iperf3.openFirewall = true;
+
+  # p2p mesh network
+  services.tailscale.exitNode = true;
+
+  # for education purposes only
+  services.pykms.enable = true;
+  services.pykms.openFirewallPort = true;
+
+  # samba
+  services.samba.enable = true;
+
+  # navidrome
+  services.navidrome = {
+    enable = true;
+    settings = {
+      Address = "0.0.0.0";
+      Port = 4533;
+      MusicFolder = "/data/samba/Public/Media/Music";
+    };
+  };
+
+  # allow access to transmisson data
+  users.users.googlebot.extraGroups = [ "transmission" ];
+  users.groups.transmission.gid = config.ids.gids.transmission;
+
+  vpn-container.enable = true;
+  vpn-container.mounts = [
+    "/var/lib"
+    "/data/samba/Public"
+  ];
+  vpn-container.config = {
+    # servarr services
+    services.prowlarr.enable = true;
+    services.sonarr.enable = true;
+    services.sonarr.user = "public_data";
+    services.sonarr.group = "public_data";
+    services.bazarr.enable = true;
+    services.bazarr.user = "public_data";
+    services.bazarr.group = "public_data";
+    services.radarr.enable = true;
+    services.radarr.user = "public_data";
+    services.radarr.group = "public_data";
+    services.lidarr.enable = true;
+    services.lidarr.user = "public_data";
+    services.lidarr.group = "public_data";
+
+    services.transmission = {
+      enable = true;
+      performanceNetParameters = true;
+      user = "public_data";
+      group = "public_data";
+      settings = {
+        /* directory settings */
+        # "watch-dir" = "/srv/storage/Transmission/To-Download";
+        # "watch-dir-enabled" = true;
+        "download-dir" = "/data/samba/Public/Media/Transmission";
+        "incomplete-dir" = "/var/lib/transmission/.incomplete";
+        "incomplete-dir-enabled" = true;
+
+        /* web interface, accessible from local network */
+        "rpc-enabled" = true;
+        "rpc-bind-address" = "0.0.0.0";
+        "rpc-whitelist" = "127.0.0.1,192.168.*.*,172.16.*.*";
+        "rpc-host-whitelist" = "void,192.168.*.*,172.16.*.*";
+        "rpc-host-whitelist-enabled" = false;
+
+        "port-forwarding-enabled" = true;
+        "peer-port" = 50023;
+        "peer-port-random-on-start" = false;
+
+        "encryption" = 1;
+        "lpd-enabled" = true; /* local peer discovery */
+        "dht-enabled" = true; /* dht peer discovery in swarm */
+        "pex-enabled" = true; /* peer exchange */
+
+        /* ip blocklist */
+        "blocklist-enabled" = true;
+        "blocklist-updates-enabled" = true;
+        "blocklist-url" = "https://github.com/Naunter/BT_BlockLists/raw/master/bt_blocklists.gz";
+
+        /* download speed settings */
+        # "speed-limit-down" = 1200;
+        # "speed-limit-down-enabled" = false;
+        # "speed-limit-up" = 500;
+        # "speed-limit-up-enabled" = true;
+
+        /* seeding limit */
+        "ratio-limit" = 3;
+        "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;
+      group = "public_data";
+      uid = 994;
+    };
+  };
+  pia.wireguard.badPortForwardPorts = [
+    9696 # prowlarr
+    8989 # sonarr
+    6767 # bazarr
+    7878 # radarr
+    8686 # lidarr
+    9091 # transmission web
+  ];
+
+  # jellyfin
+  # jellyfin cannot run in the vpn container and use hardware encoding
+  # I could not figure out how to allow the container to access the encoder
+  services.jellyfin.enable = true;
+  users.users.${config.services.jellyfin.user}.extraGroups = [ "public_data" ];
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver
+      vaapiIntel
+      vaapiVdpau
+      libvdpau-va-gl
+      intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
+    ];
+  };
+
+  # nginx
+  services.nginx = {
+    enable = true;
+    openFirewall = false; # All nginx services are internal
+    virtualHosts =
+      let
+        mkVirtualHost = external: internal:
+          {
+            ${external} = {
+              useACMEHost = "s0.neet.dev"; # Use wildcard cert
+              forceSSL = true;
+              locations."/" = {
+                proxyPass = internal;
+                proxyWebsockets = true;
+              };
+            };
+          };
+      in
+      lib.mkMerge [
+        (mkVirtualHost "bazarr.s0.neet.dev" "http://vpn.containers:6767")
+        (mkVirtualHost "radarr.s0.neet.dev" "http://vpn.containers:7878")
+        (mkVirtualHost "lidarr.s0.neet.dev" "http://vpn.containers:8686")
+        (mkVirtualHost "sonarr.s0.neet.dev" "http://vpn.containers:8989")
+        (mkVirtualHost "prowlarr.s0.neet.dev" "http://vpn.containers:9696")
+        (mkVirtualHost "transmission.s0.neet.dev" "http://vpn.containers:9091")
+        (mkVirtualHost "unifi.s0.neet.dev" "https://localhost:8443")
+        (mkVirtualHost "music.s0.neet.dev" "http://localhost:4533")
+        (mkVirtualHost "jellyfin.s0.neet.dev" "http://localhost:8096")
+        (mkVirtualHost "s0.neet.dev" "http://localhost:56815")
+        {
+          # Landing page LAN redirect
+          "s0" = {
+            default = true;
+            redirectCode = 302;
+            globalRedirect = "s0.neet.dev";
+          };
+        }
+        (mkVirtualHost "ha.s0.neet.dev" "http://localhost:8123") # home assistant
+        (mkVirtualHost "esphome.s0.neet.dev" "http://localhost:6052")
+        (mkVirtualHost "zigbee.s0.neet.dev" "http://localhost:55834")
+        {
+          "frigate.s0.neet.dev" = {
+            # Just configure SSL, frigate module configures the rest of nginx
+            useACMEHost = "s0.neet.dev";
+            forceSSL = true;
+          };
+        }
+        (mkVirtualHost "vacuum.s0.neet.dev" "http://192.168.1.125") # valetudo
+        (mkVirtualHost "todo.s0.neet.dev" "http://localhost:${toString config.services.vikunja.port}")
+      ];
+
+    tailscaleAuth = {
+      enable = true;
+      virtualHosts = [
+        "bazarr.s0.neet.dev"
+        "radarr.s0.neet.dev"
+        "lidarr.s0.neet.dev"
+        "sonarr.s0.neet.dev"
+        "prowlarr.s0.neet.dev"
+        "transmission.s0.neet.dev"
+        "unifi.s0.neet.dev"
+        # "music.s0.neet.dev" # messes up navidrome
+        "jellyfin.s0.neet.dev"
+        "s0.neet.dev"
+        # "ha.s0.neet.dev" # messes up home assistant
+        "esphome.s0.neet.dev"
+        "zigbee.s0.neet.dev"
+        "vacuum.s0.neet.dev"
+        "todo.s0.neet.dev"
+      ];
+      expectedTailnet = "koi-bebop.ts.net";
+    };
+  };
+
+  # Get wildcard cert
+  security.acme.certs."s0.neet.dev" = {
+    dnsProvider = "digitalocean";
+    credentialsFile = "/run/agenix/digitalocean-dns-credentials";
+    extraDomainNames = [ "*.s0.neet.dev" ];
+    group = "nginx";
+    dnsResolver = "1.1.1.1:53";
+    dnsPropagationCheck = false; # sadly this erroneously fails
+  };
+  age.secrets.digitalocean-dns-credentials.file = ../../../secrets/digitalocean-dns-credentials.age;
+
+  virtualisation.oci-containers.backend = "podman";
+  virtualisation.podman.dockerSocket.enable = true; # TODO needed?
+  services.dashy = {
+    enable = true;
+    configFile = ./dashy.yaml;
+  };
+
+  services.unifi = {
+    enable = true;
+    openMinimalFirewall = true;
+  };
+
+  services.vikunja = {
+    enable = true;
+    port = 61473;
+    frontendScheme = "https";
+    frontendHostname = "todo.s0.neet.dev";
+    settings = {
+      service.enableregistration = false;
+    };
+  };
+
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
+}

machines/storage/s0/frigate.nix

@@ -0,0 +1,155 @@
+{ config, pkgs, lib, ... }:
+
+let
+  frigateHostname = "frigate.s0.neet.dev";
+
+  mkGo2RtcStream = name: url: withAudio: {
+    ${name} = [
+      url
+      "ffmpeg:${name}#video=copy${if withAudio then "#audio=copy" else ""}"
+    ];
+  };
+
+  # Assumes camera is set to output:
+  # - rtsp
+  # - H.264 + AAC
+  # - a downscaled substream for detection
+  mkCamera = name: primaryUrl: detectUrl: {
+    # Reference https://docs.frigate.video/configuration/reference/
+    services.frigate.settings = {
+      cameras.${name} = {
+        ffmpeg = {
+          # Camera feeds are relayed through go2rtc
+          inputs = [
+            {
+              path = "rtsp://127.0.0.1:8554/${name}";
+              # input_args = "preset-rtsp-restream";
+              input_args = "preset-rtsp-restream-low-latency";
+              roles = [ "record" ];
+            }
+            {
+              path = detectUrl;
+              roles = [ "detect" ];
+            }
+          ];
+          output_args = {
+            record = "preset-record-generic-audio-copy";
+          };
+        };
+      };
+    };
+    services.go2rtc.settings.streams = lib.mkMerge [
+      (mkGo2RtcStream name primaryUrl false)
+
+      # Sadly having the detection stream go through go2rpc too makes the stream unreadable by frigate for some reason.
+      # It might need to be re-encoded to work.  But I am not interested in wasting the processing power if only frigate
+      # need the detection stream anyway. So just let frigate grab the stream directly since it works.
+      # (mkGo2RtcStream detectName detectUrl false)
+    ];
+  };
+
+  mkDahuaCamera = name: address:
+    let
+      # go2rtc and frigate have a slightly different syntax for inserting env vars. So the URLs are not interchangable :(
+      # - go2rtc: ${VAR}
+      # - frigate: {VAR}
+      primaryUrl = "rtsp://admin:\${FRIGATE_RTSP_PASSWORD}@${address}/cam/realmonitor?channel=1&subtype=0";
+      detectUrl = "rtsp://admin:{FRIGATE_RTSP_PASSWORD}@${address}/cam/realmonitor?channel=1&subtype=1";
+    in
+    mkCamera name primaryUrl detectUrl;
+
+  mkEsp32Camera = name: address: {
+    services.frigate.settings.cameras.${name} = {
+      ffmpeg = {
+        input_args = "";
+        inputs = [{
+          path = "http://${address}:8080";
+          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 ";
+      };
+    };
+  };
+in
+lib.mkMerge [
+  (mkDahuaCamera "dog-cam" "192.168.10.31")
+  # (mkEsp32Camera "dahlia-cam" "dahlia-cam.lan")
+  {
+    services.frigate = {
+      enable = true;
+      hostname = frigateHostname;
+      settings = {
+        mqtt = {
+          enabled = true;
+          host = "localhost:1883";
+        };
+        rtmp.enabled = false;
+        snapshots = {
+          enabled = true;
+          bounding_box = true;
+        };
+        record = {
+          enabled = true;
+          # sync_recordings = true; # detect if recordings were deleted outside of frigate (expensive)
+          retain = {
+            days = 2; # Keep video for 2 days
+            mode = "motion";
+          };
+          events = {
+            retain = {
+              default = 10; # Keep video with detections for 10 days
+              mode = "motion";
+              # mode = "active_objects";
+            };
+          };
+        };
+        # Make frigate aware of the go2rtc streams
+        go2rtc.streams = config.services.go2rtc.settings.streams;
+        detect.enabled = true;
+        objects = {
+          track = [ "person" "dog" ];
+        };
+      };
+    };
+
+    services.go2rtc = {
+      enable = true;
+      settings = {
+        rtsp.listen = ":8554";
+        webrtc.listen = ":8555";
+      };
+    };
+
+    # Pass in env file with secrets to frigate/go2rtc
+    systemd.services.frigate.serviceConfig.EnvironmentFile = "/run/agenix/frigate-credentials";
+    systemd.services.go2rtc.serviceConfig.EnvironmentFile = "/run/agenix/frigate-credentials";
+    age.secrets.frigate-credentials.file = ../../../secrets/frigate-credentials.age;
+  }
+  {
+    # hardware encode/decode with amdgpu vaapi
+    systemd.services.frigate = {
+      environment.LIBVA_DRIVER_NAME = "radeonsi";
+      serviceConfig = {
+        SupplementaryGroups = [ "render" "video" ]; # for access to dev/dri/*
+        AmbientCapabilities = "CAP_PERFMON";
+      };
+    };
+    services.frigate.settings.ffmpeg.hwaccel_args = "preset-vaapi";
+  }
+  {
+    # 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;
+
+    services.frigate.settings.detectors.coral = {
+      type = "edgetpu";
+      device = "pci";
+    };
+  }
+]

machines/storage/s0/hardware-configuration.nix

@@ -7,7 +7,8 @@
     ];
 
   # boot
-  efi.enable = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.memtest86.enable = true;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -31,18 +32,14 @@
   boot.initrd.luks.devices."enc-pv4".device = "/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";
@@ -55,13 +52,6 @@
       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";
@@ -69,7 +59,12 @@
     };
   swapDevices = [ ];
 
-  networking.interfaces.eth0.useDHCP = true;
+  networking.vlans = {
+    iot = {
+      id = 2;
+      interface = "eth1";
+    };
+  };
 
   powerManagement.cpuFreqGovernor = "powersave";
 }

machines/storage/s0/home-automation.nix

@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.esphome.enable = true;
+
+  # TODO lock down
+  services.mosquitto = {
+    enable = true;
+    listeners = [
+      {
+        acl = [ "pattern readwrite #" ];
+        omitPasswordAuth = true;
+        settings.allow_anonymous = true;
+      }
+    ];
+  };
+  networking.firewall.allowedTCPPorts = [
+    1883 # mqtt
+  ];
+
+  services.zigbee2mqtt = {
+    enable = true;
+    settings = {
+      homeassistant = true;
+      permit_join = false;
+      serial = {
+        port = "/dev/ttyACM0";
+      };
+      mqtt = {
+        server = "mqtt://localhost:1883";
+        # base_topic = "zigbee2mqtt";
+      };
+      frontend = {
+        host = "localhost";
+        port = 55834;
+      };
+    };
+  };
+
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      "default_config"
+      "esphome"
+      "met"
+      "radio_browser"
+      "wled"
+      "mqtt"
+      "apple_tv" # why is this even needed? I get `ModuleNotFoundError: No module named 'pyatv'` errors otherwise for some reason.
+      "unifi"
+      "digital_ocean"
+      "downloader"
+      "mailgun"
+      "minecraft_server"
+      "mullvad"
+      "nextcloud"
+      "ollama"
+      "openweathermap"
+      "jellyfin"
+      "transmission"
+      "radarr"
+      "sonarr"
+      "syncthing"
+      "tailscale"
+      "weather"
+      "whois"
+      "youtube"
+      "homekit_controller"
+      "zha"
+      "bluetooth"
+    ];
+    # config = null;
+    config = {
+      # Includes dependencies for a basic setup
+      # https://www.home-assistant.io/integrations/default_config/
+      default_config = { };
+
+      # Enable reverse proxy support
+      http = {
+        use_x_forwarded_for = true;
+        trusted_proxies = [
+          "127.0.0.1"
+          "::1"
+        ];
+      };
+
+      "automation manual" = [
+      ];
+      # Allow using automations generated from the UI
+      "automation ui" = "!include automations.yaml";
+    };
+  };
+}

machines/storage/s0/properties.nix

@@ -0,0 +1,23 @@
+{
+  hostNames = [
+    "s0"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "storage"
+    "server"
+    "pia"
+    "binary-cache"
+    "gitea-actions-runner"
+    "frigate"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";
+
+  remoteUnlock = {
+    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNiceeFMos5ZXcYem4yFxh8PiZNNnuvhlyLbQLrgIZH";
+    onionHost = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
+  };
+}

machines/zoidberg/default.nix

@@ -0,0 +1,109 @@
+{ 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

@@ -0,0 +1,46 @@
+{ 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

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

new_machine.md

@@ -1,27 +1,34 @@
+# New Machine Setup
+
+### Prepare Shell If Needed
+
+```sh
 nix-shell -p nixFlakes git
+```
+
+### Disk Setup
+```sh
 cfdisk
-mkfs.ext3 boot
 cryptsetup luksFormat /dev/vda2
 cryptsetup luksOpen /dev/vda2 enc-pv
 pvcreate /dev/mapper/enc-pv
+vgcreate vg /dev/mapper/enc-pv
 lvcreate -L 4G -n swap vg
 lvcreate -l '100%FREE' -n root vg
 mkswap -L swap /dev/vg/swap
 swapon /dev/vg/swap
 mkfs.btrfs /dev/vg/root
 mount /dev/vg/root /mnt
-cd /mnt
-btrfs subvolume create root
-btrfs subvolume create home
-cd
-mount -o subvol=root /dev/vg/root /mnt
-mkdir /mnt/home
-mount -o subvol=home /dev/vg/root /mnt/home
-mkdir /mnt/boot
+mkfs.ext3 boot
 mount /dev/vda1 /mnt/boot
-mkdir /mnt/secret
+```
 
-/tmp/tor.rc
+### Generate Secrets
+```sh
+mkdir /mnt/secret
+```
+
+In `/tmp/tor.rc`
 ```
 DataDirectory /tmp/my-dummy.tor/
 SOCKSPort 127.0.0.1:10050 IsolateDestAddr
@@ -30,8 +37,23 @@ HiddenServiceDir /mnt/secret/onion
 HiddenServicePort 1234 127.0.0.1:1234
 ```
 
+```sh
 nix-shell -p tor --run "tor -f /tmp/tor.rc"
 ssh-keygen -q -N "" -t rsa -b 4096 -f /mnt/secret/ssh_host_rsa_key
 ssh-keygen -q -N "" -t ed25519 -f /mnt/secret/ssh_host_ed25519_key
-nixos-generate-config --root /mnt # copy hardware config
-nixos-install --flake "git+https://git.neet.dev/zuckerberg/nix-config.git#MACHINE_NAME"
+```
+
+### Generate Hardware Config
+```sh
+nixos-generate-config --root /mnt
+```
+
+### Install
+```sh
+nixos-install --flake "git+https://git.neet.dev/zuckerberg/nix-config.git#MACHINE_NAME"
+```
+
+### Post Install Tasks
+- Add to DNS
+- Add ssh host keys (unlock key + host key)
+- Add to tailnet

overlays/actualbudget/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, nodejs
+, runtimeShell
+}:
+buildNpmPackage rec {
+  pname = "actual-server";
+  version = "24.10.1";
+
+  src = fetchFromGitHub {
+    owner = "actualbudget";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-VJAD+lNamwuYmiPJLXkum6piGi5zLOHBp8cUeZagb4s=";
+  };
+
+  npmDepsHash = "sha256-Z2e4+JMhI/keLerT0F4WYdLnXHRQCqL7NjNyA9SFEF8=";
+
+  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

@@ -0,0 +1,48 @@
+diff --git a/src/load-config.js b/src/load-config.js
+index d99ce42..42d1351 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)));
+@@ -108,6 +109,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 cba7db0..9983471 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,7 +19,7 @@ export default function run(direction = 'up') {
+         stateStore: `${path.join(config.dataDir, '.migrate')}${
+           config.mode === 'test' ? '-test' : ''
+         }`,
+-        migrationsDirectory: `${path.join(config.projectRoot, 'migrations')}`,
++        migrationsDirectory
+       },
+       (err, set) => {
+         if (err) {

overlays/default.nix

@@ -0,0 +1,15 @@
+{ 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 { };
+}

overlays/kernel-modules/default.nix

@@ -0,0 +1,19 @@
+{ 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

@@ -0,0 +1,36 @@
+{ 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

@@ -0,0 +1,72 @@
+{ 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

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

@@ -0,0 +1,13 @@
+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 =

secrets/cris-hashed-email-pw.age

@@ -0,0 +1,10 @@
+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/digitalocean-dns-credentials.age

@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 WBT1Hw wjZGPvilRXGZsC2+7dWm/Nbau8Allv29WwQCr0XSAWU
+uTOf/sokutOGDyc8fbTbBWXqCVQCFhGdHxwA6SXqhdA
+-> ssh-ed25519 6AT2/g NU068qwqOWiKk0QwqP9vU4xJaND2OR4bo8xkmdWATgY
+uGd0sb5PH+rREn9pgLOFwk29CX66aPBQMvr4rBazylc
+-> ssh-ed25519 hPp1nw r2JRiZ7fsHPYDlte6Oh2Gx1KkugekFeeg3xSjziI+hQ
+xnO0gscMdR25mj5uAX7D42FCbCQhqbU0wkiLX4OmVqk
+-> ssh-ed25519 w3nu8g F03mPU63WwEs1SLUFErLOVCkARoggGIvvz9TFZfMOBY
+HOdVA3xW9pqUPhclO6VueSfXg3ux06Ch3fucF6Vr4hM
+--- niyo231HPT/+2dzflP+zhYjL9XiWsk7svesCYdkU1jA
+DÑØQî¬5–-ô@<40>¢¿—ßÐN5<4E> Ãÿ$Ø‚™’Çž…êÐ<C3AA>X=ŒHŽDÁ`P×5ZA´÷¼YóäÓ?¡é^[³1”6ÕK*mP݈ª­æ1æç÷ß›ƒ:$^ÑfDœ*î†ÿ“š-zi´"·Tàuÿüò

secrets/email-pw.age

@@ -1,23 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 xoAm7w uMSr0mNTntr9oRqEtrJ+LJKBxI+s+cTbXYAag6kb/hM
-JIylg1Xg08Ar/AuaE5e9O3qgsNAGG48Mw/Zvs8fdGdQ
--> ssh-ed25519 mbw8xA ngrNg4m5aiqUyudZ4Y4Y37ApFDXxq2UBOrbEajIdBAg
-1Z9hKOwNYe+o64b98WTXR30s8tv5geRCRIKe6Y6F35Y
--> ssh-ed25519 2a2Yhw U89mACfmGm2hOOHZfvVfxkWX2G54D5aw1shiyqC6T04
-2TVJ4/do2jbEJZHegTDO8Q/CiLNNT0f3GpSpEWoIHnM
--> ssh-ed25519 dMQYog BjQXtlw+fWSg2mzdbvpZdgU/UpQnByvj8QY2vf3f/Qg
-S/OFhJGyj3YhmPNiOcmAAAnxkzMwt7PnVvUxSxNWYp0
--> ssh-ed25519 6AT2/g sgzaa1V1+i3ADN/Lgn8LSCL1Mp7tCmNbG6HTo25qzVs
-q7Xfxu40RzjQORhZbGfq7U9FolNtWo3eDswxVUJ9uRw
--> ssh-ed25519 fwBF+g s3FQ1pwQYfGyQcQAtlpXFNA61BsJrEV+cDnBGot20ic
-M74z4r8nz6JvaougCsnyRVyNvLWBtwqhwGC6Oqe1YzI
--> ssh-ed25519 yHDAQw XXxh2eQf9tCEQyZKAppYu9M/EAYbsriGR/xK/ca1hE4
-GoNmSmuzuaD6DrhFD4vv+N/K6ySorZQXHqkEy59fFa4
--> ssh-ed25519 VyYH/Q X83OJlxNPRG+kRylIceDDE3hzs5BjbLRYTa4A9t76UE
-fdZcV7RRzKxeWQrniKT53UlunCWAuWIP4CAxeIHHbX4
--> ssh-ed25519 hPp1nw eIE4zQqBKr8SIW9Uqxn/HqA/wc4GIrck44k2iYbwSic
-wjemabf9WrL7dU0H5T32xKCW9FYogTuA7cTCZlVW9yU
--> r|n4m-grease AXlh $ozYI bvs$"
-AKr3E49skiQ2WLy320wi3qlafLyGnLTjCvLHz2eK3A
---- qtFNqGCcR6VAQnbPg7n52u1aJYJUDo9lV6Qnz/Y1bq4
-’¿Ëì¶+\Ù×m´®UYBa…³2·$´š7ÅQ¿xƒåôˆ+<1E>ÁUyiMoËæ,Vº	1‘W<E28098>ò´R(å<>´e5qq8ª¦ ²A^“¼}C7œïDÂ$3˜÷

secrets/frigate-credentials.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 hPp1nw Chke1ZtpXxN1c1+AnJ6Cd5kpM1KfQKTwymrfPW53QCA
+jUcw8eitC7r0rwefjllndZjARIqpWoVqGCnefHfjQ6Y
+-> ssh-ed25519 w3nu8g KY/5bU1B5uvmfGHF2d6qBL1NYy64qo324rdvkgnXoDA
+OBvuFtzZXQ0RmmEXelyzHMMiVqZir7zQJMA36ZH2siE
+--- CSd7lYSYQ2fCTjkJLPGdaNGL8eVpE9IBEyFo0LW907M
+£³$šO†ÈIß/À//Êw*ƒ™õD¤@u5o[¼â:·äš¥t¾˜]Jñ쮸™@Ùhþu£Àk;?·XüÁHRº’Ñ°E5¥ÍçÜ9

secrets/gitea-actions-runner-token.age

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

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 6AT2/g 98/m3t8axoVBE6WzdxBtRhV2uSQKSCXwQjyxfWXPmQk
+AxV0FTvqbWfk/gf65d05PcotbEnYr4PgDQnsaYxP/MU
+-> ssh-ed25519 w3nu8g jys7B4COD4iINANeSCD3BqGFoghxTmsbuXoOOIiP+wQ
+b7eSN5fe4szfliINOr7ZQ7AoSsIK5akmIQ6uLDabcIE
+-> ssh-ed25519 dMQYog ToNUqTPYmxpz9OUcC94egELcPfHQHCErfHN6l9kSrRY
+2KoSVoWp+FH29YfH57ri2KOvhkuqYew1+PXm99e0BaI
+--- Cjk3E/MjgCF45aLlFeyoGiaUEZk/QuKtsvPb6GpzD8Q
+m°å>‹“~czÆê匦†``ÜÏqX«š'ÁÎ%ôwÔž~×ÄL·eä'a±]û‹0ò´LÉÀ‰%ÍY‚TÊÓc9f¡W¶Ã^¤9ÊõÙÝ2®™æ¶ÆBÌa ƒ™ 

secrets/hostapd-pw-CXNK00BF9176.age

@@ -1,16 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 VyYH/Q 3383IYDpr6jhePY89sI7RO5KY6i5Wr/Miy4Tx1IeZEI
-Z4nN390wcZiDQCEJvTBD+v5LetZpjdcVhF8uYIUSkNA
--> ssh-ed25519 xoAm7w vO5L5G+aDSXJvD5MLKHtdfo3Ypd//vl7uO644j0S+ig
-LRIiQOSb4M9FItfqci10ELYgzkCXhOBaWv8iz2He6zA
--> ssh-ed25519 mbw8xA RxxUEOVUfKZyUM7KkUjMm9Z+Ts/et15dMxJm4XVKbzg
-hKS82nZ2v88jqxGW1xprsPk67Czn+PLTxIuOrlgXkpw
--> ssh-ed25519 2a2Yhw FRSIexkNO39x9h4wLVKscOmBIE5I/rOlNGfX+MdUfGo
-1OcV1pJ+/M3wtPnRMDxgcpnsyeFYBqBe5Gbj55dJiCY
--> ssh-ed25519 dMQYog lqtpfP3zAArnAF2M9MtUBhFymnG2S15X88YcW949PTI
-2po8qHUuVbMIzrZ+q746cb9BQ06emGowJJcIGHdHeH8
--> aH,?XIq9-grease ]Y I]hNq dZyR2f@@ Xl"1A`
-U/BZHrNalVSmBUEekZbQ1w95VrFtkskMOuI5lm9thRe2bvTe7Rue382uf0fcfvSE
-Jq7+f/b257KiFaUg8Is1WNNMY55Rw0wrnv9yIBMESxCWmgo
---- rUwKbA9SH9XIRdEXLhDIRj+mEu7BV4w7EwkAd4wZPGI
-ř@±ľ·¦ţµÉćS*ÚŘŔi(˙jW˛(WĆŇ-–€yFůů™ Î<7F><C38E>9 
+-> ssh-ed25519 w3nu8g ER07FH17Wm9op5F4pCftNK76f+nNjtA6zQc/2dLyAHI
+nxxq/8tS3ENJhAEIhJCiSi7dV+68AmcEMh9zvZoWpdY
+-> ssh-ed25519 dMQYog JelCfh+akP7C/i1kimq3fC5PRQa9gHbmBaOnjKu+PDw
+GVTwo7MzkpCereZRh0HVjGYmtdMY1gHowMZtUQl7XQw
+--- p2l83t3bEdBrrp1ctaqqKhwB4l2McgZqZTtc2SXgd8Q
+ø±ôeÆd\Yå4lXVF§U©<55>þM||)دÔûú•¶Ü8¿>ëž­%ðóJ$à´Õè