flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/5a88a6eceb8fd732b983e72b732f6f4b8269bef3?narHash=sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4%3D' (2025-12-01)
  → 'github:nix-community/disko/d64e5cdca35b5fad7c504f615357a7afe6d9c49e?narHash=sha256-fTLX9kDwLr9Y0rH/nG%2Bh1XG5UU%2BjBcy0PFYn5eneRX8%3D' (2025-12-10)
• Updated input 'home-manager':
    'github:nix-community/home-manager/20561be440a11ec57a89715480717baf19fe6343?narHash=sha256-O8VTGey1xxiRW%2BFpb%2BPs9zU7ShmxUA1a7cMTcENCVNg%3D' (2025-12-08)
  → 'github:nix-community/home-manager/44777152652bc9eacf8876976fa72cc77ca8b9d8?narHash=sha256-FuFtkJrW1Z7u%2B3lhzPRau69E0CNjADku1mLQQflUORo%3D' (2025-12-10)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/efe665b4558370af6e89921c487cd92890183961?narHash=sha256-DsURvH9UZbaPvpLR1LctCymxRJIsznUOGcS5J7z9St4%3D' (2025-12-08)
  → 'github:hyprwm/Hyprland/75f6435f70dee8f8b685a02c52db7ba16f5db39c?narHash=sha256-jWBGCyYhPVEPTw7/upguKnjwccivwap9o%2B4/pD/gcCw%3D' (2025-12-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454?narHash=sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o%3D' (2025-12-06)
  → 'github:NixOS/nixpkgs/09eb77e94fa25202af8f3e81ddc7353d9970ac1b?narHash=sha256-mSD5Ob7a%2BT2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo%3D' (2025-12-09)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05)
  → 'github:NixOS/nixpkgs/addf7cf5f383a3101ecfba091b98d0a1263dc9b8?narHash=sha256-hM20uyap1a0M9d344I692r%2Bik4gTMyj60cQWO%2BhAYP8%3D' (2025-12-08)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c?narHash=sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ%3D' (2025-12-06)
  → 'github:cachix/git-hooks.nix/09e45f2598e1a8499c3594fe11ec2943f34fe509?narHash=sha256-dixPWKiHzh80PtD0aLuxYNQ0xP%2B843dfXG/yM3OzaYQ%3D' (2025-12-11)

README.md

@@ -5,15 +5,17 @@ System and user configuration for NixOS-based systems.
 | | |
 |-|-|
 | **Shell:** | zsh |
-| **DE:** | GNOME |
+| **WM:** | Hyprland |
 | **Theme:** | Adwaita |
-| **Terminal:** | Ghostty |
+| **Terminal:** | kitty |
 
 ## Provisioning a new host
+
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
 > for provisioning
 
 Generate a new SSH host key in "$temp/etc/ssh" as per [this guide](https://nix-community.github.io/nixos-anywhere/howtos/secrets.html#example-decrypting-an-openssh-host-key-with-pass).
+
 ```
 ssh-keygen -t ed25519 -f /tmp/ssh_host_ed25519_key
 ```
@@ -29,6 +31,7 @@ Create a new directory under `hosts/` with a system configuration and disk layou
 Boot the NixOS installer (or any Linux distribution) on the target.
 
 Then run:
+
 ```
 nix run github:nix-community/nixos-anywhere -- \
   --disk-encryption-keys /tmp/secret.key /tmp/secret.key \
@@ -40,15 +43,19 @@ nix run github:nix-community/nixos-anywhere -- \
 ### Post install
 
 If backups are configured, you'll need to run:
+
 ```
 borgmatic init --encryption repokey-blake2
 ```
+
 then restart `borgmatic`.
 
 To join the Tailscale network, run:
+
 ```
 tailscale up --login-server https://headscale.vimium.net
 ```
+
 then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.
 
 The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.

flake.nix

@@ -2,165 +2,176 @@
   description = "NixOS system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    agenix = {
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+      url = "github:ryantm/agenix";
-    # nixpkgs-master.url = "nixpkgs";
+      inputs.home-manager.follows = "nixpkgs";
-    agenix.url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
-    deploy-rs.url = "github:serokell/deploy-rs";
+    };
+
+    agenix-rekey = {
+      url = "github:oddlama/agenix-rekey";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
+    };
+
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    devshell = {
+      url = "github:numtide/devshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     hyprland.url = "github:hyprwm/Hyprland";
+
     hyprland-plugins = {
       url = "github:hyprwm/hyprland-plugins";
       inputs.hyprland.follows = "hyprland";
     };
+
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
     gitea-github-theme = {
       url = "git+ssh://git@git.vimium.com/jordan/gitea-github-theme.git?ref=main";
       flake = false;
     };
+
     impermanence.url = "github:nix-community/impermanence";
+
     kvlibadwaita = {
       url = "github:GabePoel/KvLibadwaita";
       flake = false;
     };
+
     nixos-hardware.url = "github:NixOS/nixos-hardware";
+
     nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixpkgs.url = "nixpkgs/nixos-25.11";
+
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+
+    # nixpkgs-master.url = "nixpkgs";
+
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-topology = {
+      url = "github:oddlama/nix-topology";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
+    };
+
     pre-commit-hooks = {
       url = "github:cachix/git-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     secrets = {
       url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
       flake = false;
     };
+
     thunderbird-gnome-theme = {
       url = "github:rafaelmardojai/thunderbird-gnome-theme";
       flake = false;
     };
+
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
-    inputs@{ self, nixpkgs, ... }:
+    inputs@{
-    let
+      nixpkgs,
-      inherit (nixpkgs) lib;
+      flake-parts,
-
+      ...
-      domain = "mesh.vimium.net";
+    }:
-      forEachSystem = lib.genAttrs [
+    flake-parts.lib.mkFlake { inherit inputs; } {
-        "x86_64-linux"
+      imports = [
-        "aarch64-linux"
+        inputs.pre-commit-hooks.flakeModule
+        inputs.nix-topology.flakeModule
+        inputs.treefmt-nix.flakeModule
+        ./nix/agenix-rekey.nix
+        ./nix/devshell.nix
+        ./nix/hosts.nix
       ];
-      mkDeployNode = hostName: {
-        hostname = "${hostName}.${domain}";
 
-        profiles.system = {
+      flake = {
-          user = "root";
+        overlays = nixpkgs.lib.packagesFromDirectoryRecursive {
-          path =
+          callPackage = path: overrides: import path;
-            inputs.deploy-rs.lib.${
+          directory = ./overlays;
-              self.nixosConfigurations.${hostName}.config.system.build.toplevel.system
-            }.activate.nixos
-              self.nixosConfigurations.${hostName};
         };
       };
-    in
-    {
-      overlays = lib.packagesFromDirectoryRecursive {
-        callPackage = path: overrides: import path;
-        directory = ./overlays;
-      };
 
-      legacyPackages = forEachSystem (
+      systems = [
-        system:
+        "aarch64-linux"
-        lib.packagesFromDirectoryRecursive {
+        "x86_64-linux"
-          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
-          directory = ./pkgs;
-        }
-      );
-
-      nixosConfigurations = lib.pipe ./hosts [
-        builtins.readDir
-        (lib.filterAttrs (name: value: value == "directory"))
-        (lib.mapAttrs (
-          name: value:
-          lib.nixosSystem {
-            specialArgs = { inherit inputs; };
-
-            modules = [
-              {
-                networking = {
-                  inherit domain;
-                  hostName = name;
-                };
-              }
-              ./hosts/${name}
-            ];
-          }
-        ))
       ];
 
-      checks =
+      perSystem =
-        builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib
+        { pkgs, ... }:
-        // (forEachSystem (system: {
+        {
-          pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
+          formatter = pkgs.nixfmt-rfc-style;
-            src = ./.;
+
-            hooks = {
+          legacyPackages = pkgs.lib.packagesFromDirectoryRecursive {
-              check-case-conflicts.enable = true;
+            callPackage = pkgs.callPackage;
-              check-executables-have-shebangs.enable = true;
+            directory = ./pkgs;
-              check-merge-conflicts.enable = true;
+          };
-              deadnix = {
+
-                enable = true;
+          pre-commit = {
-                settings = {
+            settings = {
-                  noLambdaArg = true;
+              excludes = [ "pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem" ];
-                };
+              hooks = {
+                check-case-conflicts.enable = true;
+                check-executables-have-shebangs.enable = true;
+                check-merge-conflicts.enable = true;
+                detect-private-keys.enable = true;
+                end-of-file-fixer.enable = true;
+                fix-byte-order-marker.enable = true;
+                mixed-line-endings.enable = true;
+                treefmt.enable = true;
+                trim-trailing-whitespace.enable = true;
               };
-              detect-private-keys.enable = true;
-              end-of-file-fixer.enable = true;
-              fix-byte-order-marker.enable = true;
-              mixed-line-endings.enable = true;
-              nixfmt-rfc-style.enable = true;
-              trim-trailing-whitespace.enable = true;
             };
           };
-        }));
 
-      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
+          treefmt = {
-
+            projectRootFile = "flake.nix";
-      devShells = forEachSystem (system: {
+            programs = {
-        default = nixpkgs.legacyPackages.${system}.mkShell {
+              deadnix = {
-          inherit (self.checks.${system}.pre-commit-check) shellHook;
+                enable = true;
-          buildInputs = [
+                no-lambda-arg = true;
-            inputs.agenix.packages.${system}.agenix
+              };
-            inputs.deploy-rs.packages.${system}.deploy-rs
+              mdformat.enable = true;
-          ] ++ self.checks.${system}.pre-commit-check.enabledPackages;
+              nixfmt-rfc-style.enable = true;
+              shellcheck.enable = true;
+            };
+          };
         };
-      });
-
-      deploy = {
-        magicRollback = true;
-        autoRollback = true;
-        sshUser = "root";
-        nodes = lib.genAttrs [
-          "mail"
-          # "pi"
-          # "skycam"
-          "vps1"
-        ] mkDeployNode;
-      };
     };
 }

hosts/artemis/README.md

@@ -0,0 +1,49 @@
+# Artemis
+
+## Overview
+
+Home theatre and gaming PC
+
+## Specs
+
+- CPU - AMD Ryzen 7 9800X3D @ 4.70GHz
+- Chipset - AMD B850
+- Memory - 64 GB DDR5
+- Motherboard - ASUS ROG STRIX B850-I Gaming WiFi
+- GPU - AMD Radeon 7900 XTX
+- Case - MCPRUE Apollo S v4
+
+### Disks
+
+Device | Partitions _(filesystem, size, usage)_
+--- | ---
+WD Black SN850X | `/dev/nvme0n1p1` (EFI, 500 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS, 4 TiB, NixOS Root)
+
+#### ZFS pool layout
+
+```
+rpool/
+├── local
+│   ├── nix
+│   ├── root
+│   └── state
+└── safe
+    └── persist
+```
+
+See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
+
+#### Impermanence
+
+This machine uses [impermanence](https://github.com/nix-community/impermanence) and is rolled back to a clean state on each reboot.
+
+Mountpoint | Persists across reboots? | Backed up?
+--- | --- | ---
+`/` | No | Yes
+`/state` | Yes | No
+`/persist` | Yes | Yes
+
+### Networks
+
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `artemis.mesh.vimium.net`.

hosts/artemis/default.nix

@@ -0,0 +1,114 @@
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    getExe
+    mkForce
+    ;
+in
+{
+  imports = [
+    inputs.disko.nixosModules.disko
+    ./hardware-configuration.nix
+    ./disko-config.nix
+    ../desktop.nix
+    ../../users/guest
+  ];
+
+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config.permittedInsecurePackages = [
+      "qtwebengine-5.15.19"
+    ];
+  };
+
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+      graceful = true;
+    };
+    efi.canTouchEfiVariables = true;
+  };
+
+  networking = {
+    hostId = "4f9a2b7e";
+    networkmanager.enable = mkForce false;
+  };
+
+  services.openssh.settings.PermitRootLogin = mkForce "prohibit-password";
+
+  users = {
+    users = {
+      root = {
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+      };
+    };
+  };
+
+  services.earlyoom = {
+    enable = true;
+    extraArgs = [
+      "-M"
+      "409600,307200"
+    ]
+    ++ (
+      if config.swapDevices.zramSwap.enable or false then
+        [
+          "-S"
+          "409600,307200"
+        ]
+      else
+        [ ]
+    );
+  };
+
+  services.sunshine = {
+    enable = false;
+    package = pkgs.unstable.sunshine;
+    capSysAdmin = true;
+  };
+
+  programs.steam.enable = true;
+
+  environment = {
+    systemPackages = [ pkgs.wine ];
+    sessionVariables.WINE_BIN = getExe pkgs.wine;
+  };
+
+  environment.persistence."/persist".enable = mkForce true;
+  environment.persistence."/state".enable = mkForce true;
+
+  modules = {
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/home/jordan/Documents"
+        ];
+        repoPath = "ssh://neafzrj7@neafzrj7.repo.borgbase.com/./repo";
+      };
+    };
+    system = {
+      wireless = {
+        enable = true;
+        interfaces = [ "wlp11s0" ];
+      };
+      desktop = {
+        gnome.enable = lib.mkForce false;
+        hyprland.enable = false;
+      };
+    };
+  };
+
+  system.stateVersion = "25.05";
+}

hosts/artemis/disko-config.nix

@@ -0,0 +1,97 @@
+{ ... }:
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/disk/by-id/nvme-WD_BLACK_SN850X_4000GB_25115L4A0708";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "500M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "rpool";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      rpool = {
+        type = "zpool";
+        options = {
+          ashift = "12";
+        };
+        rootFsOptions = {
+          compression = "zstd";
+          acltype = "posix";
+          atime = "off";
+          xattr = "sa";
+          dnodesize = "auto";
+          mountpoint = "none";
+          canmount = "off";
+          devices = "off";
+          exec = "off";
+          setuid = "off";
+        };
+        datasets = {
+          "local" = {
+            type = "zfs_fs";
+          };
+          "local/root" = {
+            type = "zfs_fs";
+            mountpoint = "/";
+            options = {
+              canmount = "noauto";
+              mountpoint = "/";
+              exec = "on";
+              setuid = "on";
+            };
+            postCreateHook = "zfs snapshot rpool/local/root@blank";
+          };
+          "local/nix" = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+            options = {
+              canmount = "noauto";
+              mountpoint = "/nix";
+              exec = "on";
+              setuid = "on";
+            };
+          };
+          "local/state" = {
+            type = "zfs_fs";
+            mountpoint = "/state";
+            options = {
+              canmount = "noauto";
+              mountpoint = "/state";
+            };
+          };
+          "safe" = {
+            type = "zfs_fs";
+          };
+          "safe/persist" = {
+            type = "zfs_fs";
+            mountpoint = "/persist";
+            options = {
+              canmount = "noauto";
+              mountpoint = "/persist";
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/artemis/hardware-configuration.nix

@@ -0,0 +1,121 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+let
+  inherit (lib)
+    getExe
+    mkDefault
+    mkOverride
+    ;
+in
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  # Inspired by: https://github.com/Jovian-Experiments/Jovian-NixOS
+  boot = {
+    binfmt.registrations."DOSWin" = {
+      wrapInterpreterInShell = false;
+      interpreter = getExe pkgs.wine;
+      recognitionType = "magic";
+      offset = 0;
+      magicOrExtension = "MZ";
+    };
+    initrd = {
+      availableKernelModules = [
+        "xhci_pci"
+        "ehci_pci"
+        "nvme"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
+      kernelModules = [
+        "amdgpu"
+      ];
+      supportedFilesystems = [ "zfs" ];
+    };
+    kernel.sysctl = {
+      "kernel.sched_cfs_bandwidth_slice_u" = mkDefault 3000;
+      "kernel.sched_latency_ns" = mkDefault 3000000;
+      "kernel.sched_min_granularity_ns" = mkDefault 300000;
+      "kernel.sched_wakeup_granularity_ns" = mkDefault 500000;
+      "kernel.sched_migration_cost_ns" = mkDefault 50000;
+      "kernel.sched_nr_migrate" = mkDefault 128;
+      "kernel.split_lock_mitigate" = mkDefault 0;
+
+      "net.ipv4.tcp_mtu_probing" = true;
+      "net.ipv4.tcp_fin_timeout" = mkDefault 5;
+
+      "vm.max_map_count" = mkOverride 999 2147483642;
+    };
+    kernelModules = [
+      "hid_nintendo"
+      "hid_playstation"
+      "kvm-amd"
+      "ntsync"
+    ];
+    kernelParams = [
+      "log_buf_len=4M"
+      "amdgpu.lockup_timeout=5000,10000,10000,5000"
+      "ttm.pages_min=2097152"
+      "amdgpu.sched_hw_submission=4"
+      "audit=0"
+    ];
+    kernelPackages = pkgs.linuxPackages_6_17;
+    supportedFilesystems = [ "ntfs" ];
+  };
+
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          MultiProfile = "multiple";
+          FastConnectable = true;
+          # enable experimental LL privacy, experimental offload codecs
+          KernelExperimental = "15c0a148-c273-11ea-b3de-0242ac130004";
+        };
+        LE = {
+          ScanIntervalSuspend = 2240;
+          ScanWindowSuspend = 224;
+        };
+      };
+    };
+    graphics = {
+      enable32Bit = true;
+      extraPackages = [
+        pkgs.gamescope-wsi
+        pkgs.vk-hdr-layer
+      ];
+      extraPackages32 = [ pkgs.pkgsi686Linux.gamescope-wsi ];
+    };
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    enableRedistributableFirmware = true;
+  };
+
+  powerManagement.cpuFreqGovernor = "schedutil";
+
+  services.udev.packages = [
+    (pkgs.writeTextFile {
+      name = "ntsync-udev-rules";
+      text = ''KERNEL=="ntsync", MODE="0660", TAG+="uaccess"'';
+      destination = "/etc/udev/rules.d/70-ntsync.rules";
+    })
+  ];
+
+  services.pulseaudio.enable = false;
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

hosts/artemis/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDXJmnp4LUE9AFjGHwvxAu4m/3PB2uYQ69F7wYv7cGGT

hosts/atlas/README.md

@@ -1,24 +1,28 @@
 # Atlas
 
 ## Overview
+
 A general purpose mini computer used for web browsing and multimedia.
 
 ## Specs
-* CPU - Intel Core i7-4790K @ 4.00GHz
+
-* Chipset - Intel Z97
+- CPU - Intel Core i7-4790K @ 4.00GHz
-* Memory - 8 GB DDR3
+- Chipset - Intel Z97
-* Motherboard - ASRock Z97M-ITX
+- Memory - 8 GB DDR3
-* GPU - AMD Radeon R9 290X 4GB
+- Motherboard - ASRock Z97M-ITX
-* Case - SilverStone Sugo SG13
+- GPU - AMD Radeon R9 290X 4GB
-* NIC - Intel Gigabit I218-V, Broadcom BCM4360 802.11ac
+- Case - SilverStone Sugo SG13
+- NIC - Intel Gigabit I218-V, Broadcom BCM4360 802.11ac
 
 ### Disks
+
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
 Samsung SSD 850 | `/dev/sda1` (NTFS, 500 GiB, Windows XP)
 Samsung SSD 850 | `/dev/sdb1` (EFI, 500 MiB, NixOS Boot) <br> `/dev/sdb2` (ZFS, 500 GiB, NixOS Root)
 
 #### ZFS pool layout
+
 ```
 rpool/
 ├── local
@@ -34,5 +38,6 @@ rpool/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `atlas.mesh.vimium.net`.

hosts/atlas/default.nix

@@ -4,10 +4,13 @@
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;

hosts/atlas/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPddvpZeCUelUGsnFvx87WOqKKc+MGPU6+rx6s1ReWQl

hosts/common.nix

@@ -4,19 +4,26 @@
   pkgs,
   ...
 }:
