Update flake.lock

.gitea/workflows/check-flake.yaml

@@ -15,5 +15,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      - run: |
+          pwd
+          ls -lah .
+          whoami
+
       - name: Check Flake
-        run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace
+        run: nix flake check --show-trace

Makefile

@@ -1,27 +1,15 @@
 # Lockfile utils
-.PHONY: update-lockfile
 update-lockfile:
 	nix flake update --commit-lock-file
-
-.PHONY: update-lockfile-without-commit
 update-lockfile-without-commit:
 	nix flake update
 
 # Agenix utils
-.PHONY: edit-secret
 edit-secret:
 	cd secrets && agenix -e $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: rekey-secrets
 rekey-secrets:
 	cd secrets && agenix -r
 
 # NixOS utils
-.PHONY: clean-old-nixos-profiles
 clean-old-nixos-profiles:
 	doas nix-collect-garbage -d
-
-# Garbage Collect
-.PHONY: gc
-gc:
-	nix store gc

common/binary-cache.nix

@@ -1,29 +1,17 @@
 { config, lib, ... }:
 
-let
-
-in
 {
-  options.enableExtraSubstituters = lib.mkEnableOption "Enable extra substituters";
+  nix = {
-
+    settings = {
-  config = lib.mkMerge [
+      substituters = [
-    {
+        "https://cache.nixos.org/"
-      enableExtraSubstituters = lib.mkDefault true;
+        "https://nix-community.cachix.org"
-    }
+        "http://s0.koi-bebop.ts.net:5000"
-    (lib.mkIf config.enableExtraSubstituters {
+      ];
-      nix = {
+      trusted-public-keys = [
-        settings = {
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          substituters = [
+        "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
-            "https://cache.nixos.org/"
+      ];
-            "https://nix-community.cachix.org"
+    };
-            "http://s0.koi-bebop.ts.net:5000"
+  };
-          ];
-          trusted-public-keys = [
-            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-            "s0.koi-bebop.ts.net:OjbzD86YjyJZpCp9RWaQKANaflcpKhtzBMNP8I2aPUU="
-          ];
-        };
-      };
-    })
-  ];
 }

common/boot/remote-luks-unlock.nix

@@ -35,6 +35,11 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    # boot.initrd.luks.devices.${cfg.device.name} = {
+    #   device = cfg.device.path;
+    #   allowDiscards = cfg.device.allowDiscards;
+    # };
+
     # Unlock LUKS disk over ssh
     boot.initrd.network.enable = true;
     boot.initrd.kernelModules = cfg.kernelModules;

common/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
@@ -20,12 +20,12 @@
 
   system.stateVersion = "23.11";
 
-  networking.useDHCP = lib.mkDefault true;
+  networking.useDHCP = false;
 
   networking.firewall.enable = true;
   networking.firewall.allowPing = true;
 
-  time.timeZone = "America/Los_Angeles";
+  time.timeZone = "America/Denver";
   i18n = {
     defaultLocale = "en_US.UTF-8";
     extraLocaleSettings = {

common/flakes.nix

@@ -10,6 +10,7 @@ in
 
   config = mkIf cfg.enable {
     nix = {
+      package = pkgs.nixFlakes;
       extraOptions = ''
         experimental-features = nix-command flakes
       '';

common/pc/audio.nix

@@ -19,15 +19,6 @@ in
       jack.enable = true;
     };
 
-    services.pipewire.extraConfig.pipewire."92-fix-wine-audio" = {
-      context.properties = {
-        default.clock.rate = 48000;
-        default.clock.quantum = 2048;
-        default.clock.min-quantum = 512;
-        default.clock.max-quantum = 2048;
-      };
-    };
-
     users.users.googlebot.extraGroups = [ "audio" ];
 
     # bt headset support

common/pc/chromium.nix

@@ -41,7 +41,7 @@ in
         "SpellcheckLanguage" = [ "en-US" ];
       };
       defaultSearchProviderSuggestURL = null;
-      defaultSearchProviderSearchURL = "https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
+      defaultSearchProviderSearchURL = " https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
     };
 
     # hardware accelerated video playback (on intel)
@@ -52,7 +52,7 @@ in
         # ungoogled = true;
         # --enable-native-gpu-memory-buffers # fails on AMD APU
         # --enable-webrtc-vp9-support
-        commandLineArgs = "--use-vulkan";
+        commandLineArgs = "--use-vulkan --use-gl=desktop --enable-zero-copy --enable-hardware-overlays --enable-features=VaapiVideoDecoder,CanvasOopRasterization --ignore-gpu-blocklist --enable-accelerated-mjpeg-decode --enable-accelerated-video  --enable-gpu-rasterization";
       };
     };
     # todo vulkan in chrome

common/pc/default.nix

@@ -6,20 +6,19 @@ in
 {
   imports = [
     ./kde.nix
-    #    ./xfce.nix
+    ./xfce.nix
     ./yubikey.nix
     ./chromium.nix
-    ./firefox.nix
+    #    ./firefox.nix
     ./audio.nix
     #    ./torbrowser.nix
     ./pithos.nix
+    ./spotify.nix
     ./vscodium.nix
     ./discord.nix
     ./steam.nix
     ./touchpad.nix
     ./mount-samba.nix
-    ./udev.nix
-    ./virtualisation.nix
   ];
 
   options.de = {
@@ -42,10 +41,12 @@ in
       mpv
       nextcloud-client
       signal-desktop
+      minecraft
       gparted
       libreoffice-fresh
       thunderbird
-      spotify
+      spotifyd
+      spotify-qt
       arduino
       yt-dlp
       jellyfin-media-player
@@ -56,6 +57,7 @@ in
 
       # For Nix IDE
       nixpkgs-fmt
+      rnix-lsp
     ];
 
     # Networking
@@ -69,28 +71,12 @@ in
     ];
     # Printer discovery
     services.avahi.enable = true;
-    services.avahi.nssmdns4 = true;
+    services.avahi.nssmdns = true;
 
     programs.file-roller.enable = true;
 
     # Security
     services.gnome.gnome-keyring.enable = true;
     security.pam.services.googlebot.enableGnomeKeyring = true;
-
-    # Android dev
-    programs.adb.enable = true;
-
-    # Mount personal SMB stores
-    services.mount-samba.enable = true;
-
-    # allow building ARM derivations
-    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-    # for luks onlock over tor
-    services.tor.enable = true;
-    services.tor.client.enable = true;
-
-    # Enable wayland support in various chromium based applications
-    environment.sessionVariables.NIXOS_OZONE_WL = "1";
   };
 }

common/pc/firefox.nix

@@ -20,6 +20,31 @@ let
   };
 
   firefox = pkgs.wrapFirefox somewhatPrivateFF {
+    desktopName = "Sneed Browser";
+
+    nixExtensions = [
+      (pkgs.fetchFirefoxAddon {
+        name = "ublock-origin";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3719054/ublock_origin-1.33.2-an+fx.xpi";
+        sha256 = "XDpe9vW1R1iVBTI4AmNgAg1nk7BVQdIAMuqd0cnK5FE=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "sponsorblock";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3720594/sponsorblock_skip_sponsorships_on_youtube-2.0.12.3-an+fx.xpi";
+        sha256 = "HRtnmZWyXN3MKo4AvSYgNJGkBEsa2RaMamFbkz+YzQg=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "KeePassXC-Browser";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3720664/keepassxc_browser-1.7.6-fx.xpi";
+        sha256 = "3K404/eq3amHhIT0WhzQtC892he5I0kp2SvbzE9dbZg=";
+      })
+      (pkgs.fetchFirefoxAddon {
+        name = "https-everywhere";
+        url = "https://addons.mozilla.org/firefox/downloads/file/3716461/https_everywhere-2021.1.27-an+fx.xpi";
+        sha256 = "2gSXSLunKCwPjAq4Wsj0lOeV551r3G+fcm1oeqjMKh8=";
+      })
+    ];
+
     extraPolicies = {
       CaptivePortal = false;
       DisableFirefoxStudies = true;
@@ -49,6 +74,12 @@ let
         ExtensionRecommendations = false;
         SkipOnboarding = true;
       };
+      WebsiteFilter = {
+        Block = [
+          "http://paradigminteractive.io/"
+          "https://paradigminteractive.io/"
+        ];
+      };
     };
 
     extraPrefs = ''

