encrypted samba vault with gocryptfs

README.md

@@ -3,7 +3,7 @@
 ### Source Layout
 - `/common` - common configuration imported into all `/machines`
     - `/boot` - config related to bootloaders, cpu microcode, and unlocking LUKS root disks over tor
-    - `/network` - config for tailscale, zeroteir, and NixOS container with automatic vpn tunneling via PIA
+    - `/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`

TODO.md

@@ -52,19 +52,6 @@
         - https://ampache.org/
 - replace nextcloud with seafile
 
-### VPN container
-- use wireguard for vpn
-    - https://github.com/triffid/pia-wg/blob/master/pia-wg.sh
-    - https://github.com/pia-foss/manual-connections
-    - port forwarding for vpn
-        - transmission using forwarded port
-    - https://www.wireguard.com/netns/
-    - one way firewall for vpn container
-
-### Networking
-- tailscale for p2p connections
-    - remove all use of zerotier
-
 ### Archive
 - https://www.backblaze.com/b2/cloud-storage.html
 - email

common/boot/default.nix

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

common/boot/remote-luks-unlock.nix

@@ -1,22 +1,14 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.luks;
+  cfg = config.remoteLuksUnlock;
 in {
-  options.luks = {
+  options.remoteLuksUnlock = {
     enable = lib.mkEnableOption "enable luks root remote decrypt over ssh/tor";
-    device = {
+    enableTorUnlock = lib.mkOption {
-      name = lib.mkOption {
-        type = lib.types.str;
-        default = "enc-pv";
-      };
-      path = lib.mkOption {
-        type = lib.types.either lib.types.str lib.types.path;
-      };
-      allowDiscards = lib.mkOption {
       type = lib.types.bool;
-        default = false;
+      default = cfg.enable;
-      };
+      description = "Make machine accessable over tor for ssh boot unlock";
     };
     sshHostKeys = lib.mkOption {
       type = lib.types.listOf (lib.types.either lib.types.str lib.types.path);
@@ -40,10 +32,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    boot.initrd.luks.devices.${cfg.device.name} = {
+    # boot.initrd.luks.devices.${cfg.device.name} = {
-      device = cfg.device.path;
+    #   device = cfg.device.path;
-      allowDiscards = cfg.device.allowDiscards;
+    #   allowDiscards = cfg.device.allowDiscards;
-    };
+    # };
 
     # Unlock LUKS disk over ssh
     boot.initrd.network.enable = true;
@@ -61,27 +53,26 @@ in {
       echo /crypt-ramfs/passphrase >> /dev/null
     '';
 
-    # Make machine accessable over tor for boot unlock
+    boot.initrd.secrets = lib.mkIf cfg.enableTorUnlock {
-    boot.initrd.secrets = {
       "/etc/tor/onion/bootup" = cfg.onionConfig;
     };
-    boot.initrd.extraUtilsCommands = ''
+    boot.initrd.extraUtilsCommands = lib.mkIf cfg.enableTorUnlock ''
       copy_bin_and_libs ${pkgs.tor}/bin/tor
       copy_bin_and_libs ${pkgs.haveged}/bin/haveged
     '';
-    # start tor during boot process
+    boot.initrd.network.postCommands = lib.mkMerge [
-    boot.initrd.network.postCommands = let
+      (''
-      torRc = (pkgs.writeText "tor.rc" ''
+        # Add nice prompt for giving LUKS passphrase over ssh
+        echo 'read -s -p "Unlock Passphrase: " passphrase && echo $passphrase > /crypt-ramfs/passphrase && exit' >> /root/.profile
+      '')
+      
+      (let torRc = (pkgs.writeText "tor.rc" ''
         DataDirectory /etc/tor
         SOCKSPort 127.0.0.1:9050 IsolateDestAddr
         SOCKSPort 127.0.0.1:9063
         HiddenServiceDir /etc/tor/onion/bootup
         HiddenServicePort 22 127.0.0.1:22
-      '');
+      ''); in lib.mkIf cfg.enableTorUnlock ''
-    in ''
-      # Add nice prompt for giving LUKS passphrase over ssh
-      echo 'read -s -p "Unlock Passphrase: " passphrase && echo $passphrase > /crypt-ramfs/passphrase && exit' >> /root/.profile
-
         echo "tor: preparing onion folder"
         # have to do this otherwise tor does not want to start
         chmod -R 700 /etc/tor
@@ -96,6 +87,7 @@ in {
         echo "tor: starting tor"
         tor -f ${torRc} --verify-config
         tor -f ${torRc} &
-    '';
+      '')
+    ];
   };
 }

common/default.nix

@@ -1,5 +1,10 @@
 { config, pkgs, ... }:
 
+let
+  ssh = import ./ssh.nix;
+  sshUserKeys = ssh.users;
+  sshHigherTrustKeys = ssh.higherTrustUserKeys;
+in
 {
   imports = [
     ./flakes.nix
@@ -20,10 +25,15 @@
   networking.firewall.enable = true;
   networking.firewall.allowPing = true;
 
-  time.timeZone = "America/New_York";
+  time.timeZone = "America/Denver";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+    };
+  };
   programs.mosh.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -42,6 +52,7 @@
     micro
     helix
     lm_sensors
+    picocom
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -54,11 +65,16 @@
       "dialout" # serial
     ];
     shell = pkgs.fish;
-    openssh.authorizedKeys.keys = (import ./ssh.nix).users;
+    openssh.authorizedKeys.keys = sshUserKeys;
     hashedPassword = "$6$TuDO46rILr$gkPUuLKZe3psexhs8WFZMpzgEBGksE.c3Tjh1f8sD0KMC4oV89K2pqAABfl.Lpxu2jVdr5bgvR5cWnZRnji/r/";
     uid = 1000;
   };
-  nix.trustedUsers = [ "root" "googlebot" ];
+  users.users.root = {
+    openssh.authorizedKeys.keys = sshHigherTrustKeys;
+  };
+  nix.settings = {
+    trusted-users = [ "root" "googlebot" ];
+  };
 
   nix.gc.automatic = true;
 

common/network/default.nix

@@ -9,9 +9,10 @@ in
   imports = [
     ./hosts.nix
     ./pia-openvpn.nix
+    ./pia-wireguard.nix
+    ./ping.nix
     ./tailscale.nix
     ./vpn.nix
-    ./zerotier.nix
   ];
 
   options.networking.ip_forward = mkEnableOption "Enable ip forwarding";

common/network/hosts.nix

@@ -1,63 +1,62 @@
 { config, lib, ... }:
 
+with builtins;
+
 let
+  # TODO: remove when all systems are updated to new enough nixpkgs
+  concatMapAttrs =
+    f: with lib; flip pipe [ (mapAttrs f) attrValues (foldl' mergeAttrs { }) ];
+
   system = (import ../ssh.nix).system;
-in {
+
-  networking.hosts = {
+  # hostnames that resolve on clearnet for LUKS unlocking
-    # some DNS providers filter local ip results from DNS request
+  unlock-clearnet-hosts = {
-    "172.30.145.180" = [ "s0.zt.neet.dev" ];
+    ponyo = "unlock.ponyo.neet.dev";
-    "172.30.109.9" = [ "ponyo.zt.neet.dev" ];
+    s0 = "s0";
-    "172.30.189.212" = [ "ray.zt.neet.dev" ];
   };
 
-  programs.ssh.knownHosts = {
+  # hostnames that resolve on tor for LUKS unlocking
-    liza = {
+  unlock-onion-hosts = {
-      hostNames = [ "liza" "liza.neet.dev" ];
+    liza = "5synsrjgvfzywruomjsfvfwhhlgxqhyofkzeqt2eisyijvjvebnu2xyd.onion";
-      publicKey = system.liza;
+    router = "jxx2exuihlls2t6ncs7rvrjh2dssubjmjtclwr2ysvxtr4t7jv55xmqd.onion";
+    ponyo = "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion";
+    s0 = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
   };
+in {
+  programs.ssh.knownHosts = {
     ponyo = {
-      hostNames = [ "ponyo" "ponyo.neet.dev" "ponyo.zt.neet.dev" "git.neet.dev" ];
+      hostNames = [ "ponyo" "ponyo.neet.dev" "git.neet.dev" ];
       publicKey = system.ponyo;
     };
     ponyo-unlock = {
-      hostNames = [ "unlock.ponyo.neet.dev" "cfamr6artx75qvt7ho3rrbsc7mkucmv5aawebwflsfuorusayacffryd.onion" ];
+      hostNames = [ unlock-clearnet-hosts.ponyo unlock-onion-hosts.ponyo ];
       publicKey = system.ponyo-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" "ray.zt.neet.dev" ];
+      hostNames = [ "ray" ];
       publicKey = system.ray;
     };
     s0 = {
-      hostNames = [ "s0" "s0.zt.neet.dev" ];
+      hostNames = [ "s0" ];
       publicKey = system.s0;
     };
-    n1 = {
+    s0-unlock = {
-      hostNames = [ "n1" ];
+      hostNames = [ unlock-onion-hosts.s0 ];
-      publicKey = system.n1;
+      publicKey = system.s0-unlock;
-    };
-    n2 = {
-      hostNames = [ "n2" ];
-      publicKey = system.n2;
-    };
-    n3 = {
-      hostNames = [ "n3" ];
-      publicKey = system.n3;
-    };
-    n4 = {
-      hostNames = [ "n4" ];
-      publicKey = system.n4;
-    };
-    n5 = {
-      hostNames = [ "n5" ];
-      publicKey = system.n5;
-    };
-    n6 = {
-      hostNames = [ "n6" ];
-      publicKey = system.n6;
-    };
-    n7 = {
-      hostNames = [ "n7" ];
-      publicKey = system.n7;
     };
   };
+
+  # prebuilt cmds for easy ssh LUKS unlock
+  environment.shellAliases =
+    concatMapAttrs (host: addr: {"unlock-over-tor_${host}" = "torsocks ssh root@${addr}";}) unlock-onion-hosts
+      //
+    concatMapAttrs (host: addr: {"unlock_${host}" = "ssh root@${addr}";}) unlock-clearnet-hosts;
 }

common/network/pia-openvpn.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.pia;
+  cfg = config.pia.openvpn;
   vpnfailsafe = pkgs.stdenv.mkDerivation {
     pname = "vpnfailsafe";
     version = "0.0.1";
@@ -14,7 +14,7 @@ let
   };
 in
 {
-  options.pia = {
+  options.pia.openvpn = {
     enable = lib.mkEnableOption "Enable private internet access";
     server = lib.mkOption {
       type = lib.types.str;

common/network/pia-wireguard.nix

@@ -0,0 +1,356 @@
+{ config, lib, pkgs, ... }:
+
+# Server list:
+#   https://serverlist.piaservers.net/vpninfo/servers/v6
+# Reference materials:
+#   https://github.com/pia-foss/manual-connections
+#   https://github.com/thrnz/docker-wireguard-pia/blob/master/extra/wg-gen.sh
+
+# TODO handle potential errors (or at least print status, success, and failures to the console)
+# TODO parameterize names of systemd services so that multiple wg VPNs could coexist in theory easier
+# 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
+
+with builtins;
+with lib;
+
+let
+  cfg = config.pia.wireguard;
+
+  getPIAToken = ''
+    PIA_USER=`sed '1q;d' /run/agenix/pia-login.conf`
+    PIA_PASS=`sed '2q;d' /run/agenix/pia-login.conf`
+    # PIA_TOKEN only lasts 24hrs
+    PIA_TOKEN=`curl -s -u "$PIA_USER:$PIA_PASS" https://www.privateinternetaccess.com/gtoken/generateToken | jq -r '.token'`
+  '';
+
+  chooseWireguardServer = ''
+    servers=$(mktemp)
+    servers_json=$(mktemp)
+    curl -s "https://serverlist.piaservers.net/vpninfo/servers/v6" > "$servers"
+    # extract json part only
+    head -n 1 "$servers" | tr -d '\n' > "$servers_json"
+
+    echo "Available location ids:" && jq '.regions | .[] | {name, id, port_forward}' "$servers_json"
+
+    # Some locations have multiple servers available. Pick a random one.
+    totalservers=$(jq -r '.regions | .[] | select(.id=="'${cfg.serverLocation}'") | .servers.wg | length' "$servers_json")
+    if ! [[ "$totalservers" =~ ^[0-9]+$ ]] || [ "$totalservers" -eq 0 ] 2>/dev/null; then
+      echo "Location \"${cfg.serverLocation}\" not found."
+      exit 1
+    fi
+    serverindex=$(( RANDOM % totalservers))
+    WG_HOSTNAME=$(jq -r '.regions | .[] | select(.id=="'${cfg.serverLocation}'") | .servers.wg | .['$serverindex'].cn' "$servers_json")
+    WG_SERVER_IP=$(jq -r '.regions | .[] | select(.id=="'${cfg.serverLocation}'") | .servers.wg | .['$serverindex'].ip' "$servers_json")
+    WG_SERVER_PORT=$(jq -r '.groups.wg | .[0] | .ports | .[0]' "$servers_json")
+
+    # write chosen server
+    rm -f /tmp/${cfg.interfaceName}-server.conf
+    touch /tmp/${cfg.interfaceName}-server.conf
+    chmod 700 /tmp/${cfg.interfaceName}-server.conf
+    echo "$WG_HOSTNAME" >> /tmp/${cfg.interfaceName}-server.conf
+    echo "$WG_SERVER_IP" >> /tmp/${cfg.interfaceName}-server.conf
+    echo "$WG_SERVER_PORT" >> /tmp/${cfg.interfaceName}-server.conf
+
+    rm $servers_json $servers
+  '';
+
+  getChosenWireguardServer = ''
+    WG_HOSTNAME=`sed '1q;d' /tmp/${cfg.interfaceName}-server.conf`
+    WG_SERVER_IP=`sed '2q;d' /tmp/${cfg.interfaceName}-server.conf`
+    WG_SERVER_PORT=`sed '3q;d' /tmp/${cfg.interfaceName}-server.conf`
+  '';
+
+  refreshPIAPort = ''
+    ${getChosenWireguardServer}
+    signature=`sed '1q;d' /tmp/${cfg.interfaceName}-port-renewal`
+    payload=`sed '2q;d' /tmp/${cfg.interfaceName}-port-renewal`
+    bind_port_response=`curl -Gs -m 5 --connect-to "$WG_HOSTNAME::$WG_SERVER_IP:" --cacert "${./ca.rsa.4096.crt}" --data-urlencode "payload=$payload" --data-urlencode "signature=$signature" "https://$WG_HOSTNAME:19999/bindPort"`
+  '';
+
+  portForwarding = cfg.forwardPortForTransmission || cfg.forwardedPort != null;
+
+  containerServiceName = "container@${config.vpn-container.containerName}.service";
+in {
+  options.pia.wireguard = {
+    enable = mkEnableOption "Enable private internet access";
+    badPortForwardPorts = mkOption {
+      type = types.listOf types.port;
+      description = ''
+        Ports that will not be accepted from PIA.
+        If PIA assigns a port from this list, the connection is aborted since we cannot ask for a different port.
+        This is used to guarantee we are not assigned a port that is used by a service we do not want exposed.
+      '';
+    };
+    wireguardListenPort = mkOption {
+      type = types.port;
+      description = "The port wireguard listens on for this VPN connection";
+      default = 51820;
+    };
+    serverLocation = mkOption {
+      type = types.str;
+      default = "swiss";
+    };
+    interfaceName = mkOption {
+      type = types.str;
+      default = "piaw";
+    };
+    forwardedPort = mkOption {
+      type = types.nullOr types.port;
+      description = "The port to redirect port forwarded TCP VPN traffic too";
+      default = null;
+    };
+    forwardPortForTransmission = mkEnableOption "PIA port forwarding for transmission should be performed.";
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.forwardPortForTransmission != (cfg.forwardedPort != null);
+        message = ''
+          The PIA forwarded port cannot simultaneously be used by transmission and redirected to another port.
+        '';
+      }
+    ];
+
+    # mounts used to pass the connection parameters to the container
+    # the container doesn't have internet until it uses these parameters so it cannot fetch them itself
+    vpn-container.mounts = [
+      "/tmp/${cfg.interfaceName}.conf"
+      "/tmp/${cfg.interfaceName}-server.conf"
+      "/tmp/${cfg.interfaceName}-address.conf"
+    ];
+
+    # The container takes ownership of the wireguard interface on its startup
+    containers.vpn.interfaces = [ cfg.interfaceName ];
+
+    # TODO: while this is much better than "loose" networking, it seems to have issues with firewall restarts
+    # allow traffic for wireguard interface to pass since wireguard trips up rpfilter
+    # networking.firewall = {
+    #   extraCommands = ''
+    #     ip46tables -t raw -I nixos-fw-rpfilter -p udp -m udp --sport ${toString cfg.wireguardListenPort} -j RETURN
+    #     ip46tables -t raw -I nixos-fw-rpfilter -p udp -m udp --dport ${toString cfg.wireguardListenPort} -j RETURN
+    #   '';
+    #   extraStopCommands = ''
+    #     ip46tables -t raw -D nixos-fw-rpfilter -p udp -m udp --sport ${toString cfg.wireguardListenPort} -j RETURN || true
+    #     ip46tables -t raw -D nixos-fw-rpfilter -p udp -m udp --dport ${toString cfg.wireguardListenPort} -j RETURN || true
+    #   '';
+    # };
+    networking.firewall.checkReversePath = "loose";
+
+    systemd.services.pia-vpn-wireguard-init = {
+      description = "Creates PIA VPN Wireguard Interface";
+
+      requires = [ "network-online.target" ];
+      after = [ "network.target" "network-online.target" ];
+      before = [ containerServiceName ];
+      requiredBy = [ containerServiceName ];
+      partOf = [ containerServiceName ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = with pkgs; [ wireguard-tools jq curl iproute ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+
+        # restart once a month; PIA forwarded port expires after two months
+        # because the container is "PartOf" this unit, it gets restarted too
+        RuntimeMaxSec="30d";
+      };
+
+      script = ''
+        # 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.
+
+        ${chooseWireguardServer}
+
+        ${getPIAToken}
+
+        # generate wireguard keys
+        privKey=$(wg genkey)
+        pubKey=$(echo "$privKey" | wg pubkey)
+
+        # authorize our WG keys with the PIA server we are about to connect to
+        wireguard_json=`curl -s -G --connect-to "$WG_HOSTNAME::$WG_SERVER_IP:" --cacert "${./ca.rsa.4096.crt}" --data-urlencode "pt=$PIA_TOKEN" --data-urlencode "pubkey=$pubKey" https://$WG_HOSTNAME:$WG_SERVER_PORT/addKey`
+
+        # create wg-quick config file
+        rm -f /tmp/${cfg.interfaceName}.conf /tmp/${cfg.interfaceName}-address.conf
+        touch /tmp/${cfg.interfaceName}.conf /tmp/${cfg.interfaceName}-address.conf
+        chmod 700 /tmp/${cfg.interfaceName}.conf /tmp/${cfg.interfaceName}-address.conf
+        echo "
+        [Interface]
+        # Address = $(echo "$wireguard_json" | jq -r '.peer_ip')
+        PrivateKey = $privKey
+        ListenPort = ${toString cfg.wireguardListenPort}
+        [Peer]
+        PersistentKeepalive = 25
+        PublicKey = $(echo "$wireguard_json" | jq -r '.server_key')
+        AllowedIPs = 0.0.0.0/0
+        Endpoint = $WG_SERVER_IP:$(echo "$wireguard_json" | jq -r '.server_port')
+        " >> /tmp/${cfg.interfaceName}.conf
+
+        # create file storing the VPN ip address PIA assigned to us
+        echo "$wireguard_json" | jq -r '.peer_ip' >> /tmp/${cfg.interfaceName}-address.conf
+
+        # Create wg interface now so it inherits from the namespace with internet access
+        # the container will handle actually connecting the interface since that info is
+        # not preserved upon moving into the container's networking namespace
+        # Roughly following this guide https://www.wireguard.com/netns/#ordinary-containerization
+        [[ -z $(ip link show dev ${cfg.interfaceName} 2>/dev/null) ]] || exit
+        ip link add ${cfg.interfaceName} type wireguard
+      '';
+
+      preStop = ''
+        # cleanup wireguard interface
+        ip link del ${cfg.interfaceName}
+        rm -f /tmp/${cfg.interfaceName}.conf /tmp/${cfg.interfaceName}-address.conf
+      '';
+    };
+
+    vpn-container.config.systemd.services.pia-vpn-wireguard = {
+      description = "Initializes the PIA VPN WireGuard Tunnel";
+
+      requires = [ "network-online.target" ];
+      after = [ "network.target" "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = with pkgs; [ wireguard-tools iproute curl jq iptables ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
+
+      script = ''
+        # pseudo calls wg-quick
+        # Near equivalent of "wg-quick up /tmp/${cfg.interfaceName}.conf"
+        # cannot actually call wg-quick because the interface has to be already
+        # created before the container taken ownership of the interface
+        # Thus, assumes wg interface was already created:
+        #   ip link add ${cfg.interfaceName} type wireguard
+
+        ${getChosenWireguardServer}
+
+        myaddress=`cat /tmp/${cfg.interfaceName}-address.conf`
+
+        wg setconf ${cfg.interfaceName} /tmp/${cfg.interfaceName}.conf
+        ip -4 address add $myaddress dev ${cfg.interfaceName}
+        ip link set mtu 1420 up dev ${cfg.interfaceName}
+        wg set ${cfg.interfaceName} fwmark ${toString cfg.wireguardListenPort}
+        ip -4 route add 0.0.0.0/0 dev ${cfg.interfaceName} table ${toString cfg.wireguardListenPort}
+
+        # TODO is this needed?
+        ip -4 rule add not fwmark ${toString cfg.wireguardListenPort} table ${toString cfg.wireguardListenPort}
+        ip -4 rule add table main suppress_prefixlength 0
+
+        # The rest of the script is only for only for port forwarding skip if not needed
+        if [ ${boolToString portForwarding} == false ]; then exit 0; fi
+
+        # Reserve port
+        ${getPIAToken}
+        payload_and_signature=`curl -s -m 5 --connect-to "$WG_HOSTNAME::$WG_SERVER_IP:" --cacert "${./ca.rsa.4096.crt}" -G --data-urlencode "token=$PIA_TOKEN" "https://$WG_HOSTNAME:19999/getSignature"`
+        signature=$(echo "$payload_and_signature" | jq -r '.signature')
+        payload=$(echo "$payload_and_signature" | jq -r '.payload')
+        port=$(echo "$payload" | base64 -d | jq -r '.port')
+
+        # Check if the port is acceptable
+        notallowed=(${concatStringsSep " " (map toString cfg.badPortForwardPorts)})
+        if [[ " ''${notallowed[*]} " =~ " $port " ]]; then
+          # the port PIA assigned is not allowed, kill the connection
+          wg-quick down /tmp/${cfg.interfaceName}.conf
+          exit 1
+        fi
+
+        # write reserved port to file readable for all users
+        echo $port > /tmp/${cfg.interfaceName}-port
+        chmod 644 /tmp/${cfg.interfaceName}-port
+
+        # write payload and signature info needed to allow refreshing allocated forwarded port
+        rm -f /tmp/${cfg.interfaceName}-port-renewal
+        touch /tmp/${cfg.interfaceName}-port-renewal
+        chmod 700 /tmp/${cfg.interfaceName}-port-renewal
+        echo $signature >> /tmp/${cfg.interfaceName}-port-renewal
+        echo $payload >> /tmp/${cfg.interfaceName}-port-renewal
+
+        # Block all traffic from VPN interface except for traffic that is from the forwarded port
+        iptables -I nixos-fw -p tcp --dport $port -j nixos-fw-accept -i ${cfg.interfaceName}
+        iptables -I nixos-fw -p udp --dport $port -j nixos-fw-accept -i ${cfg.interfaceName}
+
+        # The first port refresh triggers the port to be actually allocated
+        ${refreshPIAPort}
+
+        ${optionalString (cfg.forwardedPort != null) ''
+          # redirect the fowarded port
+          iptables -A INPUT -i ${cfg.interfaceName} -p tcp --dport $port -j ACCEPT
+          iptables -A INPUT -i ${cfg.interfaceName} -p udp --dport $port -j ACCEPT
+          iptables -A INPUT -i ${cfg.interfaceName} -p tcp --dport ${toString cfg.forwardedPort} -j ACCEPT
+          iptables -A INPUT -i ${cfg.interfaceName} -p udp --dport ${toString cfg.forwardedPort} -j ACCEPT
+          iptables -A PREROUTING -t nat -i ${cfg.interfaceName} -p tcp --dport $port -j REDIRECT --to-port ${toString cfg.forwardedPort}
+          iptables -A PREROUTING -t nat -i ${cfg.interfaceName} -p udp --dport $port -j REDIRECT --to-port ${toString cfg.forwardedPort}
+        ''}
+
+        ${optionalString cfg.forwardPortForTransmission ''
+          # assumes no auth needed for transmission
+          curlout=$(curl localhost:9091/transmission/rpc 2>/dev/null)
+          regex='X-Transmission-Session-Id\: (\w*)'
+          if [[ $curlout =~ $regex ]]; then
+              sessionId=''${BASH_REMATCH[1]}
+          else
+              exit 1
+          fi
+
+          # set the port in transmission
+          data='{"method": "session-set", "arguments": { "peer-port" :'$port' } }'
+          curl http://localhost:9091/transmission/rpc -d "$data" -H "X-Transmission-Session-Id: $sessionId"
+        ''}
+      '';
+
+      preStop = ''
+        wg-quick down /tmp/${cfg.interfaceName}.conf
+
+        # The rest of the script is only for only for port forwarding skip if not needed
+        if [ ${boolToString portForwarding} == false ]; then exit 0; fi
+
+        ${optionalString (cfg.forwardedPort != null) ''
+          # stop redirecting the forwarded port
+          iptables -D INPUT -i ${cfg.interfaceName} -p tcp --dport $port -j ACCEPT
+          iptables -D INPUT -i ${cfg.interfaceName} -p udp --dport $port -j ACCEPT
+          iptables -D INPUT -i ${cfg.interfaceName} -p tcp --dport ${toString cfg.forwardedPort} -j ACCEPT
+          iptables -D INPUT -i ${cfg.interfaceName} -p udp --dport ${toString cfg.forwardedPort} -j ACCEPT
+          iptables -D PREROUTING -t nat -i ${cfg.interfaceName} -p tcp --dport $port -j REDIRECT --to-port ${toString cfg.forwardedPort}
+          iptables -D PREROUTING -t nat -i ${cfg.interfaceName} -p udp --dport $port -j REDIRECT --to-port ${toString cfg.forwardedPort}
+        ''}
+      '';
+    };
+
+    vpn-container.config.systemd.services.pia-vpn-wireguard-forward-port = {
+      enable = portForwarding;
+      description = "PIA VPN WireGuard Tunnel Port Forwarding";
+      after = [ "pia-vpn-wireguard.service" ];
+      requires = [ "pia-vpn-wireguard.service" ];
+
+      path = with pkgs; [ curl ];
+
+      serviceConfig = {
+        Type = "oneshot";
+      };
+
+      script = refreshPIAPort;
+    };
+
+    vpn-container.config.systemd.timers.pia-vpn-wireguard-forward-port = {
+      enable = portForwarding;
+      partOf = [ "pia-vpn-wireguard-forward-port.service" ];
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = "*:0/10"; # 10 minutes
+        RandomizedDelaySec = "1m"; # vary by 1 min to give PIA servers some relief
+      };
+    };
+
+    age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf;
+  };
+}

common/network/ping.nix

@@ -0,0 +1,58 @@
+{ config, pkgs, lib, ... }:
+
+# keeps peer to peer connections alive with a periodic ping
+
+with lib;
+with builtins;
+
+# todo auto restart
+
+let
+  cfg = config.keepalive-ping;
+
+  serviceTemplate = host:
+  {
+    "keepalive-ping@${host}" = {
+      description = "Periodic ping keep alive for ${host} connection";
+
+      requires = [ "network-online.target" ];
+      after = [ "network.target" "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.Restart="always";
+
+      path = with pkgs; [ iputils ];
+
+      script = ''
+        ping -i ${cfg.delay} ${host} &>/dev/null
+      '';
+    };
+  };
+
+  combineAttrs = foldl recursiveUpdate {};
+
+  serviceList = map serviceTemplate cfg.hosts;
+
+  services = combineAttrs serviceList;
+in {
+  options.keepalive-ping = {
+    enable = mkEnableOption "Enable keep alive ping task";
+    hosts = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Hosts to ping periodically
+      '';
+    };
+    delay = mkOption {
+      type = types.str;
+      default = "60";
+      description = ''
+        Ping interval in seconds of periodic ping per host being pinged
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services = services;
+  };
+}

common/network/tailscale.nix

@@ -8,7 +8,11 @@ in
 {
   options.services.tailscale.exitNode = mkEnableOption "Enable exit node support";
 
-  config.services.tailscale.enable = !config.boot.isContainer;
+  config.services.tailscale.enable = mkDefault (!config.boot.isContainer);
+
+  # MagicDNS
+  config.networking.nameservers = mkIf cfg.enable [ "1.1.1.1" "8.8.8.8" "100.100.100.100" ];
+  config.networking.search = mkIf cfg.enable [ "koi-bebop.ts.net" ];
 
   # exit node
   config.networking.firewall.checkReversePath = mkIf cfg.exitNode "loose";

common/network/vpn.nix

@@ -26,6 +26,8 @@ in
       '';
     };
 
+    useOpenVPN = mkEnableOption "Uses OpenVPN instead of wireguard for PIA VPN connection";
+
     config = mkOption {
       type = types.anything;
       default = {};
@@ -41,6 +43,9 @@ in
   };
 
   config = mkIf cfg.enable {
+    pia.wireguard.enable = !cfg.useOpenVPN;
+    pia.wireguard.forwardPortForTransmission = !cfg.useOpenVPN;
+
     containers.${cfg.containerName} = {
       ephemeral = true;
       autoStart = true;
@@ -59,7 +64,7 @@ in
         }
       )));
 
-      enableTun = true;
+      enableTun = cfg.useOpenVPN;
       privateNetwork = true;
       hostAddress = "172.16.100.1";
       localAddress = "172.16.100.2";
@@ -67,28 +72,35 @@ in
       config = {
         imports = allModules ++ [cfg.config];
 
+        # speeds up evaluation
         nixpkgs.pkgs = pkgs;
 
-        networking.firewall.enable = mkForce false;
+        # networking.firewall.enable = mkForce false;
+        networking.firewall.trustedInterfaces = [
+          # completely trust internal interface to host
+          "eth0"
+        ];
 
-        pia.enable = true;
+        pia.openvpn.enable = cfg.useOpenVPN;
-        pia.server = "swiss.privacy.network"; # swiss vpn
+        pia.openvpn.server = "swiss.privacy.network"; # swiss vpn
 
+        # TODO fix so it does run it's own resolver again
         # run it's own DNS resolver
         networking.useHostResolvConf = false;
-        services.resolved.enable = true;
+        # services.resolved.enable = true;
+        networking.nameservers = [ "1.1.1.1" "8.8.8.8" ];
       };
     };
 
     # load secrets the container needs
     age.secrets = config.containers.${cfg.containerName}.config.age.secrets;
 
-    # forwarding for vpn container
+    # forwarding for vpn container (only for OpenVPN)
-    networking.nat.enable = true;
+    networking.nat.enable = mkIf cfg.useOpenVPN true;
-    networking.nat.internalInterfaces = [
+    networking.nat.internalInterfaces = mkIf cfg.useOpenVPN [
       "ve-${cfg.containerName}"
     ];
-    networking.ip_forward = true;
+    networking.ip_forward = mkIf cfg.useOpenVPN true;
 
     # assumes only one potential interface
     networking.usePredictableInterfaceNames = false;

common/network/zerotier.nix

@@ -1,14 +0,0 @@
-{ lib, config, ... }:
-
-let
-  cfg = config.services.zerotierone;
-in {
-  config = lib.mkIf cfg.enable {
-    services.zerotierone.joinNetworks = [
-      "565799d8f6d654c0"
-    ];
-    networking.firewall.allowedUDPPorts = [
-      9993
-    ];
-  };
-}

common/pc/default.nix

@@ -50,6 +50,8 @@ in {
       arduino
       yt-dlp
       jellyfin-media-player
+      joplin-desktop
+      config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
     ];
 
     # Networking

common/pc/mount-samba.nix

@@ -1,6 +1,6 @@
-# mounts the samba share on s0 over zeroteir
+# mounts the samba share on s0 over tailscale
 
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.services.mount-samba;
@@ -18,19 +18,25 @@ in {
     enable = lib.mkEnableOption "enable mounting samba shares";
   };
 
-  config = lib.mkIf (cfg.enable && config.services.zerotierone.enable) {
+  config = lib.mkIf (cfg.enable && config.services.tailscale.enable) {
     fileSystems."/mnt/public" = {
-        device = "//s0.zt.neet.dev/public";
+        device = "//s0.koi-bebop.ts.net/public";
         fsType = "cifs";
         options = [ opts ];
     };
 
     fileSystems."/mnt/private" = {
-        device = "//s0.zt.neet.dev/googlebot";
+        device = "//s0.koi-bebop.ts.net/googlebot";
         fsType = "cifs";
         options = [ opts ];
     };
 
     age.secrets.smb-secrets.file = ../../secrets/smb-secrets.age;
+
+    # Encrypted Vault
+    environment.shellAliases = {
+      vault_unlock = "${pkgs.gocryptfs}/bin/gocryptfs /mnt/private/.vault/ /mnt/vault/";
+      vault_lock = "umount /mnt/vault/";
+    };
   };
 }

common/server/default.nix

@@ -14,5 +14,9 @@
     ./radio.nix
     ./samba.nix
     ./owncast.nix
+    ./mailserver.nix
+    ./nextcloud.nix
+    ./iodine.nix
+    ./searx.nix
   ];
 }

common/server/gitea.nix

@@ -14,11 +14,8 @@ in {
       domain = cfg.hostname;
       rootUrl = "https://${cfg.hostname}/";
       appName = cfg.hostname;
-      ssh.enable = true;
       # lfs.enable = true;
       dump.enable = true;
-      cookieSecure = true;
-      disableRegistration = true;
       settings = {
         other = {
           SHOW_FOOTER_VERSION = false;
@@ -26,6 +23,12 @@ in {
         ui = {
           DEFAULT_THEME = "arc-green";
         };
+        service = {
+          DISABLE_REGISTRATION = true;
+        };
+        session = {
+          COOKIE_SECURE = true;
+        };
       };
     };
     services.nginx.enable = true;

common/server/iodine.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.iodine.server;
+in {
+  config = lib.mkIf cfg.enable {
+    # iodine DNS-based vpn
+    services.iodine.server = {
+      ip = "192.168.99.1";
+      domain = "tun.neet.dev";
+      passwordFile = "/run/agenix/iodine";
+    };
+    age.secrets.iodine.file = ../../secrets/iodine.age;
+    networking.firewall.allowedUDPPorts = [ 53 ];
+
+    networking.nat.internalInterfaces = [
+      "dns0" # iodine
+    ];
+  };
+}

common/server/mailserver.nix

@@ -0,0 +1,83 @@
+{ config, pkgs, lib, ... }:
+
+with builtins;
+
+let
+  cfg = config.mailserver;
+  domains = [
+    "neet.space"
+    "neet.dev"
+    "neet.cloud"
+    "runyan.org"
+    "runyan.rocks"
+    "thunderhex.com"
+    "tar.ninja"
+    "bsd.ninja"
+    "bsd.rocks"
+  ];
+in {
+  config = lib.mkIf cfg.enable {
+    # kresd doesn't work with tailscale MagicDNS
+    mailserver.localDnsResolver = false;
+    services.resolved.enable = true;
+
+    mailserver = {
+      fqdn = "mail.neet.dev";
+      dkimKeyBits = 2048;
+      indexDir = "/var/lib/mailindex";
+      enableManageSieve = true;
+      fullTextSearch.enable = true;
+      fullTextSearch.indexAttachments = true;
+      fullTextSearch.memoryLimit = 500;
+      inherit domains;
+      loginAccounts = {
+        "jeremy@runyan.org" = {
+          hashedPasswordFile = "/run/agenix/email-pw";
+          # catchall for all domains
+          aliases = map (domain: "@${domain}") domains;
+        };
+      };
+      rejectRecipients = [
+        "george@runyan.org"
+        "joslyn@runyan.org"
+        "damon@runyan.org"
+        "jonas@runyan.org"
+      ];
+      certificateScheme = 3; # use let's encrypt for certs
+    };
+    age.secrets.email-pw.file = ../../secrets/email-pw.age;
+
+    # sendmail to use xxx@domain instead of xxx@mail.domain
+    services.postfix.origin = "$mydomain";
+
+    # relay sent mail through mailgun
+    # https://www.howtoforge.com/community/threads/different-smtp-relays-for-different-domains-in-postfix.82711/#post-392620
+    services.postfix.config = {
+      smtp_sasl_auth_enable = "yes";
+      smtp_sasl_security_options = "noanonymous";
+      smtp_sasl_password_maps = "hash:/var/lib/postfix/conf/sasl_relay_passwd";
+      smtp_use_tls = "yes";
+      sender_dependent_relayhost_maps = "hash:/var/lib/postfix/conf/sender_relay";
+      smtp_sender_dependent_authentication = "yes";
+    };
+    services.postfix.mapFiles.sender_relay = let
+      relayHost = "[smtp.mailgun.org]:587";
+    in pkgs.writeText "sender_relay"
+      (concatStringsSep "\n" (map (domain: "@${domain} ${relayHost}") domains));
+    services.postfix.mapFiles.sasl_relay_passwd = "/run/agenix/sasl_relay_passwd";
+    age.secrets.sasl_relay_passwd.file = ../../secrets/sasl_relay_passwd.age;
+
+    # webmail
+    services.nginx.enable = true;
+    services.roundcube = {
+      enable = true;
+      hostName = config.mailserver.fqdn;
+      extraConfig = ''
+        # starttls needed for authentication, so the fqdn required to match the certificate
+        $config['smtp_server'] = "tls://${config.mailserver.fqdn}";
+        $config['smtp_user'] = "%u";
+        $config['smtp_pass'] = "%p";
+      '';
+    };
+  };
+}

common/server/nextcloud.nix

@@ -0,0 +1,27 @@
+{ config, pkgs, lib, ... }:
+
+
+let
+  cfg = config.services.nextcloud;
+in {
+  config = lib.mkIf cfg.enable {
+    services.nextcloud = {
+      https = true;
+      package = pkgs.nextcloud25;
+      hostName = "neet.cloud";
+      config.dbtype = "sqlite";
+      config.adminuser = "jeremy";
+      config.adminpassFile = "/run/agenix/nextcloud-pw";
+      autoUpdateApps.enable = true;
+      enableBrokenCiphersForSSE = false;
+    };
+    age.secrets.nextcloud-pw = {
+      file = ../../secrets/nextcloud-pw.age;
+      owner = "nextcloud";
+    };
+    services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
+      enableACME = true;
+      forceSSL = true;
+    };
+  };
+}

common/server/searx.nix

@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.searx;
+in {
+  config = lib.mkIf cfg.enable {
+    services.searx = {
+      environmentFile = "/run/agenix/searx";
+      settings = {
+        server.port = 43254;
+        server.secret_key = "@SEARX_SECRET_KEY@";
+        engines = [ {
+          name = "wolframalpha";
+          shortcut = "wa";
+          api_key = "@WOLFRAM_API_KEY@";
+          engine = "wolframalpha_api";
+        } ];
+      };
+    };
+    services.nginx.virtualHosts."search.neet.space" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "http://localhost:${toString config.services.searx.settings.server.port}";
+      };
+    };
+    age.secrets.searx.file = ../../secrets/searx.age;
+  };
+}

common/shell.nix

@@ -1,34 +1,24 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # Improvements to the default shell
-# - use nix-locate for command-not-found
+# - use nix-index for command-not-found
 # - disable fish's annoying greeting message
 # - add some handy shell commands
 
-let
+{
-  nix-locate = config.inputs.nix-locate.packages.${config.currentSystem}.default;
+  environment.systemPackages = with pkgs; [
-in {
+    comma
-  programs.command-not-found.enable = false;
-
-  environment.systemPackages = [
-    nix-locate
   ];
 
+  # nix-index
+  programs.nix-index.enable = true;
+  programs.nix-index.enableFishIntegration = true;
+  programs.command-not-found.enable = false;
+
   programs.fish = {
     enable = true;
 
-    shellInit = let
+    shellInit = ''
-      wrapper = pkgs.writeScript "command-not-found" ''
-        #!${pkgs.bash}/bin/bash
-        source ${nix-locate}/etc/profile.d/command-not-found.sh
-        command_not_found_handle "$@"
-      '';
-    in ''
-      # use nix-locate for command-not-found functionality
-      function __fish_command_not_found_handler --on-event fish_command_not_found
-          ${wrapper} $argv
-      end
-
       # disable annoying fish shell greeting
       set fish_greeting
     '';
@@ -38,9 +28,23 @@ in {
     myip = "dig +short myip.opendns.com @resolver1.opendns.com";
 
     # https://linuxreviews.org/HOWTO_Test_Disk_I/O_Performance
-    io_seq_read = "nix run nixpkgs#fio -- --name TEST --eta-newline=5s --filename=temp.file --rw=read --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_seq_read = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=read --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_seq_write = "nix run nixpkgs#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_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 = "nix run nixpkgs#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_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 = "nix run nixpkgs#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";
+    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";
   };
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      # comma uses the "nix-index" package built into nixpkgs by default.
+      # That package doesn't use the prebuilt nix-index database so it needs to be changed.
+      comma = prev.comma.overrideAttrs (old: {
+        postInstall = ''
+          wrapProgram $out/bin/comma \
+            --prefix PATH : ${lib.makeBinPath [ prev.fzy config.programs.nix-index.package ]}
+          ln -s $out/bin/comma $out/bin/,
+        '';
+      });
+    })
+  ];
 }

common/ssh.nix

@@ -2,62 +2,37 @@ rec {
   users = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVR/R3ZOsv7TZbICGBCHdjh1NDT8SnswUyINeJOC7QG"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0dcqL/FhHmv+a1iz3f9LJ48xubO7MZHy35rW9SZOYM"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO0VFnn3+Mh0nWeN92jov81qNE9fpzTAHYBphNoY7HUx" # reg
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSkKiRUUmnErOKGx81nyge/9KqjkPh8BfDk0D3oP586" # nat
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP" # ray
-  ];
+  ] ++ higherTrustUserKeys;
   system = {
-    liza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDY/pNyWedEfU7Tq9ikGbriRuF1ZWkHhegGS17L0Vcdl";
     ponyo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBBlTAIp38RhErU1wNNV5MBeb+WGH0mhF/dxh5RsAXN";
     ponyo-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC9LQuuImgWlkjDhEEIbM1wOd+HqRv1RxvYZuLXPSdRi";
     ray = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB";
+    router = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFr2IHmWFlaLaLp5dGoSmFEYKA/eg2SwGXAogaOmLsHL";
+    router-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOw5dTPmtKqiPBH6VKyz5MYBubn8leAh5Eaw7s/O85c";
     s0 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";
-    n1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWlhd1Oid5Xf2zdcBrcdrR0TlhObutwcJ8piobRTpRt";
+    s0-unlock = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNiceeFMos5ZXcYem4yFxh8PiZNNnuvhlyLbQLrgIZH";
-    n2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7bRiRutnI7Bmyt/I238E3Fp5DqiClIXiVibsccipOr";
-    n3 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+rJEaRrFDGirQC2UoWQkmpzLg4qgTjGJgVqiipWiU5";
-    n4 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINYm2ROIfCeGz6QtDwqAmcj2DX9tq2CZn0eLhskdvB4Z";
-    n5 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5Qhvwq3PiHEKf+2/4w5ZJkSMNzFLhIRrPOR98m7wW4";
-    n6 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/P/pa9+qhKAPfvvd8xSO2komJqDW0M1nCK7ZrP6PO7";
-    n7 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtOlOvTlMX2mxPaXDJ6VlMe5rmroUXpKmJVNxgV32xL";
   };
 
+  higherTrustUserKeys = [
+    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEaGIwLiUa6wQLlEF+keQOIYy/tCmJvV6eENzUQjSqW2AAAABHNzaDo=" # ray fido
+  ];
+
   # groups
   systems = with system; [
-    liza
     ponyo
     ray
+    router
     s0
-    n1
-    n2
-    n3
-    n4
-    n5
-    n6
-    n7
   ];
   personal = with system; [
     ray
   ];
   servers = with system; [
-    liza
     ponyo
+    router
     s0
-    n1
-    n2
-    n3
-    n4
-    n5
-    n6
-    n7
-  ];
-  compute = with system; [
-    n1
-    n2
-    n3
-    n4
-    n5
-    n6
-    n7
   ];
   storage = with system; [
     s0

flake.lock

@@ -105,6 +105,31 @@
         "type": "github"
       }
     },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": [
+          "simple-nixos-mailserver",
+          "utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1674127017,
+        "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -136,39 +161,38 @@
         "type": "github"
       }
     },
-    "nix-locate": {
+    "nix-index-database": {
       "inputs": {
-        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1673969751,
+        "lastModified": 1677382901,
-        "narHash": "sha256-U6aYz3lqZ4NVEGEWiti1i0FyqEo4bUjnTAnA73DPnNU=",
+        "narHash": "sha256-2idFWlTVG+qUZkU2/W50amGSIxmN56igIkMAXKbv4S4=",
-        "owner": "bennofs",
+        "owner": "Mic92",
-        "repo": "nix-index",
+        "repo": "nix-index-database",
-        "rev": "5f98881b1ed27ab6656e6d71b534f88430f6823a",
+        "rev": "4306fa7c12e098360439faac1a2e6b8e509ec97c",
         "type": "github"
       },
       "original": {
-        "owner": "bennofs",
+        "owner": "Mic92",
-        "repo": "nix-index",
+        "repo": "nix-index-database",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1672580127,
+        "lastModified": 1677823547,
-        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
+        "narHash": "sha256-xD2qco8Pw8HAXgjf9OSi2H2N20WaTrtvgcl21525kVE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0874168639713f547c05947c76124f78441ea46c",
+        "rev": "78c4d33c16092e535bc4ba1284ba49e3e138483a",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.05",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -188,22 +212,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1675835843,
-        "narHash": "sha256-y1dSCQPcof4CWzRYRqDj4qZzbBl+raVPAko5Prdil28=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "32f914af34f126f54b45e482fb2da4ae78f3095f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "radio": {
       "inputs": {
         "flake-utils": [
@@ -250,10 +258,10 @@
         "agenix": "agenix",
         "archivebox": "archivebox",
         "dailybuild_modules": "dailybuild_modules",
+        "deploy-rs": "deploy-rs",
         "flake-utils": "flake-utils",
-        "nix-locate": "nix-locate",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "radio": "radio",
         "radio-web": "radio-web",
         "simple-nixos-mailserver": "simple-nixos-mailserver"

flake.nix

@@ -1,13 +1,11 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff";
+    # nixpkgs-patch-howdy.flake = false;
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    nix-locate.url = "github:bennofs/nix-index";
-    nix-locate.inputs.nixpkgs.follows = "nixpkgs";
-
     # mail server
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
     simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
@@ -32,21 +30,31 @@
     archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git";
     archivebox.inputs.nixpkgs.follows = "nixpkgs";
     archivebox.inputs.flake-utils.follows = "flake-utils";
+
+    # nixos config deployment
+    deploy-rs.url = "github:serokell/deploy-rs";
+    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
+    deploy-rs.inputs.utils.follows = "simple-nixos-mailserver/utils";
+
+    # prebuilt nix-index database
+    nix-index-database.url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: {
+  outputs = { self, nixpkgs, ... }@inputs: {
 
     nixosConfigurations =
     let
-      modules = system: [
+      modules = system: with inputs; [
         ./common
-        inputs.simple-nixos-mailserver.nixosModule
+        simple-nixos-mailserver.nixosModule
-        inputs.agenix.nixosModules.default
+        agenix.nixosModules.default
-        inputs.dailybuild_modules.nixosModule
+        dailybuild_modules.nixosModule
-        inputs.archivebox.nixosModule
+        archivebox.nixosModule
+        nix-index-database.nixosModules.nix-index
         ({ lib, ... }: {
           config.environment.systemPackages = [
-            inputs.agenix.packages.${system}.agenix
+            agenix.packages.${system}.agenix
           ];
 
           # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
@@ -58,7 +66,18 @@
       mkSystem = system: nixpkgs: path:
         let
           allModules = modules system;
-        in nixpkgs.lib.nixosSystem {
+
+          # 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-patch-howdy
+            ];
+          };
+          patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self=nixpkgs; });
+
+        in patchedNixpkgs.lib.nixosSystem {
           inherit system;
           modules = allModules ++ [path];
 
@@ -68,19 +87,11 @@
         };
     in
     {
-      "reg" = mkSystem "x86_64-linux" nixpkgs ./machines/reg/configuration.nix;
+      "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix;
-      "ray" = mkSystem "x86_64-linux" nixpkgs-unstable ./machines/ray/configuration.nix;
+      # "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix;
-      "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix;
-      "liza" = mkSystem "x86_64-linux" nixpkgs ./machines/liza/configuration.nix;
       "ponyo" = mkSystem "x86_64-linux" nixpkgs ./machines/ponyo/configuration.nix;
-      "s0" = mkSystem "aarch64-linux" nixpkgs-unstable ./machines/storage/s0/configuration.nix;
+      "router" = mkSystem "x86_64-linux" nixpkgs ./machines/router/configuration.nix;
-      "n1" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n1/configuration.nix;
+      "s0" = mkSystem "x86_64-linux" nixpkgs ./machines/storage/s0/configuration.nix;
-      "n2" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n2/configuration.nix;
-      "n3" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n3/configuration.nix;
-      "n4" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n4/configuration.nix;
-      "n5" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n5/configuration.nix;
-      "n6" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n6/configuration.nix;
-      "n7" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n7/configuration.nix;
     };
 
     packages = let
@@ -100,5 +111,22 @@
       "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};
+        };
+
+      in {
+        s0 = mkDeploy "s0" "s0";
+        router = mkDeploy "router" "192.168.1.228";
+        ponyo = mkDeploy "ponyo" "ponyo.neet.dev";
+      };
+
+    checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
   };
 }

machines/compute/common.nix

@@ -1,24 +0,0 @@
-{ config, ... }:
-
-{
-  # NixOS wants to enable GRUB by default
-  boot.loader.grub.enable = false;
-  # Enables the generation of /boot/extlinux/extlinux.conf
-  boot.loader.generic-extlinux-compatible.enable = true;
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  };
-
-  system.autoUpgrade.enable = true;
-
-  networking.interfaces.eth0.useDHCP = true;
-
-  hardware.deviceTree.enable = true;
-  hardware.deviceTree.overlays = [
-    ./sopine-baseboard-ethernet.dtbo # fix pine64 clusterboard ethernet
-  ];
-}

machines/compute/n1/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n1";
-}

machines/compute/n2/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n2";
-}

machines/compute/n3/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n3";
-}

machines/compute/n4/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n4";
-}

machines/compute/n5/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n5";
-}

machines/compute/n6/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n6";
-}

machines/compute/n7/configuration.nix

@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n7";
-}

machines/compute/sopine-baseboard-ethernet.dts

@@ -1,15 +0,0 @@
-/dts-v1/;
-
-/ {
-	model = "SoPine with baseboard";
-	compatible = "pine64,sopine-baseboard\0pine64,sopine\0allwinner,sun50i-a64";
-
-	fragment@0 {
-/*		target = <&ethernet@1c30000>; */
-		target-path = "/soc/ethernet@1c30000";
-		__overlay__ {
-			allwinner,tx-delay-ps = <500>;
-		};
-	};
-
-};

machines/ephemeral/minimal.nix

@@ -1,18 +1,35 @@
-{ pkgs, ... }:
+{ pkgs, modulesPath, ... }:
 
 {
+  imports = [
+    (modulesPath + "/installer/cd-dvd/channel.nix")
+  ];
+
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "e1000" "e1000e" "virtio_pci" "r8169" ];
   boot.kernelParams = [
     "panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues
-    "console=ttyS0" # enable serial console
+    "console=ttyS0,115200" # enable serial console
     "console=tty1"
   ];
   boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # hardware.enableAllFirmware = true;
+  # nixpkgs.config.allowUnfree = true;
+
   environment.systemPackages = with pkgs; [
     cryptsetup
     btrfs-progs
+    git git-lfs
+    wget
+    htop
+    dnsutils
+    pciutils
+    usbutils
+    lm_sensors
   ];
+
   environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
 
   networking.useDHCP = true;
@@ -24,5 +41,5 @@
   };
 
   services.getty.autologinUser = "root";
-  users.users.root.openssh.authorizedKeys.keys = (import ../common/ssh.nix).users;
+  users.users.root.openssh.authorizedKeys.keys = (import ../../common/ssh.nix).users;
 }

machines/liza/configuration.nix

@@ -1,110 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports =[
-    ./hardware-configuration.nix
-  ];
-
-  # 5synsrjgvfzywruomjsfvfwhhlgxqhyofkzeqt2eisyijvjvebnu2xyd.onion
-
-  firmware.x86_64.enable = true;
-  bios = {
-    enable = true;
-    device = "/dev/sda";
-  };
-
-  luks = {
-    enable = true;
-    device.path = "/dev/disk/by-uuid/2f736fba-8a0c-4fb5-8041-c849fb5e1297";
-  };
-
-  system.autoUpgrade.enable = true;
-
-  networking.hostName = "liza";
-
-  networking.interfaces.enp1s0.useDHCP = true;
-
-  mailserver = {
-    enable = true;
-    fqdn = "mail.neet.dev";
-    dkimKeyBits = 2048;
-    indexDir = "/var/lib/mailindex";
-    enableManageSieve = true;
-    fullTextSearch.enable = true;
-    fullTextSearch.indexAttachments = true;
-    fullTextSearch.memoryLimit = 500;
-    domains = [
-      "neet.space" "neet.dev" "neet.cloud"
-      "runyan.org" "runyan.rocks"
-      "thunderhex.com" "tar.ninja"
-      "bsd.ninja" "bsd.rocks"
-    ];
-    loginAccounts = {
-      "jeremy@runyan.org" = {
-        hashedPasswordFile = "/run/agenix/email-pw";
-        aliases = [
-          "@neet.space" "@neet.cloud" "@neet.dev"
-          "@runyan.org" "@runyan.rocks"
-          "@thunderhex.com" "@tar.ninja"
-          "@bsd.ninja" "@bsd.rocks"
-        ];
-      };
-    };
-    rejectRecipients = [
-      "george@runyan.org"
-      "joslyn@runyan.org"
-      "damon@runyan.org"
-      "jonas@runyan.org"
-    ];
-    certificateScheme = 3; # use let's encrypt for certs
-  };
-  age.secrets.email-pw.file = ../../secrets/email-pw.age;
-
-  # sendmail to use xxx@domain instead of xxx@mail.domain
-  services.postfix.origin = "$mydomain";
-
-  # relay sent mail through mailgun
-  # https://www.howtoforge.com/community/threads/different-smtp-relays-for-different-domains-in-postfix.82711/#post-392620
-  services.postfix.config = {
-    smtp_sasl_auth_enable = "yes";
-    smtp_sasl_security_options = "noanonymous";
-    smtp_sasl_password_maps = "hash:/var/lib/postfix/conf/sasl_relay_passwd";
-    smtp_use_tls = "yes";
-    sender_dependent_relayhost_maps = "hash:/var/lib/postfix/conf/sender_relay";
-    smtp_sender_dependent_authentication = "yes";
-  };
-  services.postfix.mapFiles.sender_relay = let
-    relayHost = "[smtp.mailgun.org]:587";
-  in pkgs.writeText "sender_relay" ''
-    @neet.space ${relayHost}
-    @neet.cloud ${relayHost}
-    @neet.dev ${relayHost}
-    @runyan.org ${relayHost}
-    @runyan.rocks ${relayHost}
-    @thunderhex.com ${relayHost}
-    @tar.ninja ${relayHost}
-    @bsd.ninja ${relayHost}
-    @bsd.rocks ${relayHost}
-  '';
-  services.postfix.mapFiles.sasl_relay_passwd = "/run/agenix/sasl_relay_passwd";
-  age.secrets.sasl_relay_passwd.file = ../../secrets/sasl_relay_passwd.age;
-
-  services.nextcloud = {
-    enable = true;
-    https = true;
-    package = pkgs.nextcloud22;
-    hostName = "neet.cloud";
-    config.dbtype = "sqlite";
-    config.adminuser = "jeremy";
-    config.adminpassFile = "/run/agenix/nextcloud-pw";
-    autoUpdateApps.enable = true;
-  };
-  age.secrets.nextcloud-pw = {
-    file = ../../secrets/nextcloud-pw.age;
-    owner = "nextcloud";
-  };
-  services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
-    enableACME = true;
-    forceSSL = true;
-  };
-}

machines/liza/hardware-configuration.nix

@@ -1,36 +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 + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "floppy" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b90eaf3c-2f91-499a-a066-861e0f4478df";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/b90eaf3c-2f91-499a-a066-861e0f4478df";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2b8f6f6d-9358-4d30-8341-7426574e0819";
-      fsType = "ext3";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/ef7a83db-4b33-41d1-85fc-cff69e480352"; }
-    ];
-
-}

machines/nat/configuration.nix

@@ -10,8 +10,6 @@
   networking.hostName = "nat";
   networking.interfaces.ens160.useDHCP = true;
 
-  services.zerotierone.enable = true;
-
   de.enable = true;
   de.touchpad.enable = true;
 }

machines/ponyo/configuration.nix

@@ -7,27 +7,24 @@
 
   networking.hostName = "ponyo";
 
-  firmware.x86_64.enable = true;
-  bios = {
-    enable = true;
-    device = "/dev/sda";
-  };
-
-  luks = {
-    enable = true;
-    device.path = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
-  };
-
   system.autoUpgrade.enable = true;
 
-  services.zerotierone.enable = true;
+  # p2p mesh network
+  services.tailscale.exitNode = true;
 
+  # email server
+  mailserver.enable = true;
+
+  # nextcloud
+  services.nextcloud.enable = true;
+
+  # git
   services.gitea = {
     enable = true;
     hostname = "git.neet.dev";
-    disableRegistration = true;
   };
 
+  # IRC
   services.thelounge = {
     enable = true;
     port = 9000;
@@ -39,12 +36,14 @@
     };
   };
 
+  # mumble
   services.murmur = {
     enable = true;
     port = 23563;
     domain = "voice.neet.space";
   };
 
+  # IRC bot
   services.drastikbot = {
     enable = true;
     wolframAppIdFile = "/run/agenix/wolframalpha";
@@ -54,7 +53,7 @@
     owner = config.services.drastikbot.user;
   };
 
-  # wrap radio in a VPN
+  # music radio
   vpn-container.enable = true;
   vpn-container.config = {
     services.radio = {
@@ -62,11 +61,7 @@
       host = "radio.runyan.org";
     };
   };
-
+  pia.wireguard.badPortForwardPorts = [];
-  # tailscale
-  services.tailscale.exitNode = true;
-
-  # icecast endpoint + website
   services.nginx.virtualHosts."radio.runyan.org" = {
     enableACME = true;
     forceSSL = true;
@@ -81,6 +76,7 @@
     };
   };
 
+  # matrix home server
   services.matrix = {
     enable = true;
     host = "neet.space";
@@ -98,67 +94,36 @@
       secret = "a8369a0e96922abf72494bb888c85831b";
     };
   };
+  # pin postgresql for matrix (will need to migrate eventually)
   services.postgresql.package = pkgs.postgresql_11;
 
-  services.searx = {
-    enable = true;
-    environmentFile = "/run/agenix/searx";
-    settings = {
-      server.port = 43254;
-      server.secret_key = "@SEARX_SECRET_KEY@";
-      engines = [ {
-        name = "wolframalpha";
-        shortcut = "wa";
-        api_key = "@WOLFRAM_API_KEY@";
-        engine = "wolframalpha_api";
-      } ];
-    };
-  };
-  services.nginx.virtualHosts."search.neet.space" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${toString config.services.searx.settings.server.port}";
-    };
-  };
-  age.secrets.searx.file = ../../secrets/searx.age;
-
   # iodine DNS-based vpn
-  services.iodine.server = {
+  services.iodine.server.enable = true;
-    enable = true;
-    ip = "192.168.99.1";
-    domain = "tun.neet.dev";
-    passwordFile = "/run/agenix/iodine";
-  };
-  age.secrets.iodine.file = ../../secrets/iodine.age;
-  networking.firewall.allowedUDPPorts = [ 53 ];
-
-  networking.nat.internalInterfaces = [
-    "dns0" # iodine
-  ];
 
+  # proxied web services
   services.nginx.enable = true;
   services.nginx.virtualHosts."jellyfin.neet.cloud" = {
     enableACME = true;
     forceSSL = true;
     locations."/" = {
-      proxyPass = "http://s0.zt.neet.dev";
+      proxyPass = "http://s0.koi-bebop.ts.net";
       proxyWebsockets = true;
     };
   };
   services.nginx.virtualHosts."navidrome.neet.cloud" = {
     enableACME = true;
     forceSSL = true;
-    locations."/".proxyPass = "http://s0.zt.neet.dev:4533";
+    locations."/".proxyPass = "http://s0.koi-bebop.ts.net:4533";
   };
 
+  # TODO replace with a proper file hosting service
   services.nginx.virtualHosts."tmp.neet.dev" = {
     enableACME = true;
     forceSSL = true;
     root = "/var/www/tmp";
   };
 
-  # redirect to github
+  # redirect runyan.org to github
   services.nginx.virtualHosts."runyan.org" = {
     enableACME = true;
     forceSSL = true;
@@ -167,6 +132,7 @@
     '';
   };
 
+  # owncast live streaming
   services.owncast.enable = true;
   services.owncast.hostname = "live.neet.dev";
 }

machines/ponyo/hardware-configuration.nix

@@ -10,6 +10,17 @@
   boot.kernelModules = [ "kvm-intel" "nvme" ];
   boot.extraModulePackages = [ ];
 
+  firmware.x86_64.enable = true;
+
+  bios = {
+    enable = true;
+    device = "/dev/sda";
+  };
+
+  remoteLuksUnlock.enable = true;
+  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
+  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/e52b01b3-81c8-4bb2-ae7e-a3d9c793cb00"; # expanded disk
+
   fileSystems."/" =
     { device = "/dev/mapper/enc-pv";
       fsType = "btrfs";
@@ -27,11 +38,5 @@
     }
   ];
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  networking.interfaces.eth0.useDHCP = true;
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = lib.mkDefault false;
-  networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/ray/configuration.nix

@@ -5,37 +5,24 @@
     ./hardware-configuration.nix
   ];
 
-  firmware.x86_64.enable = true;
-  efi.enable = true;
-
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
-    allowDiscards = true;
-  };
-
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
   networking.hostName = "ray";
 
-  hardware.enableAllFirmware = true;
+  # 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 ];
 
   # depthai
   services.udev.extraRules = ''
     SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
   '';
 
-  # 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";
-    };
-  };
-
   # virt-manager
   virtualisation.libvirtd.enable = true;
   programs.dconf.enable = true;
@@ -43,75 +30,13 @@
   environment.systemPackages = with pkgs; [ virt-manager ];
   users.users.googlebot.extraGroups = [ "libvirtd" ];
 
-  # vpn-container.enable = true;
+  # allow building ARM derivations
-  # containers.vpn.interfaces = [ "piaw" ];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
-  # allow traffic for wireguard interface to pass
+  services.spotifyd.enable = true;
-  # networking.firewall = {
-  #   # wireguard trips rpfilter up
-  #   extraCommands = ''
-  #     ip46tables -t raw -I nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN
-  #     ip46tables -t raw -I nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN
-  #   '';
-  #   extraStopCommands = ''
-  #     ip46tables -t raw -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true
-  #     ip46tables -t raw -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
-  #   '';
-  # };
-
-  # systemd.services.pia-vpn-wireguard = {
-  #   enable = true;
-  #   description = "PIA VPN WireGuard Tunnel";
-  #   requires = [ "network-online.target" ];
-  #   after = [ "network.target" "network-online.target" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   environment.DEVICE = "piaw";
-  #   path = with pkgs; [ kmod wireguard-tools jq curl ];
-
-  #   serviceConfig = {
-  #     Type = "oneshot";
-  #     RemainAfterExit = true;
-  #   };
-
-  #   script = ''
-  #     WG_HOSTNAME=zurich406
-  #     WG_SERVER_IP=156.146.62.153
-
-  #     PIA_USER=`sed '1q;d' /run/agenix/pia-login.conf`
-  #     PIA_PASS=`sed '2q;d' /run/agenix/pia-login.conf`
-  #     PIA_TOKEN=`curl -s -u "$PIA_USER:$PIA_PASS" https://www.privateinternetaccess.com/gtoken/generateToken | jq -r '.token'`
-  #     privKey=$(wg genkey)
-  #     pubKey=$(echo "$privKey" | wg pubkey)
-  #     wireguard_json=`curl -s -G --connect-to "$WG_HOSTNAME::$WG_SERVER_IP:" --cacert "${./ca.rsa.4096.crt}" --data-urlencode "pt=$PIA_TOKEN" --data-urlencode "pubkey=$pubKey" https://$WG_HOSTNAME:1337/addKey`
-
-  #     echo "               
-  #     [Interface]
-  #     Address = $(echo "$wireguard_json" | jq -r '.peer_ip')
-  #     PrivateKey = $privKey
-  #     ListenPort = 51820
-  #     [Peer]
-  #     PersistentKeepalive = 25
-  #     PublicKey = $(echo "$wireguard_json" | jq -r '.server_key')
-  #     AllowedIPs = 0.0.0.0/0
-  #     Endpoint = $WG_SERVER_IP:$(echo "$wireguard_json" | jq -r '.server_port')
-  #     " > /tmp/piaw.conf
-
-  #     # TODO make /tmp/piaw.conf ro to root
-
-  #     ${lib.optionalString (!config.boot.isContainer) "modprobe wireguard"}
-  #     wg-quick up /tmp/piaw.conf
-  #   '';
-
-  #   preStop = ''
-  #     wg-quick down /tmp/piaw.conf
-  #   '';
-  # };
-  # age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf;
 
   virtualisation.docker.enable = true;
 
-  services.zerotierone.enable = true;
-
   services.mount-samba.enable = true;
 
   de.enable = true;

machines/ray/hardware-configuration.nix

@@ -8,34 +8,55 @@
     [ (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"; }
     ];
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
 }

machines/reg/configuration.nix

@@ -1,35 +0,0 @@
-{ config, pkgs, fetchurl, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # smcxui7kwoyxpswwage4fkcppxnqzpw33xcmxmlhxvk5gcp5s6lrtfad.onion
-
-  boot.kernelPackages = pkgs.linuxPackages_5_12;
-
-  firmware.x86_64.enable = true;
-  efi.enable = true;
-
-  luks = {
-    enable = true;
-    device = {
-      path = "/dev/disk/by-uuid/975d8427-2c6a-440d-a1d2-18dd15ba5bc2";
-      allowDiscards = true;
-    };
-  };
-
-  networking.hostName = "reg";
-
-  de.enable = true;
-  de.touchpad.enable = true;
-
-  services.zerotierone.enable = true;
-
-  # VNC
-  networking.firewall.allowedTCPPorts = [ 5900 ];
-
-  networking.interfaces.enp57s0f1.useDHCP = true;
-}
-

machines/reg/hardware-configuration.nix

@@ -1,38 +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.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b3a2906b-e9a5-45bd-aac5-960297437fe9";
-      fsType = "btrfs";
-      options = [ "subvol=root" "noatime" "nodiratime" "discard" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/b3a2906b-e9a5-45bd-aac5-960297437fe9";
-      fsType = "btrfs";
-      options = [ "subvol=home" "noatime" "nodiratime" "discard" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6C41-24A0";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/34ec322f-79c3-4993-a073-ef1da3c6ef51"; }
-    ];
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}

machines/router/configuration.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  networking.hostName = "router";
+
+  system.autoUpgrade.enable = true;
+
+  services.tailscale.exitNode = true;
+
+  networking.useDHCP = lib.mkForce true;
+}

machines/router/hardware-configuration.nix

@@ -0,0 +1,49 @@
+{ config, pkgs, ... }:
+
+{
+  # kernel
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.initrd.availableKernelModules = [ "igb" "mt7915e" "xhci_pci" "ahci" "ehci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  # Enable serial output
+  boot.kernelParams = [
+    "panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues
+    "console=ttyS0,115200n8" # enable serial console
+  ];
+  boot.loader.grub.extraConfig = "
+    serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+    terminal_input serial
+    terminal_output serial
+  ";
+
+  # firmware
+  firmware.x86_64.enable = true;
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+
+  # boot
+  bios = {
+    enable = true;
+    device = "/dev/sda";
+  };
+
+  # disks
+  remoteLuksUnlock.enable = true;
+  boot.initrd.luks.devices."enc-pv".device = "/dev/disk/by-uuid/9b090551-f78e-45ca-8570-196ed6a4af0c";
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce";
+      fsType = "btrfs";
+    };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/d97f324f-3a2e-4b84-ae2a-4b3d1209c689";
+      fsType = "ext3";
+    };
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/45bf58dd-67eb-45e4-9a98-246e23fa7abd"; }
+    ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+}

machines/storage/s0/configuration.nix

@@ -2,50 +2,48 @@
 
 {
   imports =[
-    ./helios64
     ./hardware-configuration.nix
   ];
 
-  # nsw2zwifzyl42mbhabayjo42b2kkq3wd3dqyl6efxsz6pvmgm5cup5ad.onion
-
   networking.hostName = "s0";
 
-  boot.loader.grub.enable = false;
-  boot.loader.generic-extlinux-compatible.enable = true;
-
   system.autoUpgrade.enable = true;
 
-  boot.supportedFilesystems = [ "bcachefs" ];
+  services.iperf3.enable = true;
+  services.iperf3.openFirewall = true;
 
-  services.zerotierone.enable = true;
+  # p2p mesh network
+  services.tailscale.exitNode = true;
 
   # for education purposes only
   services.pykms.enable = true;
   services.pykms.openFirewallPort = true;
 
-  users.users.googlebot.packages = with pkgs; [
+  # samba
-    bcachefs-tools
-  ];
-
   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/Plex/Music";
+      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/Plex"
+    "/data/samba/Public"
   ];
   vpn-container.config = {
     # servarr services
@@ -63,9 +61,6 @@
     services.lidarr.user = "public_data";
     services.lidarr.group = "public_data";
 
-    services.jellyfin.enable = true;
-    users.users.${config.services.jellyfin.user}.extraGroups = [ "public_data" ];
-
     services.transmission = {
       enable = true;
       performanceNetParameters = true;
@@ -75,7 +70,7 @@
         /* directory settings */
         # "watch-dir" = "/srv/storage/Transmission/To-Download";
         # "watch-dir-enabled" = true;
-        "download-dir" = "/data/samba/Public/Plex/Transmission";
+        "download-dir" = "/data/samba/Public/Media/Transmission";
         "incomplete-dir" = "/var/lib/transmission/.incomplete";
         "incomplete-dir-enabled" = true;
 
@@ -121,10 +116,35 @@
       uid = 994;
     };
   };
+  pia.wireguard.badPortForwardPorts = [
+    9696 # prowlarr
+    8989 # sonarr
+    6767 # bazarr
+    7878 # radarr
+    8686 # lidarr
+    9091 # transmission web
+  ];
 
-  # unpackerr
+  # jellyfin
-  # flaresolverr
+  # 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";
@@ -133,57 +153,15 @@
   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://vpn.containers:8096";
+    proxyPass = "http://localhost:8096";
     proxyWebsockets = true;
   };
   services.nginx.virtualHosts."jellyfin.neet.cloud".locations."/" = {
-    proxyPass = "http://vpn.containers:8096";
+    proxyPass = "http://localhost:8096";
     proxyWebsockets = true;
   };
   services.nginx.virtualHosts."transmission.s0".locations."/" = {
     proxyPass = "http://vpn.containers:9091";
     proxyWebsockets = true;
   };
-
-  # tailscale
-  services.tailscale.exitNode = true;
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      radarr = prev.radarr.overrideAttrs (old: rec {
-        installPhase = ''
-          runHook preInstall
-          mkdir -p $out/{bin,share/${old.pname}-${old.version}}
-          cp -r * $out/share/${old.pname}-${old.version}/.
-          makeWrapper "${final.dotnet-runtime}/bin/dotnet" $out/bin/Radarr \
-            --add-flags "$out/share/${old.pname}-${old.version}/Radarr.dll" \
-            --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-              final.curl final.sqlite final.libmediainfo final.mono final.openssl final.icu final.zlib ]}
-          runHook postInstall
-        '';
-      });
-
-      prowlarr = prev.prowlarr.overrideAttrs (old: {
-        installPhase = ''
-          runHook preInstall
-          mkdir -p $out/{bin,share/${old.pname}-${old.version}}
-          cp -r * $out/share/${old.pname}-${old.version}/.
-          makeWrapper "${final.dotnet-runtime}/bin/dotnet" $out/bin/Prowlarr \
-            --add-flags "$out/share/${old.pname}-${old.version}/Prowlarr.dll" \
-            --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-              final.curl final.sqlite final.libmediainfo final.mono final.openssl final.icu final.zlib ]}
-          runHook postInstall
-        '';
-      });
-
-      pykms = prev.pykms.overrideAttrs (old: {
-        src = pkgs.fetchFromGitHub {
-          owner = "Py-KMS-Organization";
-          repo = "py-kms";
-          rev = "7bea3a2cb03c4c3666ff41185ace9f7ea2a07b99";
-          sha256 = "90DqMqPjfqfyRq86UzG9B/TjY+yclJBlggw+eIDgRe0=";
-        };
-      });
-    })
-  ];
 }

machines/storage/s0/hardware-configuration.nix

@@ -1,6 +1,3 @@
-# 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, ... }:
 
 {
@@ -8,51 +5,59 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  # boot
-    "ahci"
+  efi.enable = true;
-    "usb_storage"
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
-    "bcache"
-  ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  boot.initrd.luks.devices."enc-pv1" = {
+  # firmware
-    device = "/dev/disk/by-uuid/e3b588b6-d07f-4221-a194-e1e900299752";
+  firmware.x86_64.enable = true;
-    allowDiscards = true; # SSD
+
-  };
+  ### disks ###
-  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/514231c1-5934-401f-80e1-e3b6b62dc9d5";
+
-  boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/f45abe73-d0c6-446f-b28c-7a96a3f87851";
+  # zfs
+  networking.hostId = "5e6791f0";
+  boot.supportedFilesystems = [ "zfs" ];
+  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+
+  # luks
+  remoteLuksUnlock.enable = true;
+  boot.initrd.luks.devices."enc-pv1".device = "/dev/disk/by-uuid/d52e99a9-8825-4d0a-afc1-8edbef7e0a86";
+  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/f7275585-7760-4230-97de-36704b9a2aa3";
+  boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38";
   boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/e2c7402a-e72c-4c4a-998f-82e4c10187bc";
-  boot.initrd.luks.devices."enc-pv5".device = "/dev/disk/by-uuid/5d1002b8-a0ed-4a1c-99f5-24b8816d9e38";
-  boot.initrd.luks.devices."enc-pvUSB" = {
-    device = "/dev/disk/by-uuid/c8e18f86-a950-4e4e-8f3c-366cc78db29b";
-    allowDiscards = true; # SSD
-  };
 
+  # mounts
   fileSystems."/" =
-    { device = "/dev/mapper/enc-pv1:/dev/mapper/enc-pv2:/dev/mapper/enc-pv3:/dev/mapper/enc-pv4:/dev/mapper/enc-pv5:/dev/mapper/enc-pvUSB";
+    { device = "rpool/nixos/root";
-      fsType = "bcachefs";
+      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";
+      fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];
+    };
+  fileSystems."/var/log" =
+    { device = "rpool/nixos/var/log";
+      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/8F7E-53C4";
+    { device = "/dev/disk/by-uuid/4FB4-738E";
       fsType = "vfat";
     };
+  swapDevices = [ ];
 
-  swapDevices = [
+  networking.interfaces.eth0.useDHCP = true;
-    {
-      device = "/dev/mmcblk1p2";
-      randomEncryption.enable = true;
-    }
-  ];
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  powerManagement.cpuFreqGovernor = "powersave";
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = lib.mkDefault false;
-  networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-  networking.interfaces.eth1.useDHCP = lib.mkDefault true;
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }

machines/storage/s0/helios64/README.md

@@ -1,62 +0,0 @@
-Kobol Helios64
-==============
-
-The `default.nix` module provides the required setup for the system to work.
-
-The `recommended.nix` module adds recommended settings for the system.
-
-Status
-------
-
-### Works
-
- - SATA hard drives
- - Ethernet (1gbps)
- - Serial through USB type-c (`ttyS2`)
-
-### Untested
-
- - Ethernet (2.5gbps)
- - DP video out
- - UPS behaviour
- - `rootfs` on SATA drives
-
-### Disabled
-
-Due to misbehaviour, `ttyS0` (`&uart0`, `serial@ff180000`) has been disabled
-via a kernel patch.
-
-Without this change, using, or attempting to use `ttyS0` will break serial
-output from `ttyS2`.
-
-
-Kernel
-------
-
-Only Linux 5.10 (LTS) is supported, using the patch set derived from Armbian.
-
-
-Requirements
-------------
-
-A *platform firmware* needs to be provided out of band for the system.
-
-The author recommends Tow-Boot, for which a [draft pull request](https://github.com/Tow-Boot/Tow-Boot/pull/54)
-adds support for the Helios64.
-
-Any other supported *platform firmware* should work too.
-
-> **NOTE**: at the time of writing (2021-10-10) the *platform firmware*
-> **must** make use of the proprietary ram training. The open source equivalent
-> will make the system unstable, and worse, will cause silent memory
-> corruption, in addition to loud memory corruption.
-
-
-Notes
------
-
-### Baud rate
-
-The serial baud rate is configured for `115200`, which is a more common default
-than the usual for Rockchip at `1500000`. See [the rationale for the decision](https://github.com/Tow-Boot/Tow-Boot/pull/33).
-

machines/storage/s0/helios64/default.nix

@@ -1,27 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./modules/fancontrol.nix
-    ./modules/heartbeat.nix
-    ./modules/ups.nix
-  ];
-
-  boot.kernelParams = lib.mkAfter [
-    "console=ttyS2,115200n8"
-    "earlycon=uart8250,mmio32,0xff1a0000"
-  ];
-
-  # Required for rootfs on sata
-  boot.initrd.availableKernelModules = [
-    "pcie-rockchip-host" # required for rootfs on pcie sata disks
-    "phy-rockchip-pcie" # required for rootfs on pcie sata disks
-    "phy-rockchip-usb" # maybe not needed
-    "uas" # required for rootfs on USB 3.0 sata disks
-  ];
-
-  # bcachefs kernel is 5.15. but need patches that are only in 5.16+
-  # Patch the device tree to add support for getting the cpu thermal temp
-  hardware.deviceTree.enable = true;
-  hardware.deviceTree.kernelPackage = pkgs.linux_latest;
-}

machines/storage/s0/helios64/modules/bsp/90-helios64-hwmon.rules

@@ -1,23 +0,0 @@
-# Helios64 persistent hwmon
-
-ACTION=="remove", GOTO="helios64_hwmon_end"
-
-#
-KERNELS=="fan1", SUBSYSTEMS=="platform", ENV{_HELIOS64_FAN_}="p6", ENV{_IS_HELIOS64_FAN_}="1", ENV{IS_HELIOS64_HWMON}="1"
-KERNELS=="fan2", SUBSYSTEMS=="platform", ENV{_HELIOS64_FAN_}="p7", ENV{_IS_HELIOS64_FAN_}="1", ENV{IS_HELIOS64_HWMON}="1"
-KERNELS=="2-004c", SUBSYSTEMS=="i2c", DRIVERS=="lm75", ENV{IS_HELIOS64_HWMON}="1"
-
-SUBSYSTEM!="hwmon", GOTO="helios64_hwmon_end"
-
-ENV{HWMON_PATH}="/sys%p"
-#
-ATTR{name}=="cpu_thermal", ENV{IS_HELIOS64_HWMON}="1", ENV{HELIOS64_SYMLINK}="/dev/thermal-cpu"
-#
-ENV{IS_HELIOS64_HWMON}=="1", ATTR{name}=="lm75", ENV{HELIOS64_SYMLINK}="/dev/thermal-board"
-ENV{_IS_HELIOS64_FAN_}=="1", ENV{HELIOS64_SYMLINK}="/dev/fan-$env{_HELIOS64_FAN_}"
-
-#
-ENV{IS_HELIOS64_HWMON}=="1", RUN+="/bin/ln -sf $env{HWMON_PATH} $env{HELIOS64_SYMLINK}"
-
-LABEL="helios64_hwmon_end"
-

machines/storage/s0/helios64/modules/bsp/90-helios64-ups.rules

@@ -1,11 +0,0 @@
-ACTION=="add", GOTO="helios64_ups_end"
-ACTION=="remove", GOTO="helios64_ups_end"
-
-# Power loss event
-ACTION=="change", SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTRS{online}=="0", RUN+="/usr/bin/systemctl start helios64-ups.timer"
-
-# Power restore event
-ACTION=="change", SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTRS{online}=="1", RUN+="/usr/bin/systemctl stop helios64-ups.timer"
-
-LABEL="helios64_ups_end"
-

machines/storage/s0/helios64/modules/fancontrol.nix

@@ -1,41 +0,0 @@
-{ pkgs, ... }:
-{
-  hardware.fancontrol.enable = true;
-  hardware.fancontrol.config = ''
-    # Helios64 PWM Fan Control Configuration
-    # Temp source : /dev/thermal-cpu
-    INTERVAL=10
-    FCTEMPS=/dev/fan-p6/pwm1=/dev/thermal-cpu/temp1_input /dev/fan-p7/pwm1=/dev/thermal-cpu/temp1_input
-    MINTEMP=/dev/fan-p6/pwm1=40 /dev/fan-p7/pwm1=40
-    MAXTEMP=/dev/fan-p6/pwm1=80 /dev/fan-p7/pwm1=80
-    MINSTART=/dev/fan-p6/pwm1=60 /dev/fan-p7/pwm1=60
-    MINSTOP=/dev/fan-p6/pwm1=29 /dev/fan-p7/pwm1=29
-    MINPWM=20
-  '';
-
-  services.udev.packages = [
-    # Fan control
-    (pkgs.callPackage (
-      { stdenv, lib, coreutils }:
-      stdenv.mkDerivation {
-        name = "helios64-udev-fancontrol";
-
-        dontUnpack = true;
-        dontBuild = true;
-
-        installPhase = ''
-          mkdir -p "$out/etc/udev/rules.d/";
-          install -Dm644 "${./bsp/90-helios64-hwmon.rules}" \
-            "$out/etc/udev/rules.d/90-helios64-hwmon.rules"
-          substituteInPlace "$out/etc/udev/rules.d/90-helios64-hwmon.rules" \
-            --replace '/bin/ln'  '${lib.getBin coreutils}/bin/ln'
-        '';
-
-        meta = with lib; {
-          description = "Udev rules for fancontrol for the Helios64";
-          platforms = platforms.linux;
-        };
-      }
-    ) {})
-  ];
-}

machines/storage/s0/helios64/modules/heartbeat.nix

@@ -1,22 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  systemd.services.heartbeat = {
-    enable = true;
-    description = "Enable heartbeat & network activity led on Helios64";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = ''
-        ${lib.getBin pkgs.bash}/bin/bash -c 'echo heartbeat | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:green\\:status/trigger'
-
-        # this led is not supported yet in the kernel i'm using
-        # ${lib.getBin pkgs.bash}/bin/bash -c 'echo netdev | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:blue\\:net/trigger'
-        # ${lib.getBin pkgs.bash}/bin/bash -c 'echo eth0 | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:blue\\:net/device_name'
-        # ${lib.getBin pkgs.bash}/bin/bash -c 'echo 1 | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:blue\\:net/link'
-        # ${lib.getBin pkgs.bash}/bin/bash -c 'echo 1 | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:blue\\:net/rx'
-        # ${lib.getBin pkgs.bash}/bin/bash -c 'echo 1 | ${lib.getBin pkgs.coreutils}/bin/tee /sys/class/leds/helios64\\:blue\\:net/tx'
-      '';
-    };
-    after = [ "getty.target" ];
-    wantedBy = [ "multi-user.target" ];
-  };
-}

machines/storage/s0/helios64/modules/ups.nix

@@ -1,51 +0,0 @@
-{ pkgs, ... }:
-{
-  systemd.services.helios64-ups = {
-    enable = true;
-    description = "Helios64 UPS Action";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.systemd}/bin/poweroff";
-    };
-  };
-
-  systemd.timers.helios64-ups = {
-    enable = true;
-    description = "Helios64 UPS Shutdown timer on power loss";
-    # disabling the timer by default. Even though armbian enaled
-    # the timer by default through this, we don't, as we can't
-    # rely on the udev rules to disable it after a system switch.
-    # wantedBy = [ "multi-user.target" ];
-    timerConfig = {
-      OnActiveSec = "10m";
-      AccuracySec = "1s";
-      Unit = "helios64-ups.service";
-    };
-  };
-  # The udev rule that will trigger the above service.
-  services.udev.packages = [
-    (pkgs.callPackage (
-      { stdenv, lib, coreutils, systemd }:
-      stdenv.mkDerivation {
-          name = "helios64-udev-ups";
-
-          dontUnpack = true;
-          dontBuild = true;
-
-          installPhase = ''
-              mkdir -p "$out/etc/udev/rules.d/";
-              install -Dm644 "${./bsp/90-helios64-ups.rules}" \
-                "$out/etc/udev/rules.d/90-helios64-ups.rules"
-              substituteInPlace "$out/etc/udev/rules.d/90-helios64-ups.rules" \
-                  --replace '/bin/ln'  '${lib.getBin coreutils}/bin/ln' \
-                  --replace '/usr/bin/systemctl' '${lib.getBin systemd}/bin/systemctl'
-          '';
-
-          meta = with lib; {
-              description = "Udev rules for UPS for the Helios64";
-              platforms = platforms.linux;
-          };
-      }
-    ) {})
-  ];
-}

machines/storage/s0/helios64/recommended.nix

@@ -1,8 +0,0 @@
-{ lib, ... }:
-{
-  # Since 20.03, you must explicitly specify to use dhcp on an interface
-  networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-
-  # Helps with 4GiB of RAM
-  zramSwap.enable = lib.mkDefault true;
-}

secrets/cloudflared-navidrome.json.age

@@ -1,37 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 xoAm7w 6LPdjXDINKLmWzBbhs/gcQQnJTqePJAGVWX5YhwibHA
-5O06D+H2KbLtueFoKNVIgFYlBeJimTL2Mk5S3biEKdw
--> ssh-ed25519 mbw8xA Ubq0SL3E410a1+3z2jZ6KFi6+tqNbqG7En0moLx+B1A
-EWhz0Q4UWJDEwt1jYrX0udCdflA7unlYhddCg2vJpXA
--> ssh-ed25519 N240Tg 9UOgws8kFmAABuG68rjq9vNDLbBJa8pFOAnqtSsObm0
-CWJLwZEVg4mK5DjDSXoDnHt51WTQ9WAka0sCM78bg7o
--> ssh-ed25519 2a2Yhw +xRtdu4UdGfIFkoLTQxBkkitPOKMcJJKepcvCGofaRI
-qFjGwGjta954LgzVFCPOTmzbGO7ApEpIo88+dnLOA5s
--> ssh-ed25519 dMQYog wWsB7E4PjFCh44K2t65IVG2uOMJMyCDu4RyoMgbreQY
-iFuu7dgxBzBTqt0iecUCt2avL7i6PQ7pf1rSRrsJo/I
--> ssh-ed25519 G2eSCQ mlVuEjjG1ZZbeRZ+mPPxIkEjNnzbRjvBQz7gBEUL+lg
-1+8DUKJNvUxIpwIDEV6xRoI66Xgt4Z2YqtPA3hk/804
--> ssh-ed25519 6AT2/g n4A59l+hQA9jsQaM8ONFxp91c7jLN+bljIoNrRaSZlQ
-lwmGQF1+dviOSkHGTg2pbSiHaDmhWSvav5XfUeaXDYE
--> ssh-ed25519 yHDAQw ACe/PrRD6xPh04w8WIPTpb5f051BmhaxD01u2YK82AM
-itYUUUS1+aJ+lZ2IIwys1shG2GQWrF3q3ZgfVztMALg
--> ssh-ed25519 hPp1nw YY8vayLICissYqcnWCvxcDyB3KxnpH6xOSYAvunQzE8
-SBzK7KsQy+Z+vsRKFgxkEJC4I4CwSM7MQ7ZbOJJ1W7Q
--> ssh-ed25519 CRfjsA iGbknT4mBJzDd8eEXLYCmDIzfLKzGrQNeHfRx0t0BSo
-e9i000+K/KG0nikIGfXWEY8nPnnbOpWHhrys4qeXFY0
--> ssh-ed25519 vwVIvQ BYFMu0y8DnHivMOzITB+10tDGH3vXgUCuwASMPN4DnI
-q8te5woh6MpFXKLOzZz8VK7vvivDnxIIm2YT9stxqLs
--> ssh-ed25519 fBrw3g qJT3udFmHFFf6p+B7+rQlKeBkDjiGPJjjDoAHoP/skI
-UIC1B5eCaJArcEPetgG7cvHy2/7iOCPLPC1DM44/lmE
--> ssh-ed25519 S5xQfg teWDWxkmGO/6Pdq9BUSpyNP3HV6Abs7Dbe4YS4E8hV0
-cij5vsyrDdKolTdEMKiWe4wFB0/T/5l6slHdJ7PaAcg
--> ssh-ed25519 XPxfUQ eNsWuyTu3Z7o9MkQ5c06F9nbwyKnNdCTBnVtHWfw5TU
-bdlQbFoOflX0mN0fOfSRKv/pLSyy7wI4FKhMWtkC7sk
--> ssh-ed25519 SpD5mg BhsBDO0HY8ukC5xl6dPA0crSsFw5ItIEj1STIib+3zs
-fJHJQUDczhv/XWBzi3CX1CRf2/zypk1tDTWro1EBA78
--> ssh-ed25519 Kk8sng rhJTlmqcgXZQY8KXCzhA/s8rZki7TmBxuFDlZgr27hY
-wGjSOZgCYeVUYG6xXCG/kX18E5ljfytxfbSzPeG2M8k
--> BT2o-grease
-d46Jzs4hD8i10FLG
---- UWVcEz0fWRw7B8XDTX4SJfRPIgzAN7YfHQEJAVqQxYc
-v¯©ð˜‡ñò·ˆù•Tá4¡!ö=1›¬}nPÝ“$ºÖ~š€"nfêm‰V¡<56>‹>žÖ§3Å|ì~¸ó€Ü<E282AC>cRoeL=4(<28>"hòã¾ÌÞoPÀÇR3;ˆä’‹Æ.poÖþy-‚UO6¨í¢!Q2ìqo"ÆìúV)³GÝàªE<08>ºf¥½°™<E284A2>4Ü?[~W±<57>ÎÌz qëÚY껪Góè.fm7w¸¹"•1˜šÜã,ÿi}Çø^Öæ¿Ž	ø&/“RD‚gkÛªãn

secrets/iodine.age

@@ -1,39 +1,39 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w NvgGcHYNA6WmPn3sCmMzPCib+6P7s5R/G6lSJFpih2E
+-> ssh-ed25519 xoAm7w ubom+8Q47IB+J+Oq2engREnGa0DE+H2wmG2fz2mjxi8
-gLugCNcPJtAl9+2fa80OD7D7XaBkpb2bzKJclOdjGfw
+wpYS6ylA2PFgcsvClvv1nZBgG+Cy4RD4sVpqRcdW820
--> ssh-ed25519 mbw8xA dBYbSV7QcUTOp9a5hUAZeMlL828KrRp6tB3zMIopPDA
+-> ssh-ed25519 mbw8xA lh99YoeAM6ktJXa5z46A0JVuUcfLcwvFj3ncaf4gmxU
-i4QRHxTVaN60elfiuYXuESwbphxPN4tsQ7scH0ZJjoA
+WCOvhJJU+A6Slju2HN9kAQsGRm/0aE/rhprkMG+17BU
--> ssh-ed25519 N240Tg Xg5q74f1ylRZGLpPggkTy1QU+LWEcHpqCV6wQ2OhQlk
+-> ssh-ed25519 2a2Yhw PVqMJAGJZOb62UAfQF5shDnGUu5VPUHFZjLOCOPfIgg
-RubXACwdS4+xNt8nt0C0wk8XU2YIWOSRwIXUg47sNA0
++fRdzAagc+MmbgPdx6sOp3Vna97gaxnc4L5KZuXciRU
--> ssh-ed25519 2a2Yhw p5w1WsmcVHImVtolvrULgSsYXlm06g2za8zSiDf9uR8
+-> ssh-ed25519 dMQYog f0o48KwYRsZ9w1WowdZtH8aag/TgrV0w9r4DwJ4SdBo
-qVuj2L8jvRmINprQbYg91yoJU0XZmO7TprQv2UsvpmY
+VGtlt0K/IpbJhOnqc/IEdcqDMt90pjUR+FwRco7Ca0U
--> ssh-ed25519 dMQYog EFYjggjACyNwvNCG75XsceqnUrrrsX4cv7e+Mu2Z2zI
+-> ssh-ed25519 G2eSCQ vtbTZPGjRxUmWiE/V41pwPYw0y8rDSqSlK9g8FF8rmc
-Q7VPIP7iNqHxGGtRG2Q122f60ZztSRsRHRbziGAinNY
+iHQjLPdVYWCnuHEcQiOPwG/ymWS873dmEQ3YBeypdlE
--> ssh-ed25519 G2eSCQ 5Y6Tazqz2Wjl2/lrlQMUWgEnSBJpmzwXAUGEK56upgE
+-> ssh-ed25519 6AT2/g CTGtBM6qUCPKIp6SsipQtGIM4K2gKYlcKm1lZ7oU5Gg
-eVxcvshe+uecw4ORKdS/2W8p+jcrro8cDcDdmeY7Olg
+2toLIu43LGBsK4zEzPe3xu1sGdf0TiH61TuvaI1uu7Q
--> ssh-ed25519 6AT2/g h6E5M1uJRhqfR1bm82rXrJvmr+nkeUPbygD8S+zbAmY
+-> ssh-ed25519 yHDAQw mgKQj9uQitIfCzLATi0QeDjj/ZNdfmLN3mDMq4lhBxo
-r5yR6W2uCcR4cEnbk/1tXwhAanT2EqTsH1mIDbrVGVM
+HWt4Q0ZjKeoxkT4XB/doa6YhgF5OgrJEVe0NRPPpT4Y
--> ssh-ed25519 yHDAQw lWomhFF/IyKtOUlBori7wNjrtsbqvKXXhAwF4a1y8js
+-> ssh-ed25519 VyYH/Q zrxZoR6lY4yTOYvqxLVnJ1B/tLJqP3JiuhkFVRaUmF8
-baOAc0tKMbh6Sw0bWyynI3OMrsOPA3W1fCCIn26azeQ
+rHBLx0H/70YLpdHfYzlqbRjFgCso3voEu0Nht7UlZz0
--> ssh-ed25519 hPp1nw ZGwi0yK0Nu+Y/uXIxnQH6Pwmw1SWBE0yQ9FOuBNKp1U
+-> ssh-ed25519 hPp1nw 0zPkmUgLopoLsvG2pk3hXLFZ4y1U2zLYAnw6EnrsEis
-tN8kk/0AxUIiFbEOSeIlGiBIy0d96wTG8VrGPnEHTg4
+bcbjMtvpDs+aKUf5GUW2x8mXMm5xBZ2S/aS6ePYoZOM
--> ssh-ed25519 CRfjsA ntYznFouB2JWY2LZ6aycDogIFbLHOhqcx50QbJIB+RY
+-> ssh-ed25519 CRfjsA x5fkEqFAn2gyPjOL91H+TU0t8fGbelyYNF3Gkm2PM2I
-slo38Rvg+2GV2fKRlt4Yns644kd55DrDz7ivi6RTyXg
+CCS0OxGVfRKCXzIEGIGGtVbEmzzY/uE30snLB9kRaK8
--> ssh-ed25519 vwVIvQ UF+Bo3Rl5OPPqqddi0bqleRJV9XTuykrl2dkPPSyRAE
+-> ssh-ed25519 vwVIvQ 1WBqhGRWns+zq69pFhRGPKWE2UwXmwAp7XPGgU8MG1o
-znn5KNsXZPHN2/E652cPhOx8RF5+uuFUyGhrI+kCou0
+TAEdHH7heHvG+i/jOTAxUbtosLIJ4TL012eoivpYbF0
--> ssh-ed25519 fBrw3g w8EkEo1db0Po5ZhDzz/5nshsSmjy9wMSKp+XFDEuUQA
+-> ssh-ed25519 fBrw3g rnGGZG45LWTLl9rMUtusEADK//cskSRDbVNHqymaRX0
-q50eyTDTxQULpogMbVXI2zSfu+ZZP9DOXjM+Y2/rMNI
+eQyOhsDPF3o1hlfrVJqHd873wPtMkWW1QhslCY9qyL4
--> ssh-ed25519 S5xQfg 651xn3mNSl/3+KT5d4XD2pkMNcxi6BScqX3teoKbgio
+-> ssh-ed25519 S5xQfg /SYkIjBEuboiTRBN3/Hy54WCm30rPeTb7hyW8Ne8XQo
-EOfzB+woFBWBaVKuv4t4E0Gx3vf7Lg40WXSovXs8N6s
+Zixg9/lPh8sEylM0k4UZMbKiM7G07C1s8z0U+RWGxb0
--> ssh-ed25519 XPxfUQ FL+FYVsRNJBv7xEpwf0fXgJt3G/FiARQ7+aWK/sxryE
+-> ssh-ed25519 XPxfUQ YMnUrS3KvUfwX+QXvHMDWj/dF58e8CpaFMMuQlHaBCc
-xneOKh3muAhjkLC2upsRrc4B0mggwm7IOMFsg+25gT8
+qtOCQrVvAzaG3TlG2EUHwMHXC6Q1STC5ZnEGZ/yh6U4
--> ssh-ed25519 SpD5mg f140sUr/7itxtllfcbBaNV9xhRaV/IULGVn6AaP7zkw
+-> ssh-ed25519 SpD5mg e+roG6erU7LFz/JG081vYo2QG5/72pGhxrrmJfNTLVM
-FnostzjoSC/bdOu2UF+rT+0mZ0aUM8rAAoQltUXn534
+taKovBNCmrYb5712fnZ2Gq1GLQfog9IyezIhyN2hYkA
--> ssh-ed25519 Kk8sng 9JnybgIcROZf+l0C9YGNb4xWkZLtdfUPm2V0WJsGPUI
+-> ssh-ed25519 Kk8sng T+387c8n+DojonjyQnB19JJifJWHufU+/oTLrvjzW2I
-fs4wBEIdK6kU1CIhI8zz/yqa4Fb6Q2u+MO6SsudQlCM
+nhjogEUDM7m6jTLiY3qZibKfe/8SPDkoz4v5TqY0Or0
--> C89-grease >Fa(j6s UN5!{
+-> Nd\-#+C1-grease ~l H Gz#
-nb+ymnliEEKJf3IGloFQMNl/SyFjvFUqekC2YEY2qJblAUaft3Tf6hMYf7uDSjew
+52s5cUftipJSF08pl6py9q7wRH03s++6wqZZwNXTWfTyfVRpiv+LT+1vG8G40ByB
-5SRhESY0VucHhAK6OybwPWYRlXXv2gM/wxUicB8
+XZHLe7A6CJuPj6FEabA5Yz5Q9IcY5KklKoCSzlJPaWHUySon
---- t6Q6ULdQzW4/xDtZDVI/lfP5i8Cq8lnURqQSyKWHvyI
+--- VqPdz+C6jxXzt5awQag/7jMrGk8dkpe4JSPBB91fKUo
-h,:ìüæ
+l ˆÎyÌn‡	Œéë„<C3AB>üFŸÕ‘_Ÿ1„%~²×‰9ÌÿîŠ%üÍp^ocý<63>k
-H)'’ЊÂ/²)žÒ¾ìpˆ¡Rç›2QU
+¥:tcƒéþ<>

secrets/nextcloud-pw.age

@@ -1,39 +1,38 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w 7+DO9mI/zZfTIN/0KBMOIjMNnReyGoH/XVQa0OLdAHY
+-> ssh-ed25519 xoAm7w TBgxtsm66foJGt2nHrXtgzpohAgCjlFZKJJ92wVRwHE
-qg/UIBJr8GX79d7xrIIN9GUt3pDIormlOM7IdjIytHk
+3v4D4OIsYkS/f1cFzjkqsZWRY+06H/hK5BRUlK0rezE
--> ssh-ed25519 mbw8xA 9KorXegEBX3PYQm+Ljdjs2hkxAIpz2CZrITNCGo0BnM
+-> ssh-ed25519 mbw8xA DGk5uuy20YbA60OCsRRUpDPDn8/34kXB6fLPM5EaM1A
-QNQWGWqoudiryg/0fV2KZUuJQGp/suZun9KF9c2OTqw
+gX+54o4ZGMepfR+IgWtnfRrQyJI7cIaVfrB6F0bhJpM
--> ssh-ed25519 N240Tg kfl4aaKI28cDfzX3MBisRGraQYChPdUF2WigjOFYx0Y
+-> ssh-ed25519 2a2Yhw 4duxFtOvot0/yg/mat9/mq7e+3FyBRVZbDxab1kUIz0
-u8dgbgJSmcJBp2Uc8qbWMbpa/cKEmx4V3psQgzqnitA
+eYGM5bSmdkepVFtC/hu9QryA7bAmyZ1aGk+Gz11IUeI
--> ssh-ed25519 2a2Yhw MGk791xEYHlC4bYfU5CMS3rY8TVI8KYvEIwUhE7wQ3k
+-> ssh-ed25519 dMQYog j1ltBo3adLkVjynrfftU3SUuXbtkPJwqvLScqV3Egi0
-iFT3QUR8PyWw4grqy7/8KfLfYNIDkgDKM2MqSr6cj0U
+8MPpwdCulNGlw261+weh0Lg5Nn7nztUrMHyai9WFV5Q
--> ssh-ed25519 dMQYog IW1ntuHrV85WX60GI295c197NUlQMKuo5gd3sQZl/gA
+-> ssh-ed25519 G2eSCQ /IbtFM08snzoYcw59E0VDWE3Y8GUSqJDZ5X6i6l5ghU
-gAnx0rMggqZ7Rn8tHFAXJx3z3t9MkZpmjpgI2qAtK4g
+x0TAzntr4kHb9iZVqsSYAdS0mIBjdZjG6muniNz/R1A
--> ssh-ed25519 G2eSCQ 7ZpZQAda0uxjIIdpLnC5JlU6cbLtJWr9LSIIdi7PUQw
+-> ssh-ed25519 6AT2/g htY9fgi/p9aGNEGsUdcVJ7tQ5cEXDxFXAXNRvf2aAlU
-PfGFrMVLCmy8SDv2nn6p6M560Xu8lte8DjbCORDM+uc
+gxhbdfZuyPVHYLl9lsfSe1Hu/cNwgFNbT8BzScL23AM
--> ssh-ed25519 6AT2/g JGE9jVFM2Wu348XIHpubyCEismpfBraxnFGTnEvqqnI
+-> ssh-ed25519 yHDAQw r/Q4+U6D9kBM+2Tks18bVh3ketV6XPsPooq+mD84WhQ
-kDHfyJdBIGIURDJ0Nsce4DqzPzhk5p+LM1QZ44pZ4g8
+Mpy9wGJRPhBvpnI9Nl38BkRdXgezKg8aOdXZIzuttds
--> ssh-ed25519 yHDAQw KNzCNjvErLwEJZpWWMIBFUGOC8jURyvoKzCWX0ATrRM
+-> ssh-ed25519 VyYH/Q bj6YIiIkAWr9f7jagbx57jRvSDcnmbqtx6Q1ijcOTDk
-EyIJpn48eU8oEB5FbMhCOd16hAVrxTFLyJEoos7WGOY
+IWktummkI2rkjpxG1wP7VG5NAZKixC/qEi//fBfPWCs
--> ssh-ed25519 hPp1nw kdjLNwgYQV/4NMubVpJw8QCIuKn+u3CT1boZNJEWfCM
+-> ssh-ed25519 hPp1nw Q4EhATKtqAuvaaSZ6mvdHYxLtEUIiq6vXCt2TIW3ujw
-FXNLqmpZB+CtSmCY9zGr+3UebEwNK3JmdP4ifdXiQL4
+XzrrxplNBzH84lzWheGA7GFtw6KAhD/Fn1dUh/IC0RQ
--> ssh-ed25519 CRfjsA axLQSlgVkaYmRktIP+fwHnhN2pJ55NCOW0fzTzgjFF4
+-> ssh-ed25519 CRfjsA tJMmvRH7ycObgJ5ZjVnIsC1NuqmUwpcAfIl6zxRfdTg
-ElO0byzF3PJxN9WgENIN/YfmsOR9rOhEh3xRNIIGIyk
+eDxKa8mqdbZbmbv+WmhbQWO+0KG7vsu3i1V+Fj1/1IU
--> ssh-ed25519 vwVIvQ LtrPXRJ0hztkWFnoKt5c0UzWQpD9CO990k52gjWcQnY
+-> ssh-ed25519 vwVIvQ mAizKoyN4QkTztzMBiz53+H7pJunPT6mZmXW75hcMh8
-nHb1hsXhHQokcA4WoRlbZy0EFQt8Xd0cYUGqblY17Q4
+/T03UWjaTw9TcJg9wrFJINs02PG11vabRgptlY/QyTk
--> ssh-ed25519 fBrw3g dnWs7lWY8QoWOjWHG68FSYqZDzsIaA/qU4AXrndGNTw
+-> ssh-ed25519 fBrw3g wTn+uGVURTaLh2uuy+hOMXADU8Y5X5rjt/I5hlgkiEU
-gh4+t6THL2mtrPUzGlYd/YxDjk3hpHxUmGq+kRcz9BQ
+djupGCAIbmou/kaeS8bvCHFU4h/tDJUPj1D7Ad3uGOg
--> ssh-ed25519 S5xQfg kEXs5hXXR4ocYYWoT2xFr4HITe9wIOOLz73zm/9bf0o
+-> ssh-ed25519 S5xQfg ndVRf5DZJG6ppRG4BLadwFdHcJBO7YsLamdY8h6M4GU
-WpO+5/zXc+UGYJGkNNQr8UsEz2RyBUtQ4Syep718294
+GdYFdMZtd7zRAejs0CoGkKEg3LquMD3rXqbXIakfv2g
--> ssh-ed25519 XPxfUQ pL4j/idFPiIPnWI7bIwn0+FuB6az/hXURAh+tvdr7Hc
+-> ssh-ed25519 XPxfUQ OzGJy6jOdsX2FOaqyPaGfGVvnmMessbQSFaaRSiJrkA
-WWJPFYanmf3+KnjG84XlnEapI1vh0wRi9XFJRn5JVpo
+/F4Rb1DdKrq8cXW1wJZQME3cjdvCg8uGnORzJH4apIA
--> ssh-ed25519 SpD5mg CpGcl7ONt0juh/N2hwcxWiuc9u9wjQ4d+AAF+1BQim0
+-> ssh-ed25519 SpD5mg rwLBuiTLSo3Sg1pfrKX72AtOYylGVsUqVvpPjfWy+n8
-7Xs7qYITkCsjloA74CDGn6lZhXNTqFV05omLiCz9efg
+Ly2MAPdLr5T91QEaDK/SzBHa6eRXM4qnl6AUzc1LkMk
--> ssh-ed25519 Kk8sng DzLM7ewz+4yz5YNQfBDKcOOlqMxScGR34XfVpCUHMEM
+-> ssh-ed25519 Kk8sng MPQqZeCMmHpseUkC1ysBlqhfOFZBWvb0rII9vLj2fG4
-eH2ogYJO2N4cqxRibCOEoL5cXcTdWavHS3uRX7wwHxY
+bx/POtqvkke0V8mtug14PzjekwvKu8lqY1C3BBHdrq0
--> h<Vf$Fh-grease :~Z8 qwh*'} 2*OyJh )iMU_m?t
+-> H;;#1-grease NIQ|aNi" ^ m ub=UpUr`
-u9QuYuPJEVl7Rt1cEcXZPQ0IfpOzqB59iTMch/SDoByr966PBlBfjDS/7i9U0sEI
+62l691hcYEUai/MhlIgoxGmJwGl1NA6CgWl8LSGbHHfAwtCa6pO7kORspVcI1nBY
-GMeVtXePXkKPXVvhmbZ/C9KI
+fm6hfhPep5Djdinrz3ti+fprTjOpJafJoAsvxE14
---- 1F0kxs/7SRrpoj9q4t1eCg381LzCgrwA1DYG7zcI3dI
+--- fxAevZGLf/QUXm/kEserDh7XPyy0lfDaUI+NnCfrZbA
-ö>°cY§ÀeéEò‹ƒ\ã¯<>Ôc¸j‘½	ßÎíÃS­—XpºýG<C3BD>§$½}i¼10
+^ŜˡÁ2Í?éÈüÇ‚‚tve<76>
-ϱ™<œ`á Œ<>, öAž¤£
~r>ø$|wˆ¿

secrets/peertube-db-pw.age

@@ -1,39 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 xoAm7w 6fOw4Kh4O0WAdZG0WPBdl63ap/Xr/w+Rweylt/0mKDU
-M2ZYVPz9vVGjJ6us48pXSFKKH8tK8PhkvBUJAUriimY
--> ssh-ed25519 mbw8xA JBYsd9iwH4E2GfGP63DwdwT4Y+gvL31sB3rSY2GKDmQ
-zMHRL3bDxeAkWdKYPPtc/xyrkZlNtzBwzMyt5lb0H4o
--> ssh-ed25519 N240Tg 9DErfKdTHuvUcw9+5yzo8kMHa+IKxspGlWb6KRvPB0o
-q1FLalljaHyYxEu6JrmcXGYhYi0L7TAtV0U8UsaQ4cs
--> ssh-ed25519 2a2Yhw eDolYbro00zktVZA8xdhbjvLkcOItFU/lTBPXNYypWI
-d1MlKnVGRf2T2VFPhDnsSF8fboF+5mAdXEMeJRTjJz8
--> ssh-ed25519 dMQYog 2y6zkr37iC5VarUPOlrXVj9XyS5pihQq6O/K20gTMnc
-jQxtJYCH1JagBpaupGVizzk0ZCswOQvFTcxT8IeFtRI
--> ssh-ed25519 G2eSCQ 8b0ZqtAxiFRfLEMHnj6LZmq5CQT7nMmfTwc+gpKbQQs
-kl9EvBs9BpZXoomdg30ViCMBV8xEnYlCD9GFY+dNVBM
--> ssh-ed25519 6AT2/g kA3H9/fN5qyPquKIBQqYSGZYhxqDc7Zyj0CrjF0Nqgg
-zXrT+jpTJo6ToVzLuLzDcqblXKdDbjxt4Zr9CvWBZc0
--> ssh-ed25519 yHDAQw vuMN4IU9wAIAWDFEDCr1yjEPtEMCISxYTx27qh4QS3U
-2vrVYYbBlbyEOmd7cpeijKeNk6uEe/1iWQcZO8dSrWI
--> ssh-ed25519 hPp1nw TwogaV1PZXUekJoqXepW8sUm+DvPCxTEL+RobecJ3ys
-VKM1QHFM8qDW1ZCpueQEqQtQknoQ470nll7y6WTjlWA
--> ssh-ed25519 CRfjsA dvkLphHpCButJtI/RMlt7RvaIuMNHLbF9y663tvuvhs
-VEwK/KDK93e2iwEcwmGM8vvhwqi+tNW8SYrbsehZbWE
--> ssh-ed25519 vwVIvQ xnd9Vgz9FCeRu6yZbbIZbSBEvSkgPzFifye5eT8kmT0
-XOCZBNTP66Wzy5Vdn4qJwzApDx3U2qNnQqEBcwfARHk
--> ssh-ed25519 fBrw3g 81Mv0OtBk9J2Tb7kjnT4uCGeytV7HJfOTcA5C4NoLy4
-hiMbGjXjtvBa2Puhb8GBas3WXc0fozRD4hg73MvQumw
--> ssh-ed25519 S5xQfg F2oOMdM1U1aT4K6pIhCnCz5EbxnEb9Q4QZ0MkhSJKnE
-Pz2cyF+IGLz64466ne8np3xA7g+51S4s4mlaLRohIM4
--> ssh-ed25519 XPxfUQ 3rIutnjj8fXIo3mCAL5nfzJep7q70j+AGLE3j/JxOhY
-v2Xj5PbpFMsf6Tx68u7VHCRqGa3Wrnsk4E6Q08SklUc
--> ssh-ed25519 SpD5mg tmM+zaXpX+W8xsMfBCoWZc+7wPRI6yFt2W/p4O2s4lo
-ckNxHza6ruYdIffwxDFOWnYOUgpbWNfwzU5AQJb6ZAA
--> ssh-ed25519 Kk8sng 2ddBuZ+DEVuvRmWS2O8r+xT4Qtrev78Vre+yQ3kNdEA
-LojDcUOsZtA5kw8kIPC2y+G21T1uKUEUkwkJ3xPiUX4
--> "JnF1%Gd-grease |=~ P
-tzG7OLiEsRVyoTBpLPGwqNBUGkz0
---- /AHllIllItlnpPXQAkywTF1UsUb7Wpec2jdYE6kOkO4
-lß´“ <>§K
-^U5{Ôpœ_l9ûá7I#J¯˜Á!ë†å`Cθ^vÚÕˆEòµßŸÁˆuž¥òä×_WPæo2.<èù w}¶Ì
-(!V®

secrets/peertube-init.age

@@ -1,41 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 xoAm7w N9ZPma02+vK6eoQ6X9/AufI8d9Sq0fAmbCygEAprM30
-qUcK7qCxU/wGxssjMO3BFmiP+ZPCMMA+MPsqTS6Hau8
--> ssh-ed25519 mbw8xA 1uhQY3YHakSRBjgVfqWc3ynGGNT+T6qR74oy7UpbdGM
-7cvBh7xPxDxZqrQURBUUnyk2YjzVY/kzAUf7dy5y/JI
--> ssh-ed25519 N240Tg ujiP5iMMSupxkwhY1DpkmRQOQlZSr9WjPGrY7aUKmnQ
-FNeXuINzgDB+gn/u76gQq7J1zYCQC0wbFyUVxvbalI4
--> ssh-ed25519 2a2Yhw C8/2A7AOzjyrH4Ulre9G+w1y7H1pvVZe6k5PTmGBlCI
-9W6w4Ib0riy9sbZEQvSYeJ42LXwPruV8kPvTOP+dMqg
--> ssh-ed25519 dMQYog hIbfS8dz5LGPZ9sU+lHHnL8KB0CceM2nYV5mFV038gY
-6r14pRwszEZGVzDRZQlymlgjdp1Zd+r/O2IfjqxBZcs
--> ssh-ed25519 G2eSCQ kvgWxBHowwVcGlm3KiWjxug+Wx3zkcMWl4wbPRrhrl8
-A5VtHqvDwaa8jONXMTvVQC1ALcnsiqxllM/DrRXWFws
--> ssh-ed25519 6AT2/g XUGBtkOcpLRKNDS3hsyXAap1DXAIeaRX9jFOfhUpMw4
-sq/Ziv4RGRBmrUgS0GWTQs8AViUXBWjUxqf0V/rAN8E
--> ssh-ed25519 yHDAQw GmscTQwu+lHC2VARJusQ606NLf6OlxITZzINjrbxf2o
-LmuIU71tE+2OlF0HGNS+DdXCLdA5lAeTPXl1S+V5KCA
--> ssh-ed25519 hPp1nw XQbGxz+YJ8RieN0HxEQz9kJfikbWTtz1hFNGQBHkXzg
-1yst2YMs9XelKpIGyl+qxAgrFZ+Hq9odh6wBovbb8sc
--> ssh-ed25519 CRfjsA 79TlEM5+g11lMOkkW/KvSTmt//ChklK3jlUHLAM/1hQ
-9X1VP6SYST3Q841ahE+fAeg0FhKq+/XcZdysigIOgdc
--> ssh-ed25519 vwVIvQ 1r0/J5T1fEmOjM7ybKDPOBdE2UIDEUdkIFNWGJBzXGs
-gAOX/3koAfQx8er8nt4dlvLbIoYfeVPENjz7wLNoFwg
--> ssh-ed25519 fBrw3g 9hdWAt6qEwjAwVmTprCkR2q6GsE4dEOCiCTRfz58fTk
-f24fPWUrwtt1UN2ebk7tj7gBY8EiAMwvEvztCvaNZRc
--> ssh-ed25519 S5xQfg wyY1lx8QIDJy9pCi9zS3T3lNV0jQGhVC8HvyI60zrD4
-6+agBFHfxcaTLfZLyEeUMl9zyaFbsM9X2EXPvf6DfeM
--> ssh-ed25519 XPxfUQ IabbhU0TM3zImRHyKk1NLnGRUUTuQHHCMLzp9AltDVE
-vf+5OlycHphA0i4nB7c6OtBBahWPJR/8VSWzudM9FEc
--> ssh-ed25519 SpD5mg VSBErQVSLWPcA7C3p+wuL0/JaP58O5Gvy8z5eJduky0
-jnd3tBVjqhf8oZy9h2soMZVPEa2dvYHxvrNUdKK/UwU
--> ssh-ed25519 Kk8sng 3gM4o/sdewPR8BZo8owBVEE2GwqnQgUeA1Uxsd8nOlM
-VpgZRzc4tN7QX8s41iKoCstfU0KgrGhWolfws8QXYr8
--> vWbrVo-grease ,kVQ{
-PpMMMc8V/eqh5OBEcK067OIY3UQt9QTjHCVVesZediQxm/E2rRYvKm793NdgsflT
-mAA0Lcu8/6EPFWtK05TxkDO+JaVfrvKLKuh/E3k
---- eKZw2cOm1WsLYj/Bx14q433kkZ6altIqL0qnBSYXjn8
->»KÝ’-B<15>vœâŒ×ôÕŽ}4©Q‹åÎ˳x
-ÅîÝÒ{ʱí­
-0U
<01>Ò

-ê¶×Ý

secrets/pia-login.conf

@@ -1,38 +1,38 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w SqYHa6RK3Qc2q7PnzW+2zWIc+A45lcgsGUOcloo5NCY
+-> ssh-ed25519 xoAm7w xqcRHP0MHuiK/zomHCYc66ovGuTBwG3e74adAtR8Mwc
-YK3fq1eFLcrYyeB0jrbpaDlvZI4QXtGDB6gBsNOHRbc
+GxxxVe1BtI+XFgivxLx4iqPs/bOqY0YgRUaN5WL+J6Q
--> ssh-ed25519 mbw8xA td67bdiy9OVhynehUE0t9WNhSm5mibBSouANJsb54DI
+-> ssh-ed25519 mbw8xA d5zP1zd7jaeoDurJdLaZH3bqRuuKaSLhvYW0ZJR5Ei0
-k5Q0NYRDLuEVqi6spysZ3wczsl6KeJHnzeQs4AcfOPM
+vDZiTBxgzUUv5F7k9DNWyHmDq+72zZ++fK/QsNMejQw
--> ssh-ed25519 N240Tg yQxm7sk3zmluyfrHuXcfcUH4bep9yO2yasWsZL8jlm0
+-> ssh-ed25519 2a2Yhw PflULmGrCX2W7PTYFuu36LudH9P1w2T9Ac2BkWDtR1o
-0uLbEiU6G+BOFnhdtQ7y1TaZun3L9cayeOJUiKmhK3I
+cKCcIGfBgnVhyBQ9/w1en4QV5OnfkKahv+iWbY75rcA
--> ssh-ed25519 2a2Yhw rWgv/wgxs/G8JqWRMX4K8OMkbDDEWKXn8tr1EZHXNTg
+-> ssh-ed25519 dMQYog MPQk/1Vo/ZYw3gPBU0pWlDgrc0OV+gwW+5RS08C6w18
-//vsUBg5VSyyPOhUppiV4hkEhSVh7TUxlgRhroeMH2Y
+89xYLEHa67LA/3WJZLPaZjubI215XlLXFOu/Eya85fc
--> ssh-ed25519 dMQYog C231LaIgcDukZz+Q0w3BS6QoRNPYBpQnDc0iapNDACY
+-> ssh-ed25519 G2eSCQ U0xOVFq1wFNyT/BnkYI4w5KsNrOo+Hwx273zZI8PlQw
-h053cONj1m8SP/V9oFU7MuMRNKq8KNxr9FyWoRShZ2w
+FUcdjrHZgjokvc5qZ7VeIw0Z8CJMNjMOmf78Gg1b6Hw
--> ssh-ed25519 G2eSCQ oazxEulqB0zTHwBBZxxBvskYLENNm62hy0EMt/6BIi0
+-> ssh-ed25519 6AT2/g geU2DAuZLH0NDF+0h8A/rp2FrfaXAumy2GC1O2p/CHE
-rM8Evty9wq4qC/Tau0bU0LgBqNP1J6Zt+iQeYwhBJ1g
+Oh8GY149dxknV6QhpUrD39fwP9bREGkgVm8YPLpZdvg
--> ssh-ed25519 6AT2/g GWYlWQLxy+JjQUGGG4P2ePuqYkUov/0OV1gyAUfo7xE
+-> ssh-ed25519 yHDAQw m4eSQTxExlAHfmyQ1DdBCWemb+z6ldeaEKmBwbrgTRk
-CT4W8xfyQyZ8LgnVWncxL9TMyf2tC1mXhjJ8/OrV/yk
++kYjyUWVP7PHVoqqYG5JxwLmmCc1ezDUCGIFnX02lx0
--> ssh-ed25519 yHDAQw 5FsOvziKO7oXBvIbJ6ikUHyZsfJcwoXcXYmCCCZlUl4
+-> ssh-ed25519 VyYH/Q 22pJQ5qJFkDpyhhJ8PgpI8BVSN70kkMGJHZqbgkIACw
-5wywGXF9/QbqT0H3f7GY1J79ZwrFaSG6qzHll5G9Xcc
+8sPrt+XceTHR4PvelbxfAwH1/IUOB1f1/aVyBFISCL8
--> ssh-ed25519 hPp1nw Aii3iq5LHQPAWIGj7RbK18ChTij7zYnARHqXTAcU+wo
+-> ssh-ed25519 hPp1nw oemF2kqJpkM5wmPzV7pxWq7gwyeBtHMA2ZDcKQ8AuBM
-218UL87Ev75zAsloHSkLlQoSLk3u+XaRgMpqFlHQEIM
+jKnhqbGtI8Ll7n8APN4ppWomGVwCNxeMobMfn51baHU
--> ssh-ed25519 CRfjsA AafQ3rTlpqLZqz614VPy0h0o+ha4f7gdx3zuoO7h9BI
+-> ssh-ed25519 CRfjsA n1rHsp+O9p67x98MXOq0p1Z01IAvDmQEeOrxb3bsfAU
-jyhVN8DsgSo58YPKb8c/eBWSgunbLgN0tnvqTaaOxTU
+jQqxXAuT0Z0xNn6YKAs+KOkG7wxDFDxq5Fm2gKxB1j4
--> ssh-ed25519 vwVIvQ oQHpWgGDhgea9M774iyQ2gP0hvSgFr5ScM4ZdhMHD2g
+-> ssh-ed25519 vwVIvQ Ydiw3i6yquUvUh9dhFST8Dnpsm6/4SJMuDGm7ka/UnE
-9vJjWXwOqpOfegf9ZtKMxAayDsn2ziHGTHGIBlAO71E
+R0wpu+tP+apJFWOxfb6B1eFqHtx8CfgxrVM+hGmPF/I
--> ssh-ed25519 fBrw3g lGSzsEt5Ot/RHwJbL3fNQoR29ZQ7EsFUWv7HjWnU9wg
+-> ssh-ed25519 fBrw3g nJVo9VPVhidY50WrecFb4Z3gvbVa+HvJVoWtcTqUSiI
-cufwuuyT/Vcf3QeJGXEcYFUQqjf0US95po7FaGMYXAE
+gi+5LVtpaKI/RzpB26PPwb3Z2bznBMWyYy5T1iVDnLw
--> ssh-ed25519 S5xQfg CGj9qzx3vvlNnHh5RUyg4+3gVpIEcgGYbYJr61oTJgI
+-> ssh-ed25519 S5xQfg Qg3EG+SWYIbt6bb5KIHPB3IsrVp4dOCtxDwsDfPxwzo
-x3TLtdaRpFtMRTC/RdngyBOeXQFEVvQIRdfAsaj8hj4
+XS5K+J6Rdg0ffVKPxDjhqG14ue4sZ+2AWvTrGgUcqzQ
--> ssh-ed25519 XPxfUQ r1iu+mpoUVuf0AqaDsrumw8SOdiHapODcgrYRrAuSjo
+-> ssh-ed25519 XPxfUQ +dpWU2v78/sgzjCKMI/PF7dUH6gvyQH/Sq7IepJ5Iks
-1XNRKfEgm2U9DXZmNogFr9B9MqibE72NjyHiy2zZFMk
+e+sjwJ5yVVIqi/XFNEunzddKaeZoyt6SSQIaARKQKcA
--> ssh-ed25519 SpD5mg NM2MP1/5yxwQvvpiHnq1aiXQg4yxWpsNH/Isrwcz1Vo
+-> ssh-ed25519 SpD5mg LNEibIixLpNDeI29JpwyAy7Yj98hz+crpA3CUrdLCh8
-IdWPzZg+/mwCr91bIlDMpAiii/HWsnIxTGXnetYjRPA
+/ecP3HwrkcqMEi5KHKJ2GDs/FVMBYiOogbsmbnsKcXg
--> ssh-ed25519 Kk8sng 4NAaCbs1EOQpZz/qm8yW7PkFdsn8seSTgInow1zqBiE
+-> ssh-ed25519 Kk8sng XYXpGlL5N5Q0fW/CNR/MM5l1H4wnGc07PmG7pfIYPEA
-2MJJNUFyBkxy26adDmoJKNndeQT+MsJGjdYiXMpMS4g
+ZHDIG4o16QpkXOgEoMEElVdjuMHBOYnu1+r9j7oWJqc
--> A-grease L''*[IU]
+-> uz.p77*-grease \LNG +]\N }$z/#os
-5xdl3E2HB0Yz2TKiRucf1X/PV2JS4rc4LG4cKJ9VYIUksE5Aoj26E8h1izCrhEsp
+v9I+wGZRCAIjCEeJespiFlyqUu+OblQlv9/hJcSTjEo8jMIlhjTgitVN0gcG/iGc
-Hnr2xC029yD3shPQ1w
+Eb8YAQ
---- OjLAmZwep6nKTZYMUuBBaMe+F3FmWqsCM2XCDqoiG/4
+--- 6EmzITbtgIPahwrQlzo06L8D2UykOG023TWIcXmflJ4
-ÍZΛëk²¬¨œoéG´ûCbÇÚ!Zö{ʦƒ\öO˜+PK±¬†’rîЕîA´~zÕô@ö’\Õ‘±M3G¿i’ÚGl‹èçÒ~€!þ§Á*Qõ‡ã
+úPá™.Öú¥RvÎûÎ7*@»Ò¨Ngá3^¸†‰ßáá"{&²ÛZOb¦Š\ÑÙB$cb¤I20F/FYºýGæ—»ÂJ%™?¢P<C2A2>¾Ü3ÐdÖ½˜<C2BD>$<24>øP

secrets/searx.age

@@ -1,40 +1,38 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w CNXq63Qxe5wvwn0dr7QKcJogg9cO5+no3FcNmxkL7Gg
+-> ssh-ed25519 xoAm7w 8X/mQQdaVvKGFTa8S8Kq0gjXQizdQqKjCbLPbj+E+xg
-w14UiCOJofq3r8VikRCOjIp29NXvoKJHyRms6tjr3/M
+ztcO7CI7PlIg+kqGi5mIriGs1uYAdsvsA5TC+vU2D0E
--> ssh-ed25519 mbw8xA tzrtBUcTaOZBi2BNhgwN45MqMlQKGZU6FYm8IEQJKH8
+-> ssh-ed25519 mbw8xA fcD+NYtWgZaXpIwe0kIGplhsHphwjwr5bWn3fu9bCxY
-Vpc/0IHNizsxTozoVm0YZdm0qgKwx1sZ/JMIKSjQW3g
+HEdS7uNl7BEajuPvMVhWM/B2Z5SLavZ1go6wSCuUN20
--> ssh-ed25519 N240Tg F4wZmhSgHx1+tLok5IdJe+CCzWf6LmlkOFNGWqOpxXc
+-> ssh-ed25519 2a2Yhw 6exAx6FTladZDoIkXDFwiH4b2qYCMUWgPDrXzP//uQI
-ZF7+t0HDmfaJnyNe3lkz5aVFezD7mAxqRiDCZCwW2sk
+HAN7bkNCLhYPwt6Fcdkij+9c+EBrN88lxhJr9rJlfc4
--> ssh-ed25519 2a2Yhw rC3PH9ftW4UWPuUpP6tThaSe9AkfKUiEgQPPXerJ/SA
+-> ssh-ed25519 dMQYog ZFiEF1MYdIha67bN75Rv+6Wr6Z9E34NVk3tHsSEEQyY
-UNKobz02TnEN/oqhp7hwS46mU1IA0ehVzLqeIm9QVVk
+Y24l9R+jd1kN3mwSnaaZ+kogwIgNtIUb2gLW0eLAi54
--> ssh-ed25519 dMQYog XowiBliO/PhqZFnmfnXWmw7KVT8I8Rp46RjuFd/amEM
+-> ssh-ed25519 G2eSCQ sYOr9ilW7CW+P/0hsv/RAmv/v34JevYIyYN+I6lHph8
-eAhc4PVY/3ZjwiNihO9Yqa/au6ebkXmqbK4Zehf/FxQ
+SzmVgwmecQuo5c468CMh4yXpHFUi5EovS9GeYGerFbs
--> ssh-ed25519 G2eSCQ ann2y2LP2fIHtQRLtpLow/g2yTmcEYpUrbc0N69iJxI
+-> ssh-ed25519 6AT2/g HRkU3oRZwF826qweInLFI6+3rrOdsVhDJWoYdmuuWHQ
-N1VAHkPjzxA5Vf9lKY5o7SWFy1kxlv78LSDcRt/MxaU
+OCoS/Ody/GzMr2TFXDf3VXUwE0gCu/cHFl+AHcnU6i0
--> ssh-ed25519 6AT2/g uQhLUtHpvNoLBUs0zvdMeGTtXQH8gHzNiRfDq1x/3yA
+-> ssh-ed25519 yHDAQw TxlUhpGkdVzkBa51kUb4ry5oibol/QD+VPj0h4XOhWc
-rhSm2KQw3k/nhrm2UmCWJ1oBcmYwP1S8hAY5xUALY5U
+48aqzpCdhR2rYltDlpsq8FdnCAOaRZ+t8RdIFsWjHjk
--> ssh-ed25519 yHDAQw qO/7smo6DZpW4/dBvkorYBYSGBdemDe7UrdSXDjb8zk
+-> ssh-ed25519 VyYH/Q ctWC4UZPhsQngMldM97HwJuvQKMuJm5ANSs3bSIjJFg
-xkRizpKMEbD0X3BsdSfc5DgjYG1IQLKJuQjLLSwPnzU
+evx82bQ4zeuFDRunameiCgn5UjwhAPa46w7KHQkjVe8
--> ssh-ed25519 hPp1nw +Y+MeoeD58k8uedCeD2RbRyGlcLYEgNc2PC0Hr7MuTY
+-> ssh-ed25519 hPp1nw oKSXL61Cjahb3BHYybXWFZ5eQyzGtjG0arMU8xWpABo
-B3wQcio9YW1Vl6reg6APLKDbizQDxWY32CkXbuzyyt4
+1KvSvzZoLMuAR9+ekO8hjE2yOqZgRtEghD6pSgfOi44
--> ssh-ed25519 CRfjsA 6KxnAOe2pmjfwTiQZe8zHaeNJApPYdCCFK1OlFaE61A
+-> ssh-ed25519 CRfjsA /lA/ylPuiOtKXYQynlwDoMiZknOf/BCR9UUJqxZTQiE
-9psQfGIFCSjSYw0AKpKRFZ5qIYFOvq3FvHFyVRa/zbI
+yGVXz5L3UxxNN2z2mx51o/GGb3Q02z3ZDm3JrP2/3/g
--> ssh-ed25519 vwVIvQ Zghw7uz/yR4dgsFhbeXfPvk1HmSaXV6CcRD6GlHeiGI
+-> ssh-ed25519 vwVIvQ bgVIF75qEP72heamHRLHB+21R9NTQ1tBbbYVcAXVWn0
-KTM1Xu01FBcsmhJVeB6VGhMqHpnpLNmvWVBxV0+JW5Y
+brIkrynLCEDIEwYe86w9auMkpZKgDNPs1JIUYdP3eQE
--> ssh-ed25519 fBrw3g h+wmH368BHkFp5Mu3PnbZFjyMVRBNcwU4hloIaZEaGo
+-> ssh-ed25519 fBrw3g AWnifShqHcTU/eUuLQvuexV9KVWIssqkXz6SzvIrgDc
-TKPz2C3yF2wBsiT8/WhbKEg792PLcQ3YN5UWcxJnwtE
+tbAY5ZgkiolGeZsSmFqahBARhXkiur2DuXhY0xLAcYw
--> ssh-ed25519 S5xQfg YZcNHfVDJ0GRF+IpLVSxOeBOSoDhDhdL7r2npRYcuEg
+-> ssh-ed25519 S5xQfg Bdl1p1oV/YXfIIYfWJpghpxW0iyVdBHoFExbODeRAEA
-mPfQ+m3SGGnGO32oA917AfosSnXGqHRDdMfIypK+UOw
+3NOolEtebZWathrLTUYx8xj0Lox2AA15pPGFHAJLoLs
--> ssh-ed25519 XPxfUQ jsXVjpItFnuJiaeYIaYKsJFusASry67LiqDW3n5+QSg
+-> ssh-ed25519 XPxfUQ b9EHQK/9OnEDTRAlpW02LM2aCb6o2EY5yi3QI5bmyHI
-0KzbBSbRrq6JrpWEyTbs41b4gUUiKeZzWI3rBaa/AdM
+xChQko2D2OhElau65jID1OpLlsSF7K80zxIb5m7l+VI
--> ssh-ed25519 SpD5mg 873X6UIo87svyS+jhQGjILcVy+RjtsKwJfDyj6gmF3I
+-> ssh-ed25519 SpD5mg KnEt9/djsQISjA3foA2ZQzPdyWTg9jXnROLQo9vG6Ec
-KNHCRKZ5NhJbNmrhWehpUXEv6jBGeJkRxCi9+/bgouA
+qq3t1LPxKYQLuZQdD+Dv/OsxTJHhO/0Qe6wFNXJFIEU
--> ssh-ed25519 Kk8sng /ItiKGK46Wia6VSKa2AtEPj+PqpDtWxBhea4s3mqOVo
+-> ssh-ed25519 Kk8sng vMGJcs3ihnJ35jqfC7gpcr42wcRoOvk5+PbLF2BokWo
-OPclxoc2MygKYJtahVbLfE72X4s4yVil4dugeSF/3DU
+rR9PrXl+aSQhyx0DYl0mSbrSbAe1+Q8JbHfitwfOlOM
--> U(/M3X-grease Jh[D'
+-> )!'e>x-grease )w;#| HUZG$ lzX;qm0
-z6L8qVMUmuElYKbQViqc6tecJic8gho79RaMilbwp7uS+owmgqNMUFxv9+8bbtYY
+JAhpSw3t1WV3CFI/YTh3GPjMjGg3HRXqJH+jtwa7LjpTymLsQsC4spxLugccRSL8
-wC+YIigf5xAKlwcOipCJ7xv3jlqt8yUFWV8hg3J0GRbkWnhFYdWGXHnPtomPFtE
+1P6SN9WEL5lmoyf+wSirBayoYsdduG7NtGJW
---- bD5IgVE3GQSnej0FLxh1nGD2q2/fuhqRL2yYw+2KMek
+--- UCMko0rEs8lHjZnQSJJJBrRAgJjfCDfKHTFNlsHi5SQ
-·)ˆ7&ªð„3¦ Ñ_¾â
%!2aâýÍݱQ
+Žì÷ôG%)—½íŽ™U(Û(<ÅÚó‹BÒZŽÄ?­îàêü6+£•
-ÿ6hêlÑ	)Í0ß}*ÌmìO(¿l8^"È‘Ì‘ù<H¡Žqr¶²û³!r<0F>ÌXóÖ˜ºxó:FF£¹áÉó§‚#.Ž™Ú"[Š9çZ„°
-C¾ÜÊ62›¥-'™ÛX$S

secrets/secrets.nix

@@ -5,18 +5,13 @@ let
   all = users ++ systems;
 in
 {
-  "searx.age".publicKeys = all;
-  "pia-login.conf".publicKeys = all;
-  "peertube-init.age".publicKeys = all;
-  "peertube-db-pw.age".publicKeys = all;
-  "peertube-redis-pw.age".publicKeys = all;
-  "peertube-smtp.age".publicKeys = all;
   "email-pw.age".publicKeys = all;
-  "nextcloud-pw.age".publicKeys = all;
   "iodine.age".publicKeys = all;
+  "nextcloud-pw.age".publicKeys = all;
+  "pia-login.conf".publicKeys = all;
+  "sasl_relay_passwd.age".publicKeys = all;
+  "searx.age".publicKeys = all;
+  "smb-secrets.age".publicKeys = all;
   "spotifyd.age".publicKeys = all;
   "wolframalpha.age".publicKeys = all;
-  "cloudflared-navidrome.json.age".publicKeys = all;
-  "smb-secrets.age".publicKeys = all;
-  "sasl_relay_passwd.age".publicKeys = all;
 }

secrets/smb-secrets.age

@@ -1,38 +1,38 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w Kg7UClnYqMV4+rPfZsUFgHyXUFfD9ZY2miGwr0m+NWc
+-> ssh-ed25519 xoAm7w Y5MLu+HhgDeKPDSyg5vzGIw7jpOkCbkuW07QjqLicjM
-SCfg3UYlGpUJreLgdkKUVru7Gqvh7AfmJLRoI+Jwmdo
+XDsAENs5+79A5f24nXNCwY8RM5Ac9jypxCip5EYG34Q
--> ssh-ed25519 mbw8xA LeqtlUz7egt8G5z8Ca69GUM9Jgt7HMiqPxO/YN0rwR4
+-> ssh-ed25519 mbw8xA 4ESXjbxaKpfnCYTN+/a/y91jyrhoWyD3lppboLuF2ws
-ILPsmKmjrc2m0kFMhpY2ebVXTsTRUiQMookDindWrig
+tc5m9m4/mF/KUvy3QAqf/Wr7qFYGPgACNgu8vHqYl6k
--> ssh-ed25519 N240Tg G6vylAd18eW8zdF+vReXY7fTfdYseWY//4/ElWDMxXo
+-> ssh-ed25519 2a2Yhw MwU09hKahVJ5QQhcz6F0NJm/3J0JSdNMvL19Uh8Oc2s
-a1BWR4URSMmHV8Z48aChmVQAlfSfNn0S66WOG0uxNc0
+EVJ/POUeJ4ybwC9IIzkNzwnGp4PkO4Zn6P007Y00iKw
--> ssh-ed25519 2a2Yhw XXZOpsj9uhKDzh6rnSWOj3HWeohsm3LvPw0RTR3zLkI
+-> ssh-ed25519 dMQYog IZltBF7HETAKqvxTjkBtRpLLbmrGfk7s1I88gZedkB4
-9U5oc+gWXmK5r4mLZueFBnkyal88lNbFNlzRcT77Zyo
+K3iu+GfLMnd5PE2XTkDNRcOYWpVQ7uhCx29J3vTMUIM
--> ssh-ed25519 dMQYog m+Tm6nn0yVLiPPua1K7v2ToXg4JzRouarE63L/sh4kk
+-> ssh-ed25519 G2eSCQ zBk6wQ4TMoxIS4QBtAphyTyCAFbZ/wNYQqBkps/X/TU
-SZ7HXZ2wteV6mxJ2bdMOenMO3clsL7nRyAkDAJomODQ
+W+5tTl1P4m93taLUrSljvEdYeob88wgAzrjW8N0flkc
--> ssh-ed25519 G2eSCQ sFl1qmmOPtEypFvjZStXITKedfQV45B2MDk90Bcb3hI
+-> ssh-ed25519 6AT2/g 5mX5s28Y8Z1XlpWUHjyi1sqLL4eytYC4MP2r1Oe8xmM
-fetONY50e4lApLBWTABlDrV7iG0EdQl4sJE276LNz+0
+pfvf78ZSok4qTq07vQzPl5G0YmsshBZvizwEdaywXAY
--> ssh-ed25519 6AT2/g eL7ilpjXlLTIEqgOoX5jlDapUZjipe4ssmgFdaWGfQU
+-> ssh-ed25519 yHDAQw qVbOBU732m24b1z7L6FbkQ60Lz1/Nxsflo1QwmNKyk4
-5JOCPit0JyCuHQk9JUqPUbk1l1YJcPfeFYqZLrlA2+4
+b26BFy5h0khO6a4wRg3hB2Bkxzh9qssm5JOxWSgwCPI
--> ssh-ed25519 yHDAQw OL1GcsvJ1xxiGLqnkVVCMdwZTd1lSsxMV/ERkGlKqDU
+-> ssh-ed25519 VyYH/Q Q58vyR9AeGSbrh/tVi304IRWv6PFSGRkYbafP6C0IXE
-gDiwmUUDPBoYE5uKmxUkfQXV95bAnTghmnE4URjEAC0
+4v8XAdt3/shftljWDAloEUK8jbhXz8g19i6jYqPanOM
--> ssh-ed25519 hPp1nw Qq52IpfX5qtzg7E9ruK4qI3W0tyXTnm5ntITOzZ4r3M
+-> ssh-ed25519 hPp1nw nMT+3ux5DZTEttaQDSGR4TFqMjJOnpmw6VuYmYew41A
-QhTA1V4vN9qMKhIcmNKIOBYnggPP4FfbIkXR+00jJMY
+pQmpkCPJ7tLusjS5kIgqcujeTjiKf53IpUVv1LrmlZE
--> ssh-ed25519 CRfjsA EtorS2Ba+6E4grspQXhDFiXSOxGsnNSQbkSpv+NkGkc
+-> ssh-ed25519 CRfjsA btyR2YFxYAuBRtNKL3HxPEK4BzYptB5BJ1Et/OOA8Cc
-Oz6xPjiHUJI/md01GxNLA9O52V/inIeaEi0wGe/T2QE
+pT7HayclLxdcCbmfA8Rm3EvXFin13koKKgKYX5D6zd8
--> ssh-ed25519 vwVIvQ yzWaeWjer2QysLCpcpiEGuUSX/JEf+CVOLEbV4cdwG4
+-> ssh-ed25519 vwVIvQ Pf2x6AjYZvotGoZHRv2YgLlySxT5MIbgKpo/iKD0cjA
-00vNjH+LFNjGGFrJmJtpLGKZTnEtFDW94sDIeNeklbk
+W4mubpJM7n+rh1U+7220Obhgx2PiCLSmlRB7c8g94Kg
--> ssh-ed25519 fBrw3g PJqw2w4s10ncE5q95Srxc49S3UfiZpDskoCHLsYE8wo
+-> ssh-ed25519 fBrw3g aWphvCv0R/42EkyQgbtmrZ3c0+d8Yj+fd3W4BHBrt1I
-SMpvtbRNMdGi3+VENOVziLt2U6kg4djaJwY9QN7qm+A
+unRlUKNZHLdUXpTnMYOKt2r6Ku3IFFN0Qt2KfEzBXRo
--> ssh-ed25519 S5xQfg QCkCr+gN488FKCu+TlhJ6HUbFxqdkwSaUYxgnJ66zl8
+-> ssh-ed25519 S5xQfg 4EwsQL2IgpSrucGFE9ycyS4/82vfLKgIR7jtfyK9RQs
-XhMSuZ/HOlXJmWRVrQjMY80IKxvrnNHh6eR6N2vSKeQ
+2ytPuFQd0mDPIN7d+k2FlN7fHnKNPJU2Wf04DM2sOGM
--> ssh-ed25519 XPxfUQ k8Pp9ZlRAWZRXOQ9URro05DRIViGfs2DhXTrMTZyvgA
+-> ssh-ed25519 XPxfUQ cV3abyNYwf8ddo7QTKG/jlLrtMc2EhTlBjvj/3BO7h0
-B7lvmKy5Dqw5qzLwnQEX1163NW0t6vYHPgTmqKE/2+4
+DLzsdjDvWuiwSQd4tB2TTlVozXc9X3UZY4C1kptpl0g
--> ssh-ed25519 SpD5mg Y/Cg1GVTBo1r66Oj/bFN0uDWLfM2rIAAGRP0qu0tfRo
+-> ssh-ed25519 SpD5mg CuXwDlnSjnGrSK2RJmgNFxjTKWdZEVR5wSTYHbjDu3U
-Rr+7yR2uf170A2pUylEwUthC0XGIXin51DK9JS8K0xY
+qGYlRJe0x2NvC9gi4IO1907NF2sY3M+3nrsYY9F/6Eo
--> ssh-ed25519 Kk8sng r//SXYT5xxLXwoDsWhFwaoLzhT8fdbXX3HShmS4SMX0
+-> ssh-ed25519 Kk8sng 8+lugR1z3j5TDFCv+eNDsVY0iD9RSBqE1uZw9xkL1w8
-DrcuiBS+JLkzgsYumxvnsnKkrzFYkNPRJZOegj+0Q1c
+Ey+Y8TSfRnnKUrlT8z1AGs6Ze5P3vylWtH//QENLq7k
--> X6%3Q-grease l? n?e
+-> e;){a}-grease mxF{/I
-j/l9N+hzs80iS5YZrx8mrrIIb/+y82YM4lb1a0aBOCUMsK0IHbtnPjZbVfOmO55W
+ij3j1VjVrATiBw
-+yFtp3gXw1Fnffbircs8YnYpq5vdpEABGazjSg
+--- U4dnDq0KmjHdJFRBc85V2AjVPkBlTylAI6gnqrPL5Aw
---- o3H9hWurbhlvoOR4Ulmpt/hdPk+C/OR79T0YqvoXRR0
+‘ÅÌËôõ-lN®p>YxwƳ”ÉDÒŽ¸r¬÷ùŸVç+oV=€ËùŸâ¿n9ßu¼|Xb]×Ϻ‚ÖaØ(M_® ¾Ä׋
-؆(ÚÙ0Ýíw¨WMæ‘@jO…°}2mêNßnÙ³’g«å„?¤gò³ª³†“rºB\ ï½ãØ
+ƒm4yå@7Fs0V4÷Tö‰XÀºþžõ½Å"±cM

secrets/spotifyd.age

@@ -1,38 +1,39 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w F1C6i9iOvzUf6pS7eBfcsRFRn4q2YE7htxCqiLvasw0
+-> ssh-ed25519 xoAm7w kuMA8ICWwTmJRc1yL93aZaZV19JIuPqGxjxKFuVpJUg
-viF83MLadEfum6wQWgbl/h0l65+jAtBszhevVS4jh4k
+2mT/VTjvxolyhJm5JbkwrPrsuuUjGzqym9M/rcxUkSI
--> ssh-ed25519 mbw8xA Ec2wju2txmmCHuVNDWdLQkfUNY7/okY2koAz6Jur53o
+-> ssh-ed25519 mbw8xA gFKcwWHvFNXa2ohvZGo2rwHXhAghdc0dWmC8nQFHEzc
-JLmlpd43QO/LPvS0TW9eKh6f5zZmbVDWjYn44J5ZqMo
+cCeCLBYa6MbD51gsqVvJCc9tQYMTu8WjNi4E16WjBBM
--> ssh-ed25519 N240Tg 1bl9Y+I3XGx7RiY8078wEMdaAishvW84nMrprt8jjVU
+-> ssh-ed25519 2a2Yhw Ni01ZgIQWBcHK/tPas9XWhHvBKpusGVWT+VLoRaycmU
-4lXtc1rGouF1DoTohQnSEMvNwRZaaenimEFypsfxajM
+FJE6jpgnvjMk7JtRNCie59qnbEC8uVWUqOOFM6yuRXk
--> ssh-ed25519 2a2Yhw SDknhtgjNgNy3ktoNNvLie3OdO8bKhWW5P4s73OtLk8
+-> ssh-ed25519 dMQYog Ux82p5oapnhQ48v5YC7LtUgTkh0z4heN2wIZ4zdkBHc
-Ihl/yNw35f2CgcZX6KHRXUTpAHp6aAQR/7oeU+gq3V4
+617zDYbNTKqtYrR9A8G7KHOiTvu7gM1KTheDENb0Mbo
--> ssh-ed25519 dMQYog dME46DZmwFnKBKlmx5AZEoaVipBmpuz66RXPQfFoXSY
+-> ssh-ed25519 G2eSCQ DXiNCQrPLznpFlNWjAw8AGE7N+2S+bZEPq2pxw7tYQc
-eAzeaSpIL5KPQADGEeuX/bkQ014L8MeTQF2fapO2N/w
+O/cqBzb901Ig+7ve5LMNM9w8TKPlR9AOMJaNrZ5F3hw
--> ssh-ed25519 G2eSCQ 8/xTD9nSXyAeZwBEdJgLcOembBwnMOgWX3jR4N2sXC8
+-> ssh-ed25519 6AT2/g IKSN6LZpelB1Qa0WxPpGWQ2BLWK71r9J8cqB7XIfMAg
-0BmY7u5TEcIEza2PZIJEamV2dfC0sDeVl0UXECBwDlc
+8HRo/7Wuui5imZ9rr67LlYdAO1mS13HqUv+jrSeLiOA
--> ssh-ed25519 6AT2/g xSdH52Oq0TOg0D76WlDVSY5kJb0hMAWoM3XVyMtAeWk
+-> ssh-ed25519 yHDAQw ax0q3ja7Q70+sGUZNdvyUkA0bRZYiNV5nvVhnTtcezo
-0p2AHJDa9XK6C2g8AM/g7cWdR5DGLk6SoUL3Nah2G1M
+GWps1K/7Lf4sBBo+rQCVT42NpJXdF9h+G2vB8/bTPOk
--> ssh-ed25519 yHDAQw mQBHUkvKf+Na8pCfl2Vb7+sKLmKth0lbxDFEcTtH/ng
+-> ssh-ed25519 VyYH/Q 0bzf+qa/YkcMdfFwn53X/nINPkatTGpJj+fs8/kvOB0
-JDPxV93vE8mKJtDp/MewHA0F78rW/0ZPYUQKkdNUivs
+yu+xVqTTjbQAv8d8Tx814GrP6C4G2Ivikl1yb3kQUA4
--> ssh-ed25519 hPp1nw htVxNW9zp7J38WN06jfEX417xtXt50iMTRUtrzLRO2k
+-> ssh-ed25519 hPp1nw SDKk2Cwoya2DmFlTNymeoyDCtiOxrr93F4ZpVXKQwxE
-iTHjoS5eWNiQxIWtuylkqXlO8E+Dx/2CkENs16lZqhQ
+0HwqXkVqE0mPiGenC8H6MTa2ElidAamGXLP3VZaB23I
--> ssh-ed25519 CRfjsA Dqs/SAfRhgszI9pz4yZHyVp0iqPg1ssspX6ZW2QTv10
+-> ssh-ed25519 CRfjsA +PqVqX6J1ZhcfjlEBg9hJpDeYQEeCbJifYzC4iVpzBM
-tA7NQXpPtJQ4mHjTDr4pTt9jrqDkMJZGMLVazOenMbs
+8aOqAQvJIxTcUfxW0QVYJFHpMO0aSUxbF6z4wEo1Y+g
--> ssh-ed25519 vwVIvQ oNmVe26rEpI7nNGlI5G7Er9fu7blpHNE6NOeGkoR/TM
+-> ssh-ed25519 vwVIvQ r4wRXXLTg8RpDq4gjWZGuFp9NH33kekLIu4NUvtjoH0
-vAL2gsM9NatGQpnNIh8XpCP+o9KoOnuLVt9e8+Kymcw
+2FFFi1HMKgqFYZltig76rSL9zHst5rE1/2zltjk/gmo
--> ssh-ed25519 fBrw3g 7GVBA1eUhgxGfiiKirK/i5JUbehOJVgmc2H/tgQ+A1s
+-> ssh-ed25519 fBrw3g fdCixr2OJQDSJJXcNeGwKbaM22Uj3669/GAZxVNVhEs
-n3i9gtNt4aRT4EOk8C94lGmXNN538HNOqo8uCmxZz6o
+/bIa/EtjEHgAsMsSrGnqJ+owKlZ6WlG2yHcr7tAPpF8
--> ssh-ed25519 S5xQfg 2KQLClmvqWMuJDOSAkzcpJkRTJgV6ig5Cq22RcCixWA
+-> ssh-ed25519 S5xQfg 0jb5owsvZa1tApkTRo6Ai9+MiJaWHM09SmffDS6q1R8
-zYULXTJL5o5uZxxi/fOCrocxZooH3KarUj8vUDkfWn8
+zsfdzGq1HxQtvWgjBwac0BWzoZ81/9mOh3bwLHQ7eZE
--> ssh-ed25519 XPxfUQ z0v4A6O509NqQgbKFzZrY2WL1ATc9SCYckbtqaSOdk0
+-> ssh-ed25519 XPxfUQ Tcaed1l2jarovJJcQcF3aH0oRTHG3+CjRC8nReQMphQ
-PbDNvSWw4QEGLUzhp8IrX0oMDJzWjeemuEDZ02YlClo
+aKPAQekq1S2ENodDJ+X9tURYHC5UeYX6IkAiZAwq/2s
--> ssh-ed25519 SpD5mg +A6LavFPjRHuTyk0MTZ6zmJf+CIMX69fT/HI6/0RJWI
+-> ssh-ed25519 SpD5mg CI+doikC251HbDmvWkmxMPPuCxs7DhCs5djaV/yK8Q4
-CVgJC3y/H7MHUCMR5s77oPWA56oIEpj+7MZH+Qw/LTU
+j9mNZ9jOKyC/FoGMl4mSfLUF9jQcxoapUZ7AzJLVaC4
--> ssh-ed25519 Kk8sng 4Re6/B65/TMi45/fZh7zl7dAzH4MnCnHqca1Otpaa2o
+-> ssh-ed25519 Kk8sng tfmmLUnB6P00bnx8oi05hkz1YsumbW3po5TLrUY9UHs
-zJAlQ96vODytPwtwPSxEEi8hn052vCGcPUxECyU9Ivo
+yh4L1HpuA9QHAl1o3KaMLuPNxcoHrd9xT24BSQB0gHI
--> V1&(!o4J-grease I)F/
+-> E^;,0J-grease @1%uq:\
-AQ7tCx9XyVd3QDf9Tadcz8QIOJ3bgj4kDh8YuwATAmF7M9DPAlQiW5qkkvaALloG
+rsHU3TVrPPYHVgxVVSD69DWk1ms+dBCh2/ET8h7lIz2xrDqQf8bx+oJriPv+78Qb
-KwwV
+bjoq88amMcGrJKSoNrcRxYqj7OGw4SQk2gfzotxF57BdoLSeRNboLwv8DTSJpPLt
---- VnZ2JJVPKnr8hDMqsZidpehwkLY9W2UmF40/5Khu7rg
+m1o
-„;»­晣,‘ΧÂ<C2A7>òHµˆ›¿ˆ±‚>ê¬?þL¬Üiv?PËwùìŒímW£›­3„^¯{^ÂÆ«"ýçMÈ[…P¤$­RàüNðú…£ÄŽýÓ6LÍ Ï
+--- KNvXo+zbpLVsT8S8XMPRoCjjz55fW3d97axYONHvs0U
+ýüGrsT­RrÒß	’…eG­r݆¹02bé:|òmj{øqÂØD~<7E>þP3–5)Ü£^í´ÞH´(\rV›6VŽIΞ»Ì5wL!㣭ó!«|Iañ¾\

secrets/wolframalpha.age

@@ -1,38 +1,38 @@
 age-encryption.org/v1
--> ssh-ed25519 xoAm7w QDzXkxhczV+ZUvEHmN1Uf7xWaEDSugv2dcisOakVPEc
+-> ssh-ed25519 xoAm7w HClJLz2DJRlS7owQ8Wu6lkOWBZY2t4tL3m4Xd1wf6Ts
-+k9M+R98OqsfIROOedql7ksLCtejx5uzFXigxB1Dhzs
+T/SjmYmVs4x74n/Q3fFQujyeDTaSMatIDK67N3uo6H8
--> ssh-ed25519 mbw8xA ERuMyLhLVrNwmr1wS9h0ssZYayCn0Hc1dhu3zBKzDF0
+-> ssh-ed25519 mbw8xA JFGWHAkip5tKBG9ett2/Y0Dr2wsiStKve0mpZVJN/gE
-pz2rEMX3MtxtVOTuEyO5K9ZE5s0C+2JL7lNE5BdUsRo
+lwTtXrW+0N5SYkllt6KAQs82KLa7YH/godphEWkhgdw
--> ssh-ed25519 N240Tg kHC1Wn8T3aUpWd4yK0+GJo+SDBXrVmTSrNz/Z+3kfGs
+-> ssh-ed25519 2a2Yhw blLit/oIYe10zPJOu0QOKUd7NHAS3NvSSd0DMvrqiGM
-sg6A3DgaQev5ZezJeSNAR7+G4MS1rdwHd/6u1H5+0us
+VlC0shqH1HgAR5EokdgKtWDOAS4tL5C1YKgCJ6kAeCA
--> ssh-ed25519 2a2Yhw 64vHNVi/UCK1aCBFu+BnSyy42DHZIFeiDekfnQeDlHE
+-> ssh-ed25519 dMQYog s5CZNbbI00B74zlzP6jNaw6l/YKDbLgTJPQpRlXRfSg
-19On29XUAiUsTmlqxrY8PQGderv7VzBO4a10jT5aZwY
+NQohEMrbchdS433sw3MKRH/8lryh6j4VZFBvjW1qmc0
--> ssh-ed25519 dMQYog EHtR1wf5/2aWvGwkD4EBOECctp2zs2RjAUOKcncjUSI
+-> ssh-ed25519 G2eSCQ PbfTCAk1+DJhW7F+26xvaSZlhpIAtfIAvqm9Xfi9xGE
-s7dfQHaLjO6Hor6xXpx8h5hox3OQA4mPRGt8ewr0jQM
+CbVJJl6zzm2857A5oDhF8Z4Vtq0felJ7j96Tc3aN9eI
--> ssh-ed25519 G2eSCQ 4L9zIv4aApkZgFneUjVm2esXp4DJYVzm94LA2sS0Qkc
+-> ssh-ed25519 6AT2/g A2B3VdkSf88kbSQKCSfaAR6bUREanrTyKLiZhVP3ugM
-+iDy2G82PX6yuIyn7zITzp/jvBX2P25u26n/NuGdjVM
+Z8FvbHNpGMh6Wsaxu44MAUhSFOv8UIRFTugyrtvXr9Q
--> ssh-ed25519 6AT2/g HyH+8r/SZUXilmITIsFVyr2t6rCJK9scP9TR2/rO+1M
+-> ssh-ed25519 yHDAQw LZPhYf49feALAiKTT2oiM61BgcRfrXTKal+zhjLoMxA
-0Hkx2o3wlq7nj6fRSL3QNtrxKFxYlfhg7CwsyQDjIo8
+Qi7Eu6Rq7LjNvhwgN1Cy5/B+VCOLvOdkH5jWsXGvydc
--> ssh-ed25519 yHDAQw vZlwV2QvrzG1Xu4XZt4Yi5aDQ8qmPQnadCJtHdtTSlc
+-> ssh-ed25519 VyYH/Q s2gMTJIyJZkWXeVX+kv/bUpNKqN3Zt5FpVR1bfOb+zg
-4NscOK2mu+P+vrZ8FIbIYhQ/97DPo5vgsl0jnlZM0gY
+Ho1k4VljmGXcpr4NGo7RkKhjrxnckMGL3GzDMK1U0NE
--> ssh-ed25519 hPp1nw YWRekiOxwuK8eAGehbBfOzW7Rmw95V+A/XD4rmFxS3Y
+-> ssh-ed25519 hPp1nw dg3SZjzCIzJU2Ef68SOwXmZE0Efg9MaE1J6+JKgW9xQ
-sd+q4ya9k/KE06GYGFV2O9P3O77aZcJl05tAvY6W1s8
+8/hJdKcQAcvDtarn8u7W0tKblu02thOylJ+zThWlpic
--> ssh-ed25519 CRfjsA LfIzQhaql9b4EAotyVrvKBV1AhlMVcRarA49q7+rQXc
+-> ssh-ed25519 CRfjsA FIF0LZf60q7MExEDJi0UMODKi3Q0c39c26fFUE9tHDc
-v4WddjXusd/m/s/T7E+wdKm9tDR3rGj6CNE3AdVrDb8
+TIdABrVJ6FmbqfhWbz3+6xZtyRJAehas83JmBFEoVfU
--> ssh-ed25519 vwVIvQ 53S5tWgmlVnKIHonBAmvxbv+w0j9b65NdyWvwlvgZWg
+-> ssh-ed25519 vwVIvQ uXexIx8K6/AOpX0P2JSZP27mo7Iq7kePt54m0B/83Wc
-xa+z7MYrJHCgILtG/3Yw1OKH1/YKvuVG2jabnv3gSoA
+sakOup9vuUx4/52FltGPHOT1SUG7nIIUbhTlev0Tg+4
--> ssh-ed25519 fBrw3g GsaGAXiMo4WhEZTQPgr761gAiQHmHPSwdWF0t910+DI
+-> ssh-ed25519 fBrw3g YoekhSoktfoGXc/soCDSSvOV6Y1SMOwsahtxeOkPgj0
-dmZGcEghoXi7giaxC/1UVJVAtyY5hcknUBxr0wQ4RBk
+YD0/HFmw/rJ5h8p0+IF9rfL+PLe7lwvwIV4tp6cb1AY
--> ssh-ed25519 S5xQfg wgkQBHQi8xY4++/quS4ZJWb9PPpg6b0KZpSwypdS7HY
+-> ssh-ed25519 S5xQfg pmm6X5Tl94OTiz9oWoTvfggF4UAOcCUNATbLbTHUg2s
-+1yatx5SUanPC04jJMVVILHAwdtg2r9Bd+sj9728BnY
+tFA3SJGfTDi2FhV4JBKWz1/p7SAHtPaQ+dvSmI6edLU
--> ssh-ed25519 XPxfUQ Hj2e1U4udGkp04dSdTSsaaJPIQ7gB1bwralXazBzpVM
+-> ssh-ed25519 XPxfUQ XW93ctvokekrrlNySXSl0b6TFAosf0zBxmT4dc7Ybkk
-LPOMpbX+ndXRkQlR3GKKpwSd5zOT03j5bII8btjY52o
+chKtenAqQ2tavjBzDxVyi6OwYp6oKW2Cf6g9YxEYqYU
--> ssh-ed25519 SpD5mg ++/8/U9XQKg6L3SHej+mvXeZYrvoWhiwmcurC3V0aTU
+-> ssh-ed25519 SpD5mg me2egMTBnAAwko5Hk+6rtjl7DwcGJsWpiiHFaTG8cgA
-qR3nTcugxtBgDhcbZpCe0/NUavbzV6tFJZKv3IopAO4
+h6Kzkc/jRlNE2p+CeAMLTMzLGrm0bSQEKJj4yQcQ2Eg
--> ssh-ed25519 Kk8sng /bL56jng2lp0INyIDqUAX5L8mFmKxCBeHFWPUW6gE0U
+-> ssh-ed25519 Kk8sng BEeiCUQ9QWlYscSHtvQKrYPl+/G1BCfJn13J17QTWmo
-4v+jq2N6RIQAh0VRrBZkMjSQW6L+LYcAfYUBvfTM+Jw
+3xd4hNsMGmhAg2d8jvsJ3/rVOvIooYMMOgpn9N3t3EM
--> ";etw{[s-grease E;mh^R$ c8
+-> _'bSoQ-grease uFb7xPe, S K.f; Y7i"cG
-ossMGyq0gpvz9PjjLBWD+QHRKKhzY6/9Kj4b0M7YdP0OgMdpr5QlA7UIDhiGQQBL
+D1xxRIgIslR33p/N+cnKEqSGP7iCgVS2pS8DZtGgAz3DzSUf7a1+OF4uRPOz3juH
-dbt0YyLxbAdhqG7S3lLeedQmvzv/oIyhmV0jsTB79W1l/27FujvPRWYf
+b790V0/2CzNGwSbd
---- pYjss6AEPZn0PG7FmO6bGq1O+k1IFGzoxsitB4qgotY
+--- hNoZqGbHUS8/YCysJPb8fV7RwGv8AViuQXbI5n1aPJc
-ÌÐçJö›Ç<10>>Z`´{ª<0C>
b%RW^óºñ–&<26>·ª’	­-4¥ðè¬ÙÚW…á
++¸‹o…˜•Kui/ψü´²0j!÷œ¯Ð—þâA&½8[èƒsd0þrê@ö1SÙõ