-
 {
   imports = [
-    inputs.agenix.nixosModules.age
+    inputs.agenix.nixosModules.default
+    inputs.agenix-rekey.nixosModules.default
     inputs.home-manager.nixosModules.home-manager
     ../modules/nixos
+    ../modules/nixos/impermanence.nix
   ];
 
+  age.rekey = {
+    masterIdentities = [ ../secrets/yubikey-nix-primary.pub ];
+    storageMode = "local";
+    generatedSecretsDir = inputs.self.outPath + "/secrets/generated/${config.networking.hostName}";
+    localStorageDir = inputs.self.outPath + "/secrets/rekeyed/${config.networking.hostName}";
+  };
+
   nixpkgs = {
     config.allowUnfree = true;
     overlays = [
       inputs.agenix.overlays.default
-      (import ../overlays/default.nix)
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           config = {
@@ -25,6 +32,7 @@
           system = final.system;
         };
       })
+      (import ../overlays/default.nix)
     ];
   };
 
@@ -109,13 +117,14 @@
       dates = "weekly";
       options = "-d --delete-older-than 7d";
     };
+    registry.unstable.flake = inputs.nixpkgs-unstable;
   };
 
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
     sharedModules = [
-      inputs.nixvim.homeManagerModules.nixvim
+      inputs.nixvim.homeModules.nixvim
       {
         home.stateVersion = config.system.stateVersion;
       }

hosts/desktop.nix

@@ -1,4 +1,6 @@
 {
+  inputs,
+  config,
   pkgs,
   ...
 }:
@@ -6,7 +8,6 @@
 {
   imports = [
     ./common.nix
-    ../users/jordan
   ];
 
   services.printing.enable = true;
@@ -39,11 +40,14 @@
   };
 
   system.autoUpgrade = {
-    enable = true;
+    enable = false;
     flake = "git+ssh://git@git.vimium.com/jordan/nix-config.git";
     randomizedDelaySec = "10min";
   };
 
+  age.secrets."passwords/users/root".file = "${inputs.secrets}/passwords/users/jordan.age";
+  users.users.root.hashedPasswordFile = config.age.secrets."passwords/users/root".path;
+
   systemd.services.NetworkManager-wait-online.enable = false;
 
   modules = {

hosts/eos/README.md

@@ -1,18 +1,22 @@
 # Eos
 
 ## Overview
+
 ThinkPad X220 laptop.
 
 ## Specs
-* CPU - Intel Core i5-2520M @ 3.20GHz
+
-* Memory - 8 GB DDR3
+- CPU - Intel Core i5-2520M @ 3.20GHz
+- Memory - 8 GB DDR3
 
 ### Disks
+
 Device | Partitions _(filesystem, usage)_
 --- | ---
 Solid | `/dev/sda1` (EFI, NixOS Boot) <br> `/dev/sda2` (ZFS, NixOS Root)
 
 #### ZFS pool layout
+
 ```
 rpool/
 ├── local
@@ -28,5 +32,6 @@ rpool/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `eos.mesh.vimium.net`.

hosts/eos/default.nix

@@ -4,6 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";

hosts/helios/README.md

@@ -1,16 +1,19 @@
 # Helios
 
 ## Overview
+
 Dell OptiPlex 980 small form factor desktop.
 
 ## Specs
-* CPU - Intel Core i7-860 @ 2.8GHz
+
-* Chipset - Intel Q57 Express
+- CPU - Intel Core i7-860 @ 2.8GHz
-* Memory - 8 GB DDR2
+- Chipset - Intel Q57 Express
-* GPU - AMD FirePro 2460
+- Memory - 8 GB DDR2
-* NIC - Intel Gigabit 82578DM
+- GPU - AMD FirePro 2460
+- NIC - Intel Gigabit 82578DM
 
 ### Disks
+
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
 SanDisk Ultra II | `/dev/sda1` (ext2, 200 MiB, NixOS Boot) <br> `/dev/sda2` (ZFS, 480 GiB, NixOS Root)
@@ -19,6 +22,7 @@ SanDisk Ultra II | `/dev/sda1` (ext2, 200 MiB, NixOS Boot) <br> `/dev/sda2` (ZFS
 > an MBR partition table.
 
 #### ZFS pool layout
+
 ```
 rpool/
 ├── local
@@ -34,5 +38,6 @@ rpool/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
 
 ### Networks
+
 - DHCP on `192.168.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `helios.mesh.vimium.net`.

hosts/helios/default.nix

@@ -11,10 +11,13 @@ in
   imports = [
     ./hardware-configuration.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot = {
     loader.grub = {
       enable = true;

hosts/helios/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL2tDij7eTDbljl6Crz4i7qrM0lgp8U2T9ZMXt7VQPT/

hosts/hypnos/README.md

@@ -1,21 +1,25 @@
 # Hypnos
 
 ## Overview
+
 15-inch MacBook Pro 11,3 (Mid 2014).
 
 ## Specs
-* CPU - Intel Core i7-4870HQ @ 2.50GHz
+
-* Memory - 16 GB DDR3
+- CPU - Intel Core i7-4870HQ @ 2.50GHz
-* GPU - Intel Iris Pro 5200
+- Memory - 16 GB DDR3
-* GPU - NVIDIA GeForce GT 750M
+- GPU - Intel Iris Pro 5200
-* NIC - Broadcom BCM43xx 802.11ac
+- GPU - NVIDIA GeForce GT 750M
+- NIC - Broadcom BCM43xx 802.11ac
 
 ### Disks
+
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
 Apple SSD SM0512F | `/dev/sda1` (EFI, 256 MiB, NixOS Boot) <br> `/dev/sda2` (ZFS, 500 GiB, NixOS Root)
 
 #### ZFS pool layout
+
 ```
 rpool/
 ├── local
@@ -31,5 +35,6 @@ rpool/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `hypnos.mesh.vimium.net`.

hosts/hypnos/default.nix

@@ -11,15 +11,19 @@
     ./hardware-configuration.nix
     ./disko-config.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs = {
     hostPlatform = "x86_64-linux";
     config = {
       nvidia.acceptLicense = true;
+      permittedInsecurePackages = [ "broadcom-sta-6.30.223.271-57-6.12.41" ];
     };
   };
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;

hosts/hypnos/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGlbvy+4QHbveFbS6r9S0JWUVHeI/MgYLyGtfpZqJ/3

hosts/library/README.md

@@ -1,21 +1,25 @@
 # Library
 
 ## Overview
+
 Media and public file server.
 
 ## Specs
-* CPU - AMD Ryzen 5 5600G @ 3.90GHz
+
-* Chipset - AMD B550
+- CPU - AMD Ryzen 5 5600G @ 3.90GHz
-* Memory - 64 GB DDR4
+- Chipset - AMD B550
-* Motherboard - ASRock B550M Pro4
+- Memory - 64 GB DDR4
-* Case - Fractal Design Node 804
+- Motherboard - ASRock B550M Pro4
+- Case - JMCD-12S4
 
 ### Disks
+
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
-Samsung 980 Evo | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)
+Samsung 970 Evo Plus | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)
 
 #### ZFS datasets
+
 ```
 rpool/
 ├── local
@@ -41,5 +45,6 @@ library/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind the `rpool` datasets.
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.

hosts/library/ai.nix

@@ -1,19 +1,22 @@
 {
-  inputs,
   config,
   pkgs,
   ...
 }:
 
+let
+  stateDir = "/var/lib/open-webui";
+in
 {
-  age.secrets."files/services/open-webui/envfile" = {
+  age.secrets.open-webui-env = {
-    file = "${inputs.secrets}/files/services/open-webui/envfile.age";
+    rekeyFile = ./secrets/open-webui-env.age;
   };
 
   services.open-webui = {
     enable = true;
     package = pkgs.unstable.open-webui;
     port = 8081;
+    host = "0.0.0.0";
     environment =
       let
         clientId = "open-webui";
@@ -26,9 +29,44 @@
         ENABLE_OAUTH_ROLE_MANAGEMENT = "True";
         OAUTH_CLIENT_ID = clientId;
         OAUTH_PROVIDER_NAME = "Vimium";
+        OFFLINE_MODE = "True";
         OPENID_PROVIDER_URL = "https://auth.vimium.com/oauth2/openid/${clientId}/.well-known/openid-configuration";
         OPENID_REDIRECT_URI = "${publicUrl}/oauth/oidc/callback";
+
+        # Fix from https://github.com/NixOS/nixpkgs/pull/431395
+        STATIC_DIR = "${stateDir}/static";
+        DATA_DIR = "${stateDir}/data";
+        HF_HOME = "${stateDir}/hf_home";
+        SENTENCE_TRANSFORMERS_HOME = "${stateDir}/transformers_home";
       };
-    environmentFile = config.age.secrets."files/services/open-webui/envfile".path;
+    environmentFile = config.age.secrets.open-webui-env.path;
   };
+
+  # Fix from https://github.com/NixOS/nixpkgs/pull/432897
+  systemd.services.open-webui.preStart = ''
+    if [ -d "${stateDir}/data" ] && [ -n "$(ls -A "${stateDir}/data" 2>/dev/null)" ]; then
+      exit 0
+    fi
+
+    mkdir -p "${stateDir}/data"
+
+    [ -f "${stateDir}/webui.db" ] && mv "${stateDir}/webui.db" "${stateDir}/data/"
+
+    for dir in cache uploads vector_db; do
+      [ -d "${stateDir}/$dir" ] && mv "${stateDir}/$dir" "${stateDir}/data/"
+    done
+
+    exit 0
+  '';
+
+  modules.services.borgmatic.directories = [
+    "/var/lib/private/open-webui"
+  ];
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/private/open-webui";
+      mode = "0700";
+    }
+  ];
 }

hosts/library/default.nix

@@ -8,6 +8,7 @@
     ./ai.nix
     ./grafana.nix
     ./jellyfin.nix
+    ./jellysearch.nix
     ./nginx.nix
     ./prometheus.nix
     ./tunnel.nix
@@ -16,10 +17,15 @@
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
-    zfs.extraPools = [ "library" ];
+    zfs.extraPools = [
+      "downloads"
+      "library"
+    ];
   };
 
   networking = {

hosts/library/grafana.nix

@@ -1,4 +1,5 @@
 {
+  config,
   ...
 }:
 
@@ -13,4 +14,13 @@
       };
     };
   };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.grafana.dataDir;
+      user = "grafana";
+      group = "grafana";
+      mode = "0700";
+    }
+  ];
 }

hosts/library/jellyfin.nix

@@ -8,7 +8,7 @@
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      vaapiVdpau
+      libva-vdpau-driver
     ];
   };
 
@@ -24,6 +24,22 @@
     dataDir = "/var/lib/jellyfin";
   };
 
+  environment.persistence."/state".directories = [
+    {
+      directory = config.services.jellyfin.cacheDir;
+      inherit (config.services.jellyfin) user group;
+      mode = "0700";
+    }
+  ];
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.jellyfin.dataDir;
+      inherit (config.services.jellyfin) user group;
+      mode = "0700";
+    }
+  ];
+
   modules.services.borgmatic.directories = [
     config.services.jellyfin.dataDir
   ];

hosts/library/jellysearch.nix

@@ -0,0 +1,62 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+
+{
+  age.secrets."files/services/meilisearch/envfile" = {
+    file = "${inputs.secrets}/files/services/meilisearch/envfile.age";
+  };
+
+  services.meilisearch = {
+    enable = true;
+    package = pkgs.meilisearch;
+    masterKeyFile = config.age.secrets."files/services/meilisearch/envfile".path;
+  };
+
+  users.users.jellysearch = {
+    group = "jellysearch";
+    isSystemUser = true;
+  };
+
+  users.groups.jellysearch = { };
+
+  systemd.services.jellysearch = {
+    enable = true;
+    description = "JellySearch";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Restart = "on-failure";
+      ExecStart = "${pkgs.jellysearch}/bin/jellysearch";
+      StateDirectory = "jellysearch";
+      StateDirectoryMode = "0750";
+      WorkingDirectory = "/var/lib/jellysearch";
+      EnvironmentFile = config.age.secrets."files/services/meilisearch/envfile".path;
+
+      NoNewPrivileges = true;
+      SystemCallArchitectures = "native";
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true;
+      ProtectHostname = true;
+      LockPersonality = true;
+      PrivateDevices = true;
+      PrivateUsers = true;
+      RemoveIPC = true;
+    };
+    environment = {
+      DOTNET_ENVIRONMENT = "Production";
+      INDEX_CRON = "0 0 0/2 ? * * *";
+      JELLYFIN_URL = "http://localhost:8096";
+      JELLYFIN_CONFIG_DIR = "${toString config.services.jellyfin.dataDir}";
+      MEILI_URL = "http://localhost:${toString config.services.meilisearch.listenPort}";
+    };
+  };
+
+  environment.persistence."/state".directories = [
+    config.systemd.services.jellysearch.serviceConfig.WorkingDirectory
+  ];
+}

hosts/library/nginx.nix

@@ -33,27 +33,6 @@
             '';
           };
         };
-        "chat.ai.vimium.com" = {
-          listen = [
-            {
-              addr = "127.0.0.1";
-              port = 8001;
-            }
-          ];
-          locations."/" = {
-            proxyPass = "http://localhost:8081";
-            extraConfig =
-              proxyConfig
-              + ''
-                # Disable proxy buffering for better streaming response from models
-                proxy_buffering off;
-
-                # Increase max request size for large attachments and long audio messages
-                client_max_body_size 20M;
-                proxy_read_timeout 10m;
-              '';
-          };
-        };
         "jellyfin.vimium.com" = {
           default = true;
           listen = [
@@ -63,13 +42,20 @@
             }
           ];
           locations."/" = {
-            proxyPass = "http://localhost:8096";
+            extraConfig = ''
-            extraConfig =
+              # Proxy JellySearch first
-              proxyConfig
+              if ($arg_searchTerm) {
-              + ''
+                proxy_pass http://localhost:5000;
-                proxy_set_header Range $http_range;
+                break;
-                proxy_set_header If-Range $http_if_range;
+              }
-              '';
+
+              proxy_pass http://localhost:8096;
+            ''
+            + proxyConfig
+            + ''
+              proxy_set_header Range $http_range;
+              proxy_set_header If-Range $http_if_range;
+            '';
           };
           locations."/metrics" = {
             return = "404";

hosts/library/prometheus.nix

@@ -32,4 +32,13 @@
       }
     ];
   };
+
+  environment.persistence."/state".directories = [
+    {
+      directory = "/var/lib/${config.services.prometheus.stateDir}";
+      user = "prometheus";
+      group = "prometheus";
+      mode = "0700";
+    }
+  ];
 }

hosts/library/secrets/open-webui-env.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA AqHsJTdBE6LT9QJK7Dek6b3zA/PaqAmma7uRdKHdQQym
+KMB+yq8M+eej5pg7MHFBqzYhQhVnrPpTevDVo1RZn5Q
+-> m;#M[T-grease > G>`e0C&G OS
+ichBG8145Jl9vthZfVHcznJmi+c81HHZfd7UGzdfP7TR1wp9ub6IXiqK9KRe7ga7
+N3osvWzwiwCI5oN0NA
+--- ILq3bk5+xuZ4CV7J/rQkYBMz5wG2dHzn+G+cvEqUSRw
+j
+<EFBFBD><EFBFBD>X<EFBFBD>+<2B><>r<EFBFBD><1E><>j<EFBFBD><6A><EFBFBD>ZW<16><>p<EFBFBD><70><EFBFBD>k<EFBFBD>%ǗxdC5mͧ '[<5B><>w<EFBFBD>x<EFBFBD>雸<EFBFBD>#<23><><EFBFBD>O<18><14>7<EFBFBD>bC'8<><38>3<EFBFBD>b<EFBFBD>{_<>%_<><5F>s&<26><><EFBFBD>ѹrr<72><07><><EFBFBD>,
+5L8<EFBFBD>yC<EFBFBD>O<EFBFBD>6o<EFBFBD><EFBFBD><EFBFBD>k}<7D><17>_<EFBFBD><5F>i<EFBFBD>m<EFBFBD>u3|<7C>f	5<><35>5<EFBFBD><35>A<EFBFBD>V<EFBFBD>><3E>
+<2B><><EFBFBD><EFBFBD>E=<3D><><11><>E<EFBFBD><45><EFBFBD>aE<61>-<2D>Ԑ^<5E><>Q<EFBFBD><51>j<EFBFBD><6A><EFBFBD><EFBFBD>7<EFBFBD>6P<36><50>b<EFBFBD><62>E8*4߄

