WIP RPI hotspot fallback gateway

Makefile

@@ -25,8 +25,3 @@ clean-old-nixos-profiles:
 .PHONY: gc
 gc:
 	nix store gc
-
-# Update a flake input by name (ex: 'nixpkgs')
-.PHONY: update-input
-update-input:
-	nix flake update $(filter-out $@,$(MAKECMDGOALS))

README.md

@@ -4,7 +4,7 @@
 - `/common` - common configuration imported into all `/machines`
     - `/boot` - config related to bootloaders, cpu microcode, and unlocking LUKS root disks over tor
     - `/network` - config for tailscale, and NixOS container with automatic vpn tunneling via PIA
-    - `/pc` - config that a graphical PC should have. Have the `personal` role set in the machine's `properties.nix` to enable everthing.
+    - `/pc` - config that a graphical desktop computer should have. Use `de.enable = true;` to enable everthing.
     - `/server` - config that creates new nixos services or extends existing ones to meet my needs
 - `/machines` - all my NixOS machines along with their machine unique configuration for hardware and services
     - `/kexec` - a special machine for generating minimal kexec images. Does not import `/common`

common/binary-cache.nix

@@ -1,6 +1,16 @@
 { config, lib, ... }:
 
+let
+
+in
 {
+  options.enableExtraSubstituters = lib.mkEnableOption "Enable extra substituters";
+
+  config = lib.mkMerge [
+    {
+      enableExtraSubstituters = lib.mkDefault true;
+    }
+    (lib.mkIf config.enableExtraSubstituters {
       nix = {
         settings = {
           substituters = [
@@ -12,13 +22,8 @@
             "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
             "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
           ];
-
-      # Allow substituters to be offline
-      # This isn't exactly ideal since it would be best if I could set up a system
-      # so that it is an error if a derivation isn't available for any substituters
-      # and use this flag as intended for deciding if it should build missing
-      # derivations locally. See https://github.com/NixOS/nix/issues/6901
-      fallback = true;
         };
       };
+    })
+  ];
 }

common/default.nix

@@ -98,7 +98,4 @@
 
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "zuckerberg@neet.dev";
-
-  # Enable Desktop Environment if this is a PC (machine role is "personal")
-  de.enable = lib.mkDefault (config.thisMachine.hasRole."personal");
 }

common/flakes.nix

@@ -13,6 +13,12 @@ in
       extraOptions = ''
         experimental-features = nix-command flakes
       '';
+
+      # pin nixpkgs for system commands such as "nix shell"
+      registry.nixpkgs.flake = config.inputs.nixpkgs;
+
+      # pin system nixpkgs to the same version as the flake input
+      nixPath = [ "nixpkgs=${config.inputs.nixpkgs}" ];
     };
   };
 }

common/machine-info/default.nix

@@ -5,9 +5,20 @@
 
 let
   machines = config.machines.hosts;
+in
+{
+  imports = [
+    ./ssh.nix
+    ./roles.nix
+  ];
 
-  hostOptionsSubmoduleType = lib.types.submodule {
+  options.machines = {
+
+    hosts = lib.mkOption {
+      type = lib.types.attrsOf
+        (lib.types.submodule {
           options = {
+
             hostNames = lib.mkOption {
               type = lib.types.listOf lib.types.str;
               description = ''
@@ -15,18 +26,21 @@ let
                 Used for automatically trusting hosts for ssh connections.
               '';
             };
+
             arch = lib.mkOption {
               type = lib.types.enum [ "x86_64-linux" "aarch64-linux" ];
               description = ''
                 The architecture of this machine.
               '';
             };
+
             systemRoles = lib.mkOption {
               type = lib.types.listOf lib.types.str; # TODO: maybe use an enum?
               description = ''
                 The set of roles this machine holds. Affects secrets available. (TODO add service config as well using this info)
               '';
             };
+
             hostKey = lib.mkOption {
               type = lib.types.str;
               description = ''
@@ -34,6 +48,7 @@ let
                 and for decrypting secrets with agenix.
               '';
             };
+
             remoteUnlock = lib.mkOption {
               default = null;
               type = lib.types.nullOr (lib.types.submodule {
@@ -65,6 +80,7 @@ let
                 };
               });
             };
+
             userKeys = lib.mkOption {
               default = [ ];
               type = lib.types.listOf lib.types.str;
@@ -74,6 +90,7 @@ let
                 TODO: consider auto populating other programs that use ssh keys such as gitea
               '';
             };
+
             deployKeys = lib.mkOption {
               default = [ ];
               type = lib.types.listOf lib.types.str;
@@ -81,30 +98,17 @@ let
                 The list of deployment keys. Each key here can be used to log into all other systems as `root`.
               '';
             };
+
             configurationPath = lib.mkOption {
               type = lib.types.path;
               description = ''
                 The path to this machine's configuration directory.
               '';
             };
-    };
-  };
-in
-{
-  imports = [
-    ./ssh.nix
-    ./roles.nix
-  ];
 
-  options.machines = {
-    hosts = lib.mkOption {
-      type = lib.types.attrsOf hostOptionsSubmoduleType;
           };
+        });
     };
-
-  options.thisMachine.config = lib.mkOption {
-    # For ease of use, a direct copy of the host config from machines.hosts.${hostName}
-    type = hostOptionsSubmoduleType;
   };
 
   config = {
@@ -192,12 +196,5 @@ in
           builtins.map (p: { "${dirName p}" = p; }) propFiles;
       in
       properties ../../machines;
-
-    # Don't try to evaluate "thisMachine" when reflecting using moduleless.nix.
-    # When evaluated by moduleless.nix this will fail due to networking.hostName not
-    # existing. This is because moduleless.nix is not intended for reflection from the
-    # 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};
   };
 }

common/machine-info/roles.nix

@@ -1,55 +1,19 @@
 { config, lib, ... }:
 
-# Maps roles to their hosts.
+# Maps roles to their hosts
-# machines.withRole = {
-#   personal = [
-#     "machine1" "machine3"
-#   ];
-#   cache = [
-#     "machine2"
-#   ];
-# };
-#
-# A list of all possible roles
-# machines.allRoles = [
-#   "personal"
-#   "cache"
-# ];
-#
-# For each role has true or false if the current machine has that role
-# thisMachine.hasRole = {
-#   personal = true;
-#   cache = false;
-# };
 
 {
-  options.machines.withRole = lib.mkOption {
+  options.machines.roles = lib.mkOption {
     type = lib.types.attrsOf (lib.types.listOf lib.types.str);
   };
 
-  options.machines.allRoles = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-  };
-
-  options.thisMachine.hasRole = lib.mkOption {
-    type = lib.types.attrsOf lib.types.bool;
-  };
-
   config = {
-    machines.withRole = lib.zipAttrs
+    machines.roles = lib.zipAttrs
       (lib.mapAttrsToList
         (host: cfg:
           lib.foldl (lib.mergeAttrs) { }
             (builtins.map (role: { ${role} = host; })
               cfg.systemRoles))
         config.machines.hosts);
-
-    machines.allRoles = lib.attrNames config.machines.withRole;
-
-    thisMachine.hasRole = lib.mapAttrs
-      (role: cfg:
-        builtins.elem config.networking.hostName config.machines.withRole.${role}
-      )
-      config.machines.withRole;
   };
 }

common/machine-info/ssh.nix

@@ -39,6 +39,6 @@ in
         builtins.map
           (host: machines.hosts.${host}.hostKey)
           hosts)
-      machines.withRole;
+      machines.roles;
   };
 }

common/network/pia-wireguard.nix

@@ -151,7 +151,7 @@ in
       partOf = [ containerServiceName ];
       wantedBy = [ "multi-user.target" ];
 