common/pc/kde.nix

@@ -5,16 +5,22 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    services.displayManager.sddm.enable = true;
+    # kde plasma
-    services.displayManager.sddm.wayland.enable = true;
+    services.xserver = {
-    services.desktopManager.plasma6.enable = true;
+      enable = true;
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
+    };
 
     # kde apps
+    nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
     users.users.googlebot.packages = with pkgs; [
       # akonadi
       # kmail
       # plasma5Packages.kmail-account-wizard
       kate
     ];
+
+    services.xserver.desktopManager.plasma5.useQtScaling = true;
   };
 }

common/pc/spotify.nix

@@ -0,0 +1,86 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.spotifyd;
+  toml = pkgs.formats.toml { };
+  spotifydConf = toml.generate "spotify.conf" cfg.settings;
+in
+{
+  disabledModules = [
+    "services/audio/spotifyd.nix"
+  ];
+
+  options = {
+    services.spotifyd = {
+      enable = mkEnableOption "spotifyd, a Spotify playing daemon";
+
+      settings = mkOption {
+        default = { };
+        type = toml.type;
+        example = { global.bitrate = 320; };
+        description = ''
+          Configuration for Spotifyd. For syntax and directives, see
+          <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
+        '';
+      };
+
+      users = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        description = ''
+          Usernames to be added to the "spotifyd" group, so that they
+          can start and interact with the userspace daemon.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    # username specific stuff because i'm lazy...
+    services.spotifyd.users = [ "googlebot" ];
+    users.users.googlebot.packages = with pkgs; [
+      spotify
+      spotify-tui
+    ];
+
+    users.groups.spotifyd = {
+      members = cfg.users;
+    };
+
+    age.secrets.spotifyd = {
+      file = ../../secrets/spotifyd.age;
+      group = "spotifyd";
+      mode = "0440"; # group can read
+    };
+
+    # spotifyd to read secrets and run as user service
+    services.spotifyd = {
+      settings.global = {
+        username_cmd = "sed '1q;d' /run/agenix/spotifyd";
+        password_cmd = "sed '2q;d' /run/agenix/spotifyd";
+        bitrate = 320;
+        backend = "pulseaudio";
+        device_name = config.networking.hostName;
+        device_type = "computer";
+        # on_song_change_hook = "command_to_run_on_playback_events"
+        autoplay = true;
+      };
+    };
+
+    systemd.user.services.spotifyd-daemon = {
+      enable = true;
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      description = "spotifyd, a Spotify playing daemon";
+      environment.SHELL = "/bin/sh";
+      serviceConfig = {
+        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --config-path ${spotifydConf}";
+        Restart = "always";
+        CacheDirectory = "spotifyd";
+      };
+    };
+  };
+}

common/pc/touchpad.nix

@@ -9,7 +9,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.libinput.enable = true;
+    services.xserver.libinput.enable = true;
-    services.libinput.touchpad.naturalScrolling = true;
+    services.xserver.libinput.touchpad.naturalScrolling = true;
   };
 }

common/pc/udev.nix

@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.de;
-in
-{
-  config = lib.mkIf cfg.enable {
-    services.udev.extraRules = ''
-      # depthai
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
-
-      # Moonlander
-      # Rules for Oryx web flashing and live training
-      KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
-      KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
-      # Wally Flashing rules for the Moonlander and Planck EZ
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
-    '';
-    services.udev.packages = [ pkgs.platformio ];
-
-    users.groups.plugdev = {
-      members = [ "googlebot" ];
-    };
-  };
-}

common/pc/use-meson-v57.patch

@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index dace367..8c0e290 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,7 +8,7 @@ project(
+         'warning_level=0',
+     ],
+     license: 'MIT',
+-    meson_version: '>= 0.58.0',
++    meson_version: '>= 0.57.0',
+ )
+ 
+ cc = meson.get_compiler('c')
+@@ -47,8 +47,3 @@ shared_library(
+     gnu_symbol_visibility: 'hidden',
+ )
+ 
+-meson.add_devenv(environment({
+-    'NVD_LOG': '1',
+-    'LIBVA_DRIVER_NAME': 'nvidia',
+-    'LIBVA_DRIVERS_PATH': meson.project_build_root(),
+-}))

common/pc/virtualisation.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.de;
-in
-{
-  config = lib.mkIf cfg.enable {
-    # AppVMs
-    virtualisation.appvm.enable = true;
-    virtualisation.appvm.user = "googlebot";
-
-    # Use podman instead of docker
-    virtualisation.podman.enable = true;
-    virtualisation.podman.dockerCompat = true;
-
-    # virt-manager
-    virtualisation.libvirtd.enable = true;
-    programs.dconf.enable = true;
-    virtualisation.spiceUSBRedirection.enable = true;
-    environment.systemPackages = with pkgs; [ virt-manager ];
-    users.users.googlebot.extraGroups = [ "libvirtd" "adbusers" ];
-  };
-}

common/pc/vscodium.nix

@@ -11,8 +11,6 @@ let
     golang.go
     jnoortheen.nix-ide
     ms-vscode.cpptools
-    rust-lang.rust-analyzer
-    vadimcn.vscode-lldb
   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
     {
       name = "platformio-ide";
@@ -20,12 +18,6 @@ let
       version = "3.1.1";
       sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q=";
     }
-    {
-      name = "wgsl-analyzer";
-      publisher = "wgsl-analyzer";
-      version = "0.8.1";
-      sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y=";
-    }
   ];
 
   vscodium-with-extensions = pkgs.vscode-with-extensions.override {

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,5 @@
     ./dashy.nix
     ./librechat.nix
     ./actualbudget.nix
-    ./unifi.nix
   ];
 }

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/mailserver.nix

@@ -56,7 +56,6 @@ in
         "damon@runyan.org"
         "jonas@runyan.org"
         "simon@neet.dev"
-        "ellen@runyan.org"
       ];
       forwards = {
         "amazon@runyan.org" = [
@@ -64,7 +63,7 @@ in
           "cris@runyan.org"
         ];
       };
-      certificateScheme = "acme-nginx"; # use let's encrypt for certs
+      certificateScheme = 3; # use let's encrypt for certs
     };
     age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age;
     age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age;

common/server/nextcloud.nix

@@ -8,23 +8,12 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud30;
+      package = pkgs.nextcloud28;
       hostName = "neet.cloud";
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";
       config.adminpassFile = "/run/agenix/nextcloud-pw";
       autoUpdateApps.enable = true;
-      extraApps = with config.services.nextcloud.package.packages.apps; {
-        # Want
-        inherit end_to_end_encryption mail spreed;
-
-        # Might use
-        inherit bookmarks calendar cookbook deck memories onlyoffice qownnotesapi;
-
-        # Try out
-        # inherit maps music news notes phonetrack polls forms;
-      };
-      extraAppsEnable = true;
     };
     age.secrets.nextcloud-pw = {
       file = ../../secrets/nextcloud-pw.age;

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/samba.nix

@@ -97,7 +97,7 @@
     # Printer discovery
     # (is this needed?)
     services.avahi.enable = true;
-    services.avahi.nssmdns4 = true;
+    services.avahi.nssmdns = true;
 
     # printer sharing
     systemd.tmpfiles.rules = [

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.
-      ];
-    };
-  };
-}

common/shell.nix