hosts/library/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBP+SH4lzFTE29y9HfjkaO7Ino5OqEws5UXcnBFoo76C

hosts/mail/README.md

@@ -1,17 +1,21 @@
 # Mail server
 
 ## Overview
+
 Mail server hosted in OVH.
 
 ## Specs
-* CPU - ??
+
-* Memory - ??
+- CPU - ??
+- Memory - ??
 
 ### Disks
+
 Device | Partitions _(filesystem, usage)_
 --- | ---
 NVMe | `/dev/sda1` (ext4, NixOS Root)
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.

hosts/mail/default.nix

@@ -14,6 +14,8 @@
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   networking = {
     hostId = "08ac2f14";
     firewall = {

hosts/mail/mail.nix

@@ -85,4 +85,52 @@ in
     smtp_destination_concurrency_limit = "20";
     header_size_limit = "4096000";
   };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/dkim";
+      user = "rspamd";
+      group = "rspamd";
+      mode = "0755";
+    }
+    {
+      directory = "/var/sieve";
+      user = "virtualMail";
+      group = "virtualMail";
+      mode = "0770";
+    }
+    {
+      directory = "/var/vmail";
+      user = "virtualMail";
+      group = "virtualMail";
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/rspamd";
+      user = "rspamd";
+      group = "rspamd";
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/redis-rspamd";
+      user = "redis-rspamd";
+      group = "redis-rspamd";
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/opendkim";
+      user = 221;
+      group = 221;
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/knot-resolver";
+      user = "knot-resolver";
+      group = "knot-resolver";
+      mode = "0770";
+    }
+    "/var/lib/dhparams"
+    "/var/lib/dovecot"
+    "/var/lib/postfix"
+  ];
 }

hosts/mail/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGLHtC0JmFfct+lYl0EjgphutmeYY8BWDctY3+/TsO6L

hosts/odyssey/README.md

@@ -1,22 +1,26 @@
 # Odyssey
 
 ## Overview
+
 Primary workstation.
 
 ## Specs
-* CPU - AMD Ryzen 9 9950X3D @ 4.30GHz
+
-* Chipset - AMD X870E
+- CPU - AMD Ryzen 9 9950X3D @ 4.30GHz
-* Memory - 96 GB DDR5
+- Chipset - AMD X870E
-* Motherboard - ASUS ProArt X870E-Creator WiFi
+- Memory - 96 GB DDR5
-* GPU - NVIDIA RTX 3090
+- Motherboard - ASUS ProArt X870E-Creator WiFi
-* Case - Thermaltake A500
+- GPU - NVIDIA RTX 3090
+- Case - Thermaltake A500
 
 ### Disks
+
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
 Samsung 980 Pro | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS, 2 TiB, NixOS Root)
 
 #### ZFS pool layout
+
 ```
 rpool/
 ├── local
@@ -32,5 +36,6 @@ rpool/
 See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datasets) for the motivation behind these datasets.
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `odyssey.mesh.vimium.net`.

hosts/odyssey/comfyui-docker.nix

@@ -0,0 +1,35 @@
+{
+  hardware.graphics.enable32Bit = true;
+  hardware.nvidia-container-toolkit.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  virtualisation.oci-containers = {
+    backend = "docker";
+    containers = {
+      comfyui = {
+        image = "ghcr.io/clsferguson/comfyui-docker:latest";
+        autoStart = true;
+        ports = [ "8188:8188" ];
+        extraOptions = [
+          "--device=nvidia.com/gpu=all"
+          "--ipc=host"
+        ];
+        volumes = [
+          "/home/jordan/ComfyUI/user:/app/ComfyUI/user"
+          "/home/jordan/ComfyUI/custom_nodes:/app/ComfyUI/custom_nodes"
+          "/home/jordan/ComfyUI/models:/app/ComfyUI/models:rw"
+          "/home/jordan/ComfyUI/input:/app/ComfyUI/input:rw"
+          "/home/jordan/ComfyUI/output:/app/ComfyUI/output:rw"
+        ];
+        environment = {
+          TZ = "Europe/London";
+          PUID = "1000";
+          PGID = "1000";
+          COMFY_AUTO_INSTALL = "1";
+          FORCE_SAGE_ATTENTION = "1";
+        };
+      };
+    };
+  };
+}

hosts/odyssey/default.nix

@@ -7,9 +7,12 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ./comfyui-docker.nix
     ./gitea-runner.nix
+    ./home-assistant
     ./nix-serve.nix
     ../desktop.nix
+    ../../users/jordan
   ];
 
   nixpkgs = {
@@ -19,6 +22,8 @@
     };
   };
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot.loader = {
     systemd-boot = {
       enable = true;
@@ -39,7 +44,8 @@
 
   virtualisation = {
     libvirtd.enable = true;
-    lxd.enable = true;
+    # https://github.com/NixOS/nixpkgs/issues/422385
+    # lxd.enable = true;
   };
 
   services.sunshine = {
@@ -48,6 +54,17 @@
     capSysAdmin = true;
   };
 
+  environment.systemPackages = with pkgs; [
+    yubikey-manager
+    age-plugin-yubikey
+  ];
+
+  services.udev.packages = with pkgs; [
+    libfido2
+  ];
+
+  services.pcscd.enable = true;
+
   modules = {
     hardware.presonus-studio.enable = true;
     services = {

hosts/odyssey/hardware-configuration.nix

@@ -34,6 +34,9 @@
       powerOnBoot = true;
     };
     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    graphics = {
+      extraPackages = [ pkgs.vk-hdr-layer ];
+    };
     nvidia = {
       modesetting.enable = true;
       open = true;
@@ -41,6 +44,7 @@
       powerManagement.enable = true;
       nvidiaSettings = false;
     };
+    nvidia-container-toolkit.enable = true;
   };
 
   powerManagement.cpuFreqGovernor = "schedutil";

hosts/odyssey/home-assistant/dashboards.nix

@@ -0,0 +1,63 @@
+{
+  ...
+}:
+
+{
+  /**
+    *******************
+    - Service Dashboard for stats (energy usage, bandwidth etc.)
+    - Dashboard fragment per room
+    - Tablet in each room can display just its associated fragment
+    - Per user dynamic dashboard that shows the dashboard fragment for the room
+      you are in using Bluetooth presence detection
+
+    Rooms: [Auto, Bedroom, Kitchen, Living Room, Office]
+
+    Shared: Date/time, Guest Override action, Weather, Air quality
+
+    Bedroom:
+    - Temperature
+    - Minimal Lights action
+    - Individual light cards
+    - Sheets last changed
+    - Plant last watered
+
+    Kitchen:
+    - Temperature
+    - Individual light cards
+    - Water filter age
+
+    Living Room:
+    - Temperature
+    - Turn TV on action
+      * dynamic card to start Movie Mode
+    - Individual light cards
+    - Plant last watered
+
+    Office:
+    - Temperature
+    - Individual light cards
+    - Bandwidth usage
+    - Computer stats
+
+    Primary IEEE address: 00:12:4B:00:29:E8:B1:9E
+
+    Random inspiration words:
+    - "Temp Disable Office Motion"
+    - "Main Lights {Bright,Dim,Warm}"
+    - "Robot Vacuum"
+    - "Living Room TV"
+    - "Morning wakeup"
+    - "Going to sleep early"
+    - "Take out bins"
+    - "Video Conference"
+    - "Gaming"
+    - Monitor power usage to tell when something has started/stopped
+    - Vibration sensor for kitchen drawer
+    - Todo list for dinner schedule
+    - Air quality sensor in kitchen
+    - Notification to close vents when outdoor air quality is bad
+    - "TV Lights Lock" - don't auto dim-lights on play/pause
+    *********************
+  */
+}

hosts/odyssey/home-assistant/default.nix

@@ -63,7 +63,6 @@
       };
       media_player = [ ];
       mobile_app = { };
-      onkyo = { };
       open_meteo = { };
       recorder = {
         purge_keep_days = 365;
@@ -125,13 +124,13 @@
       "folder_watcher"
       "forecast_solar"
       "frontend"
-      "gdacs"
+      # "gdacs"
       "generic"
       "generic_hygrostat"
       "generic_thermostat"
       "geo_json_events"
       "geo_location"
-      "geo_rss_events"
+      # "geo_rss_events"
       "github"
       "group"
       "hardware"
@@ -245,6 +244,7 @@
       "wake_on_lan"
       "water_heater"
       "weather"
+      "webostv"
       "websocket_api"
       "wled"
       "workday"
@@ -277,6 +277,15 @@
     lovelaceConfigWritable = true;
   };
 
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.home-assistant.configDir;
+      user = "hass";
+      group = "hass";
+      mode = "0700";
+    }
+  ];
+
   modules.services.borgmatic.directories = [
     config.services.home-assistant.configDir
   ];

hosts/odyssey/home-assistant/mqtt.nix

@@ -69,6 +69,21 @@
     };
   };
 
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.zigbee2mqtt.dataDir;
+      user = "zigbee2mqtt";
+      group = "zigbee2mqtt";
+      mode = "0700";
+    }
+    {
+      directory = config.services.mosquitto.dataDir;
+      user = "mosquitto";
+      group = "mosquitto";
+      mode = "0700";
+    }
+  ];
+
   modules.services.borgmatic.directories = [
     config.services.mosquitto.dataDir
     config.services.zigbee2mqtt.dataDir

hosts/odyssey/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJre8/cjdoUnbTu0x4ClTITcq4lq+FjpEyJBbLbOlox7

hosts/pi/README.md

@@ -1,19 +1,23 @@
 # Pi
 
 ## Overview
+
 Raspberry Pi 4
 
 ## Specs
-* SoC - Broadcom BCM2711
+
-* CPU - ARM Cortex-A72 @ 1.8 GHz
+- SoC - Broadcom BCM2711
-* Memory - 8 GB LPDDR4
+- CPU - ARM Cortex-A72 @ 1.8 GHz
+- Memory - 8 GB LPDDR4
 
 ### Disks
+
 Device | Partitions _(filesystem, usage)_
 --- | ---
 SD card | `/dev/mmcblk0` (ext4, NixOS Root)
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.
 
@@ -23,3 +27,4 @@ SD card | `/dev/mmcblk0` (ext4, NixOS Root)
 - HDMI to ONKYO HT-R990
 - S/PDIF to ONKYO HT-R990
 - Ethernet to ONKYO HT-R990
+- Ethernet to LG TV

hosts/pi/default.nix

@@ -8,12 +8,14 @@
   imports = [
     inputs.nixos-hardware.nixosModules.raspberry-pi-4
     ./hardware-configuration.nix
-    ./home-assistant
+    ./snapcast.nix
     ../server.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   hardware = {
     raspberry-pi."4" = {
       apply-overlays-dtmerge.enable = true;
@@ -98,7 +100,7 @@
       ];
     };
     firmware = with pkgs; [
-      firmwareLinuxNonfree
+      linux-firmware
       wireless-regdb
     ];
   };
@@ -128,14 +130,25 @@
     };
   };
 
-  # Connection to ONKYO HT-R990
+  networking.interfaces = {
-  networking.interfaces.end0 = {
+    # Connection to ONKYO HT-R990
-    ipv4.addresses = [
+    end0 = {
-      {
+      ipv4.addresses = [
-        address = "172.16.0.1";
+        {
-        prefixLength = 30;
+          address = "172.16.0.1";
-      }
+          prefixLength = 30;
-    ];
+        }
+      ];
+    };
+    # Connection to LG TV
+    enp1s0u2 = {
+      ipv4.addresses = [
+        {
+          address = "172.16.1.1";
+          prefixLength = 30;
+        }
+      ];
+    };
   };
 
   environment.systemPackages = with pkgs; [

hosts/pi/hardware-configuration.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   modulesPath,
   ...
 }:
@@ -11,44 +10,6 @@
   ];
 
   boot = {
-    kernelPackages =
-      let
-        version = "6.1.73";
-        tag = "stable_20240124";
-        srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
-      in
-      pkgs.linuxPackagesFor (
-        pkgs.linux_rpi4.override {
-          argsOverride = {
-            src = pkgs.fetchFromGitHub {
-              owner = "raspberrypi";
-              repo = "linux";
-              rev = tag;
-              hash = srcHash;
-            };
-            version = version;
-            modDirVersion = version;
-            structuredExtraConfig = { };
-            kernelPatches = [
-              {
-                name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
-                patch = pkgs.fetchpatch {
-                  url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
-                  hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
-                };
-              }
-              {
-                name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
-                patch = pkgs.fetchpatch {
-                  url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
-                  hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
-                };
-              }
-            ];
-          };
-        }
-      );
-
     # Stop ZFS kernel being built
     supportedFilesystems = lib.mkForce [
       "btrfs"
@@ -69,23 +30,6 @@
     (final: prev: {
       makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
     })
-    (final: prev: {
-      raspberrypifw =
-        let
-          version = "1.20240529";
-          srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
-        in
-        pkgs.raspberrypifw.override {
-          argsOverride = {
-            src = prev.fetchFromGitHub {
-              owner = "raspberrypi";
-              repo = "firmware";
-              rev = "${version}";
-              hash = srcHash;
-            };
-          };
-        };
-    })
   ];
 
   fileSystems = {

hosts/pi/snapcast.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  # Put all sinks in pipewire group
+  services.pipewire.systemWide = true;
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish = {
+      enable = true;
+      domain = true;
+      addresses = true;
+    };
+  };
+
+  services.snapserver = {
+    enable = false;
+  };
+
+  systemd.services.snapclient = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "pipewire.service" ];
+    requires = [ "pipewire.service" ];
+    description = "Snapcast client";
+    serviceConfig = {
+      ExecStart = "${pkgs.snapcast}/bin/snapclient -h 127.0.0.1 --player pulse --mixer hardware";
+      DynamicUser = true;
+      SupplementaryGroups = [ "pipewire" ];
+    };
+  };
+}

hosts/pi/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFYv5V6Lr1Er1dljwmunurIz1Q3Ce5FsFSxtUOW6aO9J

hosts/server.nix

@@ -50,11 +50,6 @@ in
       AllowSuspend=no
       AllowHibernation=no
     '';
-
-    watchdog = {
-      runtimeTime = "20s";
-      rebootTime = "30s";
-    };
   };
 
   services.fail2ban = {
@@ -70,6 +65,13 @@ in
     ];
   };
 
+  environment.persistence."/state".directories = [
+    {
+      directory = "/var/lib/fail2ban";
+      mode = "0750";
+    }
+  ];
+
   services.openssh.settings.PermitRootLogin = mkForce "prohibit-password";
 
   modules.services.tailscale = {

hosts/skycam/README.md

@@ -1,26 +1,32 @@
 # Skycam
 
 ## Overview
+
 Raspberry Pi 4-based webcam
 
 ## Specs
-* SoC - Broadcom BCM2711
+
-* CPU - ARM Cortex-A72 @ 1.8 GHz
+- SoC - Broadcom BCM2711
-* Memory - 8 GB LPDDR4
+- CPU - ARM Cortex-A72 @ 1.8 GHz
+- Memory - 8 GB LPDDR4
 
 ### Disks
+
 Device | Partitions _(filesystem, usage)_
 --- | ---
 SD card | `/dev/mmcblk0` (ext4, NixOS Root)
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `skycam.mesh.vimium.net`.
 
 ## Devices and connections
+
 - Camera Module 3 with wide-angle lens
 
 ## Building
+
 To generate a compressed SD card image for Skycam, run:
 `nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
 

hosts/skycam/default.nix

@@ -1,76 +1,17 @@
 {
-  inputs,
-  config,
   pkgs,
   ...
 }:
 
 {
   imports = [
-    inputs.nixos-hardware.nixosModules.raspberry-pi-4
     ./hardware-configuration.nix
     ../server.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-linux";
 
-  hardware = {
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
-    raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      audio.enable = false;
-      xhci.enable = false;
-    };
-    deviceTree = {
-      enable = true;
-      filter = "*rpi-4-*.dtb";
-      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
-      overlays =
-        let
-          mkCompatibleDtsFile =
-            dtbo:
-            let
-              drv =
-                pkgs.runCommand "fix-dts"
-                  {
-                    nativeBuildInputs = with pkgs; [
-                      dtc
-                      gnused
-                    ];
-                  }
-                  ''
-                    mkdir "$out"
-                    dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
-                  '';
-            in
-            "${drv}/overlay.dts";
-
-          inherit (config.boot.kernelPackages) kernel;
-        in
-        [
-          {
-            name = "imx708.dtbo";
-            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
-          }
-          {
-            name = "vc4-kms-v3d-pi4.dtbo";
-            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
-          }
-        ];
-    };
-    firmware = with pkgs; [
-      firmwareLinuxNonfree
-    ];
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
-    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
-    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
-  '';
-
-  nixpkgs.overlays = [
-    (import ./../../overlays/libcamera.nix)
-  ];
 
   networking = {
     hostId = "731d1660";
@@ -81,37 +22,84 @@
     };
   };
 
-  systemd.services.ustreamer = {
+  services.go2rtc =
+    let
+      rpicam-vid = "${pkgs.rpicam-apps}/bin/rpicam-vid";
+    in
+    {
+      enable = true;
+      settings = {
+        log.level = "debug";
+        streams.rpicam = "exec:${rpicam-vid} -v1 -t0 -o- --inline --flush=1 --width=4608 --height=2592 --framerate=1 --codec mjpeg --quality 90 --denoise=cdn_off --sharpness 1.25 --exposure long --gain 3";
+      };
+    };
+
+  systemd.services = {
+    daily-reboot = {
+      description = "Daily system reboot";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "/run/current-system/sw/bin/reboot";
+        Restart = "no";
+      };
+    };
+    skycam-archiver =
+      let
+        snapshotScript = pkgs.writeShellScript "skycam-archiver" ''
+          ${pkgs.lib.getExe pkgs.curl} -s -o "/var/lib/skycam-archiver/snapshot-$(date +%Y%m%d-%H%M%S).jpg" "http://skycam.mesh.vimium.net:1984/api/frame.jpeg?src=rpicam"
+        '';
+      in
+      {
+        description = "Capture skycam snapshot and save with timestamp";
+        serviceConfig = {
+          Type = "oneshot";
+          StateDirectory = "skycam-archiver";
+          ExecStart = "${snapshotScript}";
+        };
+        requires = [ "go2rtc.service" ];
+        after = [ "go2rtc.service" ];
+      };
+  };
+
+  systemd.timers = {
+    daily-reboot = {
+      description = "Timer for daily system reboot";
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = "*-*-* 03:00:00";
+        Persistent = false;
+      };
+    };
+    skycam-archiver = {
+      description = "Timer for capturing skycam snapshots every 30 minutes";
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnBootSec = "5min";
+        OnUnitActiveSec = "30min";
+        Unit = "skycam-archiver.service";
+      };
+    };
+  };
+
+  environment.persistence."/persist".directories = [
+    "/var/lib/skycam-archiver"
+  ];
+
+  modules.services.borgmatic = {
     enable = true;
-    description = "uStreamer service";
+    directories = [
-    unitConfig = {
+      "/var/lib/skycam-archiver"
-      Type = "simple";
+    ];
-      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
+    repoPath = "ssh://m94ekv2i@m94ekv2i.repo.borgbase.com/./repo";
-    };
-    serviceConfig = {
-      ExecStart = ''
-        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
-                --host=0.0.0.0 \
-                --resolution=4608x2592
-      '';
-      DynamicUser = "yes";
-      SupplementaryGroups = [ "video" ];
-      Restart = "always";
-      RestartSec = 10;
-    };
-    wantedBy = [ "network-online.target" ];
-    confinement.mode = "chroot-only";
   };
 
   environment.systemPackages = with pkgs; [
-    camera-streamer
     git
     neovim
     libcamera
     libraspberrypi
     raspberrypi-eeprom
-    v4l-utils
+    rpicam-apps
-    unstable.ustreamer
   ];
 
   system.stateVersion = "24.05";

hosts/skycam/hardware-configuration.nix

@@ -1,18 +1,29 @@
 {
+  inputs,
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:
 
 {
   imports = [
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
     (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
   ];
 
   boot = {
-    kernelModules = [ "bcm2835-v4l2" ];
+    kernelPatches = [
+      {
+        name = "cache-ls-table-dmabuf";
+        patch = pkgs.fetchurl {
+          url = "https://github.com/raspberrypi/linux/pull/6429.patch";
+          sha256 = "sha256-fEd+SgnjQXjAm1UcZTkHHPafmVeK/IySdLzhKI7DbS0=";
+        };
+      }
+    ];
     kernelParams = [
-      "cma=512M"
       "panic=0"
     ];
     supportedFilesystems = lib.mkForce [
@@ -23,6 +34,61 @@
     tmp.cleanOnBoot = false;
   };
 
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
+      overlays =
+        let
+          mkCompatibleDtsFile =
+            dtbo:
+            let
+              drv =
+                pkgs.runCommand "fix-dts"
+                  {
+                    nativeBuildInputs = with pkgs; [
+                      dtc
+                      gnused
+                    ];
+                  }
+                  ''
+                    mkdir "$out"
+                    dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
+                  '';
+            in
+            "${drv}/overlay.dts";
+
+          inherit (config.boot.kernelPackages) kernel;
+        in
+        [
+          {
+            name = "imx708.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
+          }
+          {
+            name = "vc4-kms-v3d-pi4.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
+          }
+        ];
+    };
+    firmware = with pkgs; [
+      linux-firmware
+    ];
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
+    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", SYMLINK+="dma_heap/vidbuf_cached", OPTIONS+="link_priority=-50"
+  '';
+
   nixpkgs.overlays = [
     (final: super: {
       makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });

hosts/skycam/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv5+HwcRetBxtQZXpGbYv22S4prJu9bYCzKTSoMCl8D

hosts/vps1/README.md

@@ -1,17 +1,21 @@
 # vps1
 
 ## Overview
+
 VPS hosted in OVH.
 
 ## Specs
-* CPU - ??
+
-* Memory - ??
+- CPU - 4 vCores
+- Memory - 4 GB
 
 ### Disks
+
 Device | Partitions _(filesystem, usage)_
 --- | ---
 NVMe | `/dev/sda1` (ext4, NixOS Root)
 
 ### Networks
+
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.

hosts/vps1/coturn.nix

@@ -40,26 +40,25 @@ in
     };
   };
 
-  age.secrets =
+  age.secrets = {
-    {
+    "passwords/services/coturn/static-auth-secret" = {
-      "passwords/services/coturn/static-auth-secret" = {
+      file = "${inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
-        file = "${inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
+      owner = "turnserver";
-        owner = "turnserver";
+      group = "turnserver";
-        group = "turnserver";
+    };
-      };
+  }
-    }
+  // (
-    // (
+    if matrixIntegration then
-      if matrixIntegration then
+      {
-        {
+        "passwords/services/coturn/matrix-turn-config.yml" = {
-          "passwords/services/coturn/matrix-turn-config.yml" = {
+          file = "${inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
-            file = "${inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
+          owner = "matrix-synapse";
-            owner = "matrix-synapse";
+          group = "matrix-synapse";
-            group = "matrix-synapse";
+        };
-          };
+      }
-        }
+    else
-      else
+      { }
-        { }
+  );
-    );
 
   services.coturn = {
     enable = true;

hosts/vps1/default.nix

@@ -11,8 +11,8 @@
     ./kanidm.nix
     ./matrix.nix
     ./nginx.nix
-    ./outline.nix
     ./photoprism.nix
+    ./vaultwarden.nix
     ../server.nix
   ];
 
@@ -20,6 +20,8 @@
     hostPlatform = "x86_64-linux";
   };
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   networking = {
     hostId = "08bf6db3";
     firewall = {

hosts/vps1/gitea.nix

@@ -86,4 +86,12 @@ in
       packages.CHUNKED_UPLOAD_PATH = lib.mkForce "${stateDir}/data/tmp/package-upload";
     };
   };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.gitea.stateDir;
+      inherit (config.services.gitea) user group;
+      mode = "0700";
+    }
+  ];
 }

hosts/vps1/headscale.nix

@@ -36,7 +36,7 @@ in
           {
             name = "home.mesh.vimium.net";
             type = "A";
-            value = "100.64.0.7";
+            value = "100.64.0.5";
           }
         ];
         magic_dns = true;
@@ -48,12 +48,19 @@ in
     };
   };
 
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/headscale";
+      inherit (config.services.headscale) user group;
+    }
+  ];
+
   services.nginx.virtualHosts = {
     "${domain}" = {
       forceSSL = true;
       enableACME = true;
       locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.headscale.port}";
+        proxyPass = "http://127.0.0.1:${toString config.services.headscale.port}";
         proxyWebsockets = true;
       };
     };

hosts/vps1/kanidm.nix

@@ -6,14 +6,27 @@
 let
   baseDomain = "vimium.com";
   domain = "auth.${baseDomain}";
+
+  mkRandomSecret = {
+    generator.script = "alnum";
+    mode = "440";
+    group = "kanidm";
+  };
 in
 {
+  age.secrets.kanidm-admin-password = mkRandomSecret;
+  age.secrets.kanidm-idm-admin-password = mkRandomSecret;
+
+  age.secrets.kanidm-oauth2-gitea = mkRandomSecret;
+  age.secrets.kanidm-oauth2-open-webui = mkRandomSecret;
+  age.secrets.kanidm-oauth2-vaultwarden = mkRandomSecret;
+
   services.kanidm =
     let
       uri = "https://${domain}";
     in
     {
-      package = pkgs.unstable.kanidm;
+      package = pkgs.unstable.kanidmWithSecretProvisioning_1_7;
       enableClient = true;
       enableServer = true;
       clientSettings = {
@@ -28,8 +41,92 @@ in
         tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
         version = "2";
       };
+      provision = {
+        enable = true;
+        adminPasswordFile = config.age.secrets.kanidm-admin-password.path;
+        idmAdminPasswordFile = config.age.secrets.kanidm-idm-admin-password.path;
+
+        persons.jordan = {
+          displayName = "Jordan Holt";
+          legalName = "Jordan Holt";
+          mailAddresses = [
+            "jordan@vimium.com"
+          ];
+          groups = [
+            "gitea_admins"
+            "gitea_users"
+            "jellyfin_admins"
+            "jellyfin_users"
+            "open-webui_admins"
+            "open-webui_users"
+            "vaultwarden_users"
+          ];
+        };
+
+        groups."gitea_admins" = { };
+        groups."gitea_users" = { };
+        systems.oauth2.gitea = {
+          displayName = "Gitea";
+          originUrl = "https://git.vimium.com/user/oauth2/Vimium/callback";
+          originLanding = "https://git.vimium.com/";
+          basicSecretFile = config.age.secrets.kanidm-oauth2-gitea.path;
+          scopeMaps."gitea_users" = [
+            "openid"
+            "email"
+            "profile"
+          ];
+          allowInsecureClientDisablePkce = true;
+          preferShortUsername = true;
+          claimMaps.groups = {
+            joinType = "array";
+            valuesByGroup."gitea_admins" = [ "admin" ];
+          };
+        };
+
+        groups."jellyfin_admins" = { };
+        groups."jellyfin_users" = { };
+
+        groups."open-webui_admins" = { };
+        groups."open-webui_users" = { };
+        systems.oauth2.open-webui = {
+          displayName = "Open WebUI";
+          originUrl = "https://chat.ai.vimium.com/oauth/oidc/callback";
+          originLanding = "https://chat.ai.vimium.com/";
+          basicSecretFile = config.age.secrets.kanidm-oauth2-open-webui.path;
+          scopeMaps."open-webui_users" = [
+            "openid"
+            "email"
+            "profile"
+          ];
+          allowInsecureClientDisablePkce = true;
+          claimMaps.groups = {
+            joinType = "array";
+            valuesByGroup."open-webui_admins" = [ "admin" ];
+          };
+        };
+
+        groups."vaultwarden_users" = { };
+        systems.oauth2.vaultwarden = {
+          displayName = "Vaultwarden";
+          originUrl = "https://vaultwarden.vimium.com/identity/connect/oidc-signin";
+          originLanding = "https://vaultwarden.vimium.com/";
+          basicSecretFile = config.age.secrets.kanidm-oauth2-vaultwarden.path;
+          scopeMaps."vaultwarden_users" = [
+            "openid"
+            "email"
+            "profile"
+          ];
+        };
+      };
     };
 
+  # LDAP server binds to tailscale network interface
+  systemd.services.kanidm = {
+    requires = [ "tailscaled.service" ];
+    after = [ "tailscaled.service" ];
+    serviceConfig.RestartSec = "60";
+  };
+
   services.nginx.virtualHosts = {
     "${domain}" = {
       useACMEHost = "${domain}";
@@ -49,4 +146,13 @@ in
     postRun = "systemctl restart kanidm.service";
     group = "acme";
   };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/kanidm";
+      user = "kanidm";
+      group = "kanidm";
+      mode = "0700";
+    }
+  ];
 }

hosts/vps1/matrix.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   config,
   lib,
   pkgs,
@@ -26,33 +27,69 @@ let
   };
   matrixServerConfig."m.server" = "${matrixSubdomain}:443";
   commonBridgeSettings = bridge: {
-    appservice = {
+    database = lib.mkIf usePostgresql {
-      database = lib.mkIf usePostgresql {
+      type = "postgres";
-        type = "postgres";
+      uri = "postgresql:///${bridge}?host=/run/postgresql";
-        uri = "postgresql:///${bridge}?host=/run/postgresql";
-      };
     };
     bridge = {
-      encryption = {
-        allow = true;
-        default = true;
-        require = true;
-      };
       permissions = {
         "${serverName}" = "user";
         "@jordan:${serverName}" = "admin";
       };
-      provisioning = {
+    };
-        shared_secret = "disable";
+    encryption = {
-      };
+      allow = true;
+      default = true;
+      require = true;
+    };
+    provisioning = {
+      shared_secret = "disable";
     };
     homeserver = {
       address = "https://${matrixSubdomain}";
       domain = serverName;
     };
+    double_puppet.secrets = {
+      "${serverName}" = "as_token:$MAUTRIX_DOUBLEPUPPET_TOKEN";
+    };
   };
+  proxyConfig = ''
+    proxy_set_header        Host $host;
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        X-Forwarded-Host $host;
+    proxy_set_header        X-Forwarded-Server $host;
+  '';
 in
 {
+  # Backport new options from https://github.com/NixOS/nixpkgs/pull/446155
+  disabledModules = [
+    "services/matrix/mautrix-whatsapp.nix"
+  ];
+
+  imports = [
+    (inputs.nixpkgs-unstable + /nixos/modules/services/matrix/mautrix-whatsapp.nix)
+  ];
+
+  age.secrets = {
+    mautrix-doublepuppet-registration = {
+      rekeyFile = ./secrets/mautrix-doublepuppet-registration.age;
+      mode = "0440";
+      group = "matrix-synapse";
+    };
+    mautrix-signal-env = {
+      rekeyFile = ./secrets/mautrix-signal-env.age;
+      mode = "0440";
+      group = "mautrix-signal";
+    };
+    mautrix-whatsapp-env = {
+      rekeyFile = ./secrets/mautrix-whatsapp-env.age;
+      mode = "0440";
+      group = "mautrix-whatsapp";
+    };
+  };
+
   networking.firewall.allowedTCPPorts = [
     8448 # Matrix federation
   ];
@@ -63,96 +100,92 @@ in
     };
   };
 
-  services.nginx.virtualHosts =
+  services.nginx.virtualHosts = {
-    {
+    "${matrixSubdomain}" = {
-      "${matrixSubdomain}" = {
+      forceSSL = true;
-        forceSSL = true;
+      enableACME = true;
-        enableACME = true;
+      listen = [
-        listen = [
+        {
-          {
+          addr = "0.0.0.0";
-            addr = "0.0.0.0";
+          port = 443;
-            port = 443;
+          ssl = true;
-            ssl = true;
+        }
-          }
+        {
-          {
+          addr = "0.0.0.0";
-            addr = "0.0.0.0";
+          port = 80;
-            port = 80;
+        }
-          }
+        {
-          {
+          addr = "0.0.0.0";
-            addr = "0.0.0.0";
+          port = 8448;
-            port = 8448;
+          ssl = true;
-            ssl = true;
+        }
-          }
+        {
-          {
+          addr = "[::1]";
-            addr = "[::1]";
+          port = 443;
-            port = 443;
+          ssl = true;
-            ssl = true;
+        }
-          }
+        {
-          {
+          addr = "[::1]";
-            addr = "[::1]";
+          port = 80;
-            port = 80;
+        }
-          }
+        {
-          {
+          addr = "[::1]";
-            addr = "[::1]";
+          port = 8448;
-            port = 8448;
+          ssl = true;
-            ssl = true;
+        }
-          }
+      ];
-        ];
+      locations = {
-        locations = {
+        "/" = {
-          "/" = {
+          proxyPass = "http://127.0.0.1:8008";
-            proxyPass = "http://localhost:8008";
+          extraConfig = proxyConfig;
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $remote_addr;
-            '';
-          };
-          "/_matrix" = {
-            proxyPass = "http://localhost:8008";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $remote_addr;
-              client_max_body_size 50M;
-            '';
-          };
-          "/_synapse/client".proxyPass = "http://localhost:8008";
         };
-      };
+        "/_matrix" = {
-      "${serverName}" =
+          proxyPass = "http://127.0.0.1:8008";
-        let
+          extraConfig = proxyConfig + ''
-          mkWellKnown = data: ''
+            client_max_body_size 50M;
-            more_set_headers 'Content-Type: application/json';
-            return 200 '${builtins.toJSON data}';
           '';
-        in
-        {
-          locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown matrixServerConfig);
-          locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown matrixClientConfig);
         };
-    }
+        "/_synapse/client".proxyPass = "http://127.0.0.1:8008";
-    // (
+      };
-      if useElement then
+    };
-        {
+    "${serverName}" =
-          "${elementSubdomain}" = {
+      let
-            forceSSL = true;
+        mkWellKnown = data: ''
-            enableACME = true;
+          more_set_headers 'Content-Type: application/json';
-            root = pkgs.unstable.element-web.override {
+          return 200 '${builtins.toJSON data}';
-              conf = {
+        '';
-                default_server_config = matrixClientConfig;
+      in
-                brand = "Vimium Chat";
+      {
-                branding = {
+        locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown matrixServerConfig);
-                  auth_header_logo_url = "https://vimium.com/images/logo.svg";
+        locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown matrixClientConfig);
-                  auth_footer_links = [
+      };
-                    {
+  }
-                      "text" = "Vimium.com";
+  // (
-                      "url" = "https://vimium.com";
+    if useElement then
-                    }
+      {
-                  ];
+        "${elementSubdomain}" = {
-                };
+          forceSSL = true;
+          enableACME = true;
+          root = pkgs.unstable.element-web.override {
+            conf = {
+              default_server_config = matrixClientConfig;
+              brand = "Vimium Chat";
+              branding = {
+                auth_header_logo_url = "https://vimium.com/images/logo.svg";
+                auth_footer_links = [
+                  {
+                    "text" = "Vimium.com";
+                    "url" = "https://vimium.com";
+                  }
+                ];
               };
             };
           };
-        }
+        };
-      else
+      }
-        { }
+    else
-    );
+      { }
+  );
 
   nixpkgs.config.permittedInsecurePackages = [
     "jitsi-meet-1.0.8043"
@@ -163,6 +196,9 @@ in
     enable = true;
     enableRegistrationScript = true;
     settings = {
+      app_service_config_files = [
+        config.age.secrets.mautrix-doublepuppet-registration.path
+      ];
       database.name = (if usePostgresql then "psycopg2" else "sqlite3");
       enable_metrics = false;
       enable_registration = false;
@@ -176,46 +212,74 @@ in
   );
 
   services.postgresql = lib.mkIf usePostgresql {
-    ensureUsers =
+    ensureUsers = [
-      [
+      {
-        {
+        name = "matrix-synapse";
-          name = "matrix-synapse";
-          ensureDBOwnership = true;
-        }
-      ]
-      ++ (lib.optional bridges.signal {
-        name = "mautrix-signal";
         ensureDBOwnership = true;
-      })
+      }
-      ++ (lib.optional bridges.whatsapp {
+    ]
-        name = "mautrix-whatsapp";
+    ++ (lib.optional bridges.signal {
-        ensureDBOwnership = true;
+      name = "mautrix-signal";
-      });
+      ensureDBOwnership = true;
-    ensureDatabases =
+    })
-      [
+    ++ (lib.optional bridges.whatsapp {
-        "matrix-synapse"
+      name = "mautrix-whatsapp";
-      ]
+      ensureDBOwnership = true;
-      ++ (lib.optional bridges.signal "mautrix-signal")
+    });
-      ++ (lib.optional bridges.whatsapp "mautrix-whatsapp");
+    ensureDatabases = [
+      "matrix-synapse"
+    ]
+    ++ (lib.optional bridges.signal "mautrix-signal")
+    ++ (lib.optional bridges.whatsapp "mautrix-whatsapp");
   };
 
   services.mautrix-signal = lib.mkIf bridges.signal {
     enable = true;
-    settings = commonBridgeSettings "mautrix-signal";
+    environmentFile = config.age.secrets.mautrix-signal-env.path;
+    settings = lib.recursiveUpdate {
+      encryption = {
+        pickle_key = "$MAUTRIX_SIGNAL_ENCRYPTION_PICKLE_KEY";
+      };
+    } (commonBridgeSettings "mautrix-signal");
   };
 
   services.mautrix-whatsapp = lib.mkIf bridges.whatsapp {
     enable = true;
-    settings = {
+    environmentFile = config.age.secrets.mautrix-whatsapp-env.path;
-      bridge = {
+    settings = lib.recursiveUpdate {
+      backfill = {
+        enabled = true;
+        max_initial_messags = 50;
+      };
+      encryption = {
+        pickle_key = "$MAUTRIX_WHATSAPP_ENCRYPTION_PICKLE_KEY";
+      };
+      network = {
+        mute_status_broadcast = true;
         history_sync = {
-          backfill = true;
           max_initial_conversations = -1;
-          message_count = 50;
           request_full_sync = true;
         };
-        mute_bridging = true;
       };
-    } // commonBridgeSettings "mautrix-whatsapp";
+    } (commonBridgeSettings "mautrix-whatsapp");
   };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = config.services.matrix-synapse.dataDir;
+      user = "matrix-synapse";
+      group = "matrix-synapse";
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/mautrix-signal";
+      user = "mautrix-signal";
+      group = "mautrix-signal";
+    }
+    {
+      directory = "/var/lib/mautrix-whatsapp";
+      user = "mautrix-whatsapp";
+      group = "mautrix-whatsapp";
+    }
+  ];
 }

hosts/vps1/nginx.nix

@@ -82,123 +82,138 @@ in
         maxSize = "100m";
       };
     };
-    virtualHosts =
+    proxyResolveWhileRunning = true;
-      {
+    resolver.addresses = [ "100.100.100.100" ];
-        ## Static sites
+    upstreams = {
-        "chat.ai.vimium.com" = {
+      jellyfin.servers = {
-          forceSSL = true;
+        "library.mesh.vimium.net:8096" = {
-          enableACME = true;
+          fail_timeout = "30s";
-          extraConfig = nginxErrorPages + nginxEdgeHeaders;
-          locations."/" = {
-            proxyPass = "http://localhost:8001";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-              proxy_set_header X-Forwarded-Proto $scheme;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header Host $host;
-
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection "upgrade";
-
-              # Disable proxy buffering for better streaming response from models
-              proxy_buffering off;
-
-              # Increase max request size for large attachments and long audio messages
-              client_max_body_size 20M;
-              proxy_read_timeout 10m;
-            '';
-          };
         };
-        "jellyfin.vimium.com" = {
+      };
-          forceSSL = true;
+      open-webui.servers = {
-          enableACME = true;
+        "library.mesh.vimium.net:8081" = {
-          extraConfig = nginxErrorPages + nginxEdgeHeaders;
+          fail_timeout = "30s";
-          locations."/" = {
-            proxyPass = "http://localhost:8000";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-              proxy_set_header X-Forwarded-Proto $scheme;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header Host $host;
-
-              proxy_set_header Range $http_range;
-              proxy_set_header If-Range $http_if_range;
-
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection "upgrade";
-            '';
-          };
         };
-        "jdholt.com" = {
+      };
-          forceSSL = true;
+      skycam.servers = {
-          enableACME = true;
+        "skycam.mesh.vimium.net:1984" = {
-          serverAliases = [ "www.jdholt.com" ];
+          fail_timeout = "30s";
-          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-          locations."/skycam/snapshot.jpg" = {
-            extraConfig = ''
-              set $backend "skycam.mesh.vimium.net:8080";
-
-              resolver 100.100.100.100;
-
-              proxy_pass http://$backend/snapshot;
-              proxy_cache skycam_cache;
-              proxy_cache_valid any 10s;
-              proxy_ignore_headers Cache-Control Expires Set-Cookie;
-            '';
-          };
-          locations."/".return = "301 https://vimium.com$request_uri";
         };
-        "pki.vimium.com" = {
+      };
-          addSSL = true;
+    };
-          forceSSL = false;
+    virtualHosts = {
-          enableACME = true;
+      ## Proxied sites
+      "chat.ai.vimium.com" = {
+        forceSSL = true;
+        enableACME = true;
+        extraConfig = nginxErrorPages + nginxEdgeHeaders;
+        locations."/" = {
+          proxyPass = "http://open-webui";
           extraConfig = ''
-            ${nginxErrorPages}
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            more_set_headers 'Server: Vimium';
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+
+            # Disable proxy buffering for better streaming response from models
+            proxy_buffering off;
+
+            # Increase max request size for large attachments and long audio messages
+            client_max_body_size 20M;
+            proxy_read_timeout 10m;
           '';
-          locations."/" = {
-            root = "/var/www/pki.vimium.com";
-          };
         };
-        "suhailhussain.com" = {
+      };
-          forceSSL = true;
+      "jellyfin.vimium.com" = {
-          enableACME = true;
+        forceSSL = true;
-          serverAliases = [ "www.suhailhussain.com" ];
+        enableACME = true;
-          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+        extraConfig = nginxErrorPages + nginxEdgeHeaders;
-          locations."/" = {
+        locations."/" = {
-            root = "/var/www/suhailhussain.com";
+          proxyPass = "http://jellyfin";
-          };
+          extraConfig = ''
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+
+            proxy_set_header Range $http_range;
+            proxy_set_header If-Range $http_if_range;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+          '';
         };
-        "vimium.com" = {
+        locations."/metrics" = {
-          default = true;
+          return = "404";
-          forceSSL = true;
-          enableACME = true;
-          serverAliases = [ "www.vimium.com" ];
-          extraConfig =
-            nginxErrorPages
-            + nginxEdgeHeaders
-            + nginxStrictHeaders
-            + ''
-              add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
-            '';
-          locations."/" = {
-            root = "/var/www/vimium.com";
-          };
         };
-      }
+      };
-      ## Redirects
+
-      // (mkRedirect "h0lt.com" "jdholt.com")
+      ## Static sites
-      // (mkRedirect "jordanholt.xyz" "jdholt.com")
+      "jdholt.com" = {
-      // (mkRedirect "omnimagic.com" "vimium.com")
+        forceSSL = true;
-      // (mkRedirect "omnimagic.net" "vimium.com")
+        enableACME = true;
-      // (mkRedirect "thelostlegend.com" "suhailhussain.com")
+        serverAliases = [ "www.jdholt.com" ];
-      // (mkRedirect "vimium.co" "vimium.com")
+        extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-      // (mkRedirect "vimium.co.uk" "vimium.com")
+        locations."/skycam" = {
-      // (mkRedirect "vimium.info" "vimium.com")
+          root = "/var/www/jdholt.com";
-      // (mkRedirect "vimium.net" "vimium.com")
+        };
-      // (mkRedirect "vimium.org" "vimium.com")
+        locations."/skycam/snapshot.jpg" = {
-      // (mkRedirect "vimium.xyz" "vimium.com");
+          extraConfig = ''
+            set $args "";
+            proxy_pass http://skycam/api/frame.jpeg?src=rpicam;
+            proxy_cache skycam_cache;
+            proxy_cache_valid any 10s;
+            proxy_ignore_headers Cache-Control Expires Set-Cookie;
+          '';
+        };
+        locations."/".return = "301 https://vimium.com$request_uri";
+      };
+      "pki.vimium.com" = {
+        addSSL = true;
+        forceSSL = false;
+        enableACME = true;
+        extraConfig = ''
+          ${nginxErrorPages}
+          more_set_headers 'Server: Vimium';
+        '';
+        locations."/" = {
+          root = "/var/www/pki.vimium.com";
+        };
+      };
+      "vimium.com" = {
+        default = true;
+        forceSSL = true;
+        enableACME = true;
+        serverAliases = [ "www.vimium.com" ];
+        extraConfig =
+          nginxErrorPages
+          + nginxEdgeHeaders
+          + nginxStrictHeaders
+          + ''
+            add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
+          '';
+        locations."/" = {
+          root = "/var/www/vimium.com";
+        };
+      };
+    }
+
+    ## Redirects
+    // (mkRedirect "h0lt.com" "jdholt.com")
+    // (mkRedirect "jordanholt.xyz" "jdholt.com")
+    // (mkRedirect "omnimagic.com" "vimium.com")
+    // (mkRedirect "omnimagic.net" "vimium.com")
+    // (mkRedirect "thelostlegend.com" "suhailhussain.com")
+    // (mkRedirect "vimium.co" "vimium.com")
+    // (mkRedirect "vimium.co.uk" "vimium.com")
+    // (mkRedirect "vimium.info" "vimium.com")
+    // (mkRedirect "vimium.net" "vimium.com")
+    // (mkRedirect "vimium.org" "vimium.com")
+    // (mkRedirect "vimium.xyz" "vimium.com");
   };
 }

hosts/vps1/outline.nix

@@ -1,51 +0,0 @@
-{
-  inputs,
-  config,
-  ...
-}:
-let
-  domain = "outline.vimium.com";
-in
-{
-  services.nginx.virtualHosts = {
-    "${domain}" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:3000";
-        extraConfig = ''
-          proxy_set_header Upgrade $http_upgrade;
-          proxy_set_header Connection "Upgrade";
-          proxy_set_header Host $host;
-
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header X-Scheme $scheme;
-          proxy_set_header X-Forwarded-Proto $scheme;
-          proxy_redirect off;
-        '';
-      };
-    };
-  };
-
-  age.secrets."passwords/services/outline/oidc-client-secret" = {
-    file = "${inputs.secrets}/passwords/services/outline/oidc-client-secret.age";
-    owner = "outline";
-    group = "outline";
-  };
-
-  services.outline = {
-    enable = true;
-    forceHttps = false;
-    oidcAuthentication = {
-      clientId = "outline";
-      clientSecretFile = config.age.secrets."passwords/services/outline/oidc-client-secret".path;
-      displayName = "Vimium";
-      authUrl = "https://auth.vimium.com/ui/oauth2";
-      tokenUrl = "https://auth.vimium.com/oauth2/token";
-      userinfoUrl = "https://auth.vimium.com/oauth2/openid/outline/userinfo";
-    };
-    publicUrl = "https://${domain}";
-    storage.storageType = "local";
-  };
-}

hosts/vps1/photoprism.nix

@@ -32,6 +32,14 @@ in
     file = "${inputs.secrets}/passwords/services/photoprism/admin.age";
   };
 
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/private/photoprism";
+      user = "photoprism";
+      group = "photoprism";
+    }
+  ];
+
   services.photoprism = {
     enable = true;
     address = "localhost";

hosts/vps1/secrets/mautrix-signal-env.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA AuFF7Zqic+KNiU82xDS8ItdNSnr1045DpKOyYHZgq3kE
+qNK+p6I6kR2A41d/gVyCp2b3xu7g0/rCXIL22Gal3IA
+-> R.kR/-r-grease 5Q54Z B.x PMjy\
+3ajY8AoJzUB9fiDnHoFVSIPEfvgAk2VtJeHNOno9cxeK6uZ+Ve22pUWBN2cp+2Qz
+J7J9U1zQWVSOum3dDmscAVBzf4Hw2hUBZcAnZA
+--- hZ4N9mXSCS3zT9R/Axb9dWVx5Lr+mLxxXuR45oehok4
+<EFBFBD><EFBFBD>z󩃢<EFBFBD>J%<25><>w<><77><EFBFBD>͜<EFBFBD><CD9C><EFBFBD>c<15>' <20><><EFBFBD>K39<33><39>˯<EFBFBD>q<1A>G<>bX6<58>6<EFBFBD>̚<EFBFBD><CC9A>p<03>4<EFBFBD>mG<6D><14><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ꇿ<EFBFBD>`<60>8

hosts/vps1/secrets/vaultwarden-env.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA A+JTQrgN4xxrQpLhyMtfq82/26DwsudKmxyE8gx9PlJU
+oZjXRvr2mza+28asKcXzSDU0em5edPpazk5dOLXrvZ8
+-> )z\cT7C|-grease v>P/r|O s\(zEXaF Q ,!Y2g+NM
+ZAEVPuF8OEWWNKFP+7IUrpaDydZDAFCRnj1vOdGiBf6BzgbicAAmIF4XgBQqpE5M
+JoCzgjdKB1kLOQB2PWRfJ02L93/zFQXm
+--- vcFS71G0ZZ1bU8dKgMmLMv5sUIi/TYjOu41EuDpJyXw
+:<3A><><15><><EFBFBD><7F>!<21>-<<11><1E>:<3A><><EFBFBD><EFBFBD>rg?<3F>N-i<><69><EFBFBD>?<3F>d<EFBFBD>Z2h<32>3<EFBFBD><0C>]

hosts/vps1/ssh_host_ed25519_key.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII9NBbTqjs709LTRgeBV306s3SI7WuQMbor195QprBFc

hosts/vps1/vaultwarden.nix

@@ -0,0 +1,78 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  inherit (lib)
+    mkForce
+    ;
+  baseDomain = "vimium.com";
+  domain = "vaultwarden.${baseDomain}";
+in
+{
+  age.secrets.vaultwarden-env = {
+    rekeyFile = ./secrets/vaultwarden-env.age;
+    mode = "0440";
+    group = "vaultwarden";
+  };
+
+  services.vaultwarden = {
+    enable = true;
+    dbBackend = "sqlite";
+    backupDir = "/var/cache/vaultwarden-backup";
+    config = {
+      dataFolder = mkForce "/var/lib/vaultwarden";
+      useSysLog = true;
+      webVaultEnabled = true;
+
+      rocketPort = 8222;
+
+      ssoEnabled = true;
+      ssoOnly = true;
+      ssoAuthority = "https://auth.vimium.com/oauth2/openid/vaultwarden";
+      ssoClientId = "vaultwarden";
+      signupsAllowed = false;
+      passwordIterations = 1000000;
+      invitationsAllowed = true;
+      invitationOrgName = "Vimium";
+      domain = "https://${domain}";
+    };
+    environmentFile = config.age.secrets.vaultwarden-env.path;
+  };
+
+  services.nginx.virtualHosts = {
+    "${domain}" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.rocketPort}";
+        proxyWebsockets = true;
+      };
+    };
+  };
+
+  systemd.services.backup-vaultwarden.environment.DATA_FOLDER = mkForce "/var/lib/vaultwarden";
+  systemd.services.vaultwarden.serviceConfig = {
+    StateDirectory = mkForce "vaultwarden";
+    RestartSec = "60";
+  };
+
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/vaultwarden";
+      user = "vaultwarden";
+      group = "vaultwarden";
+      mode = "0700";
+    }
+  ];
+
+  environment.persistence."/state".directories = [
+    {
+      directory = config.services.vaultwarden.backupDir;
+      user = "vaultwarden";
+      group = "vaultwarden";
+      mode = "0700";
+    }
+  ];
+}

modules/nixos/impermanence.nix

@@ -0,0 +1,147 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib)
+    attrNames
+    flip
+    isAttrs
+    mapAttrs
+    mkIf
+    mkMerge
+    mkOption
+    optionals
+    types
+    ;
+in
+{
+  boot.zfs.forceImportRoot = false;
+  boot.initrd.systemd.enable = true;
+  boot.initrd.systemd.services.impermanence-rollback =
+    mkIf
+      (config.environment.persistence."/persist".enable || config.environment.persistence."/state".enable)
+      {
+        description = "Rollback root filesystem";
+        wantedBy = [ "initrd.target" ];
+        after = [ "zfs-import-rpool.service" ];
+        before = [ "sysroot.mount" ];
+        unitConfig.DefaultDependencies = "no";
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank";
+        };
+      };
+
+  age.identityPaths = [
+    "/persist/etc/ssh/ssh_host_ed25519_key"
+    "/etc/ssh/ssh_host_ed25519_key"
+  ];
+
+  fileSystems."/state" = mkIf config.environment.persistence."/state".enable {
+    neededForBoot = true;
+  };
+  environment.persistence."/state" = {
+    enable = false;
+    hideMounts = true;
+    directories = [
+      "/var/lib/systemd"
+      "/var/log"
+      "/var/spool"
+    ];
+  };
+
+  fileSystems."/persist" = mkIf config.environment.persistence."/persist".enable {
+    neededForBoot = true;
+  };
+  environment.persistence."/persist" = {
+    enable = false;
+    hideMounts = true;
+    files = [
+      (mkIf (!config.boot.isContainer) "/etc/machine-id")
+      "/etc/adjtime"
+      "/etc/ssh/ssh_host_ed25519_key"
+      "/etc/ssh/ssh_host_ed25519_key.pub"
+    ];
+    directories = [
+      "/var/lib/nixos"
+    ]
+    ++ optionals config.security.acme.acceptTerms [
+      {
+        directory = "/var/lib/acme";
+        user = "acme";
+        group = "acme";
+        mode = "0755";
+      }
+    ]
+    ++ optionals config.services.printing.enable [
+      {
+        directory = "/var/lib/cups";
+        mode = "0700";
+      }
+    ]
+    ++ optionals config.hardware.bluetooth.enable [
+      "/var/lib/bluetooth"
+    ];
+  };
+
+  users.mutableUsers = !config.environment.persistence."/persist".enable;
+
+  # For each user that has a home-manager config, merge the locally defined
+  # persistence options that we defined above.
+  imports =
+    let
+      mkUserFiles = map (
+        x: { parentDirectory.mode = "700"; } // (if isAttrs x then x else { file = x; })
+      );
+      mkUserDirs = map (x: { mode = "700"; } // (if isAttrs x then x else { directory = x; }));
+    in
+    [
+      {
+        environment.persistence = mkMerge (
+          flip map (attrNames config.home-manager.users) (
+            user:
+            let
+              hmUserCfg = config.home-manager.users.${user};
+            in
+            flip mapAttrs hmUserCfg.home.persistence (
+              _: sourceCfg: {
+                users.${user} = {
+                  files = mkUserFiles sourceCfg.files;
+                  directories = mkUserDirs sourceCfg.directories;
+                };
+              }
+            )
+          )
+        );
+      }
+    ];
+
+  home-manager.sharedModules = [
+    {
+      options.home.persistence = mkOption {
+        description = "Additional persistence config for the given source path";
+        default = { };
+        type = types.attrsOf (
+          types.submodule {
+            options = {
+              files = mkOption {
+                description = "Additional files to persist via NixOS impermanence.";
+                type = types.listOf (types.either types.attrs types.str);
+                default = [ ];
+              };
+
+              directories = mkOption {
+                description = "Additional directories to persist via NixOS impermanence.";
+                type = types.listOf (types.either types.attrs types.str);
+                default = [ ];
+              };
+            };
+          }
+        );
+      };
+    }
+  ];
+}

modules/nixos/podman.nix

@@ -40,6 +40,10 @@ in
 
     };
 
+    environment.persistence."/persist".directories = [
+      "/var/lib/containers/storage"
+    ];
+
     networking.firewall.interfaces."podman+" = {
       allowedUDPPorts = [ 53 ];
       allowedTCPPorts = [ 53 ];

modules/nixos/services/postgresql.nix

@@ -30,6 +30,15 @@ in
       };
     };
 
+    environment.persistence."/persist".directories = [
+      {
+        directory = "/var/lib/postgresql";
+        user = "postgres";
+        group = "postgres";
+        mode = "0700";
+      }
+    ];
+
     services.borgmatic.settings = {
       postgresql_databases = [
         {

modules/nixos/services/tailscale.nix

@@ -17,6 +17,14 @@ in
       default = false;
       example = true;
     };
+    isExitNode = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    useExitNode = lib.mkOption {
+      default = false;
+      example = true;
+    };
     restrictSSH = lib.mkOption {
       default = true;
       example = true;
@@ -37,7 +45,8 @@ in
       extraUpFlags = [
         "--login-server"
         headscale
-      ];
+      ]
+      ++ (if cfg.isExitNode then [ "--advertise-exit-node" ] else [ ]);
     };
 
     services.openssh.openFirewall = !cfg.restrictSSH;
@@ -47,5 +56,9 @@ in
       trustedInterfaces = [ "tailscale0" ];
       allowedUDPPorts = [ config.services.tailscale.port ];
     };
+
+    environment.persistence."/state".directories = [
+      "/var/lib/tailscale"
+    ];
   };
 }

modules/nixos/system/desktop/gnome.nix

@@ -47,7 +47,6 @@ in
       gnomeExtensions.dash-to-panel
       gnomeExtensions.desktop-cube
       gnomeExtensions.easyScreenCast
-      gnomeExtensions.espresso
       gnomeExtensions.fly-pie
       gnomeExtensions.forge
       gnomeExtensions.gsconnect
@@ -70,5 +69,11 @@ in
       gnomeExtensions.worksets
       gnomeExtensions.workspace-matrix
     ];
+
+    environment.persistence."/persist".directories = [
+      "/etc/NetworkManager"
+      "/var/lib/AccountsService"
+      "/var/lib/NetworkManager"
+    ];
   };
 }

nix/agenix-rekey.nix

@@ -0,0 +1,29 @@
+{
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.agenix-rekey.flakeModule
+  ];
+
+  perSystem =
+    { config, ... }:
+    {
+      agenix-rekey.nixosConfigurations = inputs.self.nixosConfigurations;
+      devshells.default = {
+        commands = [
+          {
+            inherit (config.agenix-rekey) package;
+            help = "Edit, generate, and rekey secrets";
+          }
+        ];
+        env = [
+          {
+            name = "AGENIX_REKEY_ADD_TO_GIT";
+            value = "true";
+          }
+        ];
+      };
+    };
+}

nix/devshell.nix

@@ -0,0 +1,26 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.devshell.flakeModule
+  ];
+
+  perSystem =
+    { config, pkgs, ... }:
+    {
+      devshells.default = {
+        commands = [
+          {
+            package = config.treefmt.build.wrapper;
+            help = "Format all files";
+          }
+          {
+            package = pkgs.deploy-rs;
+            name = "deploy";
+            help = "Deploy this nix-config to remote hosts";
+          }
+        ];
+
+        devshell.startup.pre-commit.text = config.pre-commit.installationScript;
+      };
+    };
+}

nix/hosts.nix

@@ -0,0 +1,60 @@
+{
+  inputs,
+  ...
+}:
+
+{
+  flake =
+    { config, lib, ... }:
+    let
+      domain = "mesh.vimium.net";
+      mkDeployNode = hostName: {
+        hostname = "${hostName}.${domain}";
+
+        profiles.system = {
+          user = "root";
+          path =
+            inputs.deploy-rs.lib.${
+              config.nixosConfigurations.${hostName}.config.system.build.toplevel.system
+            }.activate.nixos
+              config.nixosConfigurations.${hostName};
+        };
+      };
+    in
+    {
+      nixosConfigurations = lib.pipe ../hosts [
+        builtins.readDir
+        (lib.filterAttrs (name: value: value == "directory"))
+        (lib.mapAttrs (
+          name: value:
+          inputs.nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs; };
+
+            modules = [
+              inputs.impermanence.nixosModules.impermanence
+              {
+                networking = {
+                  inherit domain;
+                  hostName = name;
+                };
+              }
+              ../hosts/${name}
+            ];
+          }
+        ))
+      ];
+
+      deploy = {
+        magicRollback = true;
+        autoRollback = true;
+        sshUser = "root";
+        nodes = lib.genAttrs [
+          "artemis"
+          "mail"
+          "pi"
+          "skycam"
+          "vps1"
+        ] mkDeployNode;
+      };
+    };
+}

overlays/0001-Ignore-IPA-signing.patch

@@ -1,24 +0,0 @@
-From 625939e594ce255afa3fab3a40c3e524460e1f8b Mon Sep 17 00:00:00 2001
-From: Jordan Holt <jordan@vimium.com>
-Date: Sat, 10 Aug 2024 18:28:08 +0100
-Subject: [PATCH] Ignore IPA signing
-
----
- src/libcamera/ipa_manager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
-index 6d5bbd05..43004175 100644
---- a/src/libcamera/ipa_manager.cpp
-+++ b/src/libcamera/ipa_manager.cpp
-@@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
- 	if (data.empty())
- 		return false;
-
--	bool valid = pubKey_.verify(data, ipa->signature());
-+	bool valid = true;
-
- 	LOG(IPAManager, Debug)
- 		<< "IPA module " << ipa->path() << " signature is "
---
-2.44.1

overlays/0001-Remove-relative-config-lookups.patch

@@ -1,141 +0,0 @@
-From 57128bb78f56cadf9e2dcca5ba4d710c3bd478a7 Mon Sep 17 00:00:00 2001
-From: Jordan Holt <jordan@vimium.com>
-Date: Mon, 5 Aug 2024 21:53:09 +0100
-Subject: [PATCH] Remove relative config lookups
-
----
- src/libcamera/ipa_manager.cpp      | 16 ----------
- src/libcamera/ipa_proxy.cpp        | 48 ++----------------------------
- src/libcamera/pipeline_handler.cpp | 21 ++-----------
- 3 files changed, 4 insertions(+), 81 deletions(-)
-
-diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
-index f4e0b633..6d5bbd05 100644
---- a/src/libcamera/ipa_manager.cpp
-+++ b/src/libcamera/ipa_manager.cpp
-@@ -131,22 +131,6 @@ IPAManager::IPAManager()
- 				<< "No IPA found in '" << modulePaths << "'";
- 	}
-
--	/*
--	 * When libcamera is used before it is installed, load IPAs from the
--	 * same build directory as the libcamera library itself.
--	 */
--	std::string root = utils::libcameraBuildPath();
--	if (!root.empty()) {
--		std::string ipaBuildPath = root + "src/ipa";
--		constexpr int maxDepth = 2;
--
--		LOG(IPAManager, Info)
--			<< "libcamera is not installed. Adding '"
--			<< ipaBuildPath << "' to the IPA search path";
--
--		ipaCount += addDir(ipaBuildPath.c_str(), maxDepth);
--	}
--
- 	/* Finally try to load IPAs from the installed system path. */
- 	ipaCount += addDir(IPA_MODULE_DIR);
-
-diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
-index 69975d8f..cd9284a3 100644
---- a/src/libcamera/ipa_proxy.cpp
-+++ b/src/libcamera/ipa_proxy.cpp
-@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
- 		}
- 	}
-
--	std::string root = utils::libcameraSourcePath();
--	if (!root.empty()) {
--		/*
--		 * When libcamera is used before it is installed, load
--		 * configuration files from the source directory. The
--		 * configuration files are then located in the 'data'
--		 * subdirectory of the corresponding IPA module.
--		 */
--		std::string ipaConfDir = root + "src/ipa/" + ipaName + "/data";
--
--		LOG(IPAProxy, Info)
--			<< "libcamera is not installed. Loading IPA configuration from '"
--			<< ipaConfDir << "'";
--
--		std::string confPath = ipaConfDir + "/" + name;
-+	for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
-+		std::string confPath = dir + "/" + ipaName + "/" + name;
- 		ret = stat(confPath.c_str(), &statbuf);
- 		if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
- 			return confPath;
--
--	} else {
--		/* Else look in the system locations. */
--		for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
--			std::string confPath = dir + "/" + ipaName + "/" + name;
--			ret = stat(confPath.c_str(), &statbuf);
--			if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
--				return confPath;
--		}
- 	}
-
- 	if (fallbackName.empty()) {
-@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
- 		}
- 	}
-
--	/*
--	 * When libcamera is used before it is installed, load proxy workers
--	 * from the same build directory as the libcamera directory itself.
--	 * This requires identifying the path of the libcamera.so, and
--	 * referencing a relative path for the proxy workers from that point.
--	 */
--	std::string root = utils::libcameraBuildPath();
--	if (!root.empty()) {
--		std::string ipaProxyDir = root + "src/libcamera/proxy/worker";
--
--		LOG(IPAProxy, Info)
--			<< "libcamera is not installed. Loading proxy workers from '"
--			<< ipaProxyDir << "'";
--
--		std::string proxyPath = ipaProxyDir + proxyFile;
--		if (!access(proxyPath.c_str(), X_OK))
--			return proxyPath;
--
--		return std::string();
--	}
--
--	/* Else try finding the exec target from the install directory. */
- 	std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
- 	if (!access(proxyPath.c_str(), X_OK))
- 		return proxyPath;
-diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
-index 5ea2ca78..fd8555ca 100644
---- a/src/libcamera/pipeline_handler.cpp
-+++ b/src/libcamera/pipeline_handler.cpp
-@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
- 	struct stat statbuf;
- 	int ret;
-
--	std::string root = utils::libcameraSourcePath();
--	if (!root.empty()) {
--		/*
--		 * When libcamera is used before it is installed, load
--		 * configuration files from the source directory. The
--		 * configuration files are then located in the 'data'
--		 * subdirectory of the corresponding pipeline handler.
--		 */
--		std::string confDir = root + "src/libcamera/pipeline/";
--		confPath = confDir + subdir + "/data/" + name;
--
--		LOG(Pipeline, Info)
--			<< "libcamera is not installed. Loading platform configuration file from '"
--			<< confPath << "'";
--	} else {
--		/* Else look in the system locations. */
--		confPath = std::string(LIBCAMERA_DATA_DIR)
--				+ "/pipeline/" + subdir + '/' + name;
--	}
-+	confPath = std::string(LIBCAMERA_DATA_DIR)
-+			+ "/pipeline/" + subdir + '/' + name;
-
- 	ret = stat(confPath.c_str(), &statbuf);
- 	if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
---
-2.44.1

overlays/default.nix

@@ -31,6 +31,8 @@ lib.mapAttrs (
     else
       # Namespaced package sets in regular attrsets.
       prev.${name} // value
+  else if name == "vaultwarden" then
+    final.callPackage value { rustPlatform = final.unstable.rustPlatform; }
   else
     final.callPackage value { }
 ) pkgs

overlays/libcamera.nix

@@ -1,65 +0,0 @@
-final: prev: {
-  libpisp = final.stdenv.mkDerivation {
-    name = "libpisp";
-    version = "1.0.5";
-    src = final.fetchFromGitHub {
-      owner = "raspberrypi";
-      repo = "libpisp";
-      rev = "v1.0.5";
-      hash = "sha256-CHd44CH5dBcZuK+5fZtONZ8HE/lwGKwK5U0BYUK8gG4=";
-    };
-
-    nativeBuildInputs = with final; [
-      pkg-config
-      meson
-      ninja
-    ];
-
-    buildInputs = with final; [
-      nlohmann_json
-      boost
-    ];
-
-    BOOST_INCLUDEDIR = "${prev.lib.getDev final.boost}/include";
-    BOOST_LIBRARYDIR = "${prev.lib.getLib final.boost}/lib";
-  };
-
-  libcamera = prev.libcamera.overrideAttrs (old: {
-    src = final.fetchFromGitHub {
-      owner = "raspberrypi";
-      repo = "libcamera";
-      rev = "eb00c13d7c9f937732305d47af5b8ccf895e700f";
-      hash = "sha256-p0/inkHPRUkxSIsTmj7VI7sIaX7OXdqjMGZ31W7cnt4=";
-    };
-
-    postPatch = ''
-      patchShebangs utils/ src/py/
-    '';
-
-    patches = [
-      ./0001-Remove-relative-config-lookups.patch
-      ./0001-Ignore-IPA-signing.patch
-    ];
-
-    buildInputs =
-      old.buildInputs
-      ++ (with final; [
-        libpisp
-        libglibutil
-      ]);
-
-    mesonFlags = old.mesonFlags ++ [
-      "--buildtype=release"
-      "-Dpipelines=rpi/vc4,rpi/pisp"
-      "-Dipas=rpi/vc4,rpi/pisp"
-      "-Dgstreamer=enabled"
-      "-Dtest=false"
-      "-Dcam=enabled"
-      "-Dpycamera=disabled"
-    ];
-  });
-
-  camera-streamer = prev.callPackage ../pkgs/camera-streamer/package.nix {
-    libcamera = final.libcamera;
-  };
-}

pkgs/camera-streamer/0001-Disable-libdatachannel.patch

@@ -1,24 +0,0 @@
-From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001
-From: Jordan Holt <jordan@vimium.com>
-Date: Sat, 10 Aug 2024 15:37:15 +0100
-Subject: [PATCH] Disable libdatachannel
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index d5029bd..e50ba1a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,7 +23,7 @@ USE_HW_H264 ?= 1
- USE_FFMPEG ?= $(shell pkg-config libavutil libavformat libavcodec && echo 1)
- USE_LIBCAMERA ?= $(shell pkg-config libcamera && echo 1)
- USE_RTSP ?= $(shell pkg-config live555 && echo 1)
--USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1)
-+USE_LIBDATACHANNEL ?= 0
-
- ifeq (1,$(DEBUG))
- CFLAGS += -g
---
-2.44.1

pkgs/camera-streamer/package.nix

@@ -1,82 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-
-  cmake,
-  gnumake,
-  pkg-config,
-  xxd,
-
-  v4l-utils,
-  nlohmann_json,
-  ffmpegSupport ? true,
-  ffmpeg,
-  libcameraSupport ? true,
-  libcamera,
-  rtspSupport ? false,
-  live555,
-  webrtcSupport ? false,
-  openssl,
-
-  lib,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "camera-streamer";
-  version = "0.2.8";
-
-  src = fetchFromGitHub {
-    owner = "ayufan";
-    repo = "camera-streamer";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    ./0001-Disable-libdatachannel.patch
-  ];
-
-  # Second replacement fixes literal newline in generated version.h.
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace '/usr/local/bin' '/bin' \
-      --replace 'echo "#define' 'echo -e "#define'
-  '';
-
-  env.NIX_CFLAGS_COMPILE = builtins.toString [
-    "-Wno-error=stringop-overflow"
-    "-Wno-error=format"
-    "-Wno-format"
-    "-Wno-format-security"
-    "-Wno-error=unused-result"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    gnumake
-    pkg-config
-    xxd
-  ];
-
-  dontUseCmakeConfigure = true;
-
-  buildInputs =
-    [
-      nlohmann_json
-      v4l-utils
-    ]
-    ++ (lib.optional ffmpegSupport ffmpeg)
-    ++ (lib.optional libcameraSupport libcamera)
-    ++ (lib.optional rtspSupport live555)
-    ++ (lib.optional webrtcSupport openssl);
-
-  installFlags = [ "DESTDIR=${builtins.placeholder "out"}" ];
-  preInstall = "mkdir -p $out/bin";
-
-  meta = with lib; {
-    description = "High-performance low-latency camera streamer for Raspberry Pi's";
-    website = "https://github.com/ayufan/camera-streamer";
-    license = licenses.gpl3Only;
-  };
-})

pkgs/jellysearch/nuget-deps.json

@@ -0,0 +1,172 @@
+[
+  {
+    "pname": "MeiliSearch",
+    "version": "0.15.0",
+    "hash": "sha256-MM8Z8xc+AG0m+jNXAHSLhUB2egJC4lI+u6BDTVaOwzg="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.OpenApi",
+    "version": "8.0.4",
+    "hash": "sha256-Y/UnyBlwraJjxDmEO3vsgB63GO1M7OXyIS10vL1Fs5A="
+  },
+  {
+    "pname": "Microsoft.Data.Sqlite",
+    "version": "8.0.6",
+    "hash": "sha256-t1g1cF4T26Np10H7opo/vCMTMNb9SS9pmLA9pSCUBp4="
+  },
+  {
+    "pname": "Microsoft.Data.Sqlite.Core",
+    "version": "8.0.6",
+    "hash": "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="
+  },
+  {
+    "pname": "Microsoft.Extensions.ApiDescription.Server",
+    "version": "6.0.5",
+    "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "2.1.1",
+    "hash": "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Abstractions",
+    "version": "7.4.0",
+    "hash": "sha256-rzTsvh5hDX7zk6wYzUKNg7lIQf38G/EeR6qUq/j3Eo0="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.JsonWebTokens",
+    "version": "7.4.0",
+    "hash": "sha256-IeezkUkScumgLQZqq2Zu4YsyldIUA/XpTeONB2AtYDc="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Logging",
+    "version": "7.4.0",
+    "hash": "sha256-rudTpYcSlIlE1OX2LO3Qd6DAisqd5vsuX/Edu7rHIJs="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Tokens",
+    "version": "7.4.0",
+    "hash": "sha256-qVqVYxBy5p6Jerd1rfMUgApV7vcH54N4neS2x+N5zRQ="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.2.3",
+    "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.4.3",
+    "hash": "sha256-vk47e78OwopXJx2LhDRbKFObqF3GShHfNHR2SzvbQeA="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
+  {
+    "pname": "Quartz",
+    "version": "3.10.0",
+    "hash": "sha256-1sb+JKJdS01lScgVjcbDHxbXSpHeMn1Mqg/CQ8r+BKI="
+  },
+  {
+    "pname": "SQLitePCLRaw.bundle_e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+  },
+  {
+    "pname": "SQLitePCLRaw.core",
+    "version": "2.1.6",
+    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+  },
+  {
+    "pname": "SQLitePCLRaw.lib.e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+  },
+  {
+    "pname": "SQLitePCLRaw.provider.e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore",
+    "version": "6.4.0",
+    "hash": "sha256-czuCv3Os7Oo06m3W+auJjrTGuYT82E+Bi80sJqeVb8o="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.Swagger",
+    "version": "6.4.0",
+    "hash": "sha256-1u4A9vzDUJ+wLoxH5yQEVhpOxi+VnAMd64Z18SLqjPE="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerGen",
+    "version": "6.4.0",
+    "hash": "sha256-Alra5J+i0L/4JoS5pATJexVu8LId8HZcofkx7KiRqMw="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerUI",
+    "version": "6.4.0",
+    "hash": "sha256-P84wlE4EVruLVGGTUHK29wWYs/BTq/MR5P7PuSBwr+c="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "6.0.1",
+    "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
+  {
+    "pname": "System.IdentityModel.Tokens.Jwt",
+    "version": "7.4.0",
+    "hash": "sha256-LYvdJPbPuxr8V3FJacStflSf9GVStprl1Wr+dfgqMdw="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.3",
+    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
+  },
+  {
+    "pname": "System.Net.Http.Json",
+    "version": "6.0.0",
+    "hash": "sha256-R4s4Fb3OTKpg9gXSv+8CQ9gPJPJMmj3/nagzaRndm+g="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "6.0.0",
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "6.0.0",
+    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
+  },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "6.0.0",
+    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "6.0.0",
+    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "6.0.0",
+    "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "6.0.0",
+    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
+  }
+]

pkgs/jellysearch/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitLab,
+  buildDotnetModule,
+  dotnetCorePackages,
+}:
+
+buildDotnetModule rec {
+  pname = "jellysearch";
+  version = "0.0.1";
+
+  src = fetchFromGitLab {
+    owner = "DomiStyle";
+    repo = "JellySearch";
+    rev = "7397e3f8c7daa6f0d30b22dda7c5159a913ca6b8";
+    hash = "sha256-7t0j4S5A9yvRN8zjToMNsxJ72OjU3j++EAqq9CKcPaI=";
+  };
+
+  patches = [
+    ./patches/Only-listen-on-loopback-interface.patch
+  ];
+
+  projectFile = "src/JellySearch/JellySearch.csproj";
+  executables = [ "jellysearch" ];
+  nugetDeps = ./nuget-deps.json;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+
+  meta = with lib; {
+    description = "A fast full-text search proxy for Jellyfin";
+    homepage = "https://gitlab.com/DomiStyle/jellysearch";
+    license = licenses.mit;
+    mainProgram = "JellySearch";
+    platforms = dotnet-runtime.meta.platforms;
+  };
+}

pkgs/jellysearch/patches/Only-listen-on-loopback-interface.patch

@@ -0,0 +1,24 @@
+From dede2b55ef53028b1347ccb731657a12d7fa3d15 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 22 Jun 2025 17:16:56 +0100
+Subject: [PATCH] Only listen on loopback interface
+
+---
+ src/JellySearch/Program.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/JellySearch/Program.cs b/src/JellySearch/Program.cs
+index a0c6ee1..98798f7 100644
+--- a/src/JellySearch/Program.cs
++++ b/src/JellySearch/Program.cs
+@@ -6,7 +6,7 @@ using Quartz.Impl;
+
+ var builder = WebApplication.CreateBuilder(args);
+
+-builder.WebHost.UseUrls("http://0.0.0.0:5000"); // Listen on every IP
++builder.WebHost.UseUrls("http://127.0.0.1:5000"); // Listen on loopback only
+
+ builder.Services.AddCors(options =>
+ {
+--
+2.49.0

pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCocmtyzPPjv+52
+JiZrpZFfaZ0eeUgugc8gV+0+2Q9GEkl/xxqjiDVg31gBO3iwQov2NmGuPbXr+vwZ
+QcUqNQakmmdi22tBaTtd6hMuhu9OfbP8sIFaf0dToZRHkPgf63+WCF6w0O9enEz4
+zjW3kPa1eVRVekiYCXGML/VhN+h5WwWouNWgEOw5JH39ZuGmhsGN5XekkHtyMkwq
+Vr+JodoSizhYs9VBYNA1J4PlyiS4BYr4pLiLffzPwRjcSS777x33g+nWNr1lsFxB
+nDoVvVnq0E7fiXxlmCtAr/7dv0Ug5ixuNfZ9yoT0f+mfUiG/anmfodHujIm2Db37
+jvmfxaq1AgMBAAECggEAFhJKBHSY92xod0g37A55fiZFTV8oZ1mgdXU386522yBd
+y5Wf5rIcBmm1axHrFjNeCgClq3JQEk/kdP3Ccy2YBXzq04/7HYrHmd5oLYZGOINt
+kExjYqN/SdTH7FmxPWN66AKIP8RcvQmfZ1GDxd4DiZNQitO3S96e53bIQPkVp8Lg
+GfK6LQCdOGimD00wvRoeqbV0PWGGVMfx+KvD5hxKYolyi/hNUxToD28qCAoMlMTi
+yL+17q3nIYZvUmL0k7d64U+lXF8ov3cVXNJzAzFi41MXZ2Xqk3Lj+IhNweUhlOyn
+fTo8QntNlirNL/XmtJ+5mPbGufE/6zsSNOf2Cyz2aQKBgQDio/tA3tFBzOz31hox
+gW6NKarhp7e5R3XHQjZPmQXKq2lGCTBN+LzwCLYDa+ZWkS+cel/xSbkUFl0dopCu
+7uGrSvmVAv+l1k879WHsYmLlDjJSa8WmDtVQ0SJr70X9UJmD2BivWnTnzrpZFu2A
+Nv57gvebJTI4tLfAAyIfbg8gOQKBgQC+RJRv8/jVha/4sPonQYvpH0scS0Xzwca6
+xd23e+vULBpk7IVzMbVGJEDdfWXVJeAO++FSQcgTJA38nfYm2XRPZAProliLaW8o
+XVhhhWbXP7Jc8BmL5zyfDaLOXNFBX2kfr/oKeOoQ+0dRDlWKlarw1SxC+RT6i2qQ
+YETgXHKmXQKBgGk8mWsqy2HRZOtDqE/6eLnlciprtVy7+M14Sj21oUHVTAGwPJTH
+/fs7IEEAdikWK1RuYmRoxh60r7IWDTadR35BRxjRFqILnCkMLNcVbDRN3kH1NwZ/
+dr+bDG+v4ADazx2wVu39g7Erhc3eXpOddZcmXhDVObeo+nWXPt33PeDJAoGBAJ4v
++FVnuo8Tee1Cfogat87W5KSedIcnqSjpjt+Y2MXq8PrNplnSjwrE42UCd6KRvcnX
+Ykr4Q/ad+D75uYgtLMVAuv2yWPl3bCJcETnrJkh5PbqFKEgntT/rn1sA0j0OrSDa
+NwFz6+64a1+ZkkcJDjjykr0Px4BSXwOv9jOuyOdFAoGADZEADOLX5y4utxboe1M0
+UnaFKGEDE6H8qdRJQ9bSvEwJI142al02CvnvqvP4cpd8rKOCRs9nSXFJFXCedTLy
+ojSVfjTyJMTVJxab/c/Qugkxb/TqGfEnZF2yoTsfPYp2pXRd6DvyKlDQzlSOj933
+FrqeSe1QKapuPRsujVwLZDU=
+-----END PRIVATE KEY-----

pkgs/libcamera-rpi/package.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  fetchFromGitHub,
+  libcamera,
+  boost,
+  nlohmann_json,
+  python3Packages,
+  git,
+  cacert,
+  meson,
+}:
+libcamera.overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ [
+    boost
+    nlohmann_json
+  ];
+  nativeBuildInputs = old.nativeBuildInputs ++ [ python3Packages.pybind11 ];
+
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  patches = [
+    ./patches/libcamera-installed.patch
+    ./patches/libcamera-no-timeout.patch
+  ];
+
+  postPatch = old.postPatch + ''
+    patchShebangs src/py/libcamera
+  '';
+
+  preBuild = ''
+    ninja src/ipa-priv-key.pem
+    install -D ${./libcamera-rpi-ipa-priv-key.pem} src/ipa-priv-key.pem
+  '';
+
+  mesonFlags = old.mesonFlags ++ [
+    "--buildtype=release"
+    "-Dcam=disabled"
+    "-Dgstreamer=disabled"
+    "-Dipas=rpi/vc4,rpi/pisp"
+    "-Dpipelines=rpi/vc4,rpi/pisp"
+    "-Dtest=false"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "libcamera";
+    rev = "d83ff0a4ae4503bc56b7ed48cd142c3dd423ad3b";
+    sha256 = "sha256-VP0s1jOON9J3gn81aiemsChvGeqx0PPivQF5rmSga6M=";
+
+    nativeBuildInputs = [ git ];
+
+    postFetch = ''
+      cd "$out"
+
+      export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+
+      ${lib.getExe meson} subprojects download \
+        libpisp
+
+      find subprojects -type d -name .git -prune -execdir rm -r {} +
+    '';
+  };
+})

pkgs/libcamera-rpi/patches/libcamera-installed.patch

@@ -0,0 +1,53 @@
+From e65bbb6e263d99212cd29a32d89e4c45d0c05353 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 21 Jun 2025 18:38:38 +0100
+Subject: [PATCH] libcamera installed
+
+---
+ src/libcamera/source_paths.cpp | 9 ---------
+ src/py/libcamera/meson.build   | 4 ++--
+ 2 files changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp
+index 1af5386a..3fc7d044 100644
+--- a/src/libcamera/source_paths.cpp
++++ b/src/libcamera/source_paths.cpp
+@@ -39,15 +39,6 @@ namespace {
+  */
+ bool isLibcameraInstalled()
+ {
+-	/*
+-	 * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on
+-	 * install.
+-	 */
+-	for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {
+-		if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)
+-			return false;
+-	}
+-
+ 	return true;
+ }
+
+diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
+index 596a203c..c0b1db59 100644
+--- a/src/py/libcamera/meson.build
++++ b/src/py/libcamera/meson.build
+@@ -34,14 +34,14 @@ gen_py_controls = files('gen-py-controls.py')
+ pycamera_sources += custom_target('py_gen_controls',
+                                   input : controls_files,
+                                   output : ['py_controls_generated.cpp'],
+-                                  command : [gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@',
++                                  command : ['python3', gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@',
+                                              '-t', gen_py_controls_template, '@INPUT@'],
+                                   env : py_build_env)
+
+ pycamera_sources += custom_target('py_gen_properties',
+                                   input : properties_files,
+                                   output : ['py_properties_generated.cpp'],
+-                                  command : [gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@',
++                                  command : ['python3', gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@',
+                                              '-t', gen_py_controls_template, '@INPUT@'],
+                                   env : py_build_env)
+
+--
+2.49.0

pkgs/libcamera-rpi/patches/libcamera-no-timeout.patch

@@ -0,0 +1,29 @@
+From 98918c4efdcf03701908bb756f252ba11b59490b Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 21 Jun 2025 18:41:54 +0100
+Subject: [PATCH] libcamera no timeout
+
+---
+ src/libcamera/ipc_pipe_unixsocket.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libcamera/ipc_pipe_unixsocket.cpp b/src/libcamera/ipc_pipe_unixsocket.cpp
+index 668ec73b..faf7e2a5 100644
+--- a/src/libcamera/ipc_pipe_unixsocket.cpp
++++ b/src/libcamera/ipc_pipe_unixsocket.cpp
+@@ -130,11 +130,13 @@ int IPCPipeUnixSocket::call(const IPCUnixSocket::Payload &message,
+ 	/* \todo Make this less dangerous, see IPCPipe::sendSync() */
+ 	timeout.start(2000ms);
+ 	while (!iter->second.done) {
++	#if 0
+ 		if (!timeout.isRunning()) {
+ 			LOG(IPCPipe, Error) << "Call timeout!";
+ 			callData_.erase(iter);
+ 			return -ETIMEDOUT;
+ 		}
++	#endif
+
+ 		Thread::current()->eventDispatcher()->processEvents();
+ 	}
+--
+2.49.0

pkgs/rpicam-apps/package.nix

@@ -1,58 +1,68 @@
 {
   stdenv,
+  callPackage,
   fetchFromGitHub,
+  makeWrapper,
   meson,
   ninja,
   pkg-config,
   boost,
-  ffmpeg,
+  ffmpeg-headless,
-  libcamera,
   libdrm,
+  libepoxy,
   libexif,
   libjpeg,
   libpng,
   libtiff,
-  lib,
+  libX11,
 }:
-
+let
+  libcamera-rpi = callPackage (import ../libcamera-rpi/package.nix) { };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpicam-apps";
-  version = "1.4.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpicam-apps";
-    rev = "v" + finalAttrs.version;
+    rev = "v${finalAttrs.version}";
-    hash = "sha256-3NG2ZE/Ub3lTbfne0LCXuDgLGTPaAAADRdElEbZwvls=";
+    hash = "sha256-79qpAfY83YOZdM5ZPyIOkg3s7x75hvjG6Cc96UAIdb0=";
   };
 
+  buildInputs = [
+    boost
+    ffmpeg-headless
+    libcamera-rpi
+    libdrm
+    libepoxy # GLES/EGL preview window
+    libexif
+    libjpeg
+    libpng
+    libtiff
+    libX11
+  ];
+
   nativeBuildInputs = [
+    makeWrapper
     meson
     ninja
     pkg-config
   ];
 
-  buildInputs = [
+  # See all options here: https://github.com/raspberrypi/rpicam-apps/blob/main/meson_options.txt
-    boost
+  mesonFlags = [
-    ffmpeg
+    "-Denable_drm=disabled"
-    libcamera
+    "-Denable_egl=disabled"
-    libdrm
+    "-Denable_hailo=disabled"
-    libexif
+    "-Denable_qt=disabled"
-    libjpeg
+    "-Denable_libav=disabled"
-    libpng
-    libtiff
   ];
 
-  # Meson is no longer able to pick up Boost automatically:
+  postInstall = ''
-  # https://github.com/NixOS/nixpkgs/issues/86131
+    for f in rpicam-hello rpicam-jpeg rpicam-raw rpicam-still rpicam-vid
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+    do
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+      wrapProgram $out/bin/$f --set-default LIBCAMERA_IPA_PROXY_PATH ${libcamera-rpi}/libexec/libcamera
-
+    done
-  meta = with lib; {
+  '';
-    description = ''
-      libcamera-based applications to drive the cameras on a Raspberry Pi platform
-    '';
-    homepage = "https://github.com/raspberrypi/rpicam-apps";
-    license = licenses.bsd2;
-  };
 })

pkgs/streamrip/ensure-the-default-config-file-is-writable.patch

@@ -1,25 +0,0 @@
-From 18efb9b5c8e562b169425f6ba79977e52e8b91b9 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Sat, 13 Jan 2024 12:49:45 +0000
-Subject: [PATCH] Ensure the default config file is writable.
-
----
- streamrip/config.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/streamrip/config.py b/streamrip/config.py
-index 7ee2f57..88a5fef 100644
---- a/streamrip/config.py
-+++ b/streamrip/config.py
-@@ -378,6 +378,9 @@ def set_user_defaults(path: str, /):
-     """Update the TOML file at the path with user-specific default values."""
-     shutil.copy(BLANK_CONFIG_PATH, path)
-
-+    # Ensure the default config file is writable
-+    os.chmod(path, 0o644)
-+
-     with open(path) as f:
-         toml = parse(f.read())
-     toml["downloads"]["folder"] = DEFAULT_DOWNLOADS_FOLDER  # type: ignore
---
-2.42.0

pkgs/streamrip/package.nix

@@ -1,78 +0,0 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-
-  ffmpeg,
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "streamrip";
-  version = "2.0.7";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "nathom";
-    repo = "streamrip";
-    rev = "46b570dbb6f81d604cbaa3bfa379463e0a20a841";
-    hash = "sha256-LD99OjguaBnrQxCwmCeHvmBMq5aOfobwnMd5/aCRZW8=";
-  };
-
-  patches = [
-    ./ensure-the-default-config-file-is-writable.patch
-  ];
-
-  nativeBuildInputs = with python3Packages; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    aiodns
-    aiofiles
-    aiohttp
-    aiolimiter
-    appdirs
-    cleo
-    click-help-colors
-    deezer-py
-    m3u8
-    mutagen
-    pathvalidate
-    pillow
-    pycryptodomex
-    pytest-asyncio
-    pytest-mock
-    rich
-    simple-term-menu
-    tomlkit
-    tqdm
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  prePatch = ''
-    sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml
-    sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml
-    sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml
-    sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml
-    sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml
-    sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml
-    sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml
-
-    sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py
-  '';
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
-    homepage = "https://github.com/nathom/streamrip";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ paveloom ];
-    mainProgram = "rip";
-  };
-}

pkgs/vaultwarden/package.nix

@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  callPackage,
+  rustPlatform,
+  fetchFromGitHub,
+  nixosTests,
+  pkg-config,
+  openssl,
+  libiconv,
+  dbBackend ? "sqlite",
+  libmysqlclient,
+  libpq,
+}:
+
+let
+  webvault = callPackage ./webvault.nix { };
+in
+
+rustPlatform.buildRustPackage rec {
+  pname = "vaultwarden";
+  version = "git-" + builtins.substring 0 7 src.rev;
+
+  src = fetchFromGitHub {
+    owner = "dani-garcia";
+    repo = "vaultwarden";
+    rev = "a2ad1dc7c3d28834749d4b14206838d795236c27";
+    sha256 = "sha256-6Qmp/Uv8hdKuL9e3tPMKgNq1ZdvRQbzM65ifmS2Z3UY=";
+  };
+
+  cargoHash = "sha256-F7we9rurJ7srz54lsuSrdoIZpkGE+4ncW3+wjEwaD7M=";
+
+  # used for "Server Installed" version in admin panel
+  env.VW_VERSION = version;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ]
+  ++ lib.optional (dbBackend == "mysql") libmysqlclient
+  ++ lib.optional (dbBackend == "postgresql") libpq;
+
+  buildFeatures = dbBackend;
+
+  passthru = {
+    inherit webvault;
+    tests = nixosTests.vaultwarden;
+    updateScript = callPackage ./update.nix { };
+  };
+
+  meta = with lib; {
+    description = "Unofficial Bitwarden compatible server written in Rust";
+    homepage = "https://github.com/dani-garcia/vaultwarden";
+    changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [
+      dotlambda
+      SuperSandro2000
+    ];
+    mainProgram = "vaultwarden";
+  };
+}

pkgs/vaultwarden/webvault.nix

@@ -0,0 +1,83 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nixosTests,
+  python3,
+  vaultwarden,
+}:
+
+let
+  version = "2025.8.0";
+
+  bw_web_builds = fetchFromGitHub {
+    owner = "dani-garcia";
+    repo = "bw_web_builds";
+    rev = "v${version}";
+    hash = "sha256-93acGKO3Fq81M1wKPvIynvkTFXPQXypcMb+c4aEtxJc=";
+  };
+
+in
+buildNpmPackage rec {
+  pname = "vaultwarden-webvault";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "vaultwarden";
+    repo = "vw_web_builds";
+    rev = bw_web_builds.rev;
+    hash = "sha256-u51EP4I+bUcTeMqfzx1gbZMxpjalt3bpK3QGp5QEpYU=";
+  };
+
+  npmDepsHash = "sha256-wi7ZDgGKXrtueLob5OVNKCpnzC00UW9zo8KwuoyL1Bo=";
+
+  postPatch = ''
+    ln -s ${bw_web_builds}/{patches,resources} ..
+  '';
+
+  nativeBuildInputs = [
+    python3
+  ];
+
+  makeCacheWritable = true;
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    npm_config_build_from_source = "true";
+  };
+
+  npmRebuildFlags = [
+    # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
+    "--ignore-scripts"
+  ];
+
+  npmBuildScript = "dist:oss:selfhost";
+
+  npmBuildFlags = [
+    "--workspace"
+    "apps/web"
+  ];
+
+  npmFlags = [ "--legacy-peer-deps" ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/vaultwarden
+    mv apps/web/build $out/share/vaultwarden/vault
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit bw_web_builds;
+    tests = nixosTests.vaultwarden;
+  };
+
+  meta = with lib; {
+    description = "Integrates the web vault into vaultwarden";
+    homepage = "https://github.com/dani-garcia/bw_web_builds";
+    changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}";
+    platforms = platforms.all;
+    license = licenses.gpl3Plus;
+    inherit (vaultwarden.meta) maintainers;
+  };
+}

pkgs/vk-hdr-layer/package.nix

@@ -0,0 +1,44 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  meson,
+  ninja,
+  pkg-config,
+  vulkan-headers,
+  vulkan-loader,
+  wayland-scanner,
+  wayland,
+  xorg,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vk-hdr-layer";
+  version = "303e0c69e1d33acd95158d92b1fc652fb5b85399";
+
+  src = fetchFromGitHub {
+    owner = "Zamundaaa";
+    repo = "VK_hdr_layer";
+    rev = "303e0c69e1d33acd95158d92b1fc652fb5b85399";
+    fetchSubmodules = true;
+    hash = "sha256-NsC44Ifl/fAHvFqP7NLrVZ71Y+x5mBEkv+r43HN5yn4=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+    wayland
+    wayland-scanner
+    xorg.libX11
+  ];
+
+  meta = {
+    description = "Vulkan layer utilizing a small color management / HDR protocol for experimentation";
+    homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
+    license = lib.licenses.mit;
+  };
+})

secrets/generated/vps1/kanidm-admin-password.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA A54fi3eKkgTq6VOnMm2ze+aHVpJ0NNsqT+w7nvYoznbM
+t/dRpZzqO/mX7iHLxbvzVxdmTECkRFPA5jmYfZwbMR0
+-> O_h4MVE-grease {- v~ 05B3
+Clwo0RqQmOGC24XDUIA+4MfDLlWnc3SjR8Kk0Wokqf6R5QFobU4
+--- loq7Xutgff/pptwqLMmjVA1uZwtDE1z6wsORzSgY80w
+"<22>2<EFBFBD>Q<EFBFBD>`D<> $<24>N<EFBFBD><4E><<3C><><EFBFBD>.<2E><05>=5<><35>8<EFBFBD>%g<><67>E<EFBFBD><45>l[T<>I<>y

secrets/generated/vps1/kanidm-idm-admin-password.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA Aul2Rho3PfWaREBYYJr5FpyV5+eQ18GY5DT1dB9QcAH8
+wDHmswR1WRsqCrqRv6imy2oeo+FP3Z1kDpWvr/IzcUY
+-> 4-grease x K>#G$!
+WbQ2yy2Pkkn0BYBR+y0tPLCFTN6cKEYGEp4B+nagPf42XONM3Q4ewp5UJF25rAiJ
+LsUecsY7dvX1n9HAz6uBwMm6Xt4
+--- iPJfeOsee5HmeCB5NRHSPIywjhUrjdhsoEx9aTxbrZs
+^ɽ$jFP	<09><>@<40><><EFBFBD>銿[|<7C><04><>N<>p2<11><><EFBFBD><EFBFBD>|[<5B><>I>><3E>%f<><66><EFBFBD><EFBFBD>֧<EFBFBD>l<EFBFBD>W<EFBFBD>!Av`<60><>2<EFBFBD><32><EFBFBD>8<>jVff<>J<1F><>