speed up

.gitea/workflows/check-flake.yaml

@@ -15,5 +15,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - run: attic -V
+
+      - name: Setup Attic Cache
+        uses: https://git.neet.dev/zuckerberg/attic-action@v0.2.5
+        with:
+          endpoint: ${{ secrets.ATTIC_ENDPOINT }}
+          cache: ${{ secrets.ATTIC_CACHE }}
+          token: ${{ secrets.ATTIC_TOKEN }}
+
       - name: Check Flake
         run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace

common/binary-cache.nix

@@ -6,11 +6,11 @@
       substituters = [
         "https://cache.nixos.org/"
         "https://nix-community.cachix.org"
-        "http://s0.koi-bebop.ts.net:5000"
+        "http://s0.koi-bebop.ts.net:28338/nixos"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
+        "nixos:IDhKojUaMz+UIiri1/DQk9EpqDokih8dwxmp41uJnls="
       ];
     };
   };

common/default.nix

@@ -63,6 +63,7 @@
     lf
     gnumake
     tree
+    attic
   ];
 
   nixpkgs.config.allowUnfree = true;

common/server/atticd.nix

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

common/server/dashy.nix

@@ -37,5 +37,17 @@ in
         ];
       };
     };
+
+    services.nginx.enable = true;
+    services.nginx.virtualHosts."s0.koi-bebop.ts.net" = {
+      default = true;
+      addSSL = true;
+      serverAliases = [ "s0" ];
+      sslCertificate = "/secret/ssl/s0.koi-bebop.ts.net.crt";
+      sslCertificateKey = "/secret/ssl/s0.koi-bebop.ts.net.key";
+      locations."/" = {
+        proxyPass = "http://localhost:${toString cfg.port}";
+      };
+    };
   };
 }

common/server/default.nix

@@ -22,6 +22,6 @@
     ./dashy.nix
     ./librechat.nix
     ./actualbudget.nix
-    ./unifi.nix
+    ./atticd.nix
   ];
 }

common/server/gitea-actions-runner.nix

@@ -116,6 +116,7 @@ in
       git
       # Gitea Actions rely heavily on node. Include it because it would be installed anyway.
       nodejs
+      attic
     ];
 
     # To allow building on the host, must override the the service's config so it doesn't use a dynamic user

common/server/librechat.nix

@@ -26,7 +26,6 @@ in
           HOST = "0.0.0.0";
           MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";
           ENDPOINTS = "openAI,google,bingAI,gptPlugins";
-          REFRESH_TOKEN_EXPIRY = toString (1000 * 60 * 60 * 24 * 30); # 30 days
         };
         environmentFiles = [
           "/run/agenix/librechat-env-file"

common/server/nginx.nix

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

common/server/unifi.nix

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

flake.lock

@@ -25,6 +25,36 @@
         "type": "github"
       }
     },
+    "attic": {
+      "inputs": {
+        "crane": "crane",
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717279440,
+        "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
+        "owner": "zhaofengli",
+        "repo": "attic",
+        "rev": "717cc95983cdc357bc347d70be20ced21f935843",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "repo": "attic",
+        "type": "github"
+      }
+    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -41,6 +71,27 @@
         "type": "gitlab"
       }
     },
+    "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "attic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717025063,
+        "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "dailybuild_modules": {
       "inputs": {
         "flake-utils": [
@@ -281,6 +332,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "attic": "attic",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
         "flake-compat": "flake-compat",

flake.nix

@@ -75,6 +75,17 @@
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Attic
+    attic = {
+      url = "github:zhaofengli/attic";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-stable.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        flake-compat.follows = "flake-compat";
+      };
+    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -94,6 +105,7 @@
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
             nix-index-database.nixosModules.nix-index
+            attic.nixosModules.atticd
             self.nixosModules.kernel-modules
             ({ lib, ... }: {
               config = {

machines/ponyo/default.nix

@@ -118,6 +118,14 @@
 
   # proxied web services
   services.nginx.enable = true;
+  services.nginx.virtualHosts."jellyfin.neet.cloud" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://s0.koi-bebop.ts.net";
+      proxyWebsockets = true;
+    };
+  };
   services.nginx.virtualHosts."navidrome.neet.cloud" = {
     enableACME = true;
     forceSSL = true;

machines/storage/s0/dashy.yaml

@@ -60,65 +60,73 @@ sections:
       - &ref_0
         title: Jellyfin
         icon: hl-jellyfin
-        url: https://jellyfin.s0.neet.dev
+        url: http://s0:8097
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://jellyfin.s0
         id: 0_1956_jellyfin
       - &ref_1
         title: Sonarr
         description: Manage TV
         icon: hl-sonarr
-        url: https://sonarr.s0.neet.dev
+        url: http://s0:8989
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://sonarr.s0
         id: 1_1956_sonarr
       - &ref_2
         title: Radarr
         description: Manage Movies
         icon: hl-radarr
-        url: https://radarr.s0.neet.dev
+        url: http://s0:7878
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://radarr.s0
         id: 2_1956_radarr
       - &ref_3
         title: Lidarr
         description: Manage Music
         icon: hl-lidarr
-        url: https://lidarr.s0.neet.dev
+        url: http://s0:8686
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://lidarr.s0
         id: 3_1956_lidarr
       - &ref_4
         title: Prowlarr
         description: Indexers
         icon: hl-prowlarr
-        url: https://prowlarr.s0.neet.dev
+        url: http://prowlarr.s0
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://prowlarr.s0
         id: 4_1956_prowlarr
       - &ref_5
         title: Bazarr
         description: Subtitles
         icon: hl-bazarr
-        url: https://bazarr.s0.neet.dev
+        url: http://s0:6767
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://bazarr.s0
         id: 5_1956_bazarr
       - &ref_6
         title: Navidrome
         description: Play Music
         icon: hl-navidrome
-        url: https://music.s0.neet.dev
+        url: http://s0:4534
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://music.s0
         id: 6_1956_navidrome
       - &ref_7
         title: Transmission
         description: Torrenting
         icon: hl-transmission
-        url: https://transmission.s0.neet.dev
+        url: http://s0:9091
         target: sametab
-        statusCheck: false
+        statusCheck: true
+        statusCheckUrl: http://transmission.s0
         id: 7_1956_transmission
     filteredItems:
       - *ref_0

machines/storage/s0/default.nix

@@ -10,23 +10,6 @@
 
   # system.autoUpgrade.enable = true;
 
-  nix.gc.automatic = lib.mkForce false; # allow the nix store to serve as a build cache
-
-  # binary cache
-  services.nix-serve = {
-    enable = true;
-    openFirewall = true;
-    secretKeyFile = "/run/agenix/binary-cache-private-key";
-  };
-  age.secrets.binary-cache-private-key.file = ../../../secrets/binary-cache-private-key.age;
-  users.users.cache-push = {
-    isNormalUser = true;
-    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB" ];
-  };
-  nix.settings = {
-    trusted-users = [ "cache-push" ];
-  };
-
   services.iperf3.enable = true;
   services.iperf3.openFirewall = true;
 
@@ -165,96 +148,61 @@
   };
 
   # nginx
-  services.nginx = {
+  services.nginx.enable = true;
-    enable = true;
+  services.nginx.virtualHosts."bazarr.s0" = {
-    openFirewall = false; # All nginx services are internal
+    listen = [{ addr = "0.0.0.0"; port = 6767; } { addr = "0.0.0.0"; port = 80; }];
-    virtualHosts =
+    locations."/".proxyPass = "http://vpn.containers:6767";
-      let
+  };
-        mkVirtualHost = external: internal:
+  services.nginx.virtualHosts."radarr.s0" = {
-          {
+    listen = [{ addr = "0.0.0.0"; port = 7878; } { addr = "0.0.0.0"; port = 80; }];
-            ${external} = {
+    locations."/".proxyPass = "http://vpn.containers:7878";
-              useACMEHost = "s0.neet.dev"; # Use wildcard cert
+  };
-              forceSSL = true;
+  services.nginx.virtualHosts."lidarr.s0" = {
-              locations."/" = {
+    listen = [{ addr = "0.0.0.0"; port = 8686; } { addr = "0.0.0.0"; port = 80; }];
-                proxyPass = internal;
+    locations."/".proxyPass = "http://vpn.containers:8686";
-                proxyWebsockets = true;
+  };
-              };
+  services.nginx.virtualHosts."sonarr.s0" = {
-            };
+    listen = [{ addr = "0.0.0.0"; port = 8989; } { addr = "0.0.0.0"; port = 80; }];
-          };
+    locations."/".proxyPass = "http://vpn.containers:8989";
-      in
+  };
-      lib.mkMerge [
+  services.nginx.virtualHosts."prowlarr.s0" = {
-        (mkVirtualHost "bazarr.s0.neet.dev" "http://vpn.containers:6767")
+    listen = [{ addr = "0.0.0.0"; port = 9696; } { addr = "0.0.0.0"; port = 80; }];
-        (mkVirtualHost "radarr.s0.neet.dev" "http://vpn.containers:7878")
+    locations."/".proxyPass = "http://vpn.containers:9696";
-        (mkVirtualHost "lidarr.s0.neet.dev" "http://vpn.containers:8686")
+  };
-        (mkVirtualHost "sonarr.s0.neet.dev" "http://vpn.containers:8989")
+  services.nginx.virtualHosts."music.s0" = {
-        (mkVirtualHost "prowlarr.s0.neet.dev" "http://vpn.containers:9696")
+    listen = [{ addr = "0.0.0.0"; port = 4534; } { addr = "0.0.0.0"; port = 80; }];
-        (mkVirtualHost "transmission.s0.neet.dev" "http://vpn.containers:9091")
+    locations."/".proxyPass = "http://localhost:4533";
-        (mkVirtualHost "unifi.s0.neet.dev" "https://localhost:8443")
+  };
-        (mkVirtualHost "music.s0.neet.dev" "http://localhost:4533")
+  services.nginx.virtualHosts."jellyfin.s0" = {
-        (mkVirtualHost "jellyfin.s0.neet.dev" "http://localhost:8096")
+    listen = [{ addr = "0.0.0.0"; port = 8097; } { addr = "0.0.0.0"; port = 80; }];
-        (mkVirtualHost "s0.neet.dev" "http://localhost:56815")
+    locations."/" = {
-        (mkVirtualHost "ha.s0.neet.dev" "http://localhost:8123") # home assistant
+      proxyPass = "http://localhost:8096";
-        (mkVirtualHost "esphome.s0.neet.dev" "http://localhost:6052")
+      proxyWebsockets = true;
-        (mkVirtualHost "zigbee.s0.neet.dev" "http://localhost:55834")
+    };
-        {
+  };
-          # Landing page LAN redirect
+  services.nginx.virtualHosts."jellyfin.neet.cloud".locations."/" = {
-          "s0" = {
+    proxyPass = "http://localhost:8096";
-            default = true;
+    proxyWebsockets = true;
-            redirectCode = 302;
+  };
-            globalRedirect = "s0.neet.dev";
+  services.nginx.virtualHosts."transmission.s0" = {
-          };
+    listen = [{ addr = "0.0.0.0"; port = 9091; } { addr = "0.0.0.0"; port = 80; }];
-          "frigate.s0.neet.dev" = {
+    locations."/" = {
-            # Just configure SSL, frigate module configures the rest of nginx
+      proxyPass = "http://vpn.containers:9091";
-            useACMEHost = "s0.neet.dev";
+      proxyWebsockets = true;
-            forceSSL = true;
-          };
-        }
-      ];
-
-    # Problem #1: Keeping certain programs from being accessed from certain external networks/VLANs
-    # Solution #1: Isolate that service in a container system that automatically fowards the ports to the right network interface(s)
-    # Solution #2: Don't open the firewall for these services, manually open the ports instead for the specific network interface(s) (trickier and easy to miss ports or ports can change)
-    # Untrusted network list:
-    #  - VLANs [cameras]
-
-    # Problem #2: Untrusted internal services. Prevent them from accessing certain internal services (usually key unauth'd services like frigate)
-    # Solution #1: Isolate the untrusted services into their own container
-    # Untrusted services list:
-    #  - Unifi? (it already has access to the cameras anyway?)
-    #  - torrenting, *arr (worried about vulns)
-
-
-    tailscaleAuth = {
-      enable = true;
-      virtualHosts = [
-        "bazarr.s0.neet.dev"
-        "radarr.s0.neet.dev"
-        "lidarr.s0.neet.dev"
-        "sonarr.s0.neet.dev"
-        "prowlarr.s0.neet.dev"
-        "transmission.s0.neet.dev"
-        "unifi.s0.neet.dev"
-        # "music.s0.neet.dev" # messes up navidrome
-        "jellyfin.s0.neet.dev"
-        "s0.neet.dev"
-        # "ha.s0.neet.dev" # messes up home assistant
-        "esphome.s0.neet.dev"
-        "zigbee.s0.neet.dev"
-      ];
-      expectedTailnet = "koi-bebop.ts.net";
     };
   };
 
-  # Get wildcard cert
+  networking.firewall.allowedTCPPorts = [
-  security.acme.certs."s0.neet.dev" = {
+    6767
-    dnsProvider = "digitalocean";
+    7878
-    credentialsFile = "/run/agenix/digitalocean-dns-credentials";
+    8686
-    extraDomainNames = [ "*.s0.neet.dev" ];
+    8989
-    group = "nginx";
+    9696
-    dnsResolver = "1.1.1.1:53";
+    4534
-    dnsPropagationCheck = false; # sadly this erroneously fails
+    8097
-  };
+    9091
-  age.secrets.digitalocean-dns-credentials.file = ../../../secrets/digitalocean-dns-credentials.age;
+    8443 # unifi
+  ];
 
   virtualisation.oci-containers.backend = "podman";
   virtualisation.podman.dockerSocket.enable = true; # TODO needed?
@@ -265,8 +213,11 @@
 
   services.unifi = {
     enable = true;
-    openMinimalFirewall = true;
+    openFirewall = true;
+    unifiPackage = pkgs.unifi8;
   };
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
+
+  services.atticd.enable = true;
 }

machines/storage/s0/home-automation.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let
-  frigateHostname = "frigate.s0.neet.dev";
+  frigateHostname = "frigate.s0";
+  frigatePort = 61617;
 
   mkEsp32Cam = address: {
     ffmpeg = {
@@ -40,6 +41,9 @@ in
 {
   networking.firewall.allowedTCPPorts = [
     # 1883 # mqtt
+    55834 # mqtt zigbee frontend
+    frigatePort
+    4180 # oauth proxy
   ];
 
   services.frigate = {
@@ -76,7 +80,21 @@ in
   # Coral PCIe driver
   kernel.enableGasketKernelModule = true;
 
-  services.esphome.enable = true;
+  # Allow accessing frigate UI on a specific port in addition to by hostname
+  services.nginx.virtualHosts.${frigateHostname} = {
+    listen = [{ addr = "0.0.0.0"; port = frigatePort; } { addr = "0.0.0.0"; port = 80; }];
+  };
+
+  services.esphome = {
+    enable = true;
+    address = "0.0.0.0";
+    openFirewall = true;
+  };
+  # TODO remove after upgrading nixos version
+  systemd.services.esphome.serviceConfig.ProcSubset = lib.mkForce "all";
+  systemd.services.esphome.serviceConfig.ProtectHostname = lib.mkForce false;
+  systemd.services.esphome.serviceConfig.ProtectKernelLogs = lib.mkForce false;
+  systemd.services.esphome.serviceConfig.ProtectKernelTunables = lib.mkForce false;
 
   # TODO lock down
   services.mosquitto = {
@@ -103,7 +121,7 @@ in
         # base_topic = "zigbee2mqtt";
       };
       frontend = {
-        host = "localhost";
+        host = "0.0.0.0";
         port = 55834;
       };
     };
@@ -111,52 +129,60 @@ in
 
   services.home-assistant = {
     enable = true;
+    openFirewall = true;
+    configWritable = true;
     extraComponents = [
-      "default_config"
       "esphome"
       "met"
       "radio_browser"
       "wled"
       "mqtt"
-      "apple_tv" # why is this even needed? I get `ModuleNotFoundError: No module named 'pyatv'` errors otherwise for some reason.
-      "unifi"
-      "digital_ocean"
-      "downloader"
-      "mailgun"
-      "minecraft_server"
-      "mullvad"
-      "nextcloud"
-      "ollama"
-      "openweathermap"
-      "jellyfin"
-      "transmission"
-      "radarr"
-      "sonarr"
-      "syncthing"
-      "tailscale"
-      "weather"
-      "whois"
-      "youtube"
     ];
     # config = null;
     config = {
       # Includes dependencies for a basic setup
       # https://www.home-assistant.io/integrations/default_config/
       default_config = { };
-
-      # Enable reverse proxy support
-      http = {
-        use_x_forwarded_for = true;
-        trusted_proxies = [
-          "127.0.0.1"
-          "::1"
-        ];
-      };
-
-      "automation manual" = [
-      ];
-      # Allow using automations generated from the UI
-      "automation ui" = "!include automations.yaml";
     };
   };
+
+  # TODO need services.oauth2-proxy.cookie.domain ?
+  services.oauth2-proxy =
+    let
+      nextcloudServer = "https://neet.cloud/";
+    in
+    {
+      enable = true;
+
+      httpAddress = "http://0.0.0.0:4180";
+
+      nginx.domain = frigateHostname;
+      # nginx.virtualHosts = [
+      #   frigateHostname
+      # ];
+
+      email.domains = [ "*" ];
+
+      cookie.secure = false;
+
+      provider = "nextcloud";
+
+      # redirectURL = "http://s0:4180/oauth2/callback"; # todo forward with nginx?
+      clientID = "4FfhEB2DNzUh6wWhXTjqQQKu3Ibm6TeYpS8TqcHe55PJC1DorE7vBZBELMKDjJ0X";
+      keyFile = "/run/agenix/oauth2-proxy-env";
+
+      loginURL = "${nextcloudServer}/index.php/apps/oauth2/authorize";
+      redeemURL = "${nextcloudServer}/index.php/apps/oauth2/api/v1/token";
+      validateURL = "${nextcloudServer}/ocs/v2.php/cloud/user?format=json";
+
+      # todo --cookie-refresh
+
+      extraConfig = {
+        # cookie-csrf-per-request = true;
+        # cookie-csrf-expire = "5m";
+        # user-id-claim = "preferred_username";
+      };
+    };
+
+  age.secrets.oauth2-proxy-env.file = ../../../secrets/oauth2-proxy-env.age;
 }

secrets/atticd-credentials.age

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

secrets/digitalocean-dns-credentials.age

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

secrets/secrets.nix

@@ -20,10 +20,7 @@ with roles;
   "robots-email-pw.age".publicKeys = gitea;
 
   # nix binary cache
-  # public key: s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU=
+  "atticd-credentials.age".publicKeys = binary-cache;
-  "binary-cache-private-key.age".publicKeys = binary-cache;
-  # public key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpUZFFL9BpBVqeeU63sFPhR9ewuhEZerTCDIGW1NPSB
-  "binary-cache-push-sshkey.age".publicKeys = nobody; # this value is directly given to gitea
 
   # vpn
   "iodine.age".publicKeys = iodine;
@@ -51,7 +48,4 @@ with roles;
 
   # Librechat
   "librechat-env-file.age".publicKeys = librechat;
-
-  # For ACME DNS Challenge
-  "digitalocean-dns-credentials.age".publicKeys = server;
 }