@@ -34,8 +34,6 @@
     io_seq_write = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=write --size=2g --io_size=10g --blocksize=1024k --ioengine=libaio --fsync=10000 --iodepth=32 --direct=1 --numjobs=1 --runtime=60 --group_reporting; rm temp.file";
     io_rand_read = "${pkgs.fio}/bin/fio --name TEST --eta-newline=5s --filename=temp.file --rw=randread --size=2g --io_size=10g --blocksize=4k --ioengine=libaio --fsync=1 --iodepth=1 --direct=1 --numjobs=32 --runtime=60 --group_reporting; rm temp.file";
     io_rand_write = "${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";
   };
 
   nixpkgs.overlays = [

flake.lock

@@ -7,16 +7,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": [
+        "systems": "systems"
-          "systems"
-        ]
       },
       "locked": {
-        "lastModified": 1723293904,
+        "lastModified": 1707830867,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -57,11 +55,11 @@
         "rev": "1290ddd9a2ff2bf2d0f702750768312b80efcd34",
         "revCount": 19,
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
+        "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git"
       }
     },
     "darwin": {
@@ -88,22 +86,21 @@
     },
     "deploy-rs": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": "flake-compat",
-          "flake-compat"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
         "utils": [
-          "flake-utils"
+          "simple-nixos-mailserver",
+          "utils"
         ]
       },
       "locked": {
-        "lastModified": 1727447169,
+        "lastModified": 1708091384,
-        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
         "type": "github"
       },
       "original": {
@@ -112,6 +109,18 @@
         "type": "github"
       }
     },
+    "fix-nvidia-x11-latest": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-fLopADeWElHn3zRLJxyRZf2pjXsPQL4K1NaZ9Dmaj3E=",
+        "type": "file",
+        "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -130,16 +139,14 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": [
+        "systems": "systems_2"
-          "systems"
-        ]
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1710146030,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -176,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728263287,
+        "lastModified": 1710120787,
-        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -189,52 +196,35 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1728056216,
-        "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728193676,
+        "lastModified": 1710420202,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-frigate": {
+    "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1695825837,
+        "lastModified": 1654936503,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "repo": "nixpkgs",
+        "ref": "nixos-22.05",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "radio": {
@@ -283,42 +273,35 @@
         "agenix": "agenix",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
-        "flake-compat": "flake-compat",
+        "fix-nvidia-x11-latest": "fix-nvidia-x11-latest",
         "flake-utils": "flake-utils",
         "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",
+        "simple-nixos-mailserver": "simple-nixos-mailserver"
-        "systems": "systems"
       }
     },
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": [
-          "flake-compat"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_05": [
+        "nixpkgs-22_05": "nixpkgs-22_05",
-          "nixpkgs"
+        "utils": "utils"
-        ]
       },
       "locked": {
-        "lastModified": 1722877200,
+        "lastModified": 1655930346,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "master",
+        "ref": "nixos-22.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -337,6 +320,36 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,79 +1,41 @@
 {
   inputs = {
-    # nixpkgs
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-    nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e";
 
-    # Common Utils Among flake inputs
+    flake-utils.url = "github:numtide/flake-utils";
-    systems.url = "github:nix-systems/default";
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.systems.follows = "systems";
-    };
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
 
-    # NixOS hardware
+    # mail server
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
+    simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Mail Server
+    # agenix
-    simple-nixos-mailserver = {
+    agenix.url = "github:ryantm/agenix";
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        nixpkgs-24_05.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-      };
-    };
 
-    # Agenix
+    # radio
-    agenix = {
+    radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
-      url = "github:ryantm/agenix";
+    radio.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    radio.inputs.flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
+    radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
-        systems.follows = "systems";
+    radio-web.flake = false;
-      };
-    };
 
-    # Radio
+    # drastikbot
-    radio = {
+    dailybuild_modules.url = "git+https://git.neet.dev/zuckerberg/dailybuild_modules.git";
-      url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main&rev=5bf607fed977d41a269942a7d1e92f3e6d4f2473";
+    dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    dailybuild_modules.inputs.flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
-    radio-web = {
-      url = "git+https://git.neet.dev/zuckerberg/radio-web.git";
-      flake = false;
-    };
 
-    # Dailybot
+    # nixos config deployment
-    dailybuild_modules = {
+    deploy-rs.url = "github:serokell/deploy-rs";
-      url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
+    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    deploy-rs.inputs.utils.follows = "simple-nixos-mailserver/utils";
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
 
-    # NixOS deployment
+    # prebuilt nix-index database
-    deploy-rs = {
+    nix-index-database.url = "github:Mic92/nix-index-database";
-      url = "github:serokell/deploy-rs";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        utils.follows = "flake-utils";
-      };
-    };
 
-    # Prebuilt nix-index database
+    # https://github.com/NixOS/nixpkgs/issues/286313
-    nix-index-database = {
+    fix-nvidia-x11-latest.url = "https://github.com/NixOS/nixpkgs/pull/286084.diff";
-      url = "github:Mic92/nix-index-database";
+    fix-nvidia-x11-latest.flake = false;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -121,6 +83,7 @@
                 src = nixpkgs;
                 patches = [
                   ./patches/gamepadui.patch
+                  inputs.fix-nvidia-x11-latest
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
@@ -133,7 +96,6 @@
               specialArgs = {
                 inherit allModules;
                 lib = self.lib;
-                nixos-hardware = inputs.nixos-hardware;
               };
             };
         in
@@ -162,7 +124,7 @@
           "aarch64-linux"."iso" = mkIso "aarch64-linux";
         };
 
-      overlays.default = import ./overlays { inherit inputs; };
+      overlays.default = import ./overlays;
       nixosModules.kernel-modules = import ./overlays/kernel-modules;
 
       deploy.nodes =

machines/hotspot/default.nix

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

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

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

machines/howl/default.nix

@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # don't use remote builders
-  nix.distributedBuilds = lib.mkForce false;
-
-  de.enable = true;
-  de.touchpad.enable = true;
-}

machines/howl/hardware-configuration.nix

@@ -1,58 +0,0 @@
-{ config, lib, pkgs, modulesPath, nixos-hardware, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    nixos-hardware.nixosModules.framework-13-7040-amd
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  hardware.framework.amd-7040.preventWakeOnAC = true;
-  services.fwupd.enable = true;
-  # fingerprint reader has initially shown to be more of a nuisance than a help
-  # it makes sddm log in fail most of the time and take several minutes to finish
-  services.fprintd.enable = false;
-
-  # boot
-  boot.loader.systemd-boot.enable = true;
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  # thunderbolt
-  services.hardware.bolt.enable = true;
-
-  # firmware
-  firmware.x86_64.enable = true;
-
-  # disks
-  remoteLuksUnlock.enable = true;
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/c801586b-f0a2-465c-8dae-532e61b83fee";
-    allowDiscards = true;
-  };
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/95db6950-a7bc-46cf-9765-3ea675ccf014";
-      fsType = "btrfs";
-    };
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/B087-2C20";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-  swapDevices =
-    [{ 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

machines/howl/properties.nix

@@ -1,26 +0,0 @@
-{
-  hostNames = [
-    "howl"
-  ];
-
-  arch = "x86_64-linux";
-
-  systemRoles = [
-    "personal"
-  ];
-
-  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQi3q8jU6vRruExAL60J7GFO1gS8HsmXVJuKRT4ljrG";
-
-  userKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKPnLt84bKhUgFxjQf10+Htro9Lo1Pabqm8mGalBUniv"
-  ];
-
-  deployKeys = [
-    # TODO
-  ];
-
-  remoteUnlock = {
-    hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0N80r0Sl2WlJaUqfxZPkOtYyGumFazkIqq7eq3Gd2o";
-    onionHost = "ll6yjnkh4psmfwmtkmqoutl4gq4elqzbmjxv4s6gpgoavyi3kwhjvnqd.onion";
-  };
-}

machines/phil/properties.nix

@@ -9,6 +9,7 @@
   systemRoles = [
     "server"
     "nix-builder"
+    "gitea-actions-runner"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2";

machines/ponyo/default.nix

@@ -102,7 +102,7 @@
       host = "chat.neet.space";
     };
     jitsi-meet = {
-      enable = false; # disabled until vulnerable libolm dependency is removed/fixed
+      enable = true;
       host = "meet.neet.space";
     };
     turn = {
@@ -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/ray/default.nix

@@ -0,0 +1,67 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  # for luks onlock over tor
+  services.tor.enable = true;
+  services.tor.client.enable = true;
+
+  # don't use remote builders
+  nix.distributedBuilds = lib.mkForce false;
+
+  # services.howdy.enable = true;
+
+  hardware.openrazer.enable = true;
+  hardware.openrazer.users = [ "googlebot" ];
+  hardware.openrazer.devicesOffOnScreensaver = false;
+  users.users.googlebot.packages = [ pkgs.polychromatic ];
+
+  services.udev.extraRules = ''
+    # depthai
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
+
+    # Moonlander
+    # Rules for Oryx web flashing and live training
+    KERNEL=="hidraw*", ATTRS{idVendor}=="16c0", MODE="0664", GROUP="plugdev"
+    KERNEL=="hidraw*", ATTRS{idVendor}=="3297", MODE="0664", GROUP="plugdev"
+    # Wally Flashing rules for the Moonlander and Planck EZ
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+  '';
+  services.udev.packages = [ pkgs.platformio ];
+  users.groups.plugdev = {
+    members = [ "googlebot" ];
+  };
+
+  # virt-manager
+  virtualisation.libvirtd.enable = true;
+  programs.dconf.enable = true;
+  virtualisation.spiceUSBRedirection.enable = true;
+  environment.systemPackages = with pkgs; [ virt-manager ];
+  users.users.googlebot.extraGroups = [ "libvirtd" "adbusers" ];
+
+  # allow building ARM derivations
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+  services.spotifyd.enable = true;
+
+  virtualisation.podman.enable = true;
+  virtualisation.podman.dockerCompat = true;
+
+  virtualisation.appvm.enable = true;
+  virtualisation.appvm.user = "googlebot";
+
+  services.mount-samba.enable = true;
+
+  de.enable = true;
+  de.touchpad.enable = true;
+
+  networking.firewall.allowedTCPPorts = [
+    # barrier
+    24800
+  ];
+
+  programs.adb.enable = true;
+}

machines/ray/hardware-configuration.nix

@@ -0,0 +1,62 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  # boot
+  efi.enable = true;
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+
+  # kernel
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  # firmware
+  firmware.x86_64.enable = true;
+  hardware.enableAllFirmware = true;
+
+  # gpu
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    modesetting.enable = true; # for nvidia-vaapi-driver
+    prime = {
+      reverseSync.enable = true;
+      offload.enableOffloadCmd = true;
+      nvidiaBusId = "PCI:1:0:0";
+      amdgpuBusId = "PCI:4:0:0";
+    };
+  };
+
+  # disks
+  remoteLuksUnlock.enable = true;
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
+    allowDiscards = true;
+  };
+  fileSystems."/" =
+    {
+      device = "/dev/vg/root";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+  fileSystems."/home" =
+    {
+      device = "/dev/vg/root";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/2C85-2B59";
+      fsType = "vfat";
+    };
+  swapDevices =
+    [{ device = "/dev/vg/swap"; }];
+}

machines/ray/properties.nix

@@ -0,0 +1,22 @@
+{
+  hostNames = [
+    "ray"
+  ];
+
+  arch = "x86_64-linux";
+
+  systemRoles = [
+    "personal"
+    "deploy"
+  ];
+
+  hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQM8hwKRgl8cZj7UVYATSLYu4LhG7I0WFJ9m2iWowiB";
+
+  userKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeTK1iARlNIKP/DS8/ObBm9yUM/3L1Ub4XI5A2r9OzP"
+  ];
+
+  deployKeys = [
+    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEaGIwLiUa6wQLlEF+keQOIYy/tCmJvV6eENzUQjSqW2AAAABHNzaDo="
+  ];
+}

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

@@ -3,7 +3,6 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./frigate.nix
     ./home-automation.nix
   ];
 
@@ -166,89 +165,60 @@
   };
 
   # 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."/" = {
-        {
+      proxyPass = "http://localhost:8096";
-          # Landing page LAN redirect
+      proxyWebsockets = true;
-          "s0" = {
+    };
-            default = true;
+  };
-            redirectCode = 302;
+  services.nginx.virtualHosts."jellyfin.neet.cloud".locations."/" = {
-            globalRedirect = "s0.neet.dev";
+    proxyPass = "http://localhost:8096";
-          };
+    proxyWebsockets = true;
-        }
+  };
-        (mkVirtualHost "ha.s0.neet.dev" "http://localhost:8123") # home assistant
+  services.nginx.virtualHosts."transmission.s0" = {
-        (mkVirtualHost "esphome.s0.neet.dev" "http://localhost:6052")
+    listen = [{ addr = "0.0.0.0"; port = 9091; } { addr = "0.0.0.0"; port = 80; }];
-        (mkVirtualHost "zigbee.s0.neet.dev" "http://localhost:55834")
+    locations."/" = {
-        {
+      proxyPass = "http://vpn.containers:9091";
-          "frigate.s0.neet.dev" = {
+      proxyWebsockets = true;
-            # Just configure SSL, frigate module configures the rest of nginx
-            useACMEHost = "s0.neet.dev";
-            forceSSL = true;
-          };
-        }
-        (mkVirtualHost "vacuum.s0.neet.dev" "http://192.168.1.125") # valetudo
-        (mkVirtualHost "todo.s0.neet.dev" "http://localhost:${toString config.services.vikunja.port}")
-      ];
-
-    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"
-        "vacuum.s0.neet.dev"
-        "todo.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;
+  ];
 
   virtualisation.oci-containers.backend = "podman";
   virtualisation.podman.dockerSocket.enable = true; # TODO needed?
@@ -257,20 +227,5 @@
     configFile = ./dashy.yaml;
   };
 
-  services.unifi = {
-    enable = true;
-    openMinimalFirewall = true;
-  };
-
-  services.vikunja = {
-    enable = true;
-    port = 61473;
-    frontendScheme = "https";
-    frontendHostname = "todo.s0.neet.dev";
-    settings = {
-      service.enableregistration = false;
-    };
-  };
-
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ];
 }

machines/storage/s0/frigate.nix

@@ -1,155 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  frigateHostname = "frigate.s0.neet.dev";
-
-  mkGo2RtcStream = name: url: withAudio: {
-    ${name} = [
-      url
-      "ffmpeg:${name}#video=copy${if withAudio then "#audio=copy" else ""}"
-    ];
-  };
-
-  # Assumes camera is set to output:
-  # - rtsp
-  # - H.264 + AAC
-  # - a downscaled substream for detection
-  mkCamera = name: primaryUrl: detectUrl: {
-    # Reference https://docs.frigate.video/configuration/reference/
-    services.frigate.settings = {
-      cameras.${name} = {
-        ffmpeg = {
-          # Camera feeds are relayed through go2rtc
-          inputs = [
-            {
-              path = "rtsp://127.0.0.1:8554/${name}";
-              # input_args = "preset-rtsp-restream";
-              input_args = "preset-rtsp-restream-low-latency";
-              roles = [ "record" ];
-            }
-            {
-              path = detectUrl;
-              roles = [ "detect" ];
-            }
-          ];
-          output_args = {
-            record = "preset-record-generic-audio-copy";
-          };
-        };
-      };
-    };
-    services.go2rtc.settings.streams = lib.mkMerge [
-      (mkGo2RtcStream name primaryUrl false)
-
-      # Sadly having the detection stream go through go2rpc too makes the stream unreadable by frigate for some reason.
-      # It might need to be re-encoded to work.  But I am not interested in wasting the processing power if only frigate
-      # need the detection stream anyway. So just let frigate grab the stream directly since it works.
-      # (mkGo2RtcStream detectName detectUrl false)
-    ];
-  };
-
-  mkDahuaCamera = name: address:
-    let
-      # go2rtc and frigate have a slightly different syntax for inserting env vars. So the URLs are not interchangable :(
-      # - 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=1";
-    in
-    mkCamera name primaryUrl detectUrl;
-
-  mkEsp32Camera = name: address: {
-    services.frigate.settings.cameras.${name} = {
-      ffmpeg = {
-        input_args = "";
-        inputs = [{
-          path = "http://${address}:8080";
-          roles = [ "detect" "record" ];
-        }];
-
-        output_args.record = "-f segment -pix_fmt yuv420p -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v libx264 -preset ultrafast -an ";
-      };
-    };
-  };
-in
-lib.mkMerge [
-  (mkDahuaCamera "dog-cam" "192.168.10.31")
-  # (mkEsp32Camera "dahlia-cam" "dahlia-cam.lan")
-  {
-    services.frigate = {
-      enable = true;
-      hostname = frigateHostname;
-      settings = {
-        mqtt = {
-          enabled = true;
-          host = "localhost:1883";
-        };
-        rtmp.enabled = false;
-        snapshots = {
-          enabled = true;
-          bounding_box = true;
-        };
-        record = {
-          enabled = true;
-          # sync_recordings = true; # detect if recordings were deleted outside of frigate (expensive)
-          retain = {
-            days = 2; # Keep video for 2 days
-            mode = "motion";
-          };
-          events = {
-            retain = {
-              default = 10; # Keep video with detections for 10 days
-              mode = "motion";
-              # mode = "active_objects";
-            };
-          };
-        };
-        # Make frigate aware of the go2rtc streams
-        go2rtc.streams = config.services.go2rtc.settings.streams;
-        detect.enabled = true;
-        objects = {
-          track = [ "person" "dog" ];
-        };
-      };
-    };
-
-    services.go2rtc = {
-      enable = true;
-      settings = {
-        rtsp.listen = ":8554";
-        webrtc.listen = ":8555";
-      };
-    };
-
-    # Pass in env file with secrets to frigate/go2rtc
-    systemd.services.frigate.serviceConfig.EnvironmentFile = "/run/agenix/frigate-credentials";
-    systemd.services.go2rtc.serviceConfig.EnvironmentFile = "/run/agenix/frigate-credentials";
-    age.secrets.frigate-credentials.file = ../../../secrets/frigate-credentials.age;
-  }
-  {
-    # hardware encode/decode with amdgpu vaapi
-    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";
-    };
-  }
-]

machines/storage/s0/hardware-configuration.nix

@@ -8,7 +8,6 @@
 
   # boot
   boot.loader.systemd-boot.enable = true;
-  boot.loader.systemd-boot.memtest86.enable = true;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -59,12 +58,8 @@
     };
   swapDevices = [ ];
 
-  networking.vlans = {
+  networking.interfaces.eth0.useDHCP = true;
-    iot = {
+  networking.interfaces.eth1.useDHCP = true;
-      id = 2;
-      interface = "eth1";
-    };
-  };
 
   powerManagement.cpuFreqGovernor = "powersave";
 }

machines/storage/s0/home-automation.nix

@@ -1,7 +1,99 @@
 { config, lib, pkgs, ... }:
 
+let
+  frigateHostname = "frigate.s0";
+  frigatePort = 61617;
+in
 {
-  services.esphome.enable = true;
+  networking.firewall.allowedTCPPorts = [
+    # 1883 # mqtt
+    55834 # mqtt zigbee frontend
+    frigatePort
+    4180 # oauth proxy
+  ];
+
+  services.frigate = {
+    enable = true;
+    hostname = frigateHostname;
+    settings = {
+      mqtt = {
+        enabled = true;
+        host = "localhost:1883";
+      };
+      cameras = {
+        dahlia-cam = {
+          ffmpeg = {
+            input_args = "";
+            inputs = [{
+              path = "http://dahlia-cam.lan:8080";
+              roles = [ "detect" "record" ];
+            }];
+
+            output_args.record = "-f segment -pix_fmt yuv420p -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v libx264 -preset ultrafast -an ";
+          };
+          rtmp.enabled = false;
+          snapshots = {
+            enabled = true;
+            bounding_box = true;
+          };
+          record = {
+            enabled = false;
+            retain.days = 0; # To not retain any recording if there is no detection of any events 
+            events.retain = {
+              default = 3; # To retain recording for 3 days of only the events that happened
+              mode = "active_objects";
+            };
+          };
+          detect = {
+            enabled = true;
+            width = 800;
+            height = 600;
+            fps = 20;
+          };
+          objects = {
+            track = [ "dog" ];
+            filters.dog.threshold = 0.4;
+          };
+        };
+      };
+      # ffmpeg = {
+      #   hwaccel_args = "preset-vaapi";
+      # };
+      detectors.coral = {
+        type = "edgetpu";
+        device = "pci";
+      };
+    };
+  };
+
+  # AMD GPU for vaapi
+  systemd.services.frigate.environment.LIBVA_DRIVER_NAME = "radeonsi";
+
+  # 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;
+
+  # 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 = {
@@ -14,9 +106,6 @@
       }
     ];
   };
-  networking.firewall.allowedTCPPorts = [
-    1883 # mqtt
-  ];
 
   services.zigbee2mqtt = {
     enable = true;
@@ -31,7 +120,7 @@
         # base_topic = "zigbee2mqtt";
       };
       frontend = {
-        host = "localhost";
+        host = "0.0.0.0";
         port = 55834;
       };
     };
@@ -39,55 +128,58 @@
 
   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"
-      "homekit_controller"
-      "zha"
-      "bluetooth"
     ];
     # 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";
     };
   };
+
+  services.oauth2_proxy =
+    let
+      nextcloudServer = "https://neet.cloud/";
+    in
+    {
+      enable = true;
+
+      httpAddress = "http://0.0.0.0:4180";
+
+      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;
 }

machines/storage/s0/properties.nix

@@ -11,7 +11,6 @@
     "pia"
     "binary-cache"
     "gitea-actions-runner"
-    "frigate"
   ];
 
   hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAwiXcUFtAvZCayhu4+AIcF+Ktrdgv9ee/mXSIhJbp4q";

machines/zoidberg/default.nix

@@ -42,28 +42,28 @@
   ];
 
   # System wide barrier instance
-  # systemd.services.barrier-sddm = {
+  systemd.services.barrier-sddm = {
-  #   description = "Barrier mouse/keyboard share";
+    description = "Barrier mouse/keyboard share";
-  #   requires = [ "display-manager.service" ];
+    requires = [ "display-manager.service" ];
-  #   after = [ "network.target" "display-manager.service" ];
+    after = [ "network.target" "display-manager.service" ];
-  #   wantedBy = [ "multi-user.target" ];
+    wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
+    serviceConfig = {
-  #     Restart = "always";
+      Restart = "always";
-  #     RestartSec = 10;
+      RestartSec = 10;
-  #     # todo use user/group
+      # todo use user/group
-  #   };
+    };
-  #   path = with pkgs; [ barrier doas ];
+    path = with pkgs; [ barrier doas ];
-  #   script = ''
+    script = ''
-  #     # Wait for file to show up. "display-manager.service" finishes a bit too soon
+      # Wait for file to show up. "display-manager.service" finishes a bit too soon
-  #     while ! [ -e /run/sddm/* ]; do sleep 1; done;
+      while ! [ -e /run/sddm/* ]; do sleep 1; done;
-  #     export XAUTHORITY=$(ls /run/sddm/*)
+      export XAUTHORITY=$(ls /run/sddm/*)
-  #     # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
+      # Disable crypto is fine because tailscale is E2E encrypting better than barrier could anyway
-  #     barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
+      barrierc -f --disable-crypto --name zoidberg ray.koi-bebop.ts.net
-  #   '';
+    '';
-  # };
+  };
 
   # Login into X11 plasma so barrier works well
-  services.displayManager.defaultSession = "plasma";
+  services.xserver.displayManager.defaultSession = "plasma";
 
   users.users.cris = {
     isNormalUser = true;
@@ -83,7 +83,7 @@
   };
 
   # Auto login into Plasma in john zoidberg account
-  services.displayManager.sddm.settings = {
+  services.xserver.displayManager.sddm.settings = {
     Autologin = {
       Session = "plasma";
       User = "john";
@@ -96,14 +96,4 @@
     spotify
     retroarchFull
   ];
-
-  # Command and Conquer Ports
-  networking.firewall.allowedUDPPorts = [ 4321 27900 ];
-  networking.firewall.allowedTCPPorts = [ 6667 28910 29900 29920 ];
-
-  nixpkgs.config.rocmSupport = true;
-  services.ollama = {
-    enable = true;
-    acceleration = "rocm";
-  };
 }

machines/zoidberg/hardware-configuration.nix

@@ -7,7 +7,7 @@
     ];
 
   # boot
-  boot.loader.systemd-boot.enable = true;
+  efi.enable = true;
   boot.loader.timeout = lib.mkForce 15;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
@@ -35,7 +35,7 @@
     };
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/954B-AB3E";
+      device = "/dev/disk/by-uuid/8074-B04D";
       fsType = "vfat";
     };
   swapDevices =

overlays/actualbudget/default.nix

@@ -7,16 +7,16 @@
 }:
 buildNpmPackage rec {
   pname = "actual-server";
-  version = "24.10.1";
+  version = "24.3.0";
 
   src = fetchFromGitHub {
     owner = "actualbudget";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-VJAD+lNamwuYmiPJLXkum6piGi5zLOHBp8cUeZagb4s=";
+    hash = "sha256-y51Dhdn84AWR/gM4LnAzvBIBpvKwUiclnPnwzkRoJ0I=";
   };
 
-  npmDepsHash = "sha256-Z2e4+JMhI/keLerT0F4WYdLnXHRQCqL7NjNyA9SFEF8=";
+  npmDepsHash = "sha256-/UM2Tz8t4hi621HtXSu0LTDIzZ9SWMqKXqKfPwkdpE8=";
 
   patches = [
     ./migrations-should-use-pkg-path.patch

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

@@ -1,5 +1,5 @@
 diff --git a/src/load-config.js b/src/load-config.js
-index d99ce42..42d1351 100644
+index d3cc5dd..cfcad8a 100644
 --- a/src/load-config.js
 +++ b/src/load-config.js
 @@ -3,7 +3,8 @@ import path from 'node:path';
@@ -12,7 +12,7 @@ index d99ce42..42d1351 100644
  const debugSensitive = createDebug('actual-sensitive:config');
  
  const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-@@ -108,6 +109,7 @@ const finalConfig = {
+@@ -90,6 +91,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,
@@ -21,7 +21,7 @@ index d99ce42..42d1351 100644
      process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT
        ? {
 diff --git a/src/migrations.js b/src/migrations.js
-index cba7db0..9983471 100644
+index 964e1f2..3a341d7 100644
 --- a/src/migrations.js
 +++ b/src/migrations.js
 @@ -1,6 +1,12 @@
@@ -37,12 +37,11 @@ index cba7db0..9983471 100644
  
  export default function run(direction = 'up') {
    console.log(
-@@ -13,7 +19,7 @@ export default function run(direction = 'up') {
+@@ -13,6 +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,
-+        migrationsDirectory
        },
        (err, set) => {
-         if (err) {
+         if (err) {

overlays/default.nix

@@ -1,15 +1,6 @@
-{ inputs }:
 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
+  libedgetpu = prev.callPackage ./libedgetpu { };
-  # 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/gasket.nix

@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "gasket";
-  version = "1.0-18-unstable-2023-09-05";
+  version = "1.0-18";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gasket-driver";
-    rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c";
+    rev = "09385d485812088e04a98a6e1227bf92663e0b59";
-    sha256 = "sha256-O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8=";
+    sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4=";
   };
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = [
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(PWD)"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
   installTargets = [ "modules_install" ];
 
-  sourceRoot = "${src.name}/src";
+  sourceRoot = "source/src";
   hardeningDisable = [ "pic" "format" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ lib.maintainers.kylehendricks ];
     platforms = platforms.linux;
-    broken = versionOlder kernel.version "5.15";
   };
 }

patches/gamepadui.patch

@@ -6,8 +6,8 @@ index 29c449c16946..f6c728eb7f0c 100644
    in
      pkgs.writeShellScriptBin "steam-gamescope" ''
        ${builtins.concatStringsSep "\n" exports}
--      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
+-      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
-+      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
++      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
      '';
  
    gamescopeSessionFile =

secrets/backblaze-s3-backups.age

@@ -1,24 +1,23 @@
 age-encryption.org/v1
--> ssh-ed25519 N7drjg YHZO6ENbBihFQFqRRjdWtgfX3R+qHtaJWIa54igHpEc
+-> ssh-ed25519 yHDAQw BnVxLTfrWFqaT6+Tz8I0gQReC2NjADak1TlzotVHzEs
-HLeZDyErwJme8knPYCxuSXMmHBkz2kDI6OBG6/EtP7w
+tzQGIMBFH1v91gezCWjCk3qNi6nhCFVMxaZrrxqFT+c
--> ssh-ed25519 yHDAQw 2YvHNNsiDJSUkKZOlhWzP4l1NfH0zTnldZV4Jjfy620
+-> ssh-ed25519 jQaHAA BwpFr2XXWTaNeYgieI1rkRw5u/mf55vVooZnJJhMLSI
-dHM0wG9JLiQJJ+NquhPeI/xv1iEqsxRy9D//NcYTr8k
+4VmJ1R5lcmD+apxg4WLnMk+aTJt3GOS+6KOE75NqjEY
--> ssh-ed25519 jQaHAA QtNkLsgdVgJqbmxLFhaf7AIG208NXHzgBweO8L3Dc3E
+-> ssh-ed25519 dMQYog oBypOzXH4ioZv9PzYGYxG4jBDRv6qIiRglj/f/uJugU
-SGjvdajk9M5azgP4QcynnxKieKEJYil1T2az4hYffdM
+SQRv3Iel0jeONRAVp96VFtKjXGJ8PMvp80ys4otQp0U
--> ssh-ed25519 w3nu8g JuFJuOdVOc8Uk5es2rpqPVHgg+l6/K0J+MHDFuffn0A
+-> ssh-ed25519 WBT1Hw wb7yUuZOQPhCYusR6WS5/e/NgC7UpBnIO0HZaO2+xxM
-n7tzohV+Uvecu6GVNeht/O/dL4x6e5SVdHEzRbJg3rI
+faHL6WBApWk8+871XmVRHcllXN4I7kgnqngY633jSI0
--> ssh-ed25519 dMQYog 44RRRe8M2FJWigy3d9TNaUQSM47gLDgU38F6ow1Xe2c
+-> ssh-ed25519 6AT2/g +l7AjVqKk9oi96mglZDQN5AVncmVqjEjFfPXFZYdGlI
-uQVkQma/hZVMCMtgcelyZhscvc46LItvbcPBuJI81Ns
+nEQtVZGMIKJlIf0Bj8T2YkUKQawpyP0bqCJ3Nj8PDPc
--> ssh-ed25519 WBT1Hw +b+2TOduL4XERN7qOYPtJ3R5w54m7VYqmyy8Smz6tXU
+-> ssh-ed25519 VyYH/Q QHjWhus6HvedZXiDtkoK9DiS8EPOpUxRHix1cSwVuiU
-TyQ+bjSK6IYSulW0rm12V+lpXYCt5kr3byaNNGJeMVc
+vn0vSFHo6doBH/rzk42DxKN8XzSzMVDMMaeqQX6iuII
--> ssh-ed25519 6AT2/g ZUmtQOHWmn0shq1iP3Ca7aQ74PLcqZGTprvsM/HAXR8
+-> ssh-ed25519 hPp1nw FH8TXl9deDyGS9pCyG3sBvzpi8d9S0u4tprKopO6vBo
-eNonzRSAwNCQi0DgtVs67zCjpOYsqeLEJYBmLjuS9rI
+ZaricPkMTEn+xNPOJP4nLIpsHdFDVCCEqFVq4FxOPCw
--> ssh-ed25519 hPp1nw qzrGZr5bFvfPwWrfNIUFubvGXBT+oQo9HZQuePSbPwk
+-> ssh-ed25519 dMQYog FYeNrUyYZ/aYZkmjTEVJ3Fq4J5qAe+Do7IDPiYDZrgw
-MKNlVl3OXBYEFWiu2hbbXDQnqkV4nENG+lcLcd+H33I
+RroBGlF7DyNKmL4+Nd84eKKkJh7AGE9FP1VxgUO3iF4
--> ssh-ed25519 w3nu8g H2UDASHwHNxU74g5IbuHIDHEZYgyWNmSX7Wv/lV41HQ
+-> htnK=h-grease F7l m it+; <4OvM
-WMgKT0GZxWQoK57E9B2j8MsyOroMhWd5SiCQtZa7AIY
+2MOngVDIi1sJJnjX2eAt4L3jObghFIbv20wJHLb7G0AMyavVmOiQ4xSehDKCb34g
--> ssh-ed25519 dMQYog YkL6XApXeP9qc4pVaIHFaNmYIK/PVEKoJz5SotQbGmQ
+10vwok0cSXaKOGmbXOFst9J2tk+z
-H+3wAxIl9Yip4xQqjhje9tL1V4m00NNSxNjH6Dbb1K8
+--- nOQEybjt9MPX5X2cUnpKFgHtTSPvJSFnDGyj3ATlrEQ
---- vBQpXXpKzzXwpNP17r8OBqO4Q3bIS4pHqbEl4u9dB1w
+ÞO¸†’¿"of<6F>æÕ¹|ñÜŠšÇ'_j]þ–ëI<u‡‡:*¼†¾hœµÆ?"M‰)Ñ̦Ví*KAôN3µ@rWí¤©¨‹
-ÎL“9[íg¡dŒxgº8Ø*0‘«šœ’…·¾öWå&`*?`ÔÊ­IQÛ÷Ýd1*ª–ñ¶bM\‹<>D™+«)‡
+tX€«Ñí…o
-\ƒg¤hDá3#k3;Åj¾ÞŽ±Ý¾Hš·ÙF&ÙX	%6˜Bî8”¹T·fG`Q¯®âñ?[hDªö*c

secrets/cris-hashed-email-pw.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g WZ9p/pCsEDpKbgGDLcTtisn25kExQX9iv+tL3wyPwiY
+-> ssh-ed25519 6AT2/g MmInWcw6GlfzvN9kxFtTVWMX+UX9PHO5V35TzRcmex0
-vom2z9QRIQSFB0+4/7lSWUEB0eoAG+08nXgiUg/OSX4
+dSMoGNuJMpRwyWTAnjHpO9mJBCxsJ77M5fWA0F1gR6s
--> ssh-ed25519 w3nu8g ECLZwCRJVJqyUMf70EOl2/3ExTruKaxCSQlY5fBZqxk
+-> ssh-ed25519 dMQYog ua3OPiErZcVRNGf/uxv7PiBBFOKAUkaSSIV4UCMu5Wc
-VemnmGpzx1VprkybW1hPlkfmiDaNcBDoEzX0mDZgmu0
+L8kYIzyEXcAxAlPQbqasgiaQi7JARhja6vM6WzvdMrs
--> ssh-ed25519 dMQYog QiPsbFE8MtXnRNBwkUEC+6grqXEbDstEtxYR8uJks2w
+-> CIn-grease !G{f,9h( Hjn\ \hTpE MAP<)J
-O3JWQGppFeZEd6o3W0KVTEIyNVGeLxKfTYTlgsAEVHQ
+0u+eQDvbxgI6aDT7xqdwOX3A34E2T4Ft9bSF6KBpHqucHib9tA5lJHgtXwgkpa/P
---- RncZzBFEyMAkpZRWrPORA0DPHuCTNswmWG5CMNnfm4A
+nbaJDnRWbM/AL7nnT7XpdLVO2r7w2ish4ALBgPvXxH/0iUXqvQk1B/E
-	ñ/¼ÔËõôŒ8nàÅ¥«¸7hîtä?T˜=‘%zˆ°[¤ÝØ!(…uÔdÇuò@
+--- +aKXbSfk6VkxqtTn+fI8VhcgO7Dw0jNSUJOJlqCbEGM
-×¢EbƒyŽ¦ù¦D=Ü!‹„XþtÞÔ:#¦þþãÞXÈX@ú_M‘
+á? Þ÷Ùþq}` ¿Žiämó<>.6Û{I

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/frigate-credentials.age

@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hPp1nw Chke1ZtpXxN1c1+AnJ6Cd5kpM1KfQKTwymrfPW53QCA
-jUcw8eitC7r0rwefjllndZjARIqpWoVqGCnefHfjQ6Y
--> ssh-ed25519 w3nu8g KY/5bU1B5uvmfGHF2d6qBL1NYy64qo324rdvkgnXoDA
-OBvuFtzZXQ0RmmEXelyzHMMiVqZir7zQJMA36ZH2siE
---- CSd7lYSYQ2fCTjkJLPGdaNGL8eVpE9IBEyFo0LW907M
-£³$šO†ÈIß/À//Êw*ƒ™õD¤@u5o[¼â:·äš¥t¾˜]Jñ쮸™@Ùhþu£Àk;?·XüÁHRº’Ñ°E5¥ÍçÜ9

secrets/hostapd-pw-CXNK00BF9176.age

@@ -1,7 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 w3nu8g ER07FH17Wm9op5F4pCftNK76f+nNjtA6zQc/2dLyAHI
+-> ssh-ed25519 VyYH/Q evYn+9ipH4t4cT2lZOiwnGqSkU+bbdVw80S0rgAqt00
-nxxq/8tS3ENJhAEIhJCiSi7dV+68AmcEMh9zvZoWpdY
+Vr24AqHOqH5DQYYlyS0X+k6TnczKHRDGZCeoLOJkybE
--> ssh-ed25519 dMQYog JelCfh+akP7C/i1kimq3fC5PRQa9gHbmBaOnjKu+PDw
+-> ssh-ed25519 dMQYog 23GqNi0N24EtnRV25Ick+aurPOngZ2Zd279LmZH15WY
-GVTwo7MzkpCereZRh0HVjGYmtdMY1gHowMZtUQl7XQw
+FEo0GyymjnPrSjf608SyCH22FvaqEixyVcbXdQ+Z3zA
---- p2l83t3bEdBrrp1ctaqqKhwB4l2McgZqZTtc2SXgd8Q
+-> (Rd{ky@}-grease D f/KA]Pe
-ø±ôeÆd\Yå4lXVF§U©<55>þM||)دÔûú•¶Ü8¿>ëž­%ðóJ$à´Õè
+8Ip1fddb0BYUwg62FSmUBp7O+TILFaCtWHcxheEyUlXPoY9TGTaySl6Znw9Mksde
+q2aAHn8
+--- ibLXcq9R/5X2jFKBABgsUcDiBjjuoA9SrCuFbGOiNBI
+¸Ó;ù½XôóÀ	m£hŽ²ý%펗
+6â×k@nWÃäT®‘0

secrets/hostspot-passwords.age

@@ -1,7 +0,0 @@
-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/iodine.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g Knb25oYknkiXyMqVBR3T0sFSO4hDjWUTq3xIml/b4ig
+-> ssh-ed25519 6AT2/g UG+Ub0bZK74/Ifa/YkZOc6B3cPl6oI7M4Ev1zxkFEh0
-n7xamnrZ+SCWiKqniF3r2JvH4G8q2pJaHzF0riNEDf4
+z71vjnEqhL3kuLePbP0nKQNwU0mrCOO386wLdUhH5tU
--> ssh-ed25519 w3nu8g 7+2R5RpLjBf4jjj3S8ibMquUWgRMrifziGQubwuLrhA
+-> ssh-ed25519 dMQYog t8H6XoIhhE4H9g4913sWgZ5BaYK04uk7Mj0FYnOdtTo
-3jLCalnbA3Z2jr8Zs+qrpzSoi3Jv6E5OV2binpr3Kk4
+U4Ygto4z3l4dcCsnGxnRo1YGBl6YZ5y5pnVBJXCSrOc
--> ssh-ed25519 dMQYog Nh2e7me0tiG7ZwQK8669VS0LCYFSH+b33I9tr8uI5CY
+-> Bad-grease <$Y
-7Gs1N9eZa1CGR9pczzugHbqnghqevX7kQCOeqR4q0eI
+1xw
---- OzW+omJsZA/b4DMF4hdQga7JVgiEYluZok3r8JM258I
+--- wiGO0H6gfd+3D/+V/rMNLGkDk6FPFUihXi43J82LAkg
-*³²ÝPŽ†AcèÈ1·@Át¸e÷nf&ù#I7‡a‰Ûâc†ÃÀ<C383>êbDâ–~aõ]1w=Á
+³8>`®À
s«»pú¨€¿U#ü™º¯KV%jbwïxN¸@
+Žî@œª€iæ
+Ow\º(@@Tòìèzá

secrets/pia-login.age

@@ -1,11 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g MGKlbzVOk5+czgAOerwl+eIyOifXJm/q4UgQUXVpx1c
+-> ssh-ed25519 6AT2/g gPeZnJ8arK6xAGnEK9uTcGfwBI1pYjjv6VX4o9EBIns
-43l6s4+5TSMQyO9tAg7v9Y5OdXOjKYz56lbr9Jm2r+o
+sKFfqnafLachTKE93Pb7gsZ5gdKis64N64BK5128LKg
--> ssh-ed25519 hPp1nw aOxni4sFPPgedUkBOuOyEWfFPJrhdTJnivIaWt5RJxM
+-> ssh-ed25519 hPp1nw e2taazZ3R6EBCbgh6Gg0Dc9p1K7zp5R7n9LIkWF/Wj8
-KNaxijzSMp7EjYKwWiAP66nPYYZK3/VXL8u+3uJt6bg
++/VkcMDL1HNJhbc6/OxpiUe1dlO0lrc1hgkD/RrYXjY
--> ssh-ed25519 w3nu8g qTAzEzQbFze35AtbvkYREw3wa7ApDN5u7RSZUXrEpms
+-> ssh-ed25519 dMQYog znMKkv1O7F/EeAyvTfULUn/pWdai2NI0uBfWn/02xg0
-Dy0uGF458A9RJMvDl2XKOkEABbbRgT+eIgvb6ZOEQqg
+45W9s4Vo8J+xOTGec9h6s0ra9ZSUA6JkorAAyqqlPfg
--> ssh-ed25519 dMQYog 5DfYuGeWuN0/CO6WWbFIi7LaKl23FXYVdPROM+TFpCA
+-> T/!XI-grease GJ_O'
-PDBdDn+YUMKYNKFkCEfXesmkB/XUxZRK3ddQt0kqQ7g
+mAOW54Txa2H9WdEMog0g1XQjkC5z0wQIoqNlnbsjCSvM1UaPiiu6vJOJKCmJb1Z6
---- JOeG87EVD+QBx6n+rMoPTOni0PyoG7xx4a2USNiapYI
+3wyLN6lCIjkR
-Zsý{ÅiÁ_
QÂ\+ô@@Üò߸ù&_š5­$¿Gt2¢rF“y×ÄQ§Iaž7ôÙÉzàgf­%O(µÙ,VéÂ}ÿn|û'J¸2ø¨óQÑB
+--- yX7lzKnDkn+KkRVTumffcd/SJSznR5n6JtUgWkSSohk
+ãQô^àèyW; â§]Š+u>¥3wŒz±¨oêM:ã™øêúÀöŸÃ9,xv×KÁÜXT-K8rÔAç(@Ø-|³
+:PÈ<50>‡*H
6€'¹&Ôi

secrets/secrets.nix

@@ -36,6 +36,7 @@ with roles;
 
   # services
   "searx.age".publicKeys = nobody;
+  "spotifyd.age".publicKeys = personal;
   "wolframalpha.age".publicKeys = dailybot;
 
   # hostapd
@@ -51,13 +52,4 @@ with roles;
 
   # Librechat
   "librechat-env-file.age".publicKeys = librechat;
-
-  # For ACME DNS Challenge
-  "digitalocean-dns-credentials.age".publicKeys = server;
-
-  # Frigate (DVR)
-  "frigate-credentials.age".publicKeys = frigate;
-
-  # Phone hotspot passwords
-  "hostspot-passwords.age".publicKeys = hotspot;
 }

secrets/wolframalpha.age

@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 6AT2/g Kw5/he5m/XAJUNv8XEJQU+e+Ou7hCYluMXXWlHiePXY
+-> ssh-ed25519 6AT2/g 3xkROcKh6I/oVGRwnvJ9Dy36JvYmsJQZq2DBvYC4Dz4
-GkhJOzSlcC9S7bs8FuDNMvMaFU3+fQ5z+o+Pb8wllp8
+JunaGg8zg2SJZmBnuV0ZcDSc8vsMHgTd1RbDn8giy+Y
--> ssh-ed25519 w3nu8g fUORtXN1ygOeV42jveCosGXR/Y6R6OG6DK7LPDBEAk8
+-> ssh-ed25519 dMQYog JG8QC1thl+CMlxoI1Y+ZUj0dQ3FXF4cquk7tdzfaS0E
-yFpoasbY/sl6BQp0LVBQnInA4Kxd8A8meEObU1KD108
+zW7jyrXhVvyIq7HXfcRqkyZdg/wkWwNfPk5KbI2jH7I
--> ssh-ed25519 dMQYog 75qVEe6/1yOV4DDLAOGaufs3ojx1/Sc1fIQOe+Oirz0
+-> $"v%-grease `Xo|a eIFIq 7hBk?8%1
-iDFsr6/30AHKH6hUs/WTpHEM8WQ03QMlGbtQkGrnVCU
+ZoNiAXY1HE1GEQPd1aJirTitFgXf3HKcV2H6HxRpzWysUd1DGOsF/jScUO36JgIP
---- islx8t7a6bShXGxvYeDVuUxkmAMtpUfr0Gp7aYrJUkI
+sY8FA22PjyUv7g
-2Ûí4¤†7Õ
+--- zFpfG3JQpSmE108GMEWLjGWMJe7cXVn3NN9vs8iDY3E
-?Õw€À<E282AC>JÁÆØv	¨º9’,ËxÅŠò¨‰¦Æ¦ñnäH?>I­
+8f,ÕªÒÅðÚÏ*}V¥Æ@j†3ÿïCèM*@}ìy2Øì9€Éè ìN|y›æ