-      path = with pkgs; [ wireguard-tools jq curl iproute2 iputils ];
+      path = with pkgs; [ wireguard-tools jq curl iproute iputils ];
 
       serviceConfig = {
         Type = "oneshot";
@@ -224,7 +224,7 @@ in
       after = [ "network.target" "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      path = with pkgs; [ wireguard-tools iproute2 curl jq iptables ];
+      path = with pkgs; [ wireguard-tools iproute curl jq iptables ];
 
       serviceConfig = {
         Type = "oneshot";

common/nix-builder.nix

@@ -1,14 +1,18 @@
 { config, lib, ... }:
 
 let
+  builderRole = "nix-builder";
   builderUserName = "nix-builder";
 
-  builderRole = "nix-builder";
+  machinesByRole = role: lib.filterAttrs (hostname: cfg: builtins.elem role cfg.systemRoles) config.machines.hosts;
-  builders = config.machines.withRole.${builderRole};
+  otherMachinesByRole = role: lib.filterAttrs (hostname: cfg: hostname != config.networking.hostName) (machinesByRole role);
-  thisMachineIsABuilder = config.thisMachine.hasRole.${builderRole};
+  thisMachineHasRole = role: builtins.hasAttr config.networking.hostName (machinesByRole role);
+
+  builders = machinesByRole builderRole;
+  thisMachineIsABuilder = thisMachineHasRole builderRole;
 
   # builders don't include themselves as a remote builder
-  otherBuilders = lib.filter (hostname: hostname != config.networking.hostName) builders;
+  otherBuilders = lib.filterAttrs (hostname: cfg: hostname != config.networking.hostName) builders;
 in
 lib.mkMerge [
   # configure builder
@@ -36,9 +40,9 @@ lib.mkMerge [
     nix.distributedBuilds = true;
 
     nix.buildMachines = builtins.map
-      (builderHostname: {
+      (builderCfg: {
-        hostName = builderHostname;
+        hostName = builtins.elemAt builderCfg.hostNames 0;
-        system = config.machines.hosts.${builderHostname}.arch;
+        system = builderCfg.arch;
         protocol = "ssh-ng";
         sshUser = builderUserName;
         sshKey = "/etc/ssh/ssh_host_ed25519_key";
@@ -46,7 +50,7 @@ lib.mkMerge [
         speedFactor = 10;
         supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
       })
-      otherBuilders;
+      (builtins.attrValues otherBuilders);
 
     # It is very likely that the builder's internet is faster or just as fast
     nix.extraOptions = ''

common/pc/audio.nix

@@ -22,8 +22,8 @@ in
     services.pipewire.extraConfig.pipewire."92-fix-wine-audio" = {
       context.properties = {
         default.clock.rate = 48000;
-        default.clock.quantum = 256;
+        default.clock.quantum = 2048;
-        default.clock.min-quantum = 256;
+        default.clock.min-quantum = 512;
         default.clock.max-quantum = 2048;
       };
     };

common/pc/chromium.nix

@@ -57,7 +57,7 @@ in
     };
     # todo vulkan in chrome
     # todo video encoding in chrome
-    hardware.graphics = {
+    hardware.opengl = {
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver # LIBVA_DRIVER_NAME=iHD

common/pc/default.nix

@@ -6,10 +6,12 @@ in
 {
   imports = [
     ./kde.nix
+    #    ./xfce.nix
     ./yubikey.nix
     ./chromium.nix
     ./firefox.nix
     ./audio.nix
+    #    ./torbrowser.nix
     ./pithos.nix
     ./vscodium.nix
     ./discord.nix
@@ -25,10 +27,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    # vulkan
-      # https://github.com/NixOS/nixpkgs/pull/328086#issuecomment-2235384618
+    hardware.opengl.driSupport = true;
-      gparted
+    hardware.opengl.driSupport32Bit = true;
-    ];
 
     # Applications
     users.users.googlebot.packages = with pkgs; [
@@ -41,6 +42,7 @@ in
       mpv
       nextcloud-client
       signal-desktop
+      gparted
       libreoffice-fresh
       thunderbird
       spotify
@@ -54,8 +56,6 @@ in
 
       # For Nix IDE
       nixpkgs-fmt
-      nixd
-      nil
     ];
 
     # Networking
@@ -92,7 +92,5 @@ in
 
     # Enable wayland support in various chromium based applications
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-    fonts.packages = with pkgs; [ nerd-fonts.symbols-only ];
   };
 }

common/pc/kde.nix

@@ -14,7 +14,7 @@ in
       # akonadi
       # kmail
       # plasma5Packages.kmail-account-wizard
-      kdePackages.kate
+      kate
     ];
   };
 }

common/pc/torbrowser.nix

@@ -0,0 +1,25 @@
+{ lib, config, pkgs, ... }:
+
+let
+  cfg = config.de;
+in
+{
+  config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [
+      (self: super: {
+        tor-browser-bundle-bin = super.tor-browser-bundle-bin.overrideAttrs (old: rec {
+          version = "10.0.10";
+          lang = "en-US";
+          src = pkgs.fetchurl {
+            url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+            sha256 = "vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=";
+          };
+        });
+      })
+    ];
+
+    users.users.googlebot.packages = with pkgs; [
+      tor-browser-bundle-bin
+    ];
+  };
+}

common/pc/touchpad.nix

@@ -1,9 +1,13 @@
 { lib, config, pkgs, ... }:
 
 let
-  cfg = config.de;
+  cfg = config.de.touchpad;
 in
 {
+  options.de.touchpad = {
+    enable = lib.mkEnableOption "enable touchpad";
+  };
+
   config = lib.mkIf cfg.enable {
     services.libinput.enable = true;
     services.libinput.touchpad.naturalScrolling = true;

common/pc/vscodium.nix

@@ -13,7 +13,6 @@ let
     ms-vscode.cpptools
     rust-lang.rust-analyzer
     vadimcn.vscode-lldb
-    tauri-apps.tauri-vscode
   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
     {
       name = "platformio-ide";
@@ -27,12 +26,6 @@ let
       version = "0.8.1";
       sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y=";
     }
-    {
-      name = "volar";
-      publisher = "Vue";
-      version = "2.2.4";
-      sha256 = "FHS/LNjSUVfCb4SVF9naR4W0JqycWzSWiK54jfbRagA=";
-    }
   ];
 
   vscodium-with-extensions = pkgs.vscode-with-extensions.override {

common/pc/xfce.nix

@@ -0,0 +1,23 @@
+{ lib, config, pkgs, ... }:
+
+let
+  cfg = config.de;
+in
+{
+  config = lib.mkIf cfg.enable {
+    services.xserver = {
+      enable = true;
+      desktopManager = {
+        xterm.enable = false;
+        xfce.enable = true;
+      };
+      displayManager.sddm.enable = true;
+    };
+
+    # xfce apps
+    # TODO for some reason whiskermenu needs to be global for it to work
+    environment.systemPackages = with pkgs; [
+      xfce.xfce4-whiskermenu-plugin
+    ];
+  };
+}

common/server/actualbudget.nix

@@ -1,16 +1,87 @@
+# Starting point:
+# https://github.com/aldoborrero/mynixpkgs/commit/c501c1e32dba8f4462dcecb57eee4b9e52038e27
+
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.services.actual;
+  cfg = config.services.actual-server;
+  stateDir = "/var/lib/${cfg.stateDirName}";
 in
 {
-  config = lib.mkIf cfg.enable {
+  options.services.actual-server = {
-    services.actual.settings = {
+    enable = lib.mkEnableOption "Actual Server";
-      port = 25448;
+
+    hostname = lib.mkOption {
+      type = lib.types.str;
+      default = "localhost";
+      description = "Hostname for the Actual Server.";
     };
 
-    backup.group."actual-budget".paths = [
+    port = lib.mkOption {
-      "/var/lib/actual"
+      type = lib.types.int;
-    ];
+      default = 25448;
+      description = "Port on which the Actual Server should listen.";
+    };
+
+    stateDirName = lib.mkOption {
+      type = lib.types.str;
+      default = "actual-server";
+      description = "Name of the directory under /var/lib holding the server's data.";
+    };
+
+    upload = {
+      fileSizeSyncLimitMB = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
+        default = null;
+        description = "File size limit in MB for synchronized files.";
+      };
+
+      syncEncryptedFileSizeLimitMB = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
+        default = null;
+        description = "File size limit in MB for synchronized encrypted files.";
+      };
+
+      fileSizeLimitMB = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
+        default = null;
+        description = "File size limit in MB for file uploads.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.actual-server = {
+      description = "Actual Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.actual-server}/bin/actual-server";
+        Restart = "always";
+        StateDirectory = cfg.stateDirName;
+        WorkingDirectory = stateDir;
+        DynamicUser = true;
+        UMask = "0007";
+      };
+      environment = {
+        NODE_ENV = "production";
+        ACTUAL_PORT = toString cfg.port;
+
+        # Actual is actually very bad at configuring it's own paths despite that information being readily available
+        ACTUAL_USER_FILES = "${stateDir}/user-files";
+        ACTUAL_SERVER_FILES = "${stateDir}/server-files";
+        ACTUAL_DATA_DIR = stateDir;
+
+        ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeSyncLimitMB or "");
+        ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SIZE_LIMIT_MB = toString (cfg.upload.syncEncryptedFileSizeLimitMB or "");
+        ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB = toString (cfg.upload.fileSizeLimitMB or "");
+      };
+    };
+
+    services.nginx.virtualHosts.${cfg.hostname} = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/".proxyPass = "http://localhost:${toString cfg.port}";
+    };
   };
 }

common/server/dashy.nix

@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.dashy;
+in
+{
+  options.services.dashy = {
+    enable = mkEnableOption "dashy";
+    imageTag = mkOption {
+      type = types.str;
+      default = "latest";
+    };
+    port = mkOption {
+      type = types.int;
+      default = 56815;
+    };
+    configFile = lib.mkOption {
+      type = lib.types.path;
+      description = "Path to the YAML configuration file";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    virtualisation.oci-containers.containers = {
+      dashy = {
+        image = "lissy93/dashy:${cfg.imageTag}";
+        environment = {
+          TZ = "${config.time.timeZone}";
+        };
+        ports = [
+          "127.0.0.1:${toString cfg.port}:80"
+        ];
+        volumes = [
+          "${cfg.configFile}:/app/public/conf.yml"
+        ];
+      };
+    };
+  };
+}

common/server/default.nix

@@ -10,6 +10,8 @@
     ./matrix.nix
     ./zerobin.nix
     ./gitea.nix
+    ./privatebin/privatebin.nix
+    ./radio.nix
     ./samba.nix
     ./owncast.nix
     ./mailserver.nix
@@ -17,6 +19,7 @@
     ./iodine.nix
     ./searx.nix
     ./gitea-actions-runner.nix
+    ./dashy.nix
     ./librechat.nix
     ./actualbudget.nix
     ./unifi.nix

common/server/gitea-actions-runner.nix

@@ -9,7 +9,10 @@
 # TODO: skipping running inside of nixos container for now because of issues getting docker/podman running
 
 let
-  thisMachineIsARunner = config.thisMachine.hasRole."gitea-actions-runner";
+  runnerRole = "gitea-actions-runner";
+  runners = config.machines.roles.${runnerRole};
+  thisMachineIsARunner = builtins.elem config.networking.hostName runners;
+
   containerName = "gitea-runner";
 in
 {

common/server/gitea.nix

@@ -24,7 +24,7 @@ in
           SHOW_FOOTER_VERSION = false;
         };
         ui = {
-          DEFAULT_THEME = "gitea-dark";
+          DEFAULT_THEME = "arc-green";
         };
         service = {
           DISABLE_REGISTRATION = true;

common/server/librechat.nix

@@ -21,17 +21,11 @@ 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.6.6";
         environment = {
           HOST = "0.0.0.0";
           MONGO_URI = "mongodb://host.containers.internal:27017/LibreChat";
           ENDPOINTS = "openAI,google,bingAI,gptPlugins";
-          OPENAI_MODELS = lib.concatStringsSep "," [
-            "gpt-4o-mini"
-            "o3-mini"
-            "gpt-4o"
-            "o1"
-          ];
           REFRESH_TOKEN_EXPIRY = toString (1000 * 60 * 60 * 24 * 30); # 30 days
         };
         environmentFiles = [

common/server/mailserver.nix

@@ -28,6 +28,7 @@ in
       indexDir = "/var/lib/mailindex";
       enableManageSieve = true;
       fullTextSearch.enable = true;
+      fullTextSearch.indexAttachments = true;
       fullTextSearch.memoryLimit = 500;
       inherit domains;
       loginAccounts = {

common/server/nextcloud.nix

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

common/server/privatebin/conf.php

@@ -0,0 +1,42 @@
+;<?php http_response_code(403); /*
+[main]
+name = "Kode Paste"
+discussion = false
+opendiscussion = false
+password = true
+fileupload = false
+burnafterreadingselected = false
+defaultformatter = "plaintext"
+sizelimit = 10485760
+template = "bootstrap"
+languageselection = false
+
+[expire]
+default = "1week"
+
+[expire_options]
+5min = 300
+10min = 600
+1hour = 3600
+1day = 86400
+1week = 604800
+
+[formatter_options]
+plaintext = "Plain Text"
+syntaxhighlighting = "Source Code"
+markdown = "Markdown"
+
+[traffic]
+limit = 10
+dir = "/var/lib/privatebin"
+
+[purge]
+limit = 300
+batchsize = 10
+dir = "/var/lib/privatebin"
+
+[model]
+class = Filesystem
+
+[model_options]
+dir = "/var/lib/privatebin"

common/server/privatebin/privatebin.nix

@@ -0,0 +1,74 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.privatebin;
+  privateBinSrc = pkgs.stdenv.mkDerivation {
+    name = "privatebin";
+    src = pkgs.fetchFromGitHub {
+      owner = "privatebin";
+      repo = "privatebin";
+      rev = "d65bf02d7819a530c3c2a88f6f9947651fe5258d";
+      sha256 = "7ttAvEDL1ab0cUZcqZzXFkXwB2rF2t4eNpPxt48ap94=";
+    };
+    installPhase = ''
+      cp -ar $src $out
+    '';
+  };
+in
+{
+  options.services.privatebin = {
+    enable = lib.mkEnableOption "enable privatebin";
+    host = lib.mkOption {
+      type = lib.types.str;
+      example = "example.com";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    users.users.privatebin = {
+      description = "privatebin service user";
+      group = "privatebin";
+      isSystemUser = true;
+    };
+    users.groups.privatebin = { };
+
+    services.nginx.enable = true;
+    services.nginx.virtualHosts.${cfg.host} = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        root = privateBinSrc;
+        index = "index.php";
+      };
+      locations."~ \.php$" = {
+        root = privateBinSrc;
+        extraConfig = ''
+          fastcgi_pass  unix:${config.services.phpfpm.pools.privatebin.socket};
+          fastcgi_index index.php;
+        '';
+      };
+    };
+
+    systemd.tmpfiles.rules = [
+      "d '/var/lib/privatebin' 0750 privatebin privatebin - -"
+    ];
+
+    services.phpfpm.pools.privatebin = {
+      user = "privatebin";
+      group = "privatebin";
+      phpEnv = {
+        CONFIG_PATH = "${./conf.php}";
+      };
+      settings = {
+        pm = "dynamic";
+        "listen.owner" = config.services.nginx.user;
+        "pm.max_children" = 5;
+        "pm.start_servers" = 2;
+        "pm.min_spare_servers" = 1;
+        "pm.max_spare_servers" = 3;
+        "pm.max_requests" = 500;
+      };
+    };
+  };
+}

common/server/radio.nix

@@ -0,0 +1,75 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.radio;
+  radioPackage = config.inputs.radio.packages.${config.currentSystem}.radio;
+in
+{
+  options.services.radio = {
+    enable = lib.mkEnableOption "enable radio";
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "radio";
+      description = ''
+        The user radio should run as
+      '';
+    };
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "radio";
+      description = ''
+        The group radio should run as
+      '';
+    };
+    dataDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/radio";
+      description = ''
+        Path to the radio data directory
+      '';
+    };
+    host = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        Domain radio is hosted on
+      '';
+    };
+    nginx = lib.mkEnableOption "enable nginx";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.icecast = {
+      enable = true;
+      hostname = cfg.host;
+      mount = "stream.mp3";
+      fallback = "fallback.mp3";
+    };
+
+    services.nginx.virtualHosts.${cfg.host} = lib.mkIf cfg.nginx {
+      enableACME = true;
+      forceSSL = true;
+      locations."/".root = config.inputs.radio-web;
+    };
+
+    users.users.${cfg.user} = {
+      isSystemUser = true;
+      group = cfg.group;
+      home = cfg.dataDir;
+      createHome = true;
+    };
+    users.groups.${cfg.group} = { };
+    systemd.services.radio = {
+      enable = true;
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${radioPackage}/bin/radio ${config.services.icecast.listen.address}:${toString config.services.icecast.listen.port} ${config.services.icecast.mount} 5500";
+      serviceConfig.User = cfg.user;
+      serviceConfig.Group = cfg.group;
+      serviceConfig.WorkingDirectory = cfg.dataDir;
+      preStart = ''
+        mkdir -p ${cfg.dataDir}
+        chown ${cfg.user} ${cfg.dataDir}
+      '';
+    };
+  };
+}

common/server/samba.nix

@@ -5,28 +5,30 @@
     services.samba = {
       openFirewall = true;
       package = pkgs.sambaFull; # printer sharing
+      securityType = "user";
 
       # should this be on?
       nsswins = true;
 
-      settings = {
+      extraConfig = ''
-        global = {
+        workgroup = HOME
-          security = "user";
+        server string = smbnix
-          workgroup = "HOME";
+        netbios name = smbnix
-          "server string" = "smbnix";
+        security = user 
-          "netbios name" = "smbnix";
+        use sendfile = yes
-          "use sendfile" = "yes";
+        min protocol = smb2
-          "min protocol" = "smb2";
+        guest account = nobody
-          "guest account" = "nobody";
+        map to guest = bad user
-          "map to guest" = "bad user";
 
         # printing
-          "load printers" = "yes";
+        load printers = yes
-          printing = "cups";
+        printing = cups
-          "printcap name" = "cups";
+        printcap name = cups
 
-          "hide files" = "/.nobackup/.DS_Store/._.DS_Store/";
+        hide files = /.nobackup/.DS_Store/._.DS_Store/
-        };
+      '';
+
+      shares = {
         public = {
           path = "/data/samba/Public";
           browseable = "yes";
@@ -75,9 +77,9 @@
 
     # backups
     backup.group."samba".paths = [
-      config.services.samba.settings.googlebot.path
+      config.services.samba.shares.googlebot.path
-      config.services.samba.settings.cris.path
+      config.services.samba.shares.cris.path
-      config.services.samba.settings.public.path
+      config.services.samba.shares.public.path
     ];
 
     # Windows discovery of samba server

common/server/unifi.nix

@@ -10,8 +10,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.unifi.unifiPackage = pkgs.unifi;
+    services.unifi.unifiPackage = pkgs.unifi8;
-    services.unifi.mongodbPackage = pkgs.mongodb-7_0;
 
     networking.firewall = lib.mkIf cfg.openMinimalFirewall {
       allowedUDPPorts = [

common/shell.nix

@@ -21,6 +21,8 @@
     shellInit = ''
       # disable annoying fish shell greeting
       set fish_greeting
+
+      alias sudo="doas"
     '';
   };
 
@@ -34,13 +36,6 @@
     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 = [

flake.lock

@@ -3,9 +3,7 @@
     "agenix": {
       "inputs": {
         "darwin": "darwin",
-        "home-manager": [
+        "home-manager": "home-manager",
-          "home-manager"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -14,11 +12,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750173260,
+        "lastModified": 1723293904,
-        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
         "type": "github"
       },
       "original": {
@@ -53,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739947126,
+        "lastModified": 1651719222,
-        "narHash": "sha256-JoiddH5H9up8jC/VKU8M7wDlk/bstKoJ3rHj+TkW4Zo=",
+        "narHash": "sha256-p/GY5vOP+HUlxNL4OtEhmBNEVQsedOHXEmjfCGONVmE=",
         "ref": "refs/heads/master",
-        "rev": "ea1ad60f1c6662103ef4a3705d8e15aa01219529",
+        "rev": "1290ddd9a2ff2bf2d0f702750768312b80efcd34",
-        "revCount": 20,
+        "revCount": 19,
         "type": "git",
         "url": "https://git.neet.dev/zuckerberg/dailybot.git"
       },
@@ -74,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
+        "lastModified": 1700795494,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -101,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749105467,
+        "lastModified": 1727447169,
-        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
         "type": "github"
       },
       "original": {
@@ -117,11 +115,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1696426674,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -137,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1726560853,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -150,71 +148,23 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "simple-nixos-mailserver",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "simple-nixos-mailserver",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "simple-nixos-mailserver",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
+          "agenix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1752208517,
+        "lastModified": 1703113217,
-        "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=",
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c6a01e54af81b381695db796a43360bf6db5702f",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -226,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752346111,
+        "lastModified": 1728263287,
-        "narHash": "sha256-SVxCIYnbED0rNYSpm3QQoOhqxYRp1GuE9FkyM5Y2afs=",
+        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "deff7a9a0aa98a08d8c7839fe2658199ce9828f8",
+        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
         "type": "github"
       },
       "original": {
@@ -241,11 +191,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1752048960,
+        "lastModified": 1728056216,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+        "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+        "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
         "type": "github"
       },
       "original": {
@@ -257,20 +207,77 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752431364,
+        "lastModified": 1728193676,
-        "narHash": "sha256-ciGIXIMq2daX5o4Tn6pnZTd1pf5FICHbqUlHu658G9c=",
+        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb0f0dbfd95f0e19fdeab8e0f18bf0b5cf057b68",
+        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-25.05",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-frigate": {
+      "locked": {
+        "lastModified": 1695825837,
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "github"
+      }
+    },
+    "radio": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1631585589,
+        "narHash": "sha256-q4o/4/2pEuJyaKZwNQC5KHnzG1obClzFB7zWk9XSDfY=",
+        "ref": "main",
+        "rev": "5bf607fed977d41a269942a7d1e92f3e6d4f2473",
+        "revCount": 38,
+        "type": "git",
+        "url": "https://git.neet.dev/zuckerberg/radio.git"
+      },
+      "original": {
+        "ref": "main",
+        "rev": "5bf607fed977d41a269942a7d1e92f3e6d4f2473",
+        "type": "git",
+        "url": "https://git.neet.dev/zuckerberg/radio.git"
+      }
+    },
+    "radio-web": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1652121792,
+        "narHash": "sha256-j1Y9MAjUVNgyFSeGzPoqibAnEysJDjZSXukVfQ7+bsQ=",
+        "ref": "refs/heads/master",
+        "rev": "72e7a9e80b780c84ed8d4a6374bfbb242701f900",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.neet.dev/zuckerberg/radio-web.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.neet.dev/zuckerberg/radio-web.git"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -278,10 +285,12 @@
         "deploy-rs": "deploy-rs",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-frigate": "nixpkgs-frigate",
+        "radio": "radio",
+        "radio-web": "radio-web",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "systems": "systems"
       }
@@ -292,25 +301,24 @@
         "flake-compat": [
           "flake-compat"
         ],
-        "git-hooks": "git-hooks",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-25_05": [
+        "nixpkgs-24_05": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1747965231,
+        "lastModified": 1722877200,
-        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "53007af63fade28853408370c4c600a63dd97f41",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-25.05",
+        "ref": "master",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }

flake.nix

@@ -1,7 +1,8 @@
 {
   inputs = {
     # nixpkgs
-    nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e";
 
     # Common Utils Among flake inputs
     systems.url = "github:nix-systems/default";
@@ -17,18 +18,12 @@
     # NixOS hardware
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    # Home Manager
-    home-manager = {
-      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/nixos-25.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        nixpkgs-25_05.follows = "nixpkgs";
+        nixpkgs-24_05.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
       };
     };
@@ -39,10 +34,22 @@
       inputs = {
         nixpkgs.follows = "nixpkgs";
         systems.follows = "systems";
-        home-manager.follows = "home-manager";
       };
     };
 
+    # Radio
+    radio = {
+      url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+    radio-web = {
+      url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
+      flake = false;
+    };
+
     # Dailybot
     dailybuild_modules = {
       url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
@@ -71,7 +78,7 @@
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
-      machineHosts = (import ./common/machine-info/moduleless.nix
+      machines = (import ./common/machine-info/moduleless.nix
         {
           inherit nixpkgs;
           assertionsModule = "${nixpkgs}/nixos/modules/misc/assertions.nix";
@@ -86,7 +93,6 @@
             agenix.nixosModules.default
             dailybuild_modules.nixosModule
             nix-index-database.nixosModules.nix-index
-            home-manager.nixosModules.home-manager
             self.nixosModules.kernel-modules
             ({ lib, ... }: {
               config = {
@@ -97,10 +103,6 @@
                 ];
 
                 networking.hostName = hostname;
-
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.googlebot = import ./home/googlebot.nix;
               };
 
               # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
@@ -118,8 +120,7 @@
                 name = "nixpkgs-patched";
                 src = nixpkgs;
                 patches = [
-                  # ./patches/gamepadui.patch
+                  ./patches/gamepadui.patch
-                  ./patches/dont-break-nix-serve.patch
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
@@ -139,7 +140,7 @@
         nixpkgs.lib.mapAttrs
           (hostname: cfg:
             mkSystem cfg.arch nixpkgs cfg.configurationPath hostname)
-          machineHosts;
+          machines;
 
       packages =
         let
@@ -176,7 +177,7 @@
         nixpkgs.lib.mapAttrs
           (hostname: cfg:
             mkDeploy hostname cfg.arch (builtins.head cfg.hostNames))
-          machineHosts;
+          machines;
 
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
 

home/googlebot.nix

@@ -1,112 +0,0 @@
-{ config, lib, pkgs, osConfig, ... }:
-
-let
-  # Check if the current machine has the role "personal"
-  thisMachineIsPersonal = osConfig.thisMachine.hasRole."personal";
-in
-{
-  home.username = "googlebot";
-  home.homeDirectory = "/home/googlebot";
-
-  home.stateVersion = "24.11";
-  programs.home-manager.enable = true;
-
-  services.ssh-agent.enable = true;
-
-  # System Monitoring
-  programs.btop.enable = true;
-  programs.bottom.enable = true;
-
-  # Modern "ls" replacement
-  programs.pls.enable = true;
-  programs.eza.enable = true;
-
-  # Graphical terminal
-  programs.ghostty.enable = thisMachineIsPersonal;
-
-  # Advanced terminal file explorer
-  programs.broot.enable = true;
-
-  # Shell promt theming
-  programs.fish.enable = true;
-  programs.starship.enable = true;
-  programs.starship.enableFishIntegration = true;
-  programs.starship.enableInteractive = true;
-  # programs.oh-my-posh.enable = true;
-  # programs.oh-my-posh.enableFishIntegration = true;
-
-  # Advanced search
-  programs.ripgrep.enable = true;
-
-  # tldr: Simplified, example based and community-driven man pages.
-  programs.tealdeer.enable = true;
-
-  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/kexec.nix

@@ -29,10 +29,10 @@
       text = ''
         #!${pkgs.stdenv.shell}
         set -e
-        ${pkgs.kexec-tools}/bin/kexec -l ${image}/kernel --initrd=${image}/initrd --append="init=${builtins.unsafeDiscardStringContext config.system.build.toplevel}/init ${toString config.boot.kernelParams}"
+        ${pkgs.kexectools}/bin/kexec -l ${image}/kernel --initrd=${image}/initrd --append="init=${builtins.unsafeDiscardStringContext config.system.build.toplevel}/init ${toString config.boot.kernelParams}"
         sync
         echo "executing kernel, filesystems will be improperly umounted"
-        ${pkgs.kexec-tools}/bin/kexec -e
+        ${pkgs.kexectools}/bin/kexec -e
       '';
     };
     kexec_tarball = pkgs.callPackage (modulesPath + "/../lib/make-system-tarball.nix") {

machines/hotspot/default.nix

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

machines/hotspot/hardware-configuration.nix

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

machines/hotspot/properties.nix

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

machines/howl/default.nix

@@ -8,5 +8,6 @@
   # don't use remote builders
   nix.distributedBuilds = lib.mkForce false;
 
-  nix.gc.automatic = lib.mkForce false;
+  de.enable = true;
+  de.touchpad.enable = true;
 }

machines/howl/hardware-configuration.nix

@@ -6,7 +6,7 @@
     nixos-hardware.nixosModules.framework-13-7040-amd
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_6_14;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   hardware.framework.amd-7040.preventWakeOnAC = true;
   services.fwupd.enable = true;
@@ -30,22 +30,22 @@
   # disks
   remoteLuksUnlock.enable = true;
   boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/2e4a6960-a6b1-40ee-9c2c-2766eb718d52";
+    device = "/dev/disk/by-uuid/c801586b-f0a2-465c-8dae-532e61b83fee";
     allowDiscards = true;
   };
   fileSystems."/" =
     {
-      device = "/dev/disk/by-uuid/1f62386c-3243-49f5-b72f-df8fc8f39db8";
+      device = "/dev/disk/by-uuid/95db6950-a7bc-46cf-9765-3ea675ccf014";
       fsType = "btrfs";
     };
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/F4D9-C5E8";
+      device = "/dev/disk/by-uuid/B087-2C20";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/5f65cb11-2649-48fe-9c78-3e325b857c53"; }];
+    [{ device = "/dev/disk/by-uuid/49fbdf62-eef4-421b-aac3-c93494afd23c"; }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

machines/nat/configuration.nix

@@ -9,4 +9,7 @@
 
   networking.hostName = "nat";
   networking.interfaces.ens160.useDHCP = true;
+
+  de.enable = true;
+  de.touchpad.enable = true;
 }

machines/ponyo/default.nix

@@ -10,8 +10,6 @@
   # p2p mesh network
   services.tailscale.exitNode = true;
 
-  services.iperf3.enable = true;
-
   # email server
   mailserver.enable = true;
 
@@ -56,6 +54,44 @@
     config.services.drastikbot.dataDir
   ];
 
+  # music radio
+  vpn-container.enable = true;
+  vpn-container.config = {
+    services.radio = {
+      enable = true;
+      host = "radio.runyan.org";
+    };
+  };
+  pia.wireguard.badPortForwardPorts = [ ];
+  services.nginx.virtualHosts = {
+    "radio.runyan.org" = {
+      enableACME = true;
+      forceSSL = true;
+      locations = {
+        "/stream.mp3" = {
+          proxyPass = "http://vpn.containers:8001/stream.mp3";
+          extraConfig = ''
+            add_header Access-Control-Allow-Origin *;
+          '';
+        };
+        "/".root = config.inputs.radio-web;
+      };
+    };
+    "radio.neet.space" = {
+      enableACME = true;
+      forceSSL = true;
+      locations = {
+        "/stream.mp3" = {
+          proxyPass = "http://vpn.containers:8001/stream.mp3";
+          extraConfig = ''
+            add_header Access-Control-Allow-Origin *;
+          '';
+        };
+        "/".root = config.inputs.radio-web;
+      };
+    };
+  };
+
   # matrix home server
   services.matrix = {
     enable = true;
@@ -111,4 +147,7 @@
   # librechat
   services.librechat.enable = true;
   services.librechat.host = "chat.neet.dev";
+
+  services.actual-server.enable = true;
+  services.actual-server.hostname = "actual.runyan.org";
 }

machines/storage/s0/dashy.nix

@@ -1,297 +0,0 @@
-{
-  appConfig = {
-    theme = "vaporware";
-    customColors = {
-      "material-dark-original" = {
-        primary = "#f36558";
-        background = "#39434C";
-        "background-darker" = "#eb615c";
-        "material-light" = "#f36558";
-        "item-text-color" = "#ff948a";
-        "curve-factor" = "5px";
-      };
-    };
-    enableErrorReporting = false;
-    layout = "auto";
-    iconSize = "large";
-    language = "en";
-    startingView = "default";
-    defaultOpeningMethod = "sametab";
-    statusCheck = true;
-    statusCheckInterval = 20;
-    faviconApi = "faviconkit";
-    routingMode = "history";
-    enableMultiTasking = false;
-    webSearch = {
-      disableWebSearch = false;
-      searchEngine = "duckduckgo";
-      openingMethod = "sametab";
-      searchBangs = { };
-    };
-    enableFontAwesome = true;
-    cssThemes = [ ];
-    externalStyleSheet = [ ];
-    hideComponents = {
-      hideHeading = false;
-      hideNav = false;
-      hideSearch = false;
-      hideSettings = false;
-      hideFooter = false;
-      hideSplashScreen = false;
-    };
-    auth = {
-      enableGuestAccess = false;
-      users = [ ];
-      enableKeycloak = false;
-      keycloak = { };
-    };
-    allowConfigEdit = true;
-    enableServiceWorker = false;
-    disableContextMenu = false;
-    disableUpdateChecks = false;
-    disableSmartSort = false;
-  };
-
-  pageInfo = {
-    title = "s0";
-    description = "s0";
-  };
-
-  sections = [
-    (
-      let
-        # Define the media section items once.
-        mediaItems = {
-          jellyfin = {
-            title = "Jellyfin";
-            icon = "hl-jellyfin";
-            url = "https://jellyfin.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "0_1956_jellyfin";
-          };
-          sonarr = {
-            title = "Sonarr";
-            description = "Manage TV";
-            icon = "hl-sonarr";
-            url = "https://sonarr.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "1_1956_sonarr";
-          };
-          radarr = {
-            title = "Radarr";
-            description = "Manage Movies";
-            icon = "hl-radarr";
-            url = "https://radarr.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "2_1956_radarr";
-          };
-          lidarr = {
-            title = "Lidarr";
-            description = "Manage Music";
-            icon = "hl-lidarr";
-            url = "https://lidarr.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "3_1956_lidarr";
-          };
-          prowlarr = {
-            title = "Prowlarr";
-            description = "Indexers";
-            icon = "hl-prowlarr";
-            url = "https://prowlarr.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "4_1956_prowlarr";
-          };
-          bazarr = {
-            title = "Bazarr";
-            description = "Subtitles";
-            icon = "hl-bazarr";
-            url = "https://bazarr.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "5_1956_bazarr";
-          };
-          navidrome = {
-            title = "Navidrome";
-            description = "Play Music";
-            icon = "hl-navidrome";
-            url = "https://music.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "6_1956_navidrome";
-          };
-          transmission = {
-            title = "Transmission";
-            description = "Torrenting";
-            icon = "hl-transmission";
-            url = "https://transmission.s0.neet.dev";
-            target = "sametab";
-            statusCheck = false;
-            id = "7_1956_transmission";
-          };
-        };
-        # Build the list once.
-        mediaList = [
-          mediaItems.jellyfin
-          mediaItems.sonarr
-          mediaItems.radarr
-          mediaItems.lidarr
-          mediaItems.prowlarr
-          mediaItems.bazarr
-          mediaItems.navidrome
-          mediaItems.transmission
-        ];
-      in
-      {
-        name = "Media & Entertainment";
-        icon = "fas fa-photo-video";
-        displayData = {
-          sortBy = "most-used";
-          cols = 1;
-          rows = 1;
-          collapsed = false;
-          hideForGuests = false;
-        };
-        items = mediaList;
-        filteredItems = mediaList;
-      }
-    )
-    (
-      let
-        networkItems = {
-          gateway = {
-            title = "Gateway";
-            description = "openwrt";
-            icon = "hl-openwrt";
-            url = "http://openwrt.lan/";
-            target = "sametab";
-            statusCheck = true;
-            id = "0_746_gateway";
-          };
-          wireless = {
-            title = "Wireless";
-            description = "openwrt (ish)";
-            icon = "hl-openwrt";
-            url = "http://PacketProvocateur.lan";
-            target = "sametab";
-            statusCheck = true;
-            id = "1_746_wireless";
-          };
-        };
-        networkList = [
-          networkItems.gateway
-          networkItems.wireless
-        ];
-      in
-      {
-        name = "Network";
-        icon = "fas fa-network-wired";
-        items = networkList;
-        filteredItems = networkList;
-        displayData = {
-          sortBy = "default";
-          rows = 1;
-          cols = 1;
-          collapsed = false;
-          hideForGuests = false;
-        };
-      }
-    )
-
-    (
-      let
-        servicesItems = {
-          matrix = {
-            title = "Matrix";
-            description = "";
-            icon = "hl-matrix";
-            url = "https://chat.neet.space";
-            target = "sametab";
-            statusCheck = true;
-            id = "0_836_matrix";
-          };
-          mumble = {
-            title = "Mumble";
-            description = "voice.neet.space";
-            icon = "hl-mumble";
-            url = "https://voice.neet.space";
-            target = "sametab";
-            statusCheck = false;
-            id = "2_836_mumble";
-          };
-          irc = {
-            title = "IRC";
-            description = "irc.neet.dev";
-            icon = "hl-thelounge";
-            url = "https://irc.neet.dev";
-            target = "sametab";
-            statusCheck = true;
-            id = "3_836_irc";
-          };
-          git = {
-            title = "Git";
-            description = "git.neet.dev";
-            icon = "hl-gitea";
-            url = "https://git.neet.dev";
-            target = "sametab";
-            statusCheck = true;
-            id = "4_836_git";
-          };
-          nextcloud = {
-            title = "Nextcloud";
-            description = "neet.cloud";
-            icon = "hl-nextcloud";
-            url = "https://neet.cloud";
-            target = "sametab";
-            statusCheck = true;
-            id = "5_836_nextcloud";
-          };
-          roundcube = {
-            title = "Roundcube";
-            description = "mail.neet.dev";
-            icon = "hl-roundcube";
-            url = "https://mail.neet.dev";
-            target = "sametab";
-            statusCheck = true;
-            id = "6_836_roundcube";
-          };
-          jitsimeet = {
-            title = "Jitsi Meet";
-            description = "meet.neet.space";
-            icon = "hl-jitsimeet";
-            url = "https://meet.neet.space";
-            target = "sametab";
-            statusCheck = true;
-            id = "7_836_jitsimeet";
-          };
-        };
-        servicesList = [
-          servicesItems.matrix
-          servicesItems.mumble
-          servicesItems.irc
-          servicesItems.git
-          servicesItems.nextcloud
-          servicesItems.roundcube
-          servicesItems.jitsimeet
-        ];
-      in
-      {
-        name = "Services";
-        icon = "fas fa-monitor-heart-rate";
-        items = servicesList;
-        filteredItems = servicesList;
-        displayData = {
-          sortBy = "default";
-          rows = 1;
-          cols = 1;
-          collapsed = false;
-          hideForGuests = false;
-        };
-      }
-    )
-  ];
-}

machines/storage/s0/dashy.yaml

@@ -0,0 +1,241 @@
+appConfig:
+  theme: vaporware
+  customColors:
+    material-dark-original:
+      primary: '#f36558'
+      background: '#39434C'
+      background-darker: '#eb615c'
+      material-light: '#f36558'
+      item-text-color: '#ff948a'
+      curve-factor: 5px
+  enableErrorReporting: false
+  layout: auto
+  iconSize: large
+  language: en
+  startingView: default
+  defaultOpeningMethod: sametab
+  statusCheck: true
+  statusCheckInterval: 20
+  faviconApi: faviconkit
+  routingMode: history
+  enableMultiTasking: false
+  webSearch:
+    disableWebSearch: false
+    searchEngine: duckduckgo
+    openingMethod: sametab
+    searchBangs: {}
+  enableFontAwesome: true
+  cssThemes: []
+  externalStyleSheet: []
+  hideComponents:
+    hideHeading: false
+    hideNav: false
+    hideSearch: false
+    hideSettings: false
+    hideFooter: false
+    hideSplashScreen: false
+  auth:
+    enableGuestAccess: false
+    users: []
+    enableKeycloak: false
+    keycloak: {}
+  allowConfigEdit: true
+  enableServiceWorker: false
+  disableContextMenu: false
+  disableUpdateChecks: false
+  disableSmartSort: false
+pageInfo:
+  title: s0
+  description: s0
+sections:
+  - name: Media & Entertainment
+    icon: fas fa-photo-video
+    displayData:
+      sortBy: most-used
+      cols: 1
+      rows: 1
+      collapsed: false
+      hideForGuests: false
+    items:
+      - &ref_0
+        title: Jellyfin
+        icon: hl-jellyfin
+        url: https://jellyfin.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 0_1956_jellyfin
+      - &ref_1
+        title: Sonarr
+        description: Manage TV
+        icon: hl-sonarr
+        url: https://sonarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 1_1956_sonarr
+      - &ref_2
+        title: Radarr
+        description: Manage Movies
+        icon: hl-radarr
+        url: https://radarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 2_1956_radarr
+      - &ref_3
+        title: Lidarr
+        description: Manage Music
+        icon: hl-lidarr
+        url: https://lidarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 3_1956_lidarr
+      - &ref_4
+        title: Prowlarr
+        description: Indexers
+        icon: hl-prowlarr
+        url: https://prowlarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 4_1956_prowlarr
+      - &ref_5
+        title: Bazarr
+        description: Subtitles
+        icon: hl-bazarr
+        url: https://bazarr.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 5_1956_bazarr
+      - &ref_6
+        title: Navidrome
+        description: Play Music
+        icon: hl-navidrome
+        url: https://music.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 6_1956_navidrome
+      - &ref_7
+        title: Transmission
+        description: Torrenting
+        icon: hl-transmission
+        url: https://transmission.s0.neet.dev
+        target: sametab
+        statusCheck: false
+        id: 7_1956_transmission
+    filteredItems:
+      - *ref_0
+      - *ref_1
+      - *ref_2
+      - *ref_3
+      - *ref_4
+      - *ref_5
+      - *ref_6
+      - *ref_7
+  - name: Network
+    icon: fas fa-network-wired
+    items:
+      - &ref_8
+        title: Gateway
+        description: openwrt
+        icon: hl-openwrt
+        url: http://openwrt.lan/
+        target: sametab
+        statusCheck: true
+        id: 0_746_gateway
+      - &ref_9
+        title: Wireless
+        description: openwrt (ish)
+        icon: hl-openwrt
+        url: http://PacketProvocateur.lan
+        target: sametab
+        statusCheck: true
+        id: 1_746_wireless
+    filteredItems:
+      - *ref_8
+      - *ref_9
+    displayData:
+      sortBy: default
+      rows: 1
+      cols: 1
+      collapsed: false
+      hideForGuests: false
+  - name: Services
+    icon: fas fa-monitor-heart-rate
+    items:
+      - &ref_10
+        title: Matrix
+        description: ''
+        icon: hl-matrix
+        url: https://chat.neet.space
+        target: sametab
+        statusCheck: true
+        id: 0_836_matrix
+      - &ref_11
+        title: Radio
+        description: Radio service
+        icon: generative
+        url: https://radio.runyan.org
+        target: sametab
+        statusCheck: true
+        id: 1_836_radio
+      - &ref_12
+        title: Mumble
+        description: voice.neet.space
+        icon: hl-mumble
+        url: https://voice.neet.space
+        target: sametab
+        statusCheck: false
+        id: 2_836_mumble
+      - &ref_13
+        title: IRC
+        description: irc.neet.dev
+        icon: hl-thelounge
+        url: https://irc.neet.dev
+        target: sametab
+        statusCheck: true
+        id: 3_836_irc
+      - &ref_14
+        title: Git
+        description: git.neet.dev
+        icon: hl-gitea
+        url: https://git.neet.dev
+        target: sametab
+        statusCheck: true
+        id: 4_836_git
+      - &ref_15
+        title: Nextcloud
+        description: neet.cloud
+        icon: hl-nextcloud
+        url: https://neet.cloud
+        target: sametab
+        statusCheck: true
+        id: 5_836_nextcloud
+      - &ref_16
+        title: Roundcube
+        description: mail.neet.dev
+        icon: hl-roundcube
+        url: https://mail.neet.dev
+        target: sametab
+        statusCheck: true
+        id: 6_836_roundcube
+      - &ref_17
+        title: Jitsi Meet
+        description: meet.neet.space
+        icon: hl-jitsimeet
+        url: https://meet.neet.space
+        target: sametab
+        statusCheck: true
+        id: 7_836_jitsimeet
+    filteredItems:
+      - *ref_10
+      - *ref_11
+      - *ref_12
+      - *ref_13
+      - *ref_14
+      - *ref_15
+      - *ref_16
+      - *ref_17
+    displayData:
+      sortBy: default
+      rows: 1
+      cols: 1
+      collapsed: false
+      hideForGuests: false

machines/storage/s0/default.nix

@@ -75,32 +75,6 @@
     services.lidarr.enable = true;
     services.lidarr.user = "public_data";
     services.lidarr.group = "public_data";
-    services.recyclarr = {
-      enable = true;
-      configuration = {
-        radarr.radarr_main = {
-          api_key = {
-            _secret = "/run/credentials/recyclarr.service/radarr-api-key";
-          };
-          base_url = "http://localhost:7878";
-
-          quality_definition.type = "movie";
-        };
-        sonarr.sonarr_main = {
-          api_key = {
-            _secret = "/run/credentials/recyclarr.service/sonarr-api-key";
-          };
-          base_url = "http://localhost:8989";
-
-          quality_definition.type = "series";
-        };
-      };
-    };
-
-    systemd.services.recyclarr.serviceConfig.LoadCredential = [
-      "radarr-api-key:/run/agenix/radarr-api-key"
-      "sonarr-api-key:/run/agenix/sonarr-api-key"
-    ];
 
     services.transmission = {
       enable = true;
@@ -171,8 +145,6 @@
     8686 # lidarr
     9091 # transmission web
   ];
-  age.secrets.radarr-api-key.file = ../../../secrets/radarr-api-key.age;
-  age.secrets.sonarr-api-key.file = ../../../secrets/sonarr-api-key.age;
 
   # jellyfin
   # jellyfin cannot run in the vpn container and use hardware encoding
@@ -182,7 +154,7 @@
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
-  hardware.graphics = {
+  hardware.opengl = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
@@ -199,23 +171,16 @@
     openFirewall = false; # All nginx services are internal
     virtualHosts =
       let
-        mkHost = external: config:
+        mkVirtualHost = external: internal:
           {
             ${external} = {
               useACMEHost = "s0.neet.dev"; # Use wildcard cert
               forceSSL = true;
-              locations."/" = config;
+              locations."/" = {
-            };
-          };
-        mkVirtualHost = external: internal:
-          mkHost external {
                 proxyPass = internal;
                 proxyWebsockets = true;
               };
-        mkStaticHost = external: static:
+            };
-          mkHost external {
-            root = static;
-            tryFiles = "$uri /index.html ";
           };
       in
       lib.mkMerge [
@@ -228,7 +193,7 @@
         (mkVirtualHost "unifi.s0.neet.dev" "https://localhost:8443")
         (mkVirtualHost "music.s0.neet.dev" "http://localhost:4533")
         (mkVirtualHost "jellyfin.s0.neet.dev" "http://localhost:8096")
-        (mkStaticHost "s0.neet.dev" config.services.dashy.finalDrv)
+        (mkVirtualHost "s0.neet.dev" "http://localhost:56815")
         {
           # Landing page LAN redirect
           "s0" = {
@@ -248,9 +213,7 @@
           };
         }
         (mkVirtualHost "vacuum.s0.neet.dev" "http://192.168.1.125") # valetudo
-        (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
       ];
 
     tailscaleAuth = {
@@ -291,7 +254,7 @@
   virtualisation.podman.dockerSocket.enable = true; # TODO needed?
   services.dashy = {
     enable = true;
-    settings = import ./dashy.nix;
+    configFile = ./dashy.yaml;
   };
 
   services.unifi = {
@@ -308,11 +271,6 @@
       service.enableregistration = false;
     };
   };
-  backup.group."vikunja".paths = [
-    "/var/lib/vikunja"
-  ];
-
-  services.actual.enable = true;
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
 }

machines/storage/s0/frigate.nix

@@ -36,11 +36,6 @@ let
             record = "preset-record-generic-audio-copy";
           };
         };
-        detect = {
-          width = 1280;
-          height = 720;
-          fps = 5;
-        };
       };
     };
     services.go2rtc.settings.streams = lib.mkMerge [
@@ -59,7 +54,7 @@ let
       # - go2rtc: ${VAR}
       # - frigate: {VAR}
       primaryUrl = "rtsp://admin:\${FRIGATE_RTSP_PASSWORD}@${address}/cam/realmonitor?channel=1&subtype=0";
-      detectUrl = "rtsp://admin:{FRIGATE_RTSP_PASSWORD}@${address}/cam/realmonitor?channel=1&subtype=3";
+      detectUrl = "rtsp://admin:{FRIGATE_RTSP_PASSWORD}@${address}/cam/realmonitor?channel=1&subtype=1";
     in
     mkCamera name primaryUrl detectUrl;
 
@@ -87,11 +82,9 @@ lib.mkMerge [
       settings = {
         mqtt = {
           enabled = true;
-          host = "localhost";
+          host = "localhost:1883";
-          port = 1883;
-          user = "root";
-          password = "{FRIGATE_MQTT_PASSWORD}";
         };
+        rtmp.enabled = false;
         snapshots = {
           enabled = true;
           bounding_box = true;
@@ -100,9 +93,8 @@ lib.mkMerge [
           enabled = true;
           # sync_recordings = true; # detect if recordings were deleted outside of frigate (expensive)
           retain = {
-            days = 7; # Keep video for 7 days
+            days = 2; # Keep video for 2 days
-            mode = "all";
+            mode = "motion";
-            # mode = "motion";
           };
           events = {
             retain = {
@@ -114,7 +106,7 @@ lib.mkMerge [
         };
         # Make frigate aware of the go2rtc streams
         go2rtc.streams = config.services.go2rtc.settings.streams;
-        detect.enabled = false; # :(
+        detect.enabled = true;
         objects = {
           track = [ "person" "dog" ];
         };
@@ -136,19 +128,28 @@ lib.mkMerge [
   }
   {
     # hardware encode/decode with amdgpu vaapi
-    services.frigate.vaapiDriver = "radeonsi";
+    systemd.services.frigate = {
+      environment.LIBVA_DRIVER_NAME = "radeonsi";
+      serviceConfig = {
+        SupplementaryGroups = [ "render" "video" ]; # for access to dev/dri/*
+        AmbientCapabilities = "CAP_PERFMON";
+      };
+    };
     services.frigate.settings.ffmpeg.hwaccel_args = "preset-vaapi";
   }
   {
     # Coral TPU for frigate
+    services.udev.packages = [ pkgs.libedgetpu ];
+    users.groups.apex = { };
+    systemd.services.frigate.environment.LD_LIBRARY_PATH = "${pkgs.libedgetpu}/lib";
+    systemd.services.frigate.serviceConfig.SupplementaryGroups = [ "apex" ];
+
+    # Coral PCIe driver
+    kernel.enableGasketKernelModule = true;
+
     services.frigate.settings.detectors.coral = {
       type = "edgetpu";
       device = "pci";
     };
   }
-  {
-    # Don't require authentication for frigate
-    # This is ok because the reverse proxy already requires tailscale access anyway
-    services.frigate.settings.auth.enabled = false;
-  }
 ]

machines/storage/s0/hardware-configuration.nix

@@ -22,6 +22,7 @@
   # zfs
   networking.hostId = "5e6791f0";
   boot.supportedFilesystems = [ "zfs" ];
+  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
 
   # luks
   remoteLuksUnlock.enable = true;
@@ -58,43 +59,12 @@
     };
   swapDevices = [ ];
 
-  networking = {
+  networking.vlans = {
-    dhcpcd.enable = false;
-
-    vlans = {
     iot = {
       id = 2;
       interface = "eth1";
     };
   };
 
-    interfaces.eth1.ipv4.addresses = [{
-      address = "192.168.1.2";
-      prefixLength = 21;
-    }];
-    interfaces.iot.ipv4.addresses = [{
-      address = "192.168.9.8";
-      prefixLength = 22;
-    }];
-
-    defaultGateway = "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

@@ -3,14 +3,14 @@
 {
   services.esphome.enable = true;
 
+  # TODO lock down
   services.mosquitto = {
     enable = true;
     listeners = [
       {
-        users.root = {
+        acl = [ "pattern readwrite #" ];
-          acl = [ "readwrite #" ];
+        omitPasswordAuth = true;
-          hashedPassword = "$7$101$8+QnkTzCdGizaKqq$lpU4o84n6D/1uwfA9pZDVExr1NDm1D/8tNla2tE9J9HdUqkvu192yYfiySY1MFqVNgUKgWEFu5P1bUKqRnzbUw==";
+        settings.allow_anonymous = true;
-        };
       }
     ];
   };
@@ -24,13 +24,11 @@
       homeassistant = true;
       permit_join = false;
       serial = {
-        adapter = "ember";
         port = "/dev/ttyACM0";
       };
       mqtt = {
         server = "mqtt://localhost:1883";
-        user = "root";
+        # base_topic = "zigbee2mqtt";
-        password = "!/run/agenix/zigbee2mqtt.yaml mqtt_password";
       };
       frontend = {
         host = "localhost";
@@ -38,16 +36,11 @@
       };
     };
   };
-  age.secrets."zigbee2mqtt.yaml" = {
-    file = ../../../secrets/zigbee2mqtt.yaml.age;
-    owner = "zigbee2mqtt";
-  };
 
   services.home-assistant = {
     enable = true;
     extraComponents = [
       "default_config"
-      "rest_command"
       "esphome"
       "met"
       "radio_browser"
@@ -76,6 +69,7 @@
       "zha"
       "bluetooth"
     ];
+    # config = null;
     config = {
       # Includes dependencies for a basic setup
       # https://www.home-assistant.io/integrations/default_config/
@@ -94,15 +88,6 @@
       ];
       # Allow using automations generated from the UI
       "automation ui" = "!include automations.yaml";
-
-      "rest_command" = {
-        json_post_request = {
-          url = "{{ url }}";
-          method = "POST";
-          content_type = "application/json";
-          payload = "{{ payload | default('{}') }}";
-        };
-      };
     };
   };
 }

machines/storage/s0/properties.nix

@@ -1,7 +1,6 @@
 {
   hostNames = [
     "s0"
-    "s0.neet.dev"
   ];
 
   arch = "x86_64-linux";
@@ -13,16 +12,12 @@
     "binary-cache"
     "gitea-actions-runner"
     "frigate"
-    "zigbee"
-    "media-server"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";
 
   remoteUnlock = {
     hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNiceeFMos5ZXcYem4yFxh8PiZNNnuvhlyLbQLrgIZH";
-
-    clearnetHost = "192.168.1.2";
     onionHost = "r3zvf7f2ppaeithzswigma46pajt3hqytmkg3rshgknbl3jbni455fqd.onion";
   };
 }

machines/zoidberg/default.nix

@@ -5,6 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  de.enable = true;
+
   # Login DE Option: Steam
   programs.steam.gamescopeSession.enable = true;
   # programs.gamescope.capSysNice = true;
@@ -31,9 +33,9 @@
   hardware.enableAllFirmware = true;
 
   # ROCm
-  hardware.graphics.extraPackages = with pkgs; [
+  hardware.opengl.extraPackages = with pkgs; [
-    rocmPackages.clr.icd
+    rocm-opencl-icd
-    rocmPackages.clr
+    rocm-opencl-runtime
   ];
   systemd.tmpfiles.rules = [
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"

machines/zoidberg/hardware-configuration.nix

@@ -17,17 +17,16 @@
   boot.extraModulePackages = [ ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # luks unlock with clevis
-  boot.initrd.systemd.enable = true;
-  boot.initrd.clevis = {
-    enable = true;
-    devices."enc-pv".secretFile = "/secret/decrypt.jwe";
-  };
-
   # disks
+  remoteLuksUnlock.enable = true;
   boot.initrd.luks.devices."enc-pv" = {
     device = "/dev/disk/by-uuid/04231c41-2f13-49c0-8fce-0357eea67990";
     allowDiscards = true;
+
+    # Fetch key from USB drive
+    keyFileSize = 4096;
+    keyFile = "/dev/disk/by-id/usb-Mass_Storage_Device_121220160204-0:0-part2";
+    fallbackToPassword = true;
   };
   fileSystems."/" =
     {

overlays/actualbudget/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, nodejs
+, runtimeShell
+}:
+buildNpmPackage rec {
+  pname = "actual-server";
+  version = "24.10.1";
+
+  src = fetchFromGitHub {
+    owner = "actualbudget";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-VJAD+lNamwuYmiPJLXkum6piGi5zLOHBp8cUeZagb4s=";
+  };
+
+  npmDepsHash = "sha256-Z2e4+JMhI/keLerT0F4WYdLnXHRQCqL7NjNyA9SFEF8=";
+
+  patches = [
+    ./migrations-should-use-pkg-path.patch
+  ];
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  dontNpmBuild = true;
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cat <<EOF > $out/bin/actual-server
+    #!${runtimeShell}
+    exec ${nodejs}/bin/node $out/lib/node_modules/actual-sync/app.js "\$@"
+    EOF
+    chmod +x $out/bin/actual-server
+  '';
+}

overlays/actualbudget/migrations-should-use-pkg-path.patch

@@ -0,0 +1,48 @@
+diff --git a/src/load-config.js b/src/load-config.js
+index d99ce42..42d1351 100644
+--- a/src/load-config.js
++++ b/src/load-config.js
+@@ -3,7 +3,8 @@ import path from 'node:path';
+ import { fileURLToPath } from 'node:url';
+ import createDebug from 'debug';
+ 
+-const debug = createDebug('actual:config');
++// const debug = createDebug('actual:config');
++const debug = console.log;
+ const debugSensitive = createDebug('actual-sensitive:config');
+ 
+ const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+@@ -108,6 +109,7 @@ const finalConfig = {
+   serverFiles: process.env.ACTUAL_SERVER_FILES || config.serverFiles,
+   userFiles: process.env.ACTUAL_USER_FILES || config.userFiles,
+   webRoot: process.env.ACTUAL_WEB_ROOT || config.webRoot,
++  dataDir: process.env.ACTUAL_DATA_DIR || config.dataDir,
+   https:
+     process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT
+       ? {
+diff --git a/src/migrations.js b/src/migrations.js
+index cba7db0..9983471 100644
+--- a/src/migrations.js
++++ b/src/migrations.js
+@@ -1,6 +1,12 @@
+ import migrate from 'migrate';
+ import path from 'node:path';
+ import config from './load-config.js';
++import { fileURLToPath } from 'url';
++
++const __filename = fileURLToPath(import.meta.url);
++const __dirname = path.dirname(__filename);
++const appRoot = path.dirname(__dirname);
++const migrationsDirectory = path.join(appRoot, "migrations");
+ 
+ export default function run(direction = 'up') {
+   console.log(
+@@ -13,7 +19,7 @@ export default function run(direction = 'up') {
+         stateStore: `${path.join(config.dataDir, '.migrate')}${
+           config.mode === 'test' ? '-test' : ''
+         }`,
+-        migrationsDirectory: `${path.join(config.projectRoot, 'migrations')}`,
++        migrationsDirectory
+       },
+       (err, set) => {
+         if (err) {

overlays/default.nix

@@ -3,5 +3,13 @@ final: prev:
 
 let
   system = prev.system;
+  frigatePkgs = inputs.nixpkgs-frigate.legacyPackages.${system};
 in
-{ }
+{
+  # It seems that libedgetpu needs to be built with the newer version of tensorflow in nixpkgs
+  # but I am lazy so I instead just downgrade by using the old nixpkgs
+  libedgetpu = frigatePkgs.callPackage ./libedgetpu { };
+  frigate = frigatePkgs.frigate;
+
+  actual-server = prev.callPackage ./actualbudget { };
+}

overlays/kernel-modules/default.nix

@@ -7,5 +7,13 @@
 
 let
   cfg = config.kernel;
+
+  gasket = config.boot.kernelPackages.callPackage ./gasket.nix { };
 in
-{ }
+{
+  options.kernel.enableGasketKernelModule = lib.mkEnableOption "Enable Gasket Kernel Module";
+
+  config = lib.mkIf cfg.enableGasketKernelModule {
+    boot.extraModulePackages = [ gasket ];
+  };
+}

overlays/kernel-modules/gasket.nix

@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+  pname = "gasket";
+  version = "1.0-18-unstable-2023-09-05";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "gasket-driver";
+    rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c";
+    sha256 = "sha256-O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8=";
+  };
+
+  makeFlags = kernel.makeFlags ++ [
+    "-C"
+    "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "M=$(PWD)"
+  ];
+  buildFlags = [ "modules" ];
+
+  installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
+  installTargets = [ "modules_install" ];
+
+  sourceRoot = "${src.name}/src";
+  hardeningDisable = [ "pic" "format" ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  meta = with lib; {
+    description = "The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.";
+    homepage = "https://github.com/google/gasket-driver";
+    license = licenses.gpl2;
+    maintainers = [ lib.maintainers.kylehendricks ];
+    platforms = platforms.linux;
+    broken = versionOlder kernel.version "5.15";
+  };
+}

overlays/libedgetpu/default.nix

@@ -0,0 +1,72 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, libusb1
+, abseil-cpp
+, flatbuffers
+, xxd
+}:
+
+let
+  flatbuffers_1_12 = flatbuffers.overrideAttrs (oldAttrs: rec {
+    version = "1.12.0";
+    NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=maybe-uninitialized";
+    cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DFLATBUFFERS_BUILD_SHAREDLIB=ON" ];
+    NIX_CXXSTDLIB_COMPILE = "-std=c++17";
+    configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ "--enable-shared" ];
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "flatbuffers";
+      rev = "v${version}";
+      sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg=";
+    };
+  });
+
+in
+stdenv.mkDerivation rec {
+  pname = "libedgetpu";
+  version = "grouper";
+
+  src = fetchFromGitHub {
+    owner = "google-coral";
+    repo = pname;
+    rev = "release-${version}";
+    sha256 = "sha256-73hwItimf88Iqnb40lk4ul/PzmCNIfdt6Afi+xjNiBE=";
+  };
+
+  patches = [ ./libedgetpu-stddef.diff ];
+
+  makeFlags = [ "-f" "makefile_build/Makefile" "libedgetpu" ];
+
+  buildInputs = [
+    libusb1
+    abseil-cpp
+    flatbuffers_1_12
+  ];
+
+  nativeBuildInputs = [
+    xxd
+  ];
+
+  NIX_CXXSTDLIB_COMPILE = "-std=c++17";
+
+  TFROOT = "${fetchFromGitHub {
+    owner = "tensorflow";
+    repo = "tensorflow";
+    rev = "v2.7.4";
+    sha256 = "sha256-liDbUAdaVllB0b74aBeqNxkYNu/zPy7k3CevzRF5dk0=";
+  }}";
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp out/direct/k8/libedgetpu.so.1.0 $out/lib
+    ln -s $out/lib/libedgetpu.so.1.0 $out/lib/libedgetpu.so.1
+    mkdir -p $out/lib/udev/rules.d
+    cp debian/edgetpu-accelerator.rules $out/lib/udev/rules.d/99-edgetpu-accelerator.rules
+
+    # PCIe rule
+    echo 'SUBSYSTEM=="apex", MODE="0660", GROUP="apex"' > $out/lib/udev/rules.d/65-apex.rules
+  '';
+}

overlays/libedgetpu/libedgetpu-stddef.diff

@@ -0,0 +1,12 @@
+diff --git a/api/allocated_buffer.h b/api/allocated_buffer.h
+index 97740f0..7bc0547 100644
+--- a/api/allocated_buffer.h
++++ b/api/allocated_buffer.h
+@@ -16,6 +16,7 @@
+ #define DARWINN_API_ALLOCATED_BUFFER_H_
+ 
+ #include <functional>
++#include <cstddef>
+ 
+ namespace platforms {
+ namespace darwinn {

patches/dont-break-nix-serve.patch

@@ -1,15 +0,0 @@
-diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
-index 49f8ed673816..643b59d68dde 100644
---- a/nixos/modules/services/video/frigate.nix
-+++ b/nixos/modules/services/video/frigate.nix
-@@ -482,10 +482,6 @@ in
-           };
-         };
-         extraConfig = ''
--          # Frigate wants to connect on 127.0.0.1:5000 for unauthenticated requests
--          # https://github.com/NixOS/nixpkgs/issues/370349
--          listen 127.0.0.1:5000;
--
-           # vod settings
-           vod_base_url "";
-           vod_segments_base_url "";

secrets/digitalocean-dns-credentials.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 WBT1Hw TGdD8Nw+GPITDOXGhevSu+880DWET7WYN3nIyJ0xy2o
+-> ssh-ed25519 WBT1Hw wjZGPvilRXGZsC2+7dWm/Nbau8Allv29WwQCr0XSAWU
-69xepRTnmaFwa4IsGJjDdwZqTSf5fz6EZK0/q3oz/ZA
+uTOf/sokutOGDyc8fbTbBWXqCVQCFhGdHxwA6SXqhdA
--> ssh-ed25519 6AT2/g EmqXrXXsRxSS6AsH+7VMgoJTYo9eGj8ebLiLT4IWNxg
+-> ssh-ed25519 6AT2/g NU068qwqOWiKk0QwqP9vU4xJaND2OR4bo8xkmdWATgY
-eKs5/3tQMdg5bGJKNz8PFh9C7HiV+IlOU9dzpYcGIjo
+uGd0sb5PH+rREn9pgLOFwk29CX66aPBQMvr4rBazylc
--> ssh-ed25519 hPp1nw wsIF676is8FquF6oANNauPrumsMnfVUZpPeVKEtBOzQ
+-> ssh-ed25519 hPp1nw r2JRiZ7fsHPYDlte6Oh2Gx1KkugekFeeg3xSjziI+hQ
-qZR8LSF+TQ2K3K0An69NHfk53ZqNEWev0IVcb71SR40
+xnO0gscMdR25mj5uAX7D42FCbCQhqbU0wkiLX4OmVqk
--> ssh-ed25519 w3nu8g TKHY/5JuzFMhbW9CQAOI3woX8M9b1H/XXUpIMT0Mylk
+-> ssh-ed25519 w3nu8g F03mPU63WwEs1SLUFErLOVCkARoggGIvvz9TFZfMOBY
-byJV0/BJ3ftG5eYv5BeyIYBi0VoWG31HRiENUxSeYE8
+HOdVA3xW9pqUPhclO6VueSfXg3ux06Ch3fucF6Vr4hM
---- fwHXHtE/sMLqCLSD8tR0oCPgNuif9Y/ncHU97hbf/Bw
+--- niyo231HPT/+2dzflP+zhYjL9XiWsk7svesCYdkU1jA
-f"+ÉŒqc<71>H†Ñjï!JSšË¡Ì|yMìðX¼þMl<4D>ýçCy™îUXn»Égk¨ë)¤óOY§uº„¦²¶g%è Håvn·œ5ô!$Jœ¤Š…¶›$<24>#Dö;±¥àÖ	}ÏŸcçKšˆ{R/
+DÑØQî¬5–-ô@<40>¢¿—ßÐN5<4E> Ãÿ$Ø‚™’Çž…êÐ<C3AA>X=ŒHŽDÁ`P×5ZA´÷¼YóäÓ?¡é^[³1”6ÕK*mP݈ª­æ1æç÷ß›ƒ:$^ÑfDœ*î†ÿ“š-zi´"·Tàuÿüò

secrets/frigate-credentials.age

@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 hPp1nw zOXF7NsZjm+DCYrJ+Ap2mX35JUt37CLJP1RhyOjB/XE
+-> ssh-ed25519 hPp1nw Chke1ZtpXxN1c1+AnJ6Cd5kpM1KfQKTwymrfPW53QCA
-ePprJM2cnhYZhP8aJUXOZeGHJm/DHlRYomWN+lFaU6w
+jUcw8eitC7r0rwefjllndZjARIqpWoVqGCnefHfjQ6Y
--> ssh-ed25519 w3nu8g gjeFAbFWXyPdGauKHXAzuIP9fmaj2Oysq9fHO8q7u38
+-> ssh-ed25519 w3nu8g KY/5bU1B5uvmfGHF2d6qBL1NYy64qo324rdvkgnXoDA
-KiMR0pgEPtsfZnYAIsH7UHNhnsB6rtsW/hqV03uS2dI
+OBvuFtzZXQ0RmmEXelyzHMMiVqZir7zQJMA36ZH2siE
---- BPzPECz1g6vEv4OlRn6+FnWP9oq3tn6TN2o867icxYA
+--- CSd7lYSYQ2fCTjkJLPGdaNGL8eVpE9IBEyFo0LW907M
-}ìjºùŽ+l&þàx<C3A0>-TïÝ‹b‡ÅèØÄ·<C384>€Dg‰ñgc’*ˆ0<CB86>÷µcp
+£³$šO†ÈIß/À//Êw*ƒ™õD¤@u5o[¼â:·äš¥t¾˜]Jñ쮸™@Ùhþu£Àk;?·XüÁHRº’Ñ°E5¥ÍçÜ9

secrets/hostspot-passwords.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 cObvAg l/suU/M4AATK7lQuZv/qnjG/xqNGoVqhS7b3xirmNUM
+Ao2tP6BBSZdlL7jZJPmLyJQWfqdU89M9hCjkkuqtxlw
+-> ssh-ed25519 w3nu8g szQugiuFfzkzVndyIdP1agun4nmCsZzFG/6EEB2V1Gk
+5+DEUJ5tkVFUpm+w/tptUCByRpMxRigwfrVglTYc8XI
+--- pjviyhRustHHMipIpkKsQ4cpu+YA66JwvWXjceXopi4
+)˜Ö®Äý8³È6Y"@?Ý9”®@¡Ÿžè|ÂÄž+©Z*4ö2å“R<qef…êªG¹ïV+{©%CmÞd^™b

secrets/secrets.nix

@@ -58,10 +58,6 @@ with roles;
   # Frigate (DVR)
   "frigate-credentials.age".publicKeys = frigate;
 
-  # zigbee2mqtt secrets
+  # Phone hotspot passwords
-  "zigbee2mqtt.yaml.age".publicKeys = zigbee;
+  "hostspot-passwords.age".publicKeys = hotspot;
-
-  # Sonarr and Radarr secrets
-  "radarr-api-key.age".publicKeys = media-server;
-  "sonarr-api-key.age".publicKeys = media-server;
 }

secrets/sonarr-api-key.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hPp1nw NkdwenOkJJKKoezAE1jG20cxwOFk2DVsbMoTaw6ce0M
-8sV6ZJupuSaktW2MaAWg0BqtX1j5I0R3Oq1wFKoXP0M
--> ssh-ed25519 w3nu8g vJ7zMw2Ruh50ufkxrttuhXT2E3c8bvZnvp0xpkCGhTo
-xpQOVyGwQhoAi/79ZISCxAvnNiRwMbgQ42H5V0zQe10
---- 57doMaI074hj/Ko2mWqFHcqEPRR24C7U1QbDOCPIOKI
-ó(D‹êøÄ­·QÉ2âóvzŸwè¬*®–´ÇaO’¯N/1GijïeøŸz<C5B8>Q(°mgd•y±p¬’<C2AC>P
-
-ÍaÑC€8¼

secrets/zigbee2mqtt.yaml.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hPp1nw TSDuPaFp/Qcz4r819X4QmU/4J2TGpoX7jCCJCdFDog0
-SwQUqEp45xMOeTkvBG6uX28kB8YWG66laYqakSgl9w4
--> ssh-ed25519 w3nu8g tLZDNE0iBgOpUB3djpNu3CgimsRc0zcds+AgctzxyQ4
-Oyz6XORsApM4vFxWyaD3bR/ApIUFPY3q4yGvtbosUIY
---- vuXlQmuOFbJhBTACN5ciH2GlOCbRCMPZdlogG2O+KOk
-Áëÿ!}UIì	p0@Xž|°þ#晆0HÙõò#BÇRR<52>Ù
-òùø5¾Iÿ?vX?pÝ<70>—<>fqÍ[lž¸˜xÏ­G7ü;UäÀOUä¶