Use programs.ssh.askPassword

Makefile

@@ -35,3 +35,8 @@ update-input:
 .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/pc/chromium.nix

@@ -46,7 +46,6 @@ 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;
@@ -61,12 +60,9 @@ 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,11 +46,12 @@ in
       spotify
       arduino
       yt-dlp
-      jellyfin-media-player
       joplin-desktop
       config.inputs.deploy-rs.packages.${config.currentSystem}.deploy-rs
       lxqt.pavucontrol-qt
-      barrier
+      deskflow
+      file-roller
+      android-tools
 
       # For Nix IDE
       nixpkgs-fmt
@@ -71,15 +72,10 @@ 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;
 
@@ -94,5 +90,9 @@ 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,6 +15,7 @@ in
       # kmail
       # plasma5Packages.kmail-account-wizard
       kdePackages.kate
+      kdePackages.kdeconnect-kde
     ];
   };
 }

common/pc/vscodium.nix

@@ -14,24 +14,14 @@ 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.8.1";
-      sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y=";
-    }
-    {
-      name = "volar";
-      publisher = "Vue";
-      version = "2.2.4";
-      sha256 = "FHS/LNjSUVfCb4SVF9naR4W0JqycWzSWiK54jfbRagA=";
+      version = "0.12.105";
+      sha256 = "sha256-NheEVNIa8CIlyMebAhxRKS44b1bZiWVt8PgC6r3ExMA=";
     }
   ];
 

common/server/librechat.nix

@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.services.librechat;
+  cfg = config.services.librechat-container;
 in
 {
-  options.services.librechat = {
+  options.services.librechat-container = {
     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.7.7";
+        image = "ghcr.io/danny-avila/librechat:v0.8.1";
         environment = {
           HOST = "0.0.0.0";
           MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";

common/server/mailserver.nix

@@ -63,18 +63,28 @@ in
           "cris@runyan.org"
         ];
       };
-      certificateScheme = "acme-nginx"; # use let's encrypt for certs
+      x509.useACMEHost = config.mailserver.fqdn; # 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.origin = "$mydomain";
+    services.postfix.settings.main.myorigin = "$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 = {
+    services.postfix.settings.main = {
       smtp_sasl_auth_enable = "yes";
       smtp_sasl_security_options = "noanonymous";
       smtp_sasl_password_maps = "hash:/var/lib/postfix/conf/sasl_relay_passwd";
@@ -92,7 +102,6 @@ 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

@@ -16,7 +16,7 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud31;
+      package = pkgs.nextcloud32;
       hostName = nextcloudHostname;
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";

common/shell.nix

@@ -41,6 +41,9 @@
       # 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 ]}

flake.lock

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

flake.nix

@@ -1,15 +1,7 @@
 {
   inputs = {
     # nixpkgs
-    nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
-    nixpkgs-linkwarden = {
-      url = "https://github.com/NixOS/nixpkgs/pull/347353.diff";
-      flake = false;
-    };
-    nixpkgs-memos = {
-      url = "https://github.com/NixOS/nixpkgs/pull/426687.diff";
-      flake = false;
-    };
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
 
     # Common Utils Among flake inputs
     systems.url = "github:nix-systems/default";
@@ -27,16 +19,15 @@
 
     # Home Manager
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Mail Server
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        nixpkgs-25_05.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
       };
     };
@@ -126,14 +117,7 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
-                  # ./patches/gamepadui.patch
                   ./patches/dont-break-nix-serve.patch
-                  # music-assistant needs a specific custom version of librespot
-                  # I tried to use an overlay but my attempts to override the rust package did not work out
-                  # despite me following guides and examples specific to rust packages.
-                  ./patches/librespot-pin.patch
-                  inputs.nixpkgs-linkwarden
-                  inputs.nixpkgs-memos
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });

home/googlebot.nix

@@ -19,7 +19,7 @@ in
 
   # Modern "ls" replacement
   programs.pls.enable = true;
-  programs.pls.enableFishIntegration = true;
+  programs.pls.enableFishIntegration = false;
   programs.eza.enable = true;
 
   # Graphical terminal
@@ -54,70 +54,5 @@ in
 
   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/fry/default.nix

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

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

@@ -0,0 +1,24 @@
+{
+  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,8 +6,7 @@
     nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 
-  # boot.kernelPackages = pkgs.linuxPackages_6_14;
-  boot.kernelPackages = pkgs.linuxPackages_6_13;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   hardware.framework.amd-7040.preventWakeOnAC = true;
   services.fwupd.enable = true;

machines/ponyo/default.nix

@@ -109,6 +109,6 @@
   services.owncast.hostname = "live.neet.dev";
 
   # librechat
-  services.librechat.enable = true;
-  services.librechat.host = "chat.neet.dev";
+  services.librechat-container.enable = true;
+  services.librechat-container.host = "chat.neet.dev";
 }

machines/storage/s0/default.nix

@@ -104,6 +104,7 @@
 
     services.transmission = {
       enable = true;
+      package = pkgs.transmission_4;
       performanceNetParameters = true;
       user = "public_data";
       group = "public_data";
@@ -179,15 +180,10 @@
   # 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)
     ];
@@ -252,7 +248,7 @@
         (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.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}")
       ];
@@ -328,15 +324,7 @@
     enableRegistration = true;
     port = 41709;
     environment.NEXTAUTH_URL = "https://linkwarden.s0.neet.dev/api/v1/auth";
-    environment.FLARESOLVERR_URL = "http://localhost:${toString config.services.flaresolverr.port}/v1";
     environmentFile = "/run/agenix/linkwarden-environment";
-    package = pkgs.linkwarden.overrideAttrs (oldAttrs: {
-      # Add patch that adds support for flaresolverr
-      patches = oldAttrs.patches or [ ] ++ [
-        # https://github.com/linkwarden/linkwarden/pull/1251
-        ../../../patches/linkwarden-flaresolverr.patch
-      ];
-    });
   };
   age.secrets.linkwarden-environment.file = ../../../secrets/linkwarden-environment.age;
   services.meilisearch = {
@@ -351,8 +339,7 @@
 
   services.memos = {
     enable = true;
-    address = "127.0.0.1";
-    port = 57643;
+    settings.MEMOS_PORT = "57643";
   };
 
   services.outline = {

machines/storage/s0/frigate.nix

@@ -84,6 +84,11 @@ 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

@@ -63,29 +63,42 @@
   # 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 = [{
-      address = "192.168.1.2";
-      prefixLength = 21;
-    }];
-    interfaces.iot.ipv4.addresses = [{
-      address = "192.168.9.8";
-      prefixLength = 22;
-    }];
+    # interfaces.eth1.ipv4.addresses = [{
+    #   address = "192.168.1.2";
+    #   prefixLength = 21;
+    # }];
+    # interfaces.iot.ipv4.addresses = [{
+    #   address = "192.168.9.8";
+    #   prefixLength = 22;
+    # }];
 
     defaultGateway = {
-      interface = "eth1";
+      # interface = "eth1";
       address = "192.168.1.1";
     };
-    nameservers = [ "1.1.1.1" "8.8.8.8" ];
+    # nameservers = [ "1.1.1.1" "8.8.8.8" ];
   };
 
   powerManagement.cpuFreqGovernor = "powersave";

machines/storage/s0/home-automation.nix

@@ -29,7 +29,6 @@
   services.zigbee2mqtt = {
     enable = true;
     settings = {
-      homeassistant = true;
       permit_join = false;
       serial = {
         adapter = "ember";

machines/storage/s0/properties.nix

@@ -17,6 +17,7 @@
     "media-server"
     "linkwarden"
     "outline"
+    "dns-challenge"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";

machines/zoidberg/default.nix

@@ -20,10 +20,6 @@
     );
   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" ];
@@ -39,28 +35,6 @@
     "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 = {
@@ -89,19 +63,17 @@
   };
 
   environment.systemPackages = with pkgs; [
-    jellyfin-media-player
     config.services.xserver.desktopManager.kodi.package
     spotify
-    retroarchFull
   ];
 
   # Command and Conquer Ports
   networking.firewall.allowedUDPPorts = [ 4321 27900 ];
   networking.firewall.allowedTCPPorts = [ 6667 28910 29900 29920 ];
 
-  nixpkgs.config.rocmSupport = true;
   services.ollama = {
     enable = true;
-    acceleration = "rocm";
+    package = pkgs.ollama-vulkan;
+    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 49f8ed673816..643b59d68dde 100644
+index f8d8f64e55da..39326d094118 100644
 --- a/nixos/modules/services/video/frigate.nix
 +++ b/nixos/modules/services/video/frigate.nix
-@@ -482,10 +482,6 @@ in
+@@ -609,10 +609,6 @@ in
            };
          };
          extraConfig = ''

patches/gamepadui.patch

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

patches/librespot-pin.patch

@@ -1,28 +0,0 @@
-diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
-index 9694c3d0cf4f..ca9502de7ee1 100644
---- a/pkgs/applications/audio/librespot/default.nix
-+++ b/pkgs/applications/audio/librespot/default.nix
-@@ -25,14 +25,19 @@ rustPlatform.buildRustPackage rec {
-   version = "0.6.0";
- 
-   src = fetchFromGitHub {
--    owner = "librespot-org";
-+    owner = "googlebot42";
-     repo = "librespot";
--    rev = "v${version}";
--    sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
-+    rev = "786cc46199e583f304a84c786acb0a9b37bc3fbd";
-+    sha256 = "sha256-xaOrqC8yCjF23Tz31RD3CzqZ3xxrDM6ncW1yoovEaGQ=";
-   };
- 
-   useFetchCargoVendor = true;
--  cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";
-+  cargoHash = "sha256-sUAZgOuBD9CGAy1mRqLRzVnVfxB0DqSCNAc2yzItTCA=";
-+
-+  cargoBuildFlags = [
-+    "--features"
-+    "passthrough-decoder"
-+  ];
- 
-   nativeBuildInputs = [
-     pkg-config

patches/linkwarden-flaresolverr.patch

@@ -1,144 +0,0 @@
-commit 3dac9f081f267e4a528decbd9d50e1f45ea7c2ba
-Author: SteveImmanuel <steve@telepix.net>
-Date:   Fri Jun 27 13:07:38 2025 +0900
-
-    Add flaresolverr support into linkwarden
-
-diff --git a/.env.sample b/.env.sample
-index bd3abcb0..0ca96d92 100644
---- a/.env.sample
-+++ b/.env.sample
-@@ -43,6 +43,7 @@ TEXT_CONTENT_LIMIT=
- SEARCH_FILTER_LIMIT=
- INDEX_TAKE_COUNT=
- MEILI_TIMEOUT=
-+FLARESOLVERR_URL=
- 
- # AI Settings
- NEXT_PUBLIC_OLLAMA_ENDPOINT_URL=
-diff --git a/apps/worker/lib/archiveHandler.ts b/apps/worker/lib/archiveHandler.ts
-index 8ae19e2c..6c8656b2 100644
---- a/apps/worker/lib/archiveHandler.ts
-+++ b/apps/worker/lib/archiveHandler.ts
-@@ -6,6 +6,7 @@ import {
-   chromium,
-   devices,
- } from "playwright";
-+import axios from 'axios';
- import { prisma } from "@linkwarden/prisma";
- import sendToWayback from "./preservationScheme/sendToWayback";
- import { AiTaggingMethod } from "@linkwarden/prisma/client";
-@@ -75,6 +76,22 @@ export default async function archiveHandler(
-   });
- 
-   const { browser, context } = await getBrowser();
-+
-+  const captchaSolve = await solveCaptcha(link.url);
-+
-+  if (captchaSolve.status === 'error') {
-+    console.error('Error solving captcha');
-+  } else if (captchaSolve.status === 'fail') {
-+    console.warn('Failed solving captcha');
-+  } else if (captchaSolve.status === 'skip') {
-+    console.info('Skip solving captcha');
-+  } else {
-+    if (captchaSolve.solution) {
-+      console.info('Solving captcha');
-+      await context.addCookies(captchaSolve.solution.cookies);
-+    }
-+  }
-+
-   const page = await context.newPage();
- 
-   createFolder({ filePath: `archives/preview/${link.collectionId}` });
-@@ -105,6 +122,7 @@ export default async function archiveHandler(
-           aiTag: user.aiTaggingMethod !== AiTaggingMethod.DISABLED,
-         };
- 
-+  let newLinkName = '';
-   try {
-     await Promise.race([
-       (async () => {
-@@ -127,6 +145,7 @@ export default async function archiveHandler(
-           // archive url
- 
-           await page.goto(link.url, { waitUntil: "domcontentloaded" });
-+          newLinkName = await page.title();
- 
-           const metaDescription = await page.evaluate(() => {
-             const description = document.querySelector(
-@@ -186,10 +205,16 @@ export default async function archiveHandler(
-       where: { id: link.id },
-     });
- 
--    if (finalLink)
-+    if (finalLink) {
-+      // Replace the captcha-blocked link name if it has not been updated by user, else keep the same name
-+      if (newLinkName === '' || finalLink.name === newLinkName || finalLink.name !== 'Just a moment...') {
-+        newLinkName = finalLink.name;
-+      }
-+
-       await prisma.link.update({
-         where: { id: link.id },
-         data: {
-+          name: newLinkName,
-           lastPreserved: new Date().toISOString(),
-           readable: !finalLink.readable ? "unavailable" : undefined,
-           image: !finalLink.image ? "unavailable" : undefined,
-@@ -203,6 +228,7 @@ export default async function archiveHandler(
-               : undefined,
-         },
-       });
-+    }
-     else {
-       await removeFiles(link.id, link.collectionId);
-     }
-@@ -271,6 +297,48 @@ export function getBrowserOptions(): LaunchOptions {
-   return browserOptions;
- }
- 
-+async function solveCaptcha(url: string, maxTimeout: number = 60000): Promise<{
-+  status: string,
-+  solution?: {
-+    cookies: {
-+      name: string,
-+      value: string,
-+      domain: string,
-+      path: string,
-+      secure: boolean,
-+      expires?: number,
-+      httpOnly?: boolean,
-+      sameSite?: "Strict" | "Lax" | "None"
-+    }[],
-+  }
-+}> {
-+  if (process.env.FLARESOLVERR_URL) {
-+    try {
-+      const response = await axios.post(process.env.FLARESOLVERR_URL,
-+        {
-+          cmd: 'request.get',
-+          url,
-+          maxTimeout
-+        },
-+        {
-+          headers: { 'Content-Type': 'application/json' }
-+        }
-+      )
-+
-+      if (response.status !== 200) {
-+        return { status: 'fail' };
-+      }
-+
-+      return { status: response.data.status, solution: response.data.solution };
-+    } catch (error) {
-+      console.error('Error during captcha solving:', error);
-+      return { status: 'error' };
-+    }
-+  }
-+
-+  return { status: 'skip' };
-+}
-+
- async function getBrowser(): Promise<{
-   browser: Browser;
-   context: BrowserContext;

secrets/frigate-credentials.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw p8uus03Jrn9HtEelmufFx2orYkSlyAq90L7bTm3n/GQ
-Ki+Pf1RG27H2wmgxXz2u7fqlU2hrxTmBZCn8RMIh8wI
--> ssh-ed25519 w3nu8g UQQYC93hQLRIgaA5P3Upax2HzfNddWkjTkAyZF5/hFs
-33fVUBBaJFRhDIuZoM8Rn1fd0JwqjmyXsbu4pioxXw4
--> ssh-ed25519 evqvfg /J1fpbZORlnYADjqAcF8kV81e+mlxXC4mhMwozG7YXw
-KYAtHd1MyNiEKoN/RgBCOsn/uCvXIjusXPFWW4urMFY
---- KVdBWZjlOA44GAK3GubvPaXlbg1zdpxL7+rJ4hv4Lmo
-X/{×[P¼æÎ
Å+³$_Z,t\#e¶ÐÃfñø>„,0ié©Ì’;þ°ÖVñB§QÍ8,Øëñú'JªRו=´ÕLœ–êÉäêL³Ý@bìðp?HÅM¦2—uÁò³€àÝp'g:ÄWÀ;YXs©ÍóN ÃO´m»y~£ò
+-> ssh-ed25519 hPp1nw MMPi5i5lVf/mcXOraMoErj12pjLWQppVTc18kMFTskM
+eez7lnpUwseCP/5MZRxjyPZ11gfLHBYPPGEUXUftrAU
+-> ssh-ed25519 ZDy34A dzbWYENdNUIHId+2XUt+gLpnw8xaVsSHrWfIhhBTYBI
+NszPXqq/beWLE9pKMhbXYSEB3WDaU2EPy66yPC+oU+Y
+-> ssh-ed25519 w3nu8g HjJYUyssutwK+bO120fPZoycsIEdLL0gnX1UDMHJKlY
+jjr1bEAD4HHN1Hbdtj8VR6CqfkTHXZ6huJQ1fnp83s4
+-> 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,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw 5wFHyqBRdZxUDa180U3RgrL4DWNF3BO60C1ytWdZvXM
-anPvoQk7kvz/wBddKYquSZ7b6dslhIrhV8wnMpC725E
--> ssh-ed25519 w3nu8g McO3H/GkcqQavMokZhXAsRijGq0wiXzmN1GH29n12wg
-ooFxa+vYd49JSwdj9Knc8iDFyxX4elDb3IjOjrC5Cmo
--> ssh-ed25519 evqvfg pW/T4WXURnk7G+HL+O3STBWkQ+5by7EgwOPTcMNakyw
-HByJjWNhOg7PSms4Px9NO0FnFcMj1Ig2rOXhCNQri7Y
---- LCgnSaNDEKv8du0OxZoLtyF4W02E/6pC/e1h0+XDDGA
-õViÁ°“ìbð[¾í<C2BE><C3AD>%þÚ{œtäL8àP‚[¦2z{g/KG®üÈAëZýåšœÂ
ïàþ0pÃSg²…󶵿P³ÊYÊù—$•á
+-> ssh-ed25519 hPp1nw CSR2HrrPUfaeOgAa3vt4yuQOrqyu0qnFBmTT2O4Rdnc
+nYiiPmn/4Qmrc5VOK+/mmtzKD9xdvEF6SmRiPi/aFqs
+-> ssh-ed25519 ZDy34A cmlgkgy5QvYYn6nHymo0u723S470qvUFt0Ubp6ggKj8
+8ACCrqGCkVbuFMNoGKMd67oMtZWhQHBigU7Tdqoqy80
+-> ssh-ed25519 w3nu8g GWytr1KtsXVQt6CKqqdjH92/Lc7aBjqa2N80oqeOdwU
+c9GfCkKIaxMgsKWplXIQjiB5c6UE+UkRd4xlg1I5JSA
+-> ssh-ed25519 evqvfg K4Z7DqPilKW9kEfFLDzJ7c2G6PvjRhxhCTEuw0Tw8hU
+QsVD2iKObcP7HyVCXn9gPWvewn2Jm/OYLA1Eu6MRP1k
+--- DGe/5H+9vk1EGj/mkUnvzk4VC5JVDIwVeaD78EHRiiI
+êPŸËÓ²ûªÒÖ duÀÉr†¿"KÇ"©„M¬áÆ©xó3 ®²Æ ú™*J.Y_ÃíT%<25>tµ(ÿYʵ´8/Qa©r]ÍmÑÿÒ–¤º‘

secrets/hashed-email-pw.age

@@ -1,9 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g kH4DufpuybglKzupJsGvWKfWsZ5xhRwefdPKkx/AuW4
-QrDu/vSbgEIgYSnraG5u37RNp6Mp6ARjqzAduy9iX/Y
--> ssh-ed25519 w3nu8g mBt4VQNJAMwcseVhc8k/mB5XThbQT48OnstkWaGQ8zQ
-6w7lMJA8giG9PVux1ncjCPrN7ER0S7uWi8UjhOOeMS8
--> ssh-ed25519 evqvfg uM4SAf1aMCvtRKdPn5BFr1EWlBGVgbgjp6OkuMV7GnU
-Zi5X5TL7phRpwsbUVsFgS0qHvqtLdckz01qDfVypn/s
---- I92hNxGkHSHR/fQhUI5UAXvzIvMd+YBih9nFP5IZW3w
-áÎ_§ØN/	nÞúú®H<C2AE>ô¡ÒaŽeõâ¼ÈêÅhÊB¤ê»[Ô´ðªqÂ<71>\ý+M:F‹Üîñ‚gP¦¤¤nh’¨¼N/¸2ÞÇl8µ3q>	rHt’UJG×n
+-> ssh-ed25519 6AT2/g BLyjF65Y/bq9gkAuzl2PZmL7Ge1BTf6MQ/J+04fwwCA
+mdGmV3lmTPhVmORAVtJucy5EaNmOiCkZqdw+in8r8+E
+-> ssh-ed25519 ZDy34A h7f7GMXKCzuVnoIai84+gNq18XqxOPQLt2a4tmmQSxs
+RMoh4ecaEFybnE1ObWFZFHJKrIO3SbRynyDBljfSRAY
+-> ssh-ed25519 w3nu8g XubNz2enRmr1uNZlErXBJngZrY52fJC4AUIbsaTh8yE
+w5w3FK30UqLok7VeG8wILcyXeAIrf/Uzbf7AnHPfYAw
+-> ssh-ed25519 evqvfg 9UkiG9r2b0ZJwN6DPL+j08YKjBOx2x6jrJlzg+N79lk
+nmpBD/vZ7h3pAzeL8CO2oABTeA5iujG9Vr4aUgWaO0E
+--- 00dECq/aOgxAgnD19UdntMCzn27Iywp4bQoyAaKJ3yw
+»ŽlŸ÷ƒƒÔrñ,ð’DžgFOíþrÍ=éŒUCR‰wW÷Æ	Ô­Ï*þA$÷³åÝÓeV
+RH ¶T
<01>ISK·é

secrets/iodine.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g +D1KEq8bDAErE5NJABbpoONsmolgc2aNDPucgzJZT2A
-jJpebutfcnNYT71oiwEATP89ZSnmjXx3skHrrk2MLOY
--> ssh-ed25519 w3nu8g MHVAh0Jp4pTahZoHIw5wUsp8STJ3rlH1C6+jrA+sJFI
-sqMpGLw3HPumgAE7GYddT/iuewYZH3xy7mE5gyrWloA
--> ssh-ed25519 evqvfg HoJqNfMckAJbHBCleHcSnI1VbOx3l7lQv1yM030G5mc
-cscFawOoA4rA3EAc/FtCafLYlVZ4vcDEEmzouOrwVVY
---- sjGmx4I61x+AP72rCFeWyNJAEUlQz/az5rQ7jNfjXjU
-ËgîV&\÷MŒ²ÜuÊMm;ãY?‡úRDÆ`‰(2Õ·ÕøÒ‘à–é€Æ²)¸
+-> ssh-ed25519 6AT2/g 3s+reqcb4Hu/3Z7rICFZBOkW02ibISthFAT1sveyLBo
+Eh5ynxeqqXhNbv/ASWZxzKXAzKX41uI5iJI4KqluHRI
+-> ssh-ed25519 ZDy34A cHcA2p0VrGr6jP/CUTOSU4Gef04ujh6wmJjmEWmWNE0
+wwaQnj7RABFzTbU74awlIJeHHePtO7jihNd2EUkNZPU
+-> ssh-ed25519 w3nu8g hN/fWUHspXoJmpibR4NAL3EXkKExe2tRjUzmLGK6VnE
+F1KQnGe3M8eD9hjnHLc7hqFTw9iXh7ICz0u421DuFOs
+-> ssh-ed25519 evqvfg r3AoIJ3KWCYIsV8+RTgYY+Eg+1EcBVNrX+ZRunKaug8
+KSXd4uq1/0ErZzSTPrCmY/66v4TT5PmFqv9LRSHNi9A
+--- 3bGqZANqdfEgdiUzu38n4dzPOShgGUzQGtO7l2S+hwU
+Ì?\<5C>•Öå¢aÚ'¤¤ÐÚ{˜/}ÉýÝL„:¨|¸G`†Ó+ºMÜÈY$s¸+‚Uk¥áäg‡ID¾K·

secrets/pia-login.age

@@ -1,12 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g rk3jNJlQwab++isNOPpQJZlb4rL7nIAYfoAhlvY9QTc
-J+6/MRepeixmDQzz3bRd/AMJpZls60dUBjrHh+p759Y
--> ssh-ed25519 hPp1nw GnjIH+V6mLcXvfNhiBBwqBvY6NO8W+1sPcgvu6fS0nI
-qP6jDxd+0h/AZhsBs7om0BDutrPmP/1NUEuZ7LBlxmw
--> ssh-ed25519 w3nu8g QwztUaCCtEVeI9AbJn5dKH07Y2fal+Nn9/bsnBkTJgI
-/Ce0a9bGv6RmQiK8C3wIvMCh5DM+m/EujYFsXgNjieY
--> ssh-ed25519 evqvfg VLoQNzz62Q1KawvTHWeyBfCGTlGYNPQcdTaPq7cLxDo
-eabkTR9iUPYqCj50R7rwYcrMqcs+RHWqRZai2KKzPMQ
---- fQkT/xI/iptJd/UmihEcUWx77d2wr6bOj5lecPa/P8o
-,V„ý²lz­ºOP¿'Ìü2ÑÃ4¦o
¸ü|ÅK‘m÷´»²FYL†Ì&ìâÓáéÊÁ>†©Ä\@emVÈnŒm½®6nôu—O@wRèãÁ‘åý^_
-ztFŠ©~
+-> ssh-ed25519 6AT2/g MrkHK56b1uQIiMoSrGmCun5QzwFWQiCFZjHQuAkdBlc
+ipK76P2VS5c00f3n468l+VsTndtEUwHtJTOhR1Zntew
+-> ssh-ed25519 hPp1nw iVISLjddu2lJpNPXewFDmjhORkkzBNUBmq33n2l9yXg
+4oOAaQpnWNsVXfDEK4rclKhAwv8xnE3EUS7PF44/GYc
+-> ssh-ed25519 ZDy34A gZY++iCMswmQVkKiIUUuuR8srojCpykELGpa0mqHMFA
+MSpvndXZY7Gm8VUQUdn/x39dVOsJ0d77H4zN0Ct+b1Q
+-> ssh-ed25519 w3nu8g mnrSRjcTax6g1PHvOwCV/Al6AWkCwiRwMnuZg4vPHys
+S2V1O0GF7wipp9Bg+7PA6z4WNbK/zv015AM1SfA/Jrg
+-> ssh-ed25519 evqvfg 8M2kGsTS/cd0daAr87u0QqS6RH00O1zkSjYdXTxjYGU
+uCUwdJFCdFWWlQPpINjf4dAIYZ/pa8tfz8pVjDLPJF0
+--- iyh7GvKqnNeyIgedqWGQMtYfXJGo1RphDpzuDXJbp1k
+#/Þ¿ «[4èAã<±Ëi×òæ˜ækÞfÓÕ

secrets/radarr-api-key.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw MRItBkM6GC+jht3ly0K04wCptE28UI9FmFAm2+8KHHw
-Pbz+oZcWtzSz4eyWyRbi/a89Q3PripNJ+PYM/wiLKq0
--> ssh-ed25519 w3nu8g a5G6FrbGmglm2Ba2T6NPsaVP+/4g//jh9ui/BVzR0EU
-f0xNuCbhC0FqqFH6CD9jPAgWmTEZqga/fRjU6VMdfSk
--> ssh-ed25519 evqvfg 1lhGzpY7I0fKimq6sQ/zWUHCFSEaN31rmGCckUepfHY
-3OfNrzAajS6azIT90CmVnBzXLXcwMw/BRhOfbcuuz3c
---- vagzuZWeWUcZTBISnL4vNVcpMX2CbJGHwfaAFiIZeHM
-en¼!<z'ß‹û,W
+-> ssh-ed25519 hPp1nw gfVRDt7ReEnz10WvPa8UfBBnsRsiw7sxxXQMuXRnCVs
+slBNX9Yc1qSu1P5ioNDNLPd97NGE/LWPS/A+u9QGo4E
+-> ssh-ed25519 ZDy34A e5MSY5qDP6WuEgbiK0p5esMQJBb3ScVpb15Ff8sTQgQ
+9nsimoUQncnbfiu13AnFWZXcpaiySUYdS1eH5O/3Fgg
+-> ssh-ed25519 w3nu8g op1KSUhJgM6w/nlaUssQDiraQpVzgnWd//JMu2vFgms
+KvEaJfsB7Qkf+PnzFJdZ3wAxm2qj23IS8RRxyuGN2G4
+-> ssh-ed25519 evqvfg 9L6pFuqkcChZq/W4zkATXm1Y76SEK+S4SyaiSlJd+C4
+j/UWJvo4Cr/UDfaN2milpJ6rU0w1EWdTAzV3SlrCcW8
+--- bdG4zC5dx6cSPetH3DNeHEk6EYCJ5TXGrn8OhUMknNU
+/¶ø+ÏpñR[¤àJ-*‚@ÌÿŸx0Ú©ò-ä.*&T·™~-i	2€eƒ¡`@ëQ8š<l™àQK0AÕ§

secrets/secrets.nix

@@ -55,7 +55,7 @@ with roles;
   "librechat-env-file.age".publicKeys = librechat;
 
   # For ACME DNS Challenge
-  "digitalocean-dns-credentials.age".publicKeys = server;
+  "digitalocean-dns-credentials.age".publicKeys = dns-challenge;
 
   # Frigate (DVR)
   "frigate-credentials.age".publicKeys = frigate;

secrets/smb-secrets.age

@@ -1,17 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 N7drjg lVrCcpRGeAJ+62CF+fTT+iGKmaaiBk2rmtzS3jz4ux4
-BbMLKa0uCoopsV0BekIcApzyJggQf4uFICuC26inA/c
--> ssh-ed25519 jQaHAA k7JCJlbAKDuH+bLhaoiQQssN5gfwPw9w30J3OAA4nWg
-fQ6te5iDG54mn5oXdarxMYPeze4ZWbk1yPAsLsTFby4
--> ssh-ed25519 w3nu8g r3wLOavRLT++n+NaBRtcQqKXFTFhRYGl8naqUWNR0kE
-pYkqQIiwzpN/XkDBrfCuFPc3yzyFjRbdCcFmRaY8iIU
--> ssh-ed25519 evqvfg b+BUWYHdu1z38I0BMqpkSf5qaeaCm2C+vf9Hcqgjlg4
-PK0y5MadYrM9ANyTMdHKXRTNi5cwD8/+19mN+vaTNiM
--> ssh-ed25519 jQaHAA 86i8je5q4vVBfdi/Ws8/n4R/Z25uLw1e6zXDza8SwiI
-5yuvdl0InHxrjRyi4SJOWEo6pWZt/mX8BsaFer3NwlE
--> ssh-ed25519 w3nu8g N2QWi7I8V//jfK2ZGsXwBkEt2Zh7/5zpWCKUNV30bFA
-ZmjY/lwFaVeM88FZSGwG+BYHi+32UPffZPZPbVcw+J8
--> ssh-ed25519 evqvfg cZflDyFn9H85TnSbi2HFrdVvlT5uZ+6+l4stOaoyOxE
-3HpWWCbWoU1ufbi02xpXnU47Ti6YjrpMVh/mS5jgO0M
---- wF990HQn1zh8JVo2alfC/QhpFimLsLDtj26DREVYr18
-Qh
E{+帻R(+­ ÝNYI¾›<C2BE><ýêþ’k¦/ÈÖ¯„pA<70>ݶ°Ð_ž'ËÅ
«ž‰@3ù;»°÷-0‰Ç¡a€b9W5ÔÃêŸbU3)ASóÅ÷Œe÷ùQ/SMJ“_šÅe˜Ža*‡:<3A><>µ
+-> ssh-ed25519 qEbiMg P0wVQfRdC6s4rGpSxPSvgsens9QF+VphlX6QL91RNGk
+Rdum6JE/NafVt/lvd54D3leH7QnX/hZoqOoUkp58vpw
+-> ssh-ed25519 N7drjg LRBM5kYSJGMXCiIaU/tc8kq8L8tjyzYjUb5WeKfx5Dk
+/hTFYyPv1gpKBmXJ0EanmfNZwkOg9SvCY1dhqJkSQ3k
+-> ssh-ed25519 jQaHAA 2niqwTr3jLx/7lDG5Yqetu3lqfU+lCYj626oZVT3XFA
+NEwUSUcgsGgyeHXTtDo6HYSkX4r7NyloUP+gabOZfOI
+-> ssh-ed25519 ZDy34A 6NZGnadwDwPUscJdtYQywtuq3FNB0FvUDlztBnAAzBw
+so26osNIZk/7tnf8HZwJ+G8+xcyDbpZ6uoX0GJBD7uk
+-> ssh-ed25519 w3nu8g KX8U395jkHGX7LV9TXRl5OcZfcropPKrgonxJsR0MyI
+KaWlP2Q44p53rqAtlojkj2EBcQH+N1EN/8pYhe92x0E
+-> ssh-ed25519 evqvfg XCZp8XLQ10+OsDwpeBC0t2RAEhj8EG85ZvbYJ6QAeXI
+w9PAegIWcFKtRrcuBk9ysc/qDecNyZBygVVCCzr2DAo
+-> ssh-ed25519 jQaHAA 76ePAMsQpZJO6b2CeE1rgvxhi2JEOxC+OPIW8GBEnWQ
+NyGlaWLtx9Vko4sDFdgsQj9oK1/gD4Y6HnVhOJfO0JE
+-> ssh-ed25519 ZDy34A RrJ8q0EcqfNgg6Fk2ZrY/RiRjI+w0WFrfvHqi7r5pgU
+ayHpp8FAVEIZhKTqYp1h/mL6UFSlQic7dlrHxbmharI
+-> ssh-ed25519 w3nu8g q4j19BwrZAkFCICDOdAhGFWiD6eCLJRW9faeTaJEvE0
+Av4UT5VsBvdL0cZOoaTrDOBvX91uuVIwru4WXMC+NNA
+-> ssh-ed25519 evqvfg UIsX165L2ccILCU5zFur/9IHarQn9nAaLH3nSbcJJE4
+cWztxUlKMcqx9GfAk2C+Gt/aR9ZXaXZYe9XQ3jnl3T8
+--- bMWqy/VkrJr/SmencAM0ClMc/jtY82jL2ZUYFdLK2qY
+Vã­¥=W}ØŸߥ¿•jUá¢Ctp

secrets/wolframalpha.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g G3ahigKIYvEJNDgz97yprVfANFzbR2uKcvBPNAxgwWI
-iLpm56WMuc1Y10FwZ8HPOyBFNlhm1nWFS05DMXsjDD4
--> ssh-ed25519 w3nu8g lx5NuJq4c4wwww887MFA1qwuLPVvddvG83l4xLzUYgk
-JgYBgcPw1jBa5yLSFBYVjf4jdoJJPoV6Q/d4Hkr3Efs
--> ssh-ed25519 evqvfg Gw0pMtP3bxgZXeEseJ+2xSb21AFX46JCAeHMroEJg1c
-qj1BjH+J9HOwYxoL2PEMa74nxfk9nlakl+40qoFunJ4
---- 5Om+5hhrNjOi0MRmrb8N1t9vVnM3wWosDsJCARknPNk
-©5HÉòÉ;)ôŽ\K“Au¯7ìx¢‹jûox…e›*FÈ怆)èµ&<26>	úÑú}é<>
+-> ssh-ed25519 6AT2/g NDsVQFHvqCl9KtbDE5oXyNsA4z9+4YiOsGHZ1m8CYW4
+6DBtl+pAuNB+PUnXSVTlVNAeFpr39dAuhOI4k9su1Hg
+-> ssh-ed25519 ZDy34A extU5azTcNDgblB36KXiLnI4oMUbb4R5BWVlXsec5GE
+D0re4GCb7KjcR1uVu+MFQe+LdaEY7xUmrYLJmgddYnQ
+-> ssh-ed25519 w3nu8g 3w4aYKO7etSZsmCGaL6bKxfrniKCnBKiRRhvPXeHlEQ
+inI1cUq5r8xM+xU+jaPD4yuZw4Q6lIZhwAztXICWu5M
+-> ssh-ed25519 evqvfg Dzb7THrNXvfpoIy1yAi2aqJSv2RQ6pvUkAgQS2f6D24
+aXlOBtqoK0xMMA+woITlbXpZoe3EVx5yQaLA24wmUfE
+--- qzPxoy3zUBEwJtCsPhi/tWxMcI8SKpxqptPTRQk4Yn0
+uS	_ô‡ÝÐ6Ÿ*+‘
jòÕþëŠÍ줩⯽žq6÷¤Õvµ¬”…Nº‚
Š´

secrets/zigbee2mqtt.yaml.age

@@ -1,9 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw FnUaydWe7+2dVUIYrKqx2/0AzRPN3ZylczJBkTqeeXg
-boSEnMZmQyre4mJBQkEPuXuRP90woU1obqMdh+uQKhM
--> ssh-ed25519 w3nu8g pIDzDUVLZuZUCn6tGKpCLVS7OmhQiMgtMvuCKfWcgiM
-zZxCUe0LslQ0ZqHV6sSMNQ5fhyscDFxVmJk0h2voEfc
--> ssh-ed25519 evqvfg eukXn1jUoHwP/cVmYCJ1O0kYQw+Xsad1PswvbcFUMEk
-B0AvuWyfqK8ZFgCAW/iuXB0sKoKmB9d62ZNRTdDG43w
---- 0aziJ5/DCB9kJUqWhIggCqRnsuqu9s/g4Rt4vbwsBJk
-FVÜçi`í1¥XFI–ÇI´@ŸoÞmf§Á³¤õ“ˆQ=ñè–彈臼i?²¿ƒb?Á
+-> ssh-ed25519 hPp1nw KENwK0yRInrVRN1Tgwvx/dJsz+z8rQenw1B4aw57v2c
+ucnKJeShVBVC8LmQ6VIGTlbB0VBpBi2/lGGfW78jj1U
+-> ssh-ed25519 ZDy34A Ghz/fsNQWte2tUx2+kEHcRPCBGc1orAXV9QkCbsKBzg
+i9mr3xguDEgLL53ji38H19dkZPHqcfqTy8/S2oaht0U
+-> ssh-ed25519 w3nu8g cN44HlL1Zu724p+Kyrygas3RCRTpEPOfTdzFHkLebC4
+BOBnfvEQLTPH6lBdSOPlYeSSdy3pohctl00lXrDs2zk
+-> ssh-ed25519 evqvfg HuPgckAebGwcWYCFNvNcNwg2QpyynHuVYRNiuC2j0m0
+HgJlN4gbED2FNaWr88Ocqdc1UJ3LA1n6fl/BUeXfwhI
+--- eczVQy6oXmBIj1D2v8LuR8ZJxnzyCNxn+rqF135QJJ4
+aj0<EFBFBD>žå^ÂÏ<C382>ö(ø'´¨p1
‹)F½>aíO¦€”›¶¤:Ú¢šŒÛ!û8T¬
+YÌ{ˆ‚3ɶ;Y