Add collabora online and move nextcloud domain

Makefile

@@ -29,14 +29,4 @@ gc:
 # Update a flake input by name (ex: 'nixpkgs')
 .PHONY: update-input
 update-input:
-	nix flake update $(filter-out $@,$(MAKECMDGOALS))
+	nix flake update $(filter-out $@,$(MAKECMDGOALS))
-
-# Build Custom Install ISO
-.PHONY: iso
-iso:
-	nix build .#packages.x86_64-linux.iso
-
-# Deploy a host by name (ex: 's0')
-.PHONY: deploy
-deploy:
-	deploy --remote-build --boot --debug-logs --skip-checks .#$(filter-out $@,$(MAKECMDGOALS))

common/machine-info/default.nix

@@ -199,9 +199,5 @@ in
     # perspective of a perticular machine but is instead intended for reflecting on
     # the properties of all machines as a whole system.
     thisMachine.config = config.machines.hosts.${config.networking.hostName};
-
-    # Add ssh keys from KeepassXC
-    machines.ssh.userKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILACiZO7QnB4bcmziVaUkUE0ZPMR0M/yJbbHYsHIZz9g" ];
-    machines.ssh.deployKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID58MvKGs3GDMMcN8Iyi9S59SciSrVM97wKtOvUAl3li" ];
   };
 }

common/pc/chromium.nix

@@ -46,6 +46,7 @@ in
 
     # hardware accelerated video playback (on intel)
     nixpkgs.config.packageOverrides = pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
       chromium = pkgs.chromium.override {
         enableWideVine = true;
         # ungoogled = true;
@@ -60,9 +61,12 @@ in
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver # LIBVA_DRIVER_NAME=iHD
+        vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+        # vaapiVdpau
         libvdpau-va-gl
         nvidia-vaapi-driver
       ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel ];
     };
   };
 }

common/pc/default.nix

@@ -46,12 +46,11 @@ in
       spotify
       arduino
       yt-dlp
+      jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
       lxqt.pavucontrol-qt
-      deskflow
+      barrier
-      file-roller
-      android-tools
 
       # For Nix IDE
       nixpkgs-fmt
@@ -72,10 +71,15 @@ in
     services.avahi.enable = true;
     services.avahi.nssmdns4 = true;
 
+    programs.file-roller.enable = true;
+
     # Security
     services.gnome.gnome-keyring.enable = true;
     security.pam.services.googlebot.enableGnomeKeyring = true;
 
+    # Android dev
+    programs.adb.enable = true;
+
     # Mount personal SMB stores
     services.mount-samba.enable = true;
 
@@ -90,9 +94,5 @@ in
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
     fonts.packages = with pkgs; [ nerd-fonts.symbols-only ];
-
-    # SSH Ask pass
-    programs.ssh.enableAskPassword = true;
-    programs.ssh.askPassword = "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
   };
 }

common/pc/kde.nix

@@ -15,7 +15,6 @@ in
       # kmail
       # plasma5Packages.kmail-account-wizard
       kdePackages.kate
-      kdePackages.kdeconnect-kde
     ];
   };
 }

common/pc/vscodium.nix

@@ -14,14 +14,24 @@ let
     rust-lang.rust-analyzer
     vadimcn.vscode-lldb
     tauri-apps.tauri-vscode
-    platformio.platformio-vscode-ide
-    vue.volar
   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+    {
+      name = "platformio-ide";
+      publisher = "platformio";
+      version = "3.1.1";
+      sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q=";
+    }
     {
       name = "wgsl-analyzer";
       publisher = "wgsl-analyzer";
-      version = "0.12.105";
+      version = "0.8.1";
-      sha256 = "sha256-NheEVNIa8CIlyMebAhxRKS44b1bZiWVt8PgC6r3ExMA=";
+      sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y=";
+    }
+    {
+      name = "volar";
+      publisher = "Vue";
+      version = "2.2.4";
+      sha256 = "FHS/LNjSUVfCb4SVF9naR4W0JqycWzSWiK54jfbRagA=";
     }
   ];
 

common/server/librechat.nix

@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.services.librechat-container;
+  cfg = config.services.librechat;
 in
 {
-  options.services.librechat-container = {
+  options.services.librechat = {
     enable = mkEnableOption "librechat";
     port = mkOption {
       type = types.int;
@@ -21,7 +21,7 @@ in
   config = mkIf cfg.enable {
     virtualisation.oci-containers.containers = {
       librechat = {
-        image = "ghcr.io/danny-avila/librechat:v0.8.1";
+        image = "ghcr.io/danny-avila/librechat:v0.7.7";
         environment = {
           HOST = "0.0.0.0";
           MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";

common/server/mailserver.nix

@@ -63,28 +63,18 @@ in
           "cris@runyan.org"
         ];
       };
-      x509.useACMEHost = config.mailserver.fqdn; # use let's encrypt for certs
+      certificateScheme = "acme-nginx"; # use let's encrypt for certs
-      stateVersion = 3;
     };
     age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age;
     age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age;
     age.secrets.hashed-robots-email-pw.file = ../../secrets/hashed-robots-email-pw.age;
 
-    # Get let's encrypt cert
-    services.nginx = {
-      enable = true;
-      virtualHosts."${config.mailserver.fqdn}" = {
-        forceSSL = true;
-        enableACME = true;
-      };
-    };
-
     # sendmail to use xxx@domain instead of xxx@mail.domain
-    services.postfix.settings.main.myorigin = "$mydomain";
+    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.settings.main = {
+    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";
@@ -102,6 +92,7 @@ in
     age.secrets.sasl_relay_passwd.file = ../../secrets/sasl_relay_passwd.age;
 
     # webmail
+    services.nginx.enable = true;
     services.roundcube = {
       enable = true;
       hostName = config.mailserver.fqdn;

common/server/nextcloud.nix

@@ -5,18 +5,13 @@ let
   cfg = config.services.nextcloud;
 
   nextcloudHostname = "runyan.org";
-  collaboraOnlineHostname = "collabora.runyan.org";
+  collaboraOnlineHostname = "docs.runyan.org";
-  whiteboardHostname = "whiteboard.runyan.org";
-  whiteboardPort = 3002; # Seems impossible to change
-
-  # Hardcoded public ip of ponyo... I wish I didn't need this...
-  public_ip_address = "147.135.114.130";
 in
 {
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud32;
+      package = pkgs.nextcloud31;
       hostName = nextcloudHostname;
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";
@@ -29,14 +24,14 @@ in
         # Want
         inherit end_to_end_encryption mail spreed;
 
-        # For file and document editing (collabora online and excalidraw)
+        # For collabora-online
-        inherit richdocuments whiteboard;
+        inherit richdocuments;
 
         # Might use
-        inherit calendar qownnotesapi;
+        inherit bookmarks calendar cookbook deck memories qownnotesapi;
 
         # Try out
-        # inherit bookmarks cookbook deck memories maps music news notes phonetrack polls forms;
+        # inherit maps music news notes phonetrack polls forms;
       };
 
       # Allows installing Apps from the UI (might remove later)
@@ -57,7 +52,6 @@ in
       forceSSL = true;
     };
 
-    # collabora-online
     # https://diogotc.com/blog/collabora-nextcloud-nixos/
     services.collabora-online = {
       enable = true;
@@ -94,62 +88,27 @@ in
     };
     systemd.services.nextcloud-config-collabora =
       let
+        inherit (config.services.nextcloud) occ;
+
         wopi_url = "http://localhost:${toString config.services.collabora-online.port}";
         public_wopi_url = "https://${collaboraOnlineHostname}";
         wopi_allowlist = lib.concatStringsSep "," [
           "127.0.0.1"
           "::1"
-          public_ip_address
         ];
       in
       {
         wantedBy = [ "multi-user.target" ];
-        after = [ "nextcloud-setup.service" "coolwsd.service" ];
+        after = [ "nextcloud-setup.service" ];
-        requires = [ "coolwsd.service" ];
-        path = [
-          config.services.nextcloud.occ
-        ];
         script = ''
-          nextcloud-occ -- config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
+          ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
-          nextcloud-occ -- config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
+          ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
-          nextcloud-occ -- config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
+          ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
-          nextcloud-occ -- richdocuments:setup
+          ${occ}/bin/nextcloud-occ richdocuments:setup
         '';
         serviceConfig = {
           Type = "oneshot";
         };
       };
-
-    # Whiteboard
-    services.nextcloud-whiteboard-server = {
-      enable = true;
-      settings.NEXTCLOUD_URL = "https://${nextcloudHostname}";
-      secrets = [ "/run/agenix/whiteboard-server-jwt-secret" ];
-    };
-    systemd.services.nextcloud-config-whiteboard = {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "nextcloud-setup.service" ];
-      requires = [ "coolwsd.service" ];
-      path = [
-        config.services.nextcloud.occ
-      ];
-      script = ''
-        nextcloud-occ -- config:app:set whiteboard collabBackendUrl --value="https://${whiteboardHostname}"
-        nextcloud-occ -- config:app:set whiteboard jwt_secret_key --value="$JWT_SECRET_KEY"
-      '';
-      serviceConfig = {
-        Type = "oneshot";
-        EnvironmentFile = [ "/run/agenix/whiteboard-server-jwt-secret" ];
-      };
-    };
-    age.secrets.whiteboard-server-jwt-secret.file = ../../secrets/whiteboard-server-jwt-secret.age;
-    services.nginx.virtualHosts.${whiteboardHostname} = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://localhost:${toString whiteboardPort}";
-        proxyWebsockets = true;
-      };
-    };
   };
 }

common/shell.nix

@@ -34,6 +34,13 @@
     io_rand_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randrw --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
 
     llsblk = "lsblk -o +uuid,fsType";
+
+    sudo = "doas";
+
+    ls = "pls";
+    ls2 = "eza";
+
+    explorer = "broot";
   };
 
   nixpkgs.overlays = [
@@ -41,9 +48,6 @@
       # 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: {
-        nativeBuildInputs = old.nativeBuildInputs ++ [
-          prev.makeWrapper
-        ];
         postInstall = ''
           wrapProgram $out/bin/comma \
             --prefix PATH : ${lib.makeBinPath [ prev.fzy config.programs.nix-index.package ]}

common/ssh.nix

@@ -31,6 +31,8 @@
 
   # TODO: Old ssh keys I will remove some day...
   machines.ssh.userKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVR/R3ZOsv7TZbICGBCHdjh1NDT8SnswUyINeJOC7QG"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0dcqL/FhHmv+a1iz3f9LJ48xubO7MZHy35rW9SZOYM"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSkKiRUUmnErOKGx81nyge/9KqjkPh8BfDk0D3oP586" # nat
   ];
 }

flake.lock

@@ -14,11 +14,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762618334,
+        "lastModified": 1750173260,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766051518,
+        "lastModified": 1749105467,
-        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
+        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
+        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1747046372,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763988335,
+        "lastModified": 1750779888,
-        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -205,16 +205,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768068402,
+        "lastModified": 1752208517,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "c6a01e54af81b381695db796a43360bf6db5702f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765267181,
+        "lastModified": 1752346111,
-        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "narHash": "sha256-SVxCIYnbED0rNYSpm3QQoOhqxYRp1GuE9FkyM5Y2afs=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
+        "rev": "deff7a9a0aa98a08d8c7839fe2658199ce9828f8",
         "type": "github"
       },
       "original": {
@@ -241,11 +241,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1767185284,
+        "lastModified": 1752048960,
-        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
+        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
+        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
         "type": "github"
       },
       "original": {
@@ -257,16 +257,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768105724,
+        "lastModified": 1752431364,
-        "narHash": "sha256-0edMCoDc1VpuqDjy0oz8cDa4kjRuhXE3040sac2iZW4=",
+        "narHash": "sha256-ciGIXIMq2daX5o4Tn6pnZTd1pf5FICHbqUlHu658G9c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c41b0361812441bf3b4427195e57ab271d5167f",
+        "rev": "fb0f0dbfd95f0e19fdeab8e0f18bf0b5cf057b68",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "release-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -295,19 +295,22 @@
         "git-hooks": "git-hooks",
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "nixpkgs-25_05": [
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1766321686,
+        "lastModified": 1747965231,
-        "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "master",
+        "ref": "nixos-25.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
     # nixpkgs
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
 
     # Common Utils Among flake inputs
     systems.url = "github:nix-systems/default";
@@ -19,15 +19,16 @@
 
     # Home Manager
     home-manager = {
-      url = "github:nix-community/home-manager/master";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Mail Server
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
       inputs = {
         nixpkgs.follows = "nixpkgs";
+        nixpkgs-25_05.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
       };
     };
@@ -117,6 +118,7 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
+                  # ./patches/gamepadui.patch
                   ./patches/dont-break-nix-serve.patch
                 ];
               };

home/googlebot.nix

@@ -19,15 +19,10 @@ in
 
   # Modern "ls" replacement
   programs.pls.enable = true;
-  programs.pls.enableFishIntegration = false;
   programs.eza.enable = true;
 
   # Graphical terminal
   programs.ghostty.enable = thisMachineIsPersonal;
-  programs.ghostty.settings = {
-    theme = "Snazzy";
-    font-size = 10;
-  };
 
   # Advanced terminal file explorer
   programs.broot.enable = true;
@@ -46,13 +41,72 @@ in
   # tldr: Simplified, example based and community-driven man pages.
   programs.tealdeer.enable = true;
 
-  home.shellAliases = {
-    sudo = "doas";
-    ls2 = "eza";
-    explorer = "broot";
-  };
-
   programs.zed-editor = {
     enable = thisMachineIsPersonal;
+    extensions = [
+      "nix"
+      "toml"
+      "html"
+      "make"
+      "git-firefly"
+      "vue"
+      "scss"
+    ];
+
+    userSettings = {
+      assistant = {
+        enabled = true;
+        version = "2";
+        default_model = {
+          provider = "openai";
+          model = "gpt-4-turbo";
+        };
+      };
+
+      features = {
+        edit_prediction_provider = "zed";
+      };
+
+      node = {
+        path = lib.getExe pkgs.nodejs;
+        npm_path = lib.getExe' pkgs.nodejs "npm";
+      };
+
+      auto_update = false;
+
+      terminal = {
+        blinking = "off";
+        copy_on_select = false;
+      };
+
+      lsp = {
+        rust-analyzer = {
+          # binary = {
+          #   path = lib.getExe pkgs.rust-analyzer;
+          # };
+          binary = {
+            path = "/run/current-system/sw/bin/nix";
+            arguments = [ "develop" "--command" "rust-analyzer" ];
+          };
+          initialization_options = {
+            cargo = {
+              features = "all";
+            };
+          };
+        };
+      };
+
+      # tell zed to use direnv and direnv can use a flake.nix enviroment.
+      load_direnv = "shell_hook";
+
+      base_keymap = "VSCode";
+      theme = {
+        mode = "system";
+        light = "One Light";
+        dark = "Andrometa";
+      };
+      ui_font_size = 12;
+      buffer_font_size = 12;
+    };
   };
 }

machines/ephemeral/minimal.nix

@@ -7,20 +7,12 @@
     ../../common/ssh.nix
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "e1000" "e1000e" "virtio_pci" "r8169" ];
-    "ata_piix"
-    "uhci_hcd"
-    "e1000"
-    "e1000e"
-    "virtio_pci"
-    "r8169"
-    "sdhci"
-    "sdhci_pci"
-    "mmc_core"
-    "mmc_block"
-  ];
   boot.kernelParams = [
+    "panic=30"
+    "boot.panic_on_fail" # reboot the machine upon fatal boot issues
     "console=ttyS0,115200" # enable serial console
+    "console=tty1"
   ];
   boot.kernel.sysctl."vm.overcommit_memory" = "1";
 

machines/fry/default.nix

@@ -1,70 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # don't use remote builders
-  nix.distributedBuilds = lib.mkForce false;
-
-  nix.gc.automatic = lib.mkForce false;
-
-  environment.systemPackages = with pkgs; [
-    system76-keyboard-configurator
-  ];
-
-  services.ollama = {
-    enable = true;
-    package = pkgs.ollama-vulkan;
-    host = "127.0.0.1";
-  };
-
-  services.open-webui = {
-    enable = true;
-    host = "127.0.0.1"; # nginx proxy
-    port = 12831;
-    environment = {
-      ANONYMIZED_TELEMETRY = "False";
-      DO_NOT_TRACK = "True";
-      SCARF_NO_ANALYTICS = "True";
-      OLLAMA_API_BASE_URL = "http://localhost:${toString config.services.ollama.port}";
-    };
-  };
-
-  # nginx
-  services.nginx = {
-    enable = true;
-    openFirewall = false; # All nginx services are internal
-    virtualHosts =
-      let
-        mkHost = external: config:
-          {
-            ${external} = {
-              useACMEHost = "fry.neet.dev"; # Use wildcard cert
-              forceSSL = true;
-              locations."/" = config;
-            };
-          };
-        mkVirtualHost = external: internal:
-          mkHost external {
-            proxyPass = internal;
-            proxyWebsockets = true;
-          };
-      in
-      lib.mkMerge [
-        (mkVirtualHost "chat.fry.neet.dev" "http://localhost:${toString config.services.open-webui.port}")
-      ];
-  };
-
-  # Get wildcard cert
-  security.acme.certs."fry.neet.dev" = {
-    dnsProvider = "digitalocean";
-    credentialsFile = "/run/agenix/digitalocean-dns-credentials";
-    extraDomainNames = [ "*.fry.neet.dev" ];
-    group = "nginx";
-    dnsResolver = "1.1.1.1:53";
-    dnsPropagationCheck = false; # sadly this erroneously fails
-  };
-  age.secrets.digitalocean-dns-credentials.file = ../../secrets/digitalocean-dns-credentials.age;
-}

machines/fry/hardware-configuration.nix

@@ -1,50 +0,0 @@
-{ config, lib, pkgs, modulesPath, nixos-hardware, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    nixos-hardware.nixosModules.framework-amd-ai-300-series
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  services.fwupd.enable = true;
-
-  # boot
-  boot.loader.systemd-boot.enable = true;
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "r8169" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  # thunderbolt
-  services.hardware.bolt.enable = true;
-
-  # firmware
-  firmware.x86_64.enable = true;
-
-  # disks
-  remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/d4f2f25a-5108-4285-968f-b24fb516d4f3";
-    allowDiscards = true;
-  };
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a8901bc1-8642-442a-940a-ddd3f428cd0f";
-      fsType = "btrfs";
-    };
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/13E5-C9D4";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/03356a74-33f0-4a2e-b57a-ec9dfc9d85c5"; }
-    ];
-
-  # Ensures that dhcp is active during initrd (Network Manager is used post boot)
-  boot.initrd.network.udhcpc.enable = true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

machines/fry/properties.nix

@@ -1,24 +0,0 @@
-{
-  hostNames = [
-    "fry"
-  ];
-
-  arch = "x86_64-linux";
-
-  systemRoles = [
-    "personal"
-    "dns-challenge"
-  ];
-
-  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/Df5lG07Il7fizEgZR/T9bMlR0joESRJ7cqM9BkOyP";
-
-  userKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM5/h6YySqNemA4+e+xslhspBp34ulXKembe3RoeZ5av"
-  ];
-
-  remoteUnlock = {
-    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL1RC1lhP4TSL2THvKAQAH7Y/eSGQPo/MjhTsZD6CEES";
-    clearnetHost = "192.168.1.3";
-    onionHost = "z7smmigsfrabqfnxqogfogmsu36jhpsyscncmd332w5ioheblw6i4lid.onion";
-  };
-}

machines/howl/hardware-configuration.nix

@@ -6,7 +6,7 @@
     nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_6_14;
 
   hardware.framework.amd-7040.preventWakeOnAC = true;
   services.fwupd.enable = true;

machines/howl/properties.nix

@@ -15,6 +15,10 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPnLt84bKhUgFxjQf10+Htro9Lo1Pabqm8mGalBUniv"
   ];
 
+  deployKeys = [
+    # TODO
+  ];
+
   remoteUnlock = {
     hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0N80r0Sl2WlJaUqfxZPkOtYyGumFazkIqq7eq3Gd2o";
     onionHost = "ll6yjnkh4psmfwmtkmqoutl4gq4elqzbmjxv4s6gpgoavyi3kwhjvnqd.onion";

machines/ponyo/default.nix

@@ -78,7 +78,7 @@
   services.postgresql.package = pkgs.postgresql_15;
 
   # iodine DNS-based vpn
-  # services.iodine.server.enable = true;
+  services.iodine.server.enable = true;
 
   # proxied web services
   services.nginx.enable = true;
@@ -109,6 +109,6 @@
   services.owncast.hostname = "live.neet.dev";
 
   # librechat
-  services.librechat-container.enable = true;
+  services.librechat.enable = true;
-  services.librechat-container.host = "chat.neet.dev";
+  services.librechat.host = "chat.neet.dev";
 }

machines/router/default.nix

@@ -22,7 +22,8 @@
 
   # networking.useDHCP = lib.mkForce true;
 
-  networking.usePredictableInterfaceNames = false;
+  # TODO
+  # networking.usePredictableInterfaceNames = true;
 
   powerManagement.cpuFreqGovernor = "ondemand";
 

machines/router/hardware-configuration.nix

@@ -10,6 +10,8 @@
 
   # 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 = "
@@ -21,8 +23,6 @@
   # firmware
   firmware.x86_64.enable = true;
   nixpkgs.config.allowUnfree = true;
-  hardware.enableRedistributableFirmware = true;
-  hardware.enableAllFirmware = true;
 
   # boot
   bios = {
@@ -31,18 +31,20 @@
   };
 
   # 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/6aa7f79e-bef8-4b0f-b22c-9d1b3e8ac94b";
+      device = "/dev/disk/by-uuid/421c82b9-d67c-4811-8824-8bb57cb10fce";
-      fsType = "ext4";
+      fsType = "btrfs";
     };
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/14dfc562-0333-4ddd-b10c-4eeefe1cd05f";
+      device = "/dev/disk/by-uuid/d97f324f-3a2e-4b84-ae2a-4b3d1209c689";
       fsType = "ext3";
     };
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/adf37c64-3b54-480c-a9a7-099d61c6eac7"; }];
+    [{ device = "/dev/disk/by-uuid/45bf58dd-67eb-45e4-9a98-246e23fa7abd"; }];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 }

machines/router/properties.nix

@@ -1,17 +0,0 @@
-{
-  hostNames = [
-    "router"
-    "192.168.6.159"
-    "192.168.3.1"
-  ];
-
-  arch = "x86_64-linux";
-
-  systemRoles = [
-    "server"
-    "wireless"
-    "router"
-  ];
-
-  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDCMhEvWJxFBNyvpyuljv5Uun8AdXCxBK9HvPBRe5x6";
-}

machines/router/properties.nix.disabled

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

machines/router/router.nix

@@ -31,10 +31,8 @@ in
     networking.bridges = {
       br0 = {
         interfaces = [
-          "eth2"
+          "enp2s0"
-          # "wlp4s0"
+          "wlp4s0"
-          # "wlan1"
-          "wlan0"
           "wlan1"
         ];
       };
@@ -66,173 +64,142 @@ in
 
     services.dnsmasq = {
       enable = true;
-      settings = {
+      extraConfig = ''
         # sensible behaviours
-        domain-needed = true;
+        domain-needed
-        bogus-priv = true;
+        bogus-priv
-        no-resolv = true;
+        no-resolv
 
         # upstream name servers
-        server = [
+        server=1.1.1.1
-          "1.1.1.1"
+        server=8.8.8.8
-          "8.8.8.8"
-        ];
 
         # local domains
-        expand-hosts = true;
+        expand-hosts
-        domain = "home";
+        domain=home
-        local = "/home/";
+        local=/home/
 
         # Interfaces to use DNS on
-        interface = "br0";
+        interface=br0
 
         # subnet IP blocks to use DHCP on
-        dhcp-range = "${cfg.privateSubnet}.10,${cfg.privateSubnet}.254,24h";
+        dhcp-range=${cfg.privateSubnet}.10,${cfg.privateSubnet}.254,24h
-      };
+      '';
     };
 
     services.hostapd = {
       enable = true;
       radios = {
-        # Simple 2.4GHz AP
+        # 2.4GHz
-        wlan0 = {
+        wlp4s0 = {
+          band = "2g";
+          noScan = true;
+          channel = 6;
           countryCode = "US";
-          networks.wlan0 = {
+          wifi4 = {
-            ssid = "CXNK00BF9176-1";
+            capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40+" ];
-            authentication.saePasswords = [{ passwordFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; }];
+          };
+          wifi5 = {
+            operatingChannelWidth = "20or40";
+            capabilities = [ "MAX-A-MPDU-LEN-EXP0" ];
+          };
+          wifi6 = {
+            enable = true;
+            singleUserBeamformer = true;
+            singleUserBeamformee = true;
+            multiUserBeamformer = true;
+            operatingChannelWidth = "20or40";
+          };
+          networks = {
+            wlp4s0 = {
+              ssid = "CXNK00BF9176";
+              authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176";
+            };
+            # wlp4s0-1 = {
+            #   ssid = "- Experimental 5G Tower by AT&T";
+            #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
+            # };
+            # wlp4s0-2 = {
+            #   ssid = "FBI Surveillance Van 2";
+            #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
+            # };
+          };
+          settings = {
+            he_oper_centr_freq_seg0_idx = 8;
+            vht_oper_centr_freq_seg0_idx = 8;
           };
         };
 
-        # WiFi 5 (5GHz) with two advertised networks
+        # 5GHz
         wlan1 = {
           band = "5g";
-          channel = 0;
+          noScan = true;
+          channel = 128;
           countryCode = "US";
-          networks.wlan1 = {
+          wifi4 = {
-            ssid = "CXNK00BF9176-1";
+            capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40-" ];
-            authentication.saePasswords = [{ passwordFile = "/run/agenix/hostapd-pw-CXNK00BF9176"; }];
+          };
+          wifi5 = {
+            operatingChannelWidth = "160";
+            capabilities = [ "RXLDPC" "SHORT-GI-80" "SHORT-GI-160" "TX-STBC-2BY1" "SU-BEAMFORMER" "SU-BEAMFORMEE" "MU-BEAMFORMER" "MU-BEAMFORMEE" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "SOUNDING-DIMENSION-3" "BF-ANTENNA-3" "VHT160" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7" ];
+          };
+          wifi6 = {
+            enable = true;
+            singleUserBeamformer = true;
+            singleUserBeamformee = true;
+            multiUserBeamformer = true;
+            operatingChannelWidth = "160";
+          };
+          networks = {
+            wlan1 = {
+              ssid = "CXNK00BF9176";
+              authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176";
+            };
+            # wlan1-1 = {
+            #   ssid = "- Experimental 5G Tower by AT&T";
+            #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
+            # };
+            # wlan1-2 = {
+            #   ssid = "FBI Surveillance Van 5";
+            #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
+            # };
+          };
+          settings = {
+            vht_oper_centr_freq_seg0_idx = 114;
+            he_oper_centr_freq_seg0_idx = 114;
           };
         };
       };
     };
+    age.secrets.hostapd-pw-experimental-tower.file = ../../secrets/hostapd-pw-experimental-tower.age;
     age.secrets.hostapd-pw-CXNK00BF9176.file = ../../secrets/hostapd-pw-CXNK00BF9176.age;
 
-    # wlan0 5Ghz 00:0a:52:08:38:32
+    hardware.firmware = [
-    # wlp4s0 2.4Ghz 00:0a:52:08:38:33
+      pkgs.mt7916-firmware
+    ];
 
-    # services.hostapd = {
+    nixpkgs.overlays = [
-    #   enable = true;
+      (self: super: {
-    #   radios = {
+        mt7916-firmware = pkgs.stdenvNoCC.mkDerivation {
-    #     # 2.4GHz
+          pname = "mt7916-firmware";
-    #     wlp4s0 = {
+          version = "custom-feb-02-23";
-    #       band = "2g";
+          src = ./firmware/mediatek; # from here https://github.com/openwrt/mt76/issues/720#issuecomment-1413537674
-    #       noScan = true;
+          dontBuild = true;
-    #       channel = 6;
+          installPhase = ''
-    #       countryCode = "US";
+            for i in \
-    #       wifi4 = {
+              mt7916_eeprom.bin \
-    #         capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40+" ];
+              mt7916_rom_patch.bin \
-    #       };
+              mt7916_wa.bin \
-    #       wifi5 = {
+              mt7916_wm.bin;
-    #         operatingChannelWidth = "20or40";
+            do
-    #         capabilities = [ "MAX-A-MPDU-LEN-EXP0" ];
+              install -D -pm644 $i $out/lib/firmware/mediatek/$i
-    #       };
+            done
-    #       wifi6 = {
+          '';
-    #         enable = true;
+          meta = with lib; {
-    #         singleUserBeamformer = true;
+            license = licenses.unfreeRedistributableFirmware;
-    #         singleUserBeamformee = true;
+          };
-    #         multiUserBeamformer = true;
+        };
-    #         operatingChannelWidth = "20or40";
+      })
-    #       };
+    ];
-    #       networks = {
-    #         wlp4s0 = {
-    #           ssid = "CXNK00BF9176";
-    #           authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176";
-    #         };
-    #         # wlp4s0-1 = {
-    #         #   ssid = "- Experimental 5G Tower by AT&T";
-    #         #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
-    #         # };
-    #         # wlp4s0-2 = {
-    #         #   ssid = "FBI Surveillance Van 2";
-    #         #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
-    #         # };
-    #       };
-    #       settings = {
-    #         he_oper_centr_freq_seg0_idx = 8;
-    #         vht_oper_centr_freq_seg0_idx = 8;
-    #       };
-    #     };
-
-    #     # 5GHz
-    #     wlan1 = {
-    #       band = "5g";
-    #       noScan = true;
-    #       channel = 128;
-    #       countryCode = "US";
-    #       wifi4 = {
-    #         capabilities = [ "LDPC" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "HT40-" ];
-    #       };
-    #       wifi5 = {
-    #         operatingChannelWidth = "160";
-    #         capabilities = [ "RXLDPC" "SHORT-GI-80" "SHORT-GI-160" "TX-STBC-2BY1" "SU-BEAMFORMER" "SU-BEAMFORMEE" "MU-BEAMFORMER" "MU-BEAMFORMEE" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "SOUNDING-DIMENSION-3" "BF-ANTENNA-3" "VHT160" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7" ];
-    #       };
-    #       wifi6 = {
-    #         enable = true;
-    #         singleUserBeamformer = true;
-    #         singleUserBeamformee = true;
-    #         multiUserBeamformer = true;
-    #         operatingChannelWidth = "160";
-    #       };
-    #       networks = {
-    #         wlan1 = {
-    #           ssid = "CXNK00BF9176";
-    #           authentication.saePasswordsFile = "/run/agenix/hostapd-pw-CXNK00BF9176";
-    #         };
-    #         # wlan1-1 = {
-    #         #   ssid = "- Experimental 5G Tower by AT&T";
-    #         #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
-    #         # };
-    #         # wlan1-2 = {
-    #         #   ssid = "FBI Surveillance Van 5";
-    #         #   authentication.saePasswordsFile = "/run/agenix/hostapd-pw-experimental-tower";
-    #         # };
-    #       };
-    #       settings = {
-    #         vht_oper_centr_freq_seg0_idx = 114;
-    #         he_oper_centr_freq_seg0_idx = 114;
-    #       };
-    #     };
-    #   };
-    # };
-    # age.secrets.hostapd-pw-experimental-tower.file = ../../secrets/hostapd-pw-experimental-tower.age;
-    # age.secrets.hostapd-pw-CXNK00BF9176.file = ../../secrets/hostapd-pw-CXNK00BF9176.age;
-
-    # hardware.firmware = [
-    #   pkgs.mt7916-firmware
-    # ];
-
-    # nixpkgs.overlays = [
-    #   (self: super: {
-    #     mt7916-firmware = pkgs.stdenvNoCC.mkDerivation {
-    #       pname = "mt7916-firmware";
-    #       version = "custom-feb-02-23";
-    #       src = ./firmware/mediatek; # from here https://github.com/openwrt/mt76/issues/720#issuecomment-1413537674
-    #       dontBuild = true;
-    #       installPhase = ''
-    #         for i in \
-    #           mt7916_eeprom.bin \
-    #           mt7916_rom_patch.bin \
-    #           mt7916_wa.bin \
-    #           mt7916_wm.bin;
-    #         do
-    #           install -D -pm644 $i $out/lib/firmware/mediatek/$i
-    #         done
-    #       '';
-    #       meta = with lib; {
-    #         license = licenses.unfreeRedistributableFirmware;
-    #       };
-    #     };
-    #   })
-    # ];
   };
 }

machines/storage/s0/default.nix

@@ -20,13 +20,13 @@
     secretKeyFile = "/run/agenix/binary-cache-private-key";
   };
   age.secrets.binary-cache-private-key.file = ../../../secrets/binary-cache-private-key.age;
-  # users.users.cache-push = {
+  users.users.cache-push = {
-  #   isNormalUser = true;
+    isNormalUser = true;
-  #   openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB" ];
+    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB" ];
-  # };
+  };
-  # nix.settings = {
+  nix.settings = {
-  #   trusted-users = [ "cache-push" ];
+    trusted-users = [ "cache-push" ];
-  # };
+  };
 
   services.iperf3.enable = true;
   services.iperf3.openFirewall = true;
@@ -104,7 +104,6 @@
 
     services.transmission = {
       enable = true;
-      package = pkgs.transmission_4;
       performanceNetParameters = true;
       user = "public_data";
       group = "public_data";
@@ -180,10 +179,15 @@
   # 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.graphics = {
     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)
     ];
@@ -233,7 +237,7 @@
             globalRedirect = "s0.neet.dev";
           };
         }
-        (mkVirtualHost "ha.s0.neet.dev" "http://localhost:${toString config.services.home-assistant.config.http.server_port}")
+        (mkVirtualHost "ha.s0.neet.dev" "http://localhost:8123") # home assistant
         (mkVirtualHost "esphome.s0.neet.dev" "http://localhost:6052")
         (mkVirtualHost "zigbee.s0.neet.dev" "http://localhost:55834")
         {
@@ -247,10 +251,6 @@
         (mkVirtualHost "sandman.s0.neet.dev" "http://192.168.9.14:3000") # es
         (mkVirtualHost "todo.s0.neet.dev" "http://localhost:${toString config.services.vikunja.port}")
         (mkVirtualHost "budget.s0.neet.dev" "http://localhost:${toString config.services.actual.settings.port}") # actual budget
-        (mkVirtualHost "linkwarden.s0.neet.dev" "http://localhost:${toString config.services.linkwarden.port}")
-        (mkVirtualHost "memos.s0.neet.dev" "http://localhost:${toString config.services.memos.settings.MEMOS_PORT}")
-        (mkVirtualHost "outline.s0.neet.dev" "http://localhost:${toString config.services.outline.port}")
-        (mkVirtualHost "languagetool.s0.neet.dev" "http://localhost:${toString config.services.languagetool.port}")
       ];
 
     tailscaleAuth = {
@@ -271,11 +271,6 @@
         "zigbee.s0.neet.dev"
         "vacuum.s0.neet.dev"
         "todo.s0.neet.dev"
-        "budget.s0.neet.dev"
-        "linkwarden.s0.neet.dev"
-        # "memos.s0.neet.dev" # messes up memos /auth route
-        # "outline.s0.neet.dev" # messes up outline /auth route
-        "languagetool.s0.neet.dev"
       ];
       expectedTailnet = "koi-bebop.ts.net";
     };
@@ -319,54 +314,5 @@
 
   services.actual.enable = true;
 
-  services.linkwarden = {
-    enable = true;
-    enableRegistration = true;
-    port = 41709;
-    environment.NEXTAUTH_URL = "https://linkwarden.s0.neet.dev/api/v1/auth";
-    environmentFile = "/run/agenix/linkwarden-environment";
-  };
-  age.secrets.linkwarden-environment.file = ../../../secrets/linkwarden-environment.age;
-  services.meilisearch = {
-    enable = true;
-    package = pkgs.meilisearch;
-  };
-
-  services.flaresolverr = {
-    enable = true;
-    port = 48072;
-  };
-
-  services.memos = {
-    enable = true;
-    settings.MEMOS_PORT = "57643";
-  };
-
-  services.outline = {
-    enable = true;
-    forceHttps = false; # https through nginx
-    port = 43933;
-    publicUrl = "https://outline.s0.neet.dev";
-    storage.storageType = "local";
-    smtp = {
-      secure = true;
-      fromEmail = "robot@runyan.org";
-      username = "robot@runyan.org";
-      replyEmail = "robot@runyan.org";
-      host = "mail.neet.dev";
-      port = 465;
-      passwordFile = "/run/agenix/robots-email-pw";
-    };
-  };
-  age.secrets.robots-email-pw = {
-    file = ../../../secrets/robots-email-pw.age;
-    owner = config.services.outline.user;
-  };
-
-  services.languagetool = {
-    enable = true;
-    port = 60613;
-  };
-
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
 }

machines/storage/s0/frigate.nix

@@ -84,11 +84,6 @@ lib.mkMerge [
     services.frigate = {
       enable = true;
       hostname = frigateHostname;
-
-      # Sadly this fails because it doesn't support frigate's var substition format
-      # which is critical... so what's even the point of it then?
-      checkConfig = false;
-
       settings = {
         mqtt = {
           enabled = true;

machines/storage/s0/hardware-configuration.nix

@@ -58,48 +58,43 @@
     };
   swapDevices = [ ];
 
-  ### networking ###
-
-  # systemd.network.enable = true;
   networking = {
-    # useNetworkd = true;
+    dhcpcd.enable = false;
-    dhcpcd.enable = true;
-    interfaces."eth0".useDHCP = true;
-    interfaces."eth1".useDHCP = false;
-    interfaces."main@eth1".useDHCP = true;
-    interfaces."iot@eth1".useDHCP = true;
-    interfaces."management@eth1".useDHCP = true;
 
     vlans = {
-      main = {
-        id = 5;
-        interface = "eth1";
-      };
       iot = {
         id = 2;
         interface = "eth1";
       };
-      management = {
-        id = 4;
-        interface = "eth1";
-      };
     };
 
-    # interfaces.eth1.ipv4.addresses = [{
+    interfaces.eth1.ipv4.addresses = [{
-    #   address = "192.168.1.2";
+      address = "192.168.1.2";
-    #   prefixLength = 21;
+      prefixLength = 21;
-    # }];
+    }];
-    # interfaces.iot.ipv4.addresses = [{
+    interfaces.iot.ipv4.addresses = [{
-    #   address = "192.168.9.8";
+      address = "192.168.9.8";
-    #   prefixLength = 22;
+      prefixLength = 22;
-    # }];
+    }];
 
-    defaultGateway = {
+    defaultGateway = "192.168.1.1";
-      # interface = "eth1";
+    nameservers = [ "1.1.1.1" "8.8.8.8" ];
-      address = "192.168.1.1";
-    };
-    # nameservers = [ "1.1.1.1" "8.8.8.8" ];
   };
 
+  # networking = {
+  #   vlans = {
+  #     iot = {
+  #       id = 2;
+  #       interface = "eth1";
+  #     };
+  #   };
+
+  #   defaultGateway = {
+  #     interface = "eth1";
+  #     address = "192.168.1.1";
+  #     metric = 10; # always use this route as default gateway
+  #   };
+  # };
+
   powerManagement.cpuFreqGovernor = "powersave";
 }

machines/storage/s0/home-automation.nix

@@ -15,20 +15,13 @@
     ];
   };
   networking.firewall.allowedTCPPorts = [
-    # mqtt
+    1883 # mqtt
-    1883
-
-    # Must be exposed so some local devices (such as HA voice preview) can pair with home assistant
-    config.services.home-assistant.config.http.server_port
-
-    # Music assistant (must be exposed so local devices can fetch the audio stream from it)
-    8095
-    8097
   ];
 
   services.zigbee2mqtt = {
     enable = true;
     settings = {
+      homeassistant = true;
       permit_join = false;
       serial = {
         adapter = "ember";
@@ -82,23 +75,12 @@
       "homekit_controller"
       "zha"
       "bluetooth"
-      "whisper"
-      "piper"
-      "wyoming"
-      "tts"
-      "music_assistant"
-      "openai_conversation"
     ];
     config = {
       # Includes dependencies for a basic setup
       # https://www.home-assistant.io/integrations/default_config/
       default_config = { };
 
-      homeassistant = {
-        external_url = "https://ha.s0.neet.dev";
-        internal_url = "http://192.168.1.2:${toString config.services.home-assistant.config.http.server_port}";
-      };
-
       # Enable reverse proxy support
       http = {
         use_x_forwarded_for = true;
@@ -123,33 +105,4 @@
       };
     };
   };
-
-  services.wyoming.faster-whisper.servers."hass" = {
-    enable = true;
-    uri = "tcp://0.0.0.0:45785";
-    model = "distil-small.en";
-    language = "en";
-  };
-
-  services.wyoming.piper.servers."hass" = {
-    enable = true;
-    uri = "tcp://0.0.0.0:45786";
-    voice = "en_US-joe-medium";
-  };
-
-  services.music-assistant = {
-    enable = true;
-    providers = [
-      "hass"
-      "hass_players"
-      "jellyfin"
-      "radiobrowser"
-      "spotify"
-    ];
-  };
-  networking.hosts = {
-    # Workaround for broken spotify api integration
-    # https://github.com/librespot-org/librespot/issues/1527#issuecomment-3167094158
-    "0.0.0.0" = [ "apresolve.spotify.com" ];
-  };
 }

machines/storage/s0/properties.nix

@@ -15,9 +15,6 @@
     "frigate"
     "zigbee"
     "media-server"
-    "linkwarden"
-    "outline"
-    "dns-challenge"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";

machines/zoidberg/default.nix

@@ -20,6 +20,10 @@
     );
   services.mount-samba.enable = true;
 
+  # Login DE Option: RetroArch
+  services.xserver.desktopManager.retroarch.enable = true;
+  services.xserver.desktopManager.retroarch.package = pkgs.retroarchFull;
+
   # wireless xbox controller support
   hardware.xone.enable = true;
   boot.kernelModules = [ "xone-wired" "xone-dongle" ];
@@ -35,6 +39,28 @@
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   ];
 
+  # System wide barrier instance
+  # systemd.services.barrier-sddm = {
+  #   description = "Barrier mouse/keyboard share";
+  #   requires = [ "display-manager.service" ];
+  #   after = [ "network.target" "display-manager.service" ];
+  #   wantedBy = [ "multi-user.target" ];
+  #   serviceConfig = {
+  #     Restart = "always";
+  #     RestartSec = 10;
+  #     # todo use user/group
+  #   };
+  #   path = with pkgs; [ barrier doas ];
+  #   script = ''
+  #     # Wait for file to show up. "display-manager.service" finishes a bit too soon
+  #     while ! [ -e /run/sddm/* ]; do sleep 1; done;
+  #     export XAUTHORITY=$(ls /run/sddm/*)
+  #     # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
+  #     barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
+  #   '';
+  # };
+
+  # Login into X11 plasma so barrier works well
   services.displayManager.defaultSession = "plasma";
 
   users.users.cris = {
@@ -63,17 +89,19 @@
   };
 
   environment.systemPackages = with pkgs; [
+    jellyfin-media-player
     config.services.xserver.desktopManager.kodi.package
     spotify
+    retroarchFull
   ];
 
   # Command and Conquer Ports
   networking.firewall.allowedUDPPorts = [ 4321 27900 ];
   networking.firewall.allowedTCPPorts = [ 6667 28910 29900 29920 ];
 
+  nixpkgs.config.rocmSupport = true;
   services.ollama = {
     enable = true;
-    package = pkgs.ollama-vulkan;
+    acceleration = "rocm";
-    host = "127.0.0.1";
   };
 }

patches/dont-break-nix-serve.patch

@@ -1,8 +1,8 @@
 diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
-index f8d8f64e55da..39326d094118 100644
+index 49f8ed673816..643b59d68dde 100644
 --- a/nixos/modules/services/video/frigate.nix
 +++ b/nixos/modules/services/video/frigate.nix
-@@ -609,10 +609,6 @@ in
+@@ -482,10 +482,6 @@ in
            };
          };
          extraConfig = ''

patches/gamepadui.patch

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

secrets/backblaze-s3-backups.age

@@ -1,31 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 qEbiMg V0tr/++dhQWcgmy46gcBm3t5qffN6N4ykabjMGdLLxg
+-> ssh-ed25519 N7drjg YHZO6ENbBihFQFqRRjdWtgfX3R+qHtaJWIa54igHpEc
-oCCUu3kOopP5JgYAiytDrxHOo3LVtyAu1OAmJRg1nV8
+HLeZDyErwJme8knPYCxuSXMmHBkz2kDI6OBG6/EtP7w
--> ssh-ed25519 N7drjg HAu/AkGATNY7L3O2ospdN+r+KKVWD1yzi/kKmH5Fhzc
+-> ssh-ed25519 yHDAQw 2YvHNNsiDJSUkKZOlhWzP4l1NfH0zTnldZV4Jjfy620
-p8Y2vToiWACE/LNXa14fbAwuc5FfgR5day8Gu1uSVL8
+dHM0wG9JLiQJJ+NquhPeI/xv1iEqsxRy9D//NcYTr8k
--> ssh-ed25519 jQaHAA YuZH6pmrOAgzPNA2Mx7u827fYXOHJQ9XW8XR5h7XAFs
+-> ssh-ed25519 jQaHAA QtNkLsgdVgJqbmxLFhaf7AIG208NXHzgBweO8L3Dc3E
-x1urfkuEH/1hHxBDK1Y7vjQMSUpUIj7uK7EGs/GtNk4
+SGjvdajk9M5azgP4QcynnxKieKEJYil1T2az4hYffdM
--> ssh-ed25519 ZDy34A AFzSzksrxlpyZfromJSB7u2HTVf7EC8Aydb7U0mQWUs
+-> ssh-ed25519 w3nu8g JuFJuOdVOc8Uk5es2rpqPVHgg+l6/K0J+MHDFuffn0A
-eWffyc2OIIEBxkk3y68xSzrDbheTzKnlilEt2VoNSaI
+n7tzohV+Uvecu6GVNeht/O/dL4x6e5SVdHEzRbJg3rI
--> ssh-ed25519 w3nu8g MSI33XCDIZN4azrtb6hh6k6Gl1BYwaRK5/ROS6DHj10
+-> ssh-ed25519 dMQYog 44RRRe8M2FJWigy3d9TNaUQSM47gLDgU38F6ow1Xe2c
-kg057sgb1LLkoNgzTmCdgoM35BqV2gRjk4GLIytR8ng
+uQVkQma/hZVMCMtgcelyZhscvc46LItvbcPBuJI81Ns
--> ssh-ed25519 evqvfg Rssqwh73ihyNldaHFb65m0PGIi0VAySg7bHK8BTrHRI
+-> ssh-ed25519 WBT1Hw +b+2TOduL4XERN7qOYPtJ3R5w54m7VYqmyy8Smz6tXU
-bNCBI3MvfFT88sgVFbgCaOrRozcDMISdCn9IJJeACOI
+TyQ+bjSK6IYSulW0rm12V+lpXYCt5kr3byaNNGJeMVc
--> ssh-ed25519 WBT1Hw y+gFWQQ/FbD1im+D6rcsGsVOYpfkgw0b2P6Gx4J+5WM
+-> ssh-ed25519 6AT2/g ZUmtQOHWmn0shq1iP3Ca7aQ74PLcqZGTprvsM/HAXR8
-od9fIeEqmEbMd0Bv+iI3UdUl2MtelF/Q+ew+4wKU6nw
+eNonzRSAwNCQi0DgtVs67zCjpOYsqeLEJYBmLjuS9rI
--> ssh-ed25519 6AT2/g +sWGzEbUwMjkY+oTFa72/wbP0VejtVpvEJocmb4ApjY
+-> ssh-ed25519 hPp1nw qzrGZr5bFvfPwWrfNIUFubvGXBT+oQo9HZQuePSbPwk
-2HipJHjD9dKzUSWdBCVkDgpUtHNaQl7WJFvEPS6fpxw
+MKNlVl3OXBYEFWiu2hbbXDQnqkV4nENG+lcLcd+H33I
--> ssh-ed25519 r848+g BTw707tEO/KQhhKsWgYYdGC+pdQyA4zhaHLt6BFen3E
+-> ssh-ed25519 w3nu8g H2UDASHwHNxU74g5IbuHIDHEZYgyWNmSX7Wv/lV41HQ
-ldBDOfC7/8vkOS01D/solHplEeIMvArHZsJL31FMYdg
+WMgKT0GZxWQoK57E9B2j8MsyOroMhWd5SiCQtZa7AIY
--> ssh-ed25519 hPp1nw Sbzvkbw5FauhfNT1oQjjycUZ84c6sijyUlYgCc7bzjE
+-> ssh-ed25519 dMQYog YkL6XApXeP9qc4pVaIHFaNmYIK/PVEKoJz5SotQbGmQ
-WQJ3KW8pGB8i0I7yI0/Tr99wTCsZwEtSWpUm4CiU/wA
+H+3wAxIl9Yip4xQqjhje9tL1V4m00NNSxNjH6Dbb1K8
--> ssh-ed25519 ZDy34A I4d/QR9LScC9NpN5upKITEc2BjJXKb4BiF/FZwpcW1Y
+--- vBQpXXpKzzXwpNP17r8OBqO4Q3bIS4pHqbEl4u9dB1w
-r+hmbq4s4N5RuhlmTn7/SuBBdfRv/mzDbq++tbK7s2M
+ÎL“9[íg¡dŒxgº8Ø*0‘«šœ’…·¾öWå&`*?`ÔÊ­IQÛ÷Ýd1*ª–ñ¶bM\‹<>D™+«)‡
--> ssh-ed25519 w3nu8g Ut4z05l9uePnZRI38zmLvcgRdvCcy+YmFkn1IiqDRk8
+\ƒg¤hDá3#k3;Åj¾ÞŽ±Ý¾Hš·ÙF&ÙX	%6˜Bî8”¹T·fG`Q¯®âñ?[hDªö*c
-64uJWpnsfmfc7z5JZnTnwHNPsp52B3/YFgIvT8Bt3GY
--> ssh-ed25519 evqvfg a6ZizyN6wCKvPtpu2hgPeQ8YTBouC+y8iQFeaJ46Ygg
-olN0U7gzDid2EbhO4kGhhZjo7cvI/y+I7yeahrgS63Y
---- MQfYtj3KvglxbRIcFSCtH3XdKElzS84QEfMhvcYN8ms
-†ÌØàÕFwH猧¿2&öÐ+鮑L
-çr\ÊÚ2‘<À<>q§“*Ù,
-0¥}ÌanZHÅmF5ª# \îêÎnInŽiªó)<29>ÿ´–xµKž}7cÁeð e¶å_6;–ðŽ„>e=¢„ˆÐXiK!Š~—³ú¿Ùò÷C2gS;⇣Å8

secrets/frigate-credentials.age

@@ -1,11 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw MMPi5i5lVf/mcXOraMoErj12pjLWQppVTc18kMFTskM
+-> ssh-ed25519 hPp1nw zOXF7NsZjm+DCYrJ+Ap2mX35JUt37CLJP1RhyOjB/XE
-eez7lnpUwseCP/5MZRxjyPZ11gfLHBYPPGEUXUftrAU
+ePprJM2cnhYZhP8aJUXOZeGHJm/DHlRYomWN+lFaU6w
--> ssh-ed25519 ZDy34A dzbWYENdNUIHId+2XUt+gLpnw8xaVsSHrWfIhhBTYBI
+-> ssh-ed25519 w3nu8g gjeFAbFWXyPdGauKHXAzuIP9fmaj2Oysq9fHO8q7u38
-NszPXqq/beWLE9pKMhbXYSEB3WDaU2EPy66yPC+oU+Y
+KiMR0pgEPtsfZnYAIsH7UHNhnsB6rtsW/hqV03uS2dI
--> ssh-ed25519 w3nu8g HjJYUyssutwK+bO120fPZoycsIEdLL0gnX1UDMHJKlY
+--- BPzPECz1g6vEv4OlRn6+FnWP9oq3tn6TN2o867icxYA
-jjr1bEAD4HHN1Hbdtj8VR6CqfkTHXZ6huJQ1fnp83s4
+}ìjºùŽ+l&þàx<C3A0>-TïÝ‹b‡ÅèØÄ·<C384>€Dg‰ñgc’*ˆ0<CB86>÷µcp
--> ssh-ed25519 evqvfg nNibZIdrlMqQXZYT+qFPyd8uB1gZgDjPdfIS7RRjJCM
-5LNiRyVpkJr4x1CtV+FRsLF+Tk1KUQDFIrTBQVw3N5c
---- 7dJKHwTqDkiiZaojRRK0mpxWopbhLwydPwFXtden9iI
-'oºé¹òîÌä<C38C>:Ö=1õ¶Bc×°V­d	qâÀ‚=Þÿ¸¸°µï뎀ˆÔjÿ`ǦÎéÏÎ&åÂ@Ûó½Ç5RQØ´’Ûh™ÞOÉÓÅPŽá£Cv7ü<37>A ûw£s±¸¥QÀR<C380>Ù­O<C2AD>M‘"Wèí*<2A>sÝߤâ×a`Æp¬

secrets/gitea-actions-runner-token.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw CSR2HrrPUfaeOgAa3vt4yuQOrqyu0qnFBmTT2O4Rdnc
+-> ssh-ed25519 WBT1Hw PbGwwDeulHF6kdh073rq0RvD1hlx6spnKNgKU+QeDAw
-nYiiPmn/4Qmrc5VOK+/mmtzKD9xdvEF6SmRiPi/aFqs
+7dITwSQ2p1LZuaVEzLxcGOhB97MQT2zGoRrnNUMcOFk
--> ssh-ed25519 ZDy34A cmlgkgy5QvYYn6nHymo0u723S470qvUFt0Ubp6ggKj8
+-> ssh-ed25519 hPp1nw Dn+5Fpme+JmRZKkCkqtCuD87p+sDYDA6OZ2aUmBkCRs
-8ACCrqGCkVbuFMNoGKMd67oMtZWhQHBigU7Tdqoqy80
+Dgg3orXF4RYT/fHtc2tRuIhOQu48zICMqgPyV47vpf4
--> ssh-ed25519 w3nu8g GWytr1KtsXVQt6CKqqdjH92/Lc7aBjqa2N80oqeOdwU
+-> ssh-ed25519 w3nu8g dghNLDH1Tm+sm42HXDhrLFtmU4iDF1yCGrO2VSgzZjo
-c9GfCkKIaxMgsKWplXIQjiB5c6UE+UkRd4xlg1I5JSA
+71scUVrGr4c4dunAFJYKd+uJ6aYJpSWBAk9swbv+IzM
--> ssh-ed25519 evqvfg K4Z7DqPilKW9kEfFLDzJ7c2G6PvjRhxhCTEuw0Tw8hU
+-> ssh-ed25519 dMQYog Wnl1+rh0Q3YD2s1UD0OYVm39wY/Uw1NRK3K7EFhFMls
-QsVD2iKObcP7HyVCXn9gPWvewn2Jm/OYLA1Eu6MRP1k
+wXF6QBonlCalS1vI9cxzWgv1Gi+yAtYn6HrYCfpl5Nw
---- DGe/5H+9vk1EGj/mkUnvzk4VC5JVDIwVeaD78EHRiiI
+--- rLOoGk0iX+wuNd1CKv7g2PRd2Ic+8JHCQhrVBaF9zbE
-êPŸËÓ²ûªÒÖ duÀÉr†¿"KÇ"©„M¬áÆ©xó3 ®²Æ ú™*J.Y_ÃíT%<25>tµ(ÿYʵ´8/Qa©r]ÍmÑÿÒ–¤º‘
+<EFBFBD>òüüˤ/A¦Ì(ØiHC¸@¢Þð‰h`ˆ3ªá´'	¬ÚöáDì>ð¿¤~¸ÿÁö?ÑÃMêÙ@<40>t°(“Ò@ö׿^xÆMÉ}

secrets/hashed-email-pw.age

@@ -1,12 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g BLyjF65Y/bq9gkAuzl2PZmL7Ge1BTf6MQ/J+04fwwCA
+-> ssh-ed25519 6AT2/g 98/m3t8axoVBE6WzdxBtRhV2uSQKSCXwQjyxfWXPmQk
-mdGmV3lmTPhVmORAVtJucy5EaNmOiCkZqdw+in8r8+E
+AxV0FTvqbWfk/gf65d05PcotbEnYr4PgDQnsaYxP/MU
--> ssh-ed25519 ZDy34A h7f7GMXKCzuVnoIai84+gNq18XqxOPQLt2a4tmmQSxs
+-> ssh-ed25519 w3nu8g jys7B4COD4iINANeSCD3BqGFoghxTmsbuXoOOIiP+wQ
-RMoh4ecaEFybnE1ObWFZFHJKrIO3SbRynyDBljfSRAY
+b7eSN5fe4szfliINOr7ZQ7AoSsIK5akmIQ6uLDabcIE
--> ssh-ed25519 w3nu8g XubNz2enRmr1uNZlErXBJngZrY52fJC4AUIbsaTh8yE
+-> ssh-ed25519 dMQYog ToNUqTPYmxpz9OUcC94egELcPfHQHCErfHN6l9kSrRY
-w5w3FK30UqLok7VeG8wILcyXeAIrf/Uzbf7AnHPfYAw
+2KoSVoWp+FH29YfH57ri2KOvhkuqYew1+PXm99e0BaI
--> ssh-ed25519 evqvfg 9UkiG9r2b0ZJwN6DPL+j08YKjBOx2x6jrJlzg+N79lk
+--- Cjk3E/MjgCF45aLlFeyoGiaUEZk/QuKtsvPb6GpzD8Q
-nmpBD/vZ7h3pAzeL8CO2oABTeA5iujG9Vr4aUgWaO0E
+m°å>‹“~czÆê匦†``ÜÏqX«š'ÁÎ%ôwÔž~×ÄL·eä'a±]û‹0ò´LÉÀ‰%ÍY‚TÊÓc9f¡W¶Ã^¤9ÊõÙÝ2®™æ¶ÆBÌa ƒ™ 
---- 00dECq/aOgxAgnD19UdntMCzn27Iywp4bQoyAaKJ3yw
-»ŽlŸ÷ƒƒÔrñ,ð’DžgFOíþrÍ=éŒUCR‰wW÷Æ	Ô­Ï*þA$÷³åÝÓeV
-RH ¶T
<01>ISK·é

secrets/iodine.age

@@ -1,11 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g 3s+reqcb4Hu/3Z7rICFZBOkW02ibISthFAT1sveyLBo
+-> ssh-ed25519 6AT2/g Knb25oYknkiXyMqVBR3T0sFSO4hDjWUTq3xIml/b4ig
-Eh5ynxeqqXhNbv/ASWZxzKXAzKX41uI5iJI4KqluHRI
+n7xamnrZ+SCWiKqniF3r2JvH4G8q2pJaHzF0riNEDf4
--> ssh-ed25519 ZDy34A cHcA2p0VrGr6jP/CUTOSU4Gef04ujh6wmJjmEWmWNE0
+-> ssh-ed25519 w3nu8g 7+2R5RpLjBf4jjj3S8ibMquUWgRMrifziGQubwuLrhA
-wwaQnj7RABFzTbU74awlIJeHHePtO7jihNd2EUkNZPU
+3jLCalnbA3Z2jr8Zs+qrpzSoi3Jv6E5OV2binpr3Kk4
--> ssh-ed25519 w3nu8g hN/fWUHspXoJmpibR4NAL3EXkKExe2tRjUzmLGK6VnE
+-> ssh-ed25519 dMQYog Nh2e7me0tiG7ZwQK8669VS0LCYFSH+b33I9tr8uI5CY
-F1KQnGe3M8eD9hjnHLc7hqFTw9iXh7ICz0u421DuFOs
+7Gs1N9eZa1CGR9pczzugHbqnghqevX7kQCOeqR4q0eI
--> ssh-ed25519 evqvfg r3AoIJ3KWCYIsV8+RTgYY+Eg+1EcBVNrX+ZRunKaug8
+--- OzW+omJsZA/b4DMF4hdQga7JVgiEYluZok3r8JM258I
-KSXd4uq1/0ErZzSTPrCmY/66v4TT5PmFqv9LRSHNi9A
+*³²ÝPŽ†AcèÈ1·@Át¸e÷nf&ù#I7‡a‰Ûâc†ÃÀ<C383>êbDâ–~aõ]1w=Á
---- 3bGqZANqdfEgdiUzu38n4dzPOShgGUzQGtO7l2S+hwU
-Ì?\<5C>•Öå¢aÚ'¤¤ÐÚ{˜/}ÉýÝL„:¨|¸G`†Ó+ºMÜÈY$s¸+‚Uk¥áäg‡ID¾K·

secrets/pia-login.age

@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g MrkHK56b1uQIiMoSrGmCun5QzwFWQiCFZjHQuAkdBlc
+-> ssh-ed25519 6AT2/g MGKlbzVOk5+czgAOerwl+eIyOifXJm/q4UgQUXVpx1c
-ipK76P2VS5c00f3n468l+VsTndtEUwHtJTOhR1Zntew
+43l6s4+5TSMQyO9tAg7v9Y5OdXOjKYz56lbr9Jm2r+o
--> ssh-ed25519 hPp1nw iVISLjddu2lJpNPXewFDmjhORkkzBNUBmq33n2l9yXg
+-> ssh-ed25519 hPp1nw aOxni4sFPPgedUkBOuOyEWfFPJrhdTJnivIaWt5RJxM
-4oOAaQpnWNsVXfDEK4rclKhAwv8xnE3EUS7PF44/GYc
+KNaxijzSMp7EjYKwWiAP66nPYYZK3/VXL8u+3uJt6bg
--> ssh-ed25519 ZDy34A gZY++iCMswmQVkKiIUUuuR8srojCpykELGpa0mqHMFA
+-> ssh-ed25519 w3nu8g qTAzEzQbFze35AtbvkYREw3wa7ApDN5u7RSZUXrEpms
-MSpvndXZY7Gm8VUQUdn/x39dVOsJ0d77H4zN0Ct+b1Q
+Dy0uGF458A9RJMvDl2XKOkEABbbRgT+eIgvb6ZOEQqg
--> ssh-ed25519 w3nu8g mnrSRjcTax6g1PHvOwCV/Al6AWkCwiRwMnuZg4vPHys
+-> ssh-ed25519 dMQYog 5DfYuGeWuN0/CO6WWbFIi7LaKl23FXYVdPROM+TFpCA
-S2V1O0GF7wipp9Bg+7PA6z4WNbK/zv015AM1SfA/Jrg
+PDBdDn+YUMKYNKFkCEfXesmkB/XUxZRK3ddQt0kqQ7g
--> ssh-ed25519 evqvfg 8M2kGsTS/cd0daAr87u0QqS6RH00O1zkSjYdXTxjYGU
+--- JOeG87EVD+QBx6n+rMoPTOni0PyoG7xx4a2USNiapYI
-uCUwdJFCdFWWlQPpINjf4dAIYZ/pa8tfz8pVjDLPJF0
+Zsý{ÅiÁ_
QÂ\+ô@@Üò߸ù&_š5­$¿Gt2¢rF“y×ÄQ§Iaž7ôÙÉzàgf­%O(µÙ,VéÂ}ÿn|û'J¸2ø¨óQÑB
---- iyh7GvKqnNeyIgedqWGQMtYfXJGo1RphDpzuDXJbp1k
-#/Þ¿ «[4èAã<±Ëi×òæ˜ækÞfÓÕ

secrets/restic-password.age

@@ -1,29 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 qEbiMg CX8Y/Si5PzI0enQNfUIAJG5JxqPRLmpHZn2qbnOdqEk
+-> ssh-ed25519 N7drjg Njjfv0Etdr9U27s+wznqw5YmnKcj3lISQ2vudDPj7F0
-RtBaY00wl7B+gz9uSxYiNFj9Jf5D18LFvD3XjcqXg00
+bw3SSPfReGSmJ5tQPv+niYn7USyZZffxvgs3J5VxiWw
--> ssh-ed25519 N7drjg 1bVVPpaqoAb9AGsb8lWCP5nBTVO3nRwCmK2X6M4eCn4
+-> ssh-ed25519 yHDAQw DVlCM84Q1P087cmlS+NzH/i2noLprEbfqSpvFS3Pzig
-SW4KXrdN0uulfVGDp5zx351v7+HyIQ2dAP2VB1Yjxx8
+PooFRhm8ofoTAT1UxJ3Y+0RMqK3CriwqpGrrKGfFYTs
--> ssh-ed25519 jQaHAA ocZpVZtXwnbZWC5RlrPmDtUnRpCnGaJLjCx3IKENJjw
+-> ssh-ed25519 jQaHAA rfoKG06gXsXPVfNql5Kk5OBebaXsRd4vCirzPB2y0jk
-x5AUP4Q1Odls9RWdtUtDBWAEbbiOaRwnBiI4+FJUhnA
+T0xv0iiWSi+FscI/OX6sT137VuiWpAS+P9XsMBT9K7Q
--> ssh-ed25519 ZDy34A JBwwmjzcV7UFHRky6rOF5jFVMxsj0SmLfCEPPzD8qBc
+-> ssh-ed25519 w3nu8g 869dCSpsCphoOPZ0z6rzbI5QKieIA4M9tAyVP40P2hY
-ESDhUTfMFVqTfyMpIcx2E4Fg1iRljqXA3kkaaBH5NRI
+N705ablrfdQWK2aEOFCkmdEQQmwJVcqVXOkhYIp1Z3o
--> ssh-ed25519 w3nu8g 32W6EjkjvobPZAV/+2dtZJWW1Xz5yEW1Y+xuPssHPyY
+-> ssh-ed25519 dMQYog ry0Qkn4YSLctLRzp1fZQ6EnbeGvv3Gge2UOsYBwbk2A
-DeoxVYTuxkFfV7JFk+PweykeN5z7+GM3IPbzJ9Aze/U
+LO1eyrU0rQJdAjZKCBr+WH2EP/juXcS7Iwrl8tZIMOM
--> ssh-ed25519 evqvfg /71B+elrbVgtDqNTPNHiIIWUCoLMh7Nw45ZxfhZSaSA
+-> ssh-ed25519 WBT1Hw NbtlJrLEcf4yO/akQyE7b9TdyM2e6m8Aj9/MzV7SliY
-z/c5GQKyJ0i7lJh6Fl2cuwrI876BKZGY4+ruPHazg7g
+JBWsIu/Aycys+uUxC2xSTE2gC0YUpC7Jkkxa0E0TfRI
--> ssh-ed25519 WBT1Hw /9VARjhq1i3zt8SAJ3KwXz4jDSzNID056rzOeZzdXHk
+-> ssh-ed25519 6AT2/g kvri9lMh7mXuJTFh15sRPhkz8+75i2YYcdZL12cLPnI
-81JSPCyru+4wS1USnTaVcO+l0t8d/WHkzC3idgXE6T8
+hsJETu9Xhbfhzzf6Z3YIKFLGN+Eczgn8EqEBPQl7a1s
--> ssh-ed25519 6AT2/g fLTmQkkH94zZBIef5LyH/v/m1s30E2Yy6AiQEtBjaxo
+-> ssh-ed25519 hPp1nw sJtNVroSF/uQNwvnbLE8vXw+1e4LMu3Gurm+KM+0IwE
-Hx5/ld4RO/Wd4KWX+cAzets9rCAYGorEIJU6FUEavWY
+wlYZUEnr1Q3TlxUAUrKAMdVWUbVWy+3+q2fw+ssIoFs
--> ssh-ed25519 r848+g XZtbfc7x3XWiUyjDyqEbJyziovGiY16qendRDtR113s
+-> ssh-ed25519 w3nu8g gA7oDI/02jl+TjMjSUHZqevmHb6gSinWF4KtjDJgFF0
-fO+QDGyAukeMT/fQrs3YQfIIoXTIb/DgGYRlw0nEyqU
+KDgSWaZi99/PkKT8g5bTVHvu8EVcPBlF79APxeorABM
--> ssh-ed25519 hPp1nw kRQYgbHSM5mVEilZA1CSYbgvSriFJyBP9vUnwQTk2D4
+-> ssh-ed25519 dMQYog PDdSuky8g5OoqyF4K5N6SSa3ln6O8vlvL4viGqJ8mUc
-LQdVdVO4MjvB4/hTVwgtLG+Amg6WbQwEaBlgMVVFSqI
+LWanrtAIfekuzhr+AGR8e34CD41vPI0BA8YA8YkcyBA
--> ssh-ed25519 ZDy34A ZJsdPqw9MjPUH5hr0Heug25ZKtzCmnykDmiMEW6b9iY
+--- LENK2A8P2SxCmpQSI3QNCNz2RDhGwCqLQGybmD73ka8
-kgN2CU+jrY5SNCKXmhsw/H5kGg+zEiYDUSrG9URA28o
+Ö{¹˜ô'Þú”|ã
êã«ŵÔjã.ùÄnG=ñY‰gï•‹c$T¬
--> ssh-ed25519 w3nu8g JxgCPagw/jHEEMxuU+Q9aZylQlRtmkrutly80aU/QQA
-C64qkcYda7plc0eNDc6hk0Lf3tRMNrUR5QlEpeEiflY
--> ssh-ed25519 evqvfg wx4dPODWj1le9AuzS+M+CufWd52ySy9WfOIPdB+w/Ag
-QyLJBNCtLVwpp3cIcO5NUHMaDNc3duUQeMGH2SQBPck
---- HgYMHuLleFiKLGaf8buXjOHpUiVhgeL1NaJwyRNHAdY
-êR*÷í÷; cßÕPò*“ýÞŠäœl©’#葇J‹]
çu­SŠKr}ž¡:'4·#Käù0P45‹EÒVªo

secrets/secrets.nix

@@ -17,7 +17,7 @@ with roles;
   "cris-hashed-email-pw.age".publicKeys = email-server;
   "sasl_relay_passwd.age".publicKeys = email-server;
   "hashed-robots-email-pw.age".publicKeys = email-server;
-  "robots-email-pw.age".publicKeys = gitea ++ outline;
+  "robots-email-pw.age".publicKeys = gitea;
 
   # nix binary cache
   # public key: s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU=
@@ -31,14 +31,12 @@ with roles;
 
   # cloud
   "nextcloud-pw.age".publicKeys = nextcloud;
-  "whiteboard-server-jwt-secret.age".publicKeys = nextcloud;
   "smb-secrets.age".publicKeys = personal ++ media-center;
   "oauth2-proxy-env.age".publicKeys = server;
 
   # services
   "searx.age".publicKeys = nobody;
   "wolframalpha.age".publicKeys = dailybot;
-  "linkwarden-environment.age".publicKeys = linkwarden;
 
   # hostapd
   "hostapd-pw-experimental-tower.age".publicKeys = nobody;
@@ -55,7 +53,7 @@ with roles;
   "librechat-env-file.age".publicKeys = librechat;
 
   # For ACME DNS Challenge
-  "digitalocean-dns-credentials.age".publicKeys = dns-challenge;
+  "digitalocean-dns-credentials.age".publicKeys = server;
 
   # Frigate (DVR)
   "frigate-credentials.age".publicKeys = frigate;

secrets/smb-secrets.age

@@ -1,23 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 qEbiMg P0wVQfRdC6s4rGpSxPSvgsens9QF+VphlX6QL91RNGk
+-> ssh-ed25519 N7drjg x2s9QZ7Ijvg4t2peGng9/zX1ZmnGggsvWHJFHEktCgw
-Rdum6JE/NafVt/lvd54D3leH7QnX/hZoqOoUkp58vpw
+o64an6DJ6Be8Jlhzn9ciQTByRAK5f2ckankCRH3y+Uw
--> ssh-ed25519 N7drjg LRBM5kYSJGMXCiIaU/tc8kq8L8tjyzYjUb5WeKfx5Dk
+-> ssh-ed25519 yHDAQw HYHo6anhKDnD74ab04Ql4RB8+WBA6EavYASX7532NCE
-/hTFYyPv1gpKBmXJ0EanmfNZwkOg9SvCY1dhqJkSQ3k
+aTp2V9g18yzUTq1ezqETj6jM2Yb1Bt5+JNkrIDT2Djs
--> ssh-ed25519 jQaHAA 2niqwTr3jLx/7lDG5Yqetu3lqfU+lCYj626oZVT3XFA
+-> ssh-ed25519 jQaHAA xGKcIQOkO/i4E2ZWZ+O4sAp7ADqCRqfRQHhKQu6yWh4
-NEwUSUcgsGgyeHXTtDo6HYSkX4r7NyloUP+gabOZfOI
+RJnqK/t0YQrIej8fRDJGjOtQD7VvgJRfCUWR0/UYcSY
--> ssh-ed25519 ZDy34A 6NZGnadwDwPUscJdtYQywtuq3FNB0FvUDlztBnAAzBw
+-> ssh-ed25519 w3nu8g P9DQy19TvDCi3nfOhFj73bNZEtUs1BrLubt5/BtLoU4
-so26osNIZk/7tnf8HZwJ+G8+xcyDbpZ6uoX0GJBD7uk
+Sx41bk41dQYa3eoBayUMRIHqMWaRiwXm8BqErDBSbDw
--> ssh-ed25519 w3nu8g KX8U395jkHGX7LV9TXRl5OcZfcropPKrgonxJsR0MyI
+-> ssh-ed25519 dMQYog OWU92PMFo9tGtlkK9zlmMFhh81TGkYlcX1PrxZl35yc
-KaWlP2Q44p53rqAtlojkj2EBcQH+N1EN/8pYhe92x0E
+owDk8wWXETS+iybhTMDmQH+eBuzZRDJIlVGCwu4LqTI
--> ssh-ed25519 evqvfg XCZp8XLQ10+OsDwpeBC0t2RAEhj8EG85ZvbYJ6QAeXI
+-> ssh-ed25519 jQaHAA MzA8dSYZ/Ysp4ogKEEu84mal8779RgkT4Gy6rBEw+kM
-w9PAegIWcFKtRrcuBk9ysc/qDecNyZBygVVCCzr2DAo
+m75x/b83aP5G1vg7EXlcLizcm16fEAUAD+VNcdTMnnQ
--> ssh-ed25519 jQaHAA 76ePAMsQpZJO6b2CeE1rgvxhi2JEOxC+OPIW8GBEnWQ
+-> ssh-ed25519 w3nu8g AAA3Me3KJgLvtQvyxLvlQ7pCnv7w73ja6Z2+3A82eGs
-NyGlaWLtx9Vko4sDFdgsQj9oK1/gD4Y6HnVhOJfO0JE
++yCW7qCdjk0fiQJmH8poMoc7APKyX/PY7zZyAG1O+Yg
--> ssh-ed25519 ZDy34A RrJ8q0EcqfNgg6Fk2ZrY/RiRjI+w0WFrfvHqi7r5pgU
+-> ssh-ed25519 dMQYog Dd8e6srT+EIl2PH0RP1bQVsDx+HCQjhFndx5TFyhfx8
-ayHpp8FAVEIZhKTqYp1h/mL6UFSlQic7dlrHxbmharI
+j7Met77pWZzK9cMTt29gWB+d9YFVH5T9qs+ulHS3kAo
--> ssh-ed25519 w3nu8g q4j19BwrZAkFCICDOdAhGFWiD6eCLJRW9faeTaJEvE0
+--- MgOK/g5hOVkGuUNDBSgVeGc9+ndjxLEA7nKSfLJMr4s
-Av4UT5VsBvdL0cZOoaTrDOBvX91uuVIwru4WXMC+NNA
+~Ÿ‹¬&”™)<29>ŠG®Ÿ¨‡'UÐÞzc¾uFGì(<ò¯ùçV"ƒÕ3þH0x0$•<>w$YvO3	"Ï×ðV~ÀŠ¸HÁ~XÛ]GœÆqµ®ã÷œ¢y'ãÓ*–Dê±ÏúœÕk#\ðAï<41>5ë{«Fe\~
--> ssh-ed25519 evqvfg UIsX165L2ccILCU5zFur/9IHarQn9nAaLH3nSbcJJE4
-cWztxUlKMcqx9GfAk2C+Gt/aR9ZXaXZYe9XQ3jnl3T8
---- bMWqy/VkrJr/SmencAM0ClMc/jtY82jL2ZUYFdLK2qY
-Vã­¥=W}ØŸߥ¿•jUá¢Ctp

secrets/whiteboard-server-jwt-secret.age

@@ -1,11 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 6AT2/g qKh6Xf7LvaAAwd4WAwkFt4am3bIFV6GUAJtAF38X5Sg
-HlIgZr0jst1ZoJaUsqM+cD/FJVHsviZyteKZu/VU9e0
--> ssh-ed25519 ZDy34A lirRPnVNX7ZMefcCjh6jxx+Vk/nG1+8kl18jBvFGFA4
-7fXtdP0kSF+S3uPrBEHiO4riUf8/BhCaEzTFgnHTkHQ
--> ssh-ed25519 w3nu8g CoUbAWX4r2jbrcAAyT2jRPY43pK27t08a+CGnnJJZ38
-au9ujHws04Hxv8gYlmxw8rmNUGZmsVW5ilp6MyujnxA
--> ssh-ed25519 evqvfg v/onOr1hwFJVX8mvG1MyS+P6B+CC+fH8k7GgV2b22FY
-hCUNukeRnYt+dyrpGp7aUzi8Vxx72cm66lcLgxJg0UE
---- akZhal+1DMZXmudX1sZUjH+KJhENZkgQcuUvXyMsQLA
-<EFBFBD>’ ÊOE~éoÈ,C<>€pµÐ1(Ó Ý®$S¦1‹òÄùgXÁüöàOyô¹rw°àâ-â:Ýï-ëe0i¡9ÎŒ<C38E>É(÷ÒR4[œÄ”%VA¼6@:ø—

secrets/wolframalpha.age

@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g NDsVQFHvqCl9KtbDE5oXyNsA4z9+4YiOsGHZ1m8CYW4
+-> ssh-ed25519 6AT2/g Kw5/he5m/XAJUNv8XEJQU+e+Ou7hCYluMXXWlHiePXY
-6DBtl+pAuNB+PUnXSVTlVNAeFpr39dAuhOI4k9su1Hg
+GkhJOzSlcC9S7bs8FuDNMvMaFU3+fQ5z+o+Pb8wllp8
--> ssh-ed25519 ZDy34A extU5azTcNDgblB36KXiLnI4oMUbb4R5BWVlXsec5GE
+-> ssh-ed25519 w3nu8g fUORtXN1ygOeV42jveCosGXR/Y6R6OG6DK7LPDBEAk8
-D0re4GCb7KjcR1uVu+MFQe+LdaEY7xUmrYLJmgddYnQ
+yFpoasbY/sl6BQp0LVBQnInA4Kxd8A8meEObU1KD108
--> ssh-ed25519 w3nu8g 3w4aYKO7etSZsmCGaL6bKxfrniKCnBKiRRhvPXeHlEQ
+-> ssh-ed25519 dMQYog 75qVEe6/1yOV4DDLAOGaufs3ojx1/Sc1fIQOe+Oirz0
-inI1cUq5r8xM+xU+jaPD4yuZw4Q6lIZhwAztXICWu5M
+iDFsr6/30AHKH6hUs/WTpHEM8WQ03QMlGbtQkGrnVCU
--> ssh-ed25519 evqvfg Dzb7THrNXvfpoIy1yAi2aqJSv2RQ6pvUkAgQS2f6D24
+--- islx8t7a6bShXGxvYeDVuUxkmAMtpUfr0Gp7aYrJUkI
-aXlOBtqoK0xMMA+woITlbXpZoe3EVx5yQaLA24wmUfE
+2Ûí4¤†7Õ
---- qzPxoy3zUBEwJtCsPhi/tWxMcI8SKpxqptPTRQk4Yn0
+?Õw€À<E282AC>JÁÆØv	¨º9’,ËxÅŠò¨‰¦Æ¦ñnäH?>I­
-uS	_ô‡ÝÐ6Ÿ*+‘
jòÕþëŠÍ줩⯽žq6÷¤Õvµ¬”…Nº‚
Š´

secrets/zigbee2mqtt.yaml.age

@@ -1,12 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw KENwK0yRInrVRN1Tgwvx/dJsz+z8rQenw1B4aw57v2c
+-> ssh-ed25519 hPp1nw TSDuPaFp/Qcz4r819X4QmU/4J2TGpoX7jCCJCdFDog0
-ucnKJeShVBVC8LmQ6VIGTlbB0VBpBi2/lGGfW78jj1U
+SwQUqEp45xMOeTkvBG6uX28kB8YWG66laYqakSgl9w4
--> ssh-ed25519 ZDy34A Ghz/fsNQWte2tUx2+kEHcRPCBGc1orAXV9QkCbsKBzg
+-> ssh-ed25519 w3nu8g tLZDNE0iBgOpUB3djpNu3CgimsRc0zcds+AgctzxyQ4
-i9mr3xguDEgLL53ji38H19dkZPHqcfqTy8/S2oaht0U
+Oyz6XORsApM4vFxWyaD3bR/ApIUFPY3q4yGvtbosUIY
--> ssh-ed25519 w3nu8g cN44HlL1Zu724p+Kyrygas3RCRTpEPOfTdzFHkLebC4
+--- vuXlQmuOFbJhBTACN5ciH2GlOCbRCMPZdlogG2O+KOk
-BOBnfvEQLTPH6lBdSOPlYeSSdy3pohctl00lXrDs2zk
+Áëÿ!}UIì	p0@Xž|°þ#晆0HÙõò#BÇRR<52>Ù
--> ssh-ed25519 evqvfg HuPgckAebGwcWYCFNvNcNwg2QpyynHuVYRNiuC2j0m0
+òùø5¾Iÿ?vX?pÝ<70>—<>fqÍ[lž¸˜xÏ­G7ü;UäÀOUä¶
-HgJlN4gbED2FNaWr88Ocqdc1UJ3LA1n6fl/BUeXfwhI
---- eczVQy6oXmBIj1D2v8LuR8ZJxnzyCNxn+rqF135QJJ4
-aj0<EFBFBD>žå^ÂÏ<C382>ö(ø'´¨p1
‹)F½>aíO¦€”›¶¤:Ú¢šŒÛ!û8T¬
-YÌ{ˆ‚3ɶ;Y