users/jordan: disable persistence by default

Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9?narHash=sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw%3D' (2025-12-15)
  → 'github:hercules-ci/flake-parts/250481aafeb741edfe23d29195671c19b36b6dca?narHash=sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY%3D' (2026-01-05)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d49d2543f02dbd789ed032188c84570d929223cb?narHash=sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM%3D' (2026-01-01)
  → 'github:nix-community/home-manager/82fb7dedaad83e5e279127a38ef410bcfac6d77c?narHash=sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY%3D' (2026-01-08)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/583c4074a5d4229f841d9e470ab427339773b592?narHash=sha256-Vkl6ta0Jaim6MvbNKfhb5GR/FtW3NyMRXyioBH1rcC0%3D' (2026-01-03)
  → 'github:hyprwm/Hyprland/5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6?narHash=sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc%2BThpSSHm90s%3D' (2026-01-08)
• Updated input 'hyprland-plugins':
    'github:hyprwm/hyprland-plugins/a084d66d7d1334b89a07d0022fa12049141cb119?narHash=sha256-KLybElvKmWkCJBVgEesy7OueJsmDhksfbDFJ3UltPlk%3D' (2026-01-03)
  → 'github:hyprwm/hyprland-plugins/fef398ed5e4faf59bc43b915e46a75cfe8b16697?narHash=sha256-jObY8O7OI%2B91hoE137APsDxm0235/Yx%2BHhFIip187zM%3D' (2026-01-06)
• Updated input 'impermanence':
    'github:nix-community/impermanence/4b3e914cdf97a5b536a889e939fb2fd2b043a170?narHash=sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI%3D' (2025-01-25)
  → 'github:nix-community/impermanence/82e5bc4508cab9e8d5a136626276eb5bbce5e9c5?narHash=sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA%3D' (2026-01-07)
• Added input 'impermanence/home-manager':
    'github:nix-community/home-manager/7419250703fd5eb50e99bdfb07a86671939103ea?narHash=sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ%3D' (2025-05-23)
• Added input 'impermanence/home-manager/nixpkgs':
    follows 'impermanence/nixpkgs'
• Added input 'impermanence/nixpkgs':
    'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D' (2025-05-23)
• Updated input 'niri':
    'github:sodiboo/niri-flake/ba6ea712dc2da0b01c6a8d02dd9e86973663e4de?narHash=sha256-OShXLsMyF9hxmiID1p4QF%2BekqreViHM9105ej05S2uI%3D' (2026-01-02)
  → 'github:sodiboo/niri-flake/28e3e179cb997a26ffa30238f9ac700744b03a65?narHash=sha256-GSHlkIV/X8oOS15fCwdH1v1HhnYDY/beK9SCgAR0loA%3D' (2026-01-09)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3?narHash=sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI%3D' (2025-12-31)
  → 'github:YaLTeR/niri/10df9f4717cbd4efd20ae796eb6b0aa400127bdc?narHash=sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0%3D' (2026-01-07)
• Updated input 'niri/nixpkgs-stable':
    'github:NixOS/nixpkgs/64049ca74d63e971b627b5f3178d95642e61cedd?narHash=sha256-yA/CuWyqm%2BAQo2ivGy6PlYrjZBQm7jfbe461%2B4HF2fo%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07)
• Updated input 'niri/xwayland-satellite-unstable':
    'github:Supreeeme/xwayland-satellite/0dde7ca1d3a8e8c5082533d76084e2aa02bef70e?narHash=sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd%2BXoTkzqF7E%3D' (2025-12-22)
  → 'github:Supreeeme/xwayland-satellite/bc47ef59501556fc2584155ddef76493752dd727?narHash=sha256-V8%2BDrPOp940J6icERAaGuDQTKyEyZzFuRw363XwDKXg%3D' (2026-01-09)
• Updated input 'nix-topology':
    'github:oddlama/nix-topology/0c052d902678b592b957eac2c250e4030fe70ebc?narHash=sha256-O/7ZAy0OczYEy7zl%2BEegeekvRqb3JPh0btyBKtRvbVw%3D' (2025-12-31)
  → 'github:oddlama/nix-topology/c02ed65766ba5153f38bb43e43a60fe5a1fff7d2?narHash=sha256-ofVU9FpGR8mLtI6UDnRSbpvXZBB%2B2xWUw3x8OcAYSNE%3D' (2026-01-09)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/64049ca74d63e971b627b5f3178d95642e61cedd?narHash=sha256-yA/CuWyqm%2BAQo2ivGy6PlYrjZBQm7jfbe461%2B4HF2fo%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/fb7944c166a3b630f177938e478f0378e64ce108?narHash=sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf%2BOkucw%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886?narHash=sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4%3D' (2026-01-07)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/d56486eb9493ad9c4777c65932618e9c2d0468fc?narHash=sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM%2BNDcX6yxj7rE%3D' (2026-01-03)
  → 'github:numtide/treefmt-nix/778a1d691f1ef45dd68c661715c5bf8cbf131c80?narHash=sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2%2BgM5tf8%3D' (2026-01-07)

README.md

@@ -5,9 +5,9 @@ System and user configuration for NixOS-based systems.
 | | |
 |-|-|
 | **Shell:** | zsh |
-| **DE:** | GNOME |
+| **WM:** | Hyprland |
 | **Theme:** | Adwaita |
-| **Terminal:** | Ghostty |
+| **Terminal:** | kitty |
 
 ## Provisioning a new host
 

flake.nix

@@ -30,7 +30,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -60,21 +60,26 @@
       flake = false;
     };
 
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    niri = {
-
+      url = "github:sodiboo/niri-flake";
-    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+
+    nixos-mailserver = {
+      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";
     };
 
@@ -113,10 +118,10 @@
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
-        inputs.agenix-rekey.flakeModule
         inputs.pre-commit-hooks.flakeModule
         inputs.nix-topology.flakeModule
         inputs.treefmt-nix.flakeModule
+        ./nix/agenix-rekey.nix
         ./nix/devshell.nix
         ./nix/hosts.nix
       ];
@@ -136,7 +141,7 @@
       perSystem =
         { pkgs, ... }:
         {
-          formatter = pkgs.nixfmt-rfc-style;
+          formatter = pkgs.nixfmt;
 
           legacyPackages = pkgs.lib.packagesFromDirectoryRecursive {
             callPackage = pkgs.callPackage;
@@ -168,7 +173,7 @@
                 no-lambda-arg = true;
               };
               mdformat.enable = true;
-              nixfmt-rfc-style.enable = true;
+              nixfmt.enable = true;
               shellcheck.enable = true;
             };
           };

hosts/artemis/default.nix

@@ -23,8 +23,13 @@ in
 
   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;
@@ -100,7 +105,7 @@ in
       };
       desktop = {
         gnome.enable = lib.mkForce false;
-        hyprland.enable = true;
+        hyprland.enable = false;
       };
     };
   };

hosts/artemis/hardware-configuration.nix

@@ -68,8 +68,9 @@ in
       "amdgpu.sched_hw_submission=4"
       "audit=0"
     ];
-    kernelPackages = pkgs.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_18;
     supportedFilesystems = [ "ntfs" ];
+    zfs.package = pkgs.zfs_2_4;
   };
 
   hardware = {

hosts/artemis/ssh_host_ed25519_key.pub

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

hosts/atlas/default.nix

@@ -9,6 +9,8 @@
 
   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

@@ -6,17 +6,25 @@
 }:
 {
   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)
+      inputs.niri.overlays.niri
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           config = {
@@ -25,6 +33,7 @@
           system = final.system;
         };
       })
+      (import ../overlays/default.nix)
     ];
   };
 
@@ -109,13 +118,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

@@ -40,7 +40,7 @@
   };
 
   system.autoUpgrade = {
-    enable = true;
+    enable = false;
     flake = "git+ssh://git@git.vimium.com/jordan/nix-config.git";
     randomizedDelaySec = "10min";
   };

hosts/helios/default.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   pkgs,
   lib,
   ...
@@ -10,15 +9,15 @@ let
 in
 {
   imports = [
-    inputs.disko.nixosModules.disko
     ./hardware-configuration.nix
-    ./disko-config.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/disko-config.nix

@@ -1,101 +0,0 @@
-{ ... }:
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/disk/by-id/ata-SanDisk_Ultra_II_480GB_162224802391";
-        content = {
-          type = "gpt";
-          partitions = {
-            MBR = {
-              size = "1M";
-              type = "EF02"; # For GRUB MBR
-            };
-            boot = {
-              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/helios/ssh_host_ed25519_key.pub

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

hosts/hypnos/default.nix

@@ -22,6 +22,8 @@
     };
   };
 
+  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/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";
@@ -29,10 +32,33 @@
         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"
   ];

hosts/library/default.nix

@@ -17,6 +17,8 @@
 
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;

hosts/library/jellyfin.nix

@@ -8,7 +8,7 @@
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      vaapiVdpau
+      libva-vdpau-driver
     ];
   };
 

hosts/library/jellysearch.nix

@@ -13,7 +13,7 @@
   services.meilisearch = {
     enable = true;
     package = pkgs.meilisearch;
-    masterKeyEnvironmentFile = config.age.secrets."files/services/meilisearch/envfile".path;
+    masterKeyFile = config.age.secrets."files/services/meilisearch/envfile".path;
   };
 
   users.users.jellysearch = {

hosts/library/nginx.nix

@@ -33,25 +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 = [

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
+æìXÖ+âÊrýá±jÏüÃZW¢¡p¶Âñk‡%Ç—xdC5mͧ '[ˆæwÂxá雸ã#ÃûËO<18>Ì7<C38C>bC'8ÑÖ3÷bñ{_Ç%_êês&„žªÑ¹rrÚÁ¦ž,
+5L8‚yCØOÅ6oîÆÙk}ˆÏ_®Üižm¾u3|Šf	5°Õ5ãêA¾Vê>¢
+âúªóE=¹»è«E²’ÇaE¿-ÉÔ<>^•»Q›¬j…ƒš•7¯6Pì»böàE8*4ß„

hosts/library/ssh_host_ed25519_key.pub

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

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/ssh_host_ed25519_key.pub

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

hosts/odyssey/aws.env

@@ -0,0 +1 @@
+AWS_REGION=us-east-1

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,7 +7,9 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ./comfyui-docker.nix
     ./gitea-runner.nix
+    ./home-assistant
     ./nix-serve.nix
     ../desktop.nix
     ../../users/jordan
@@ -20,6 +22,8 @@
     };
   };
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   boot.loader = {
     systemd-boot = {
       enable = true;
@@ -50,6 +54,41 @@
     capSysAdmin = true;
   };
 
+  environment.systemPackages = with pkgs; [
+    yubikey-manager
+    age-plugin-yubikey
+  ];
+
+  services.udev.packages = with pkgs; [
+    libfido2
+  ];
+
+  services.pcscd.enable = true;
+
+  security.acme = {
+    acceptTerms = true;
+    defaults = {
+      email = "hostmaster@vimium.com";
+      dnsProvider = "route53";
+      dnsResolver = "9.9.9.9";
+      credentialFiles = {
+        AWS_SHARED_CREDENTIALS_FILE = "/home/jordan/projects/vimium/infra/credentials";
+      };
+      environmentFile = ./aws.env;
+    };
+    certs = {
+      "vimium.com" = {
+        extraDomainNames = [ "*.vimium.com" ];
+      };
+    };
+  };
+
+  # We actually use the home-manager module to add the actual portal config,
+  # but need this so relevant implementations are found
+  environment.pathsToLink = [
+    "/share/xdg-desktop-portal"
+  ];
+
   modules = {
     hardware.presonus-studio.enable = true;
     services = {
@@ -69,7 +108,7 @@
     };
     system.desktop = {
       gnome.enable = lib.mkForce false;
-      hyprland.enable = true;
+      hyprland.enable = lib.mkForce false;
     };
   };
 

hosts/odyssey/hardware-configuration.nix

@@ -44,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

@@ -124,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"
@@ -244,6 +244,7 @@
       "wake_on_lan"
       "water_heater"
       "weather"
+      "webostv"
       "websocket_api"
       "wled"
       "workday"

hosts/odyssey/ssh_host_ed25519_key.pub

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

hosts/pi/README.md

@@ -27,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,13 +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;
@@ -99,7 +100,7 @@
       ];
     };
     firmware = with pkgs; [
-      firmwareLinuxNonfree
+      linux-firmware
       wireless-regdb
     ];
   };
@@ -129,8 +130,9 @@
     };
   };
 
+  networking.interfaces = {
     # Connection to ONKYO HT-R990
-  networking.interfaces.end0 = {
+    end0 = {
       ipv4.addresses = [
         {
           address = "172.16.0.1";
@@ -138,6 +140,16 @@
         }
       ];
     };
+    # Connection to LG TV
+    enp1s0u2 = {
+      ipv4.addresses = [
+        {
+          address = "172.16.1.1";
+          prefixLength = 30;
+        }
+      ];
+    };
+  };
 
   environment.systemPackages = with pkgs; [
     python311Packages.onkyo-eiscp

hosts/pi/snapcast.nix

@@ -18,15 +18,7 @@
   };
 
   services.snapserver = {
-    enable = true;
+    enable = false;
-    streams = {
-      default = {
-        type = "file";
-        location = "/var/lib/snapserver/test.wav";
-        sampleFormat = "44100:16:2";
-        codec = "flac";
-      };
-    };
   };
 
   systemd.services.snapclient = {

hosts/pi/ssh_host_ed25519_key.pub

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

hosts/skycam/default.nix

@@ -11,6 +11,8 @@
 
   nixpkgs.hostPlatform = "aarch64-linux";
 
+  age.rekey.hostPubkey = ./ssh_host_ed25519_key.pub;
+
   networking = {
     hostId = "731d1660";
     firewall = {

hosts/skycam/hardware-configuration.nix

@@ -78,7 +78,7 @@
         ];
     };
     firmware = with pkgs; [
-      firmwareLinuxNonfree
+      linux-firmware
     ];
   };
 

hosts/skycam/ssh_host_ed25519_key.pub

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

hosts/vps1/README.md

@@ -6,8 +6,8 @@ VPS hosted in OVH.
 
 ## Specs
 
-- CPU - ??
+- CPU - 4 vCores
-- Memory - ??
+- Memory - 4 GB
 
 ### Disks
 

hosts/vps1/default.nix

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

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;
@@ -60,7 +60,7 @@ in
       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,6 +41,90 @@ 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 = {

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 {
       type = "postgres";
       uri = "postgresql:///${bridge}?host=/run/postgresql";
     };
-    };
     bridge = {
+      permissions = {
+        "${serverName}" = "user";
+        "@jordan:${serverName}" = "admin";
+      };
+    };
     encryption = {
       allow = true;
       default = true;
       require = true;
     };
-      permissions = {
-        "${serverName}" = "user";
-        "@jordan:${serverName}" = "admin";
-      };
     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
   ];
@@ -99,19 +136,16 @@ in
       ];
       locations = {
         "/" = {
-          proxyPass = "http://localhost:8008";
+          proxyPass = "http://127.0.0.1:8008";
-          extraConfig = ''
+          extraConfig = proxyConfig;
-            proxy_set_header X-Forwarded-For $remote_addr;
-          '';
         };
         "/_matrix" = {
-          proxyPass = "http://localhost:8008";
+          proxyPass = "http://127.0.0.1:8008";
-          extraConfig = ''
+          extraConfig = proxyConfig + ''
-            proxy_set_header X-Forwarded-For $remote_addr;
             client_max_body_size 50M;
           '';
         };
-        "/_synapse/client".proxyPass = "http://localhost:8008";
+        "/_synapse/client".proxyPass = "http://127.0.0.1:8008";
       };
     };
     "${serverName}" =
@@ -162,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;
@@ -198,23 +235,33 @@ in
 
   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 = [

hosts/vps1/nginx.nix

@@ -17,7 +17,7 @@ let
     add_header Expect-CT max-age=30 always;
     add_header Referrer-Policy strict-origin-when-cross-origin always;
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-    add_header Vimium-Responding-Instance $hostname;
+    add_header Vimium-Responding-Instance edge-lhr-a0 always;
     add_header X-XSS-Protection "1; mode=block" always;
     add_header X-Content-Type-Options nosniff always;
   '';
@@ -82,14 +82,33 @@ in
         maxSize = "100m";
       };
     };
+    proxyResolveWhileRunning = true;
+    resolver.addresses = [ "100.100.100.100" ];
+    upstreams = {
+      jellyfin.servers = {
+        "library.mesh.vimium.net:8096" = {
+          fail_timeout = "30s";
+        };
+      };
+      open-webui.servers = {
+        "library.mesh.vimium.net:8081" = {
+          fail_timeout = "30s";
+        };
+      };
+      skycam.servers = {
+        "skycam.mesh.vimium.net:1984" = {
+          fail_timeout = "30s";
+        };
+      };
+    };
     virtualHosts = {
-      ## Static sites
+      ## Proxied sites
       "chat.ai.vimium.com" = {
         forceSSL = true;
         enableACME = true;
         extraConfig = nginxErrorPages + nginxEdgeHeaders;
         locations."/" = {
-          proxyPass = "http://localhost:8001";
+          proxyPass = "http://open-webui";
           extraConfig = ''
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
@@ -114,7 +133,7 @@ in
         enableACME = true;
         extraConfig = nginxErrorPages + nginxEdgeHeaders;
         locations."/" = {
-          proxyPass = "http://localhost:8000";
+          proxyPass = "http://jellyfin";
           extraConfig = ''
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
@@ -129,7 +148,12 @@ in
             proxy_set_header Connection "upgrade";
           '';
         };
+        locations."/metrics" = {
+          return = "404";
         };
+      };
+
+      ## Static sites
       "jdholt.com" = {
         forceSSL = true;
         enableACME = true;
@@ -140,11 +164,8 @@ in
         };
         locations."/skycam/snapshot.jpg" = {
           extraConfig = ''
-            set $backend "skycam.mesh.vimium.net:1984";
+            set $args "";
-
+            proxy_pass http://skycam/api/frame.jpeg?src=rpicam;
-            resolver 100.100.100.100;
-
-            proxy_pass http://$backend/api/frame.jpeg?src=rpicam;
             proxy_cache skycam_cache;
             proxy_cache_valid any 10s;
             proxy_ignore_headers Cache-Control Expires Set-Cookie;
@@ -164,15 +185,6 @@ in
           root = "/var/www/pki.vimium.com";
         };
       };
-      "suhailhussain.com" = {
-        forceSSL = true;
-        enableACME = true;
-        serverAliases = [ "www.suhailhussain.com" ];
-        extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-        locations."/" = {
-          root = "/var/www/suhailhussain.com";
-        };
-      };
       "vimium.com" = {
         default = true;
         forceSSL = true;
@@ -190,6 +202,7 @@ in
         };
       };
     }
+
     ## Redirects
     // (mkRedirect "h0lt.com" "jdholt.com")
     // (mkRedirect "jordanholt.xyz" "jdholt.com")

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
+§½z󩃢âJ%ÓÍwþèðÍœŸ–ùcÛ' “«ÀK39¦´Ë¯ÀqªGøbX6<58>6±Ìšƒ¶p˜4ºmG<6D>æÕá¤ãŒÄ
+ꇿë`¿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
+:żöźŚç÷!ä-<ˇě:”śđËrg?ŻN-i’†Ş?ŤdĺZ2hÍ3ţŽ]

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";
+    }
+  ];
+}

hosts/vps2/default.nix

@@ -1,31 +0,0 @@
-{
-  inputs,
-  ...
-}:
-
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-    ./hardware-configuration.nix
-    ./disko-config.nix
-    ../server.nix
-  ];
-
-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-  };
-
-  networking = {
-    hostId = "60de4af8";
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-        22 # SSH
-      ];
-    };
-  };
-
-  modules.services.tailscale.isExitNode = true;
-
-  system.stateVersion = "25.05";
-}

hosts/vps2/disko-config.nix

@@ -1,55 +0,0 @@
-{ lib, ... }:
-{
-  disko.devices = {
-    disk.disk1 = {
-      device = lib.mkDefault "/dev/sda";
-      type = "disk";
-      content = {
-        type = "gpt";
-        partitions = {
-          boot = {
-            name = "boot";
-            size = "2M";
-            type = "EF02";
-          };
-          esp = {
-            name = "ESP";
-            size = "300M";
-            type = "EF00";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-            };
-          };
-          root = {
-            name = "root";
-            size = "100%";
-            content = {
-              type = "lvm_pv";
-              vg = "pool";
-            };
-          };
-        };
-      };
-    };
-    lvm_vg = {
-      pool = {
-        type = "lvm_vg";
-        lvs = {
-          root = {
-            size = "100%FREE";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-              mountOptions = [
-                "defaults"
-              ];
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/vps2/hardware-configuration.nix

@@ -1,29 +0,0 @@
-{
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
-      kernelModules = [ "nvme" ];
-    };
-    loader.grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-    };
-    tmp.cleanOnBoot = true;
-  };
-
-  zramSwap.enable = true;
-}

modules/nixos/impermanence.nix

@@ -1,21 +1,14 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
 let
   inherit (lib)
-    attrNames
-    flip
-    isAttrs
-    mapAttrs
     mkIf
-    mkMerge
-    mkOption
     optionals
-    types
     ;
+  zfsPkg = config.boot.zfs.package;
 in
 {
   boot.zfs.forceImportRoot = false;
@@ -31,7 +24,7 @@ in
         unitConfig.DefaultDependencies = "no";
         serviceConfig = {
           Type = "oneshot";
-          ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank";
+          ExecStart = "${zfsPkg}/bin/zfs rollback -r rpool/local/root@blank";
         };
       };
 
@@ -88,60 +81,4 @@ in
   };
 
   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

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...
@@ -9,6 +8,7 @@ with lib;
 
 let
   cfg = config.modules.podman;
+  zfsPkg = config.boot.zfs.package;
 in
 {
   options.modules.podman = {
@@ -29,7 +29,7 @@ in
           dates = "weekly";
           flags = [ "--all" ];
         };
-        extraPackages = [ pkgs.zfs ];
+        extraPackages = [ zfsPkg ];
       };
 
       containers.storage.settings.storage = {

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

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

@@ -54,7 +54,6 @@
           "pi"
           "skycam"
           "vps1"
-          "vps2"
         ] mkDeployNode;
       };
     };

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

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;
+  };
+}

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
+"¯2ÑQœ`D„ $ÐNÑÃ<å<>Ä.•Ò=5ŸÊ8‘%g†±E¶ò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	®ä@¦ÈÆ銿[|Òÿ«N´p2Æåà–|[ðÞI>>‡%f ©ç„Ö§´l¡W‘!Av`¬ß2‰¨Ù8³jVffÀJÎÛ

secrets/generated/vps1/kanidm-oauth2-gitea.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA A5Gj5hu1YQbUrm3IK35oDUHhnohr594lykadF+Smf+LB
+grnVZatvY80rTTQR8bZphg/25aa1cKJYUGh+jYGqi7A
+-> 0-grease 6#aWp kp fD7ks3KL -)qyQ
+FH1L4t8VAxZIOeP6bPJV3qdaBXPXGkuroABtMs7D88WzHduNjBoETZH47zekRDVM
+BAGAdcqSHuGyCp7EA4lgttN/vfA+8fAbcit/p98TTiGQbXZ4YYg
+--- KB5apFUmA/vu8OLpReNzr2zeDyig5NZ8iBXdy5XDbXM
+ƒ€æÔ<EFBFBD>rŧ)NäSð•8óXÒsÏÇçàGÌx<C38C>qÀ%®éν²<C2BD>ˆ¿ëéCoÚ
+©S6óÀÜ<EFBFBD>³L\U˜ðÙz<ûHª\ÖaÉ;Q%Ú‘

secrets/generated/vps1/kanidm-oauth2-open-webui.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> piv-p256 a1N2XA Ah6buspw/yLQJuiyWr0t3Phy+U3HhRY2t0SofqISzHmJ
+pVYmmBoqXD9l55DUIad9D/0h/vhXmeMauK+xaBpX0cM
+-> M)*gn$-grease _b3%6l sH|2-zq P%h
+CWIfvXf9R5QvRXzv8wv+vB8nXLk0eTxy/htCUSm2ujjw
+--- 1t/2tU8qFo9C2yH3ZtsZIp8ZMNEjrecLh2HkDVnKTx4
+Û\ePŽŽ,<2C>üÏtª¨V—xû‘ý“è¤AÎKe´}üÆÍ\]Û
+âÛ÷`<Çÿb;yGÛë‰À

secrets/rekeyed/atlas/9f3916fc5285b691931e572afdc8ac22-open-webui-api-key.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 mV4Rog gj6NT+DEVJbKeGArVcbzNphmMXoXFmVPHlo+zWuI1Ek
+Wt0saIoq6RnQR1jVLHI84JMDP0rCvc1kfjSQoSHly/4
+-> t-grease <a`) :34)]ad /J) =]!RB~HB
+m7JCE0PP2H9DkOdbj/dhZATaXfIoPmocKnGkYUXnjyo99nVMMy2FSmNdZyE0KGCR
+eVkIGwJbH3HNimXst62gIxvSrFQ4a4IcO1Cv8UaMK9UjGfy731BRpg
+--- bEP7E9Ajvw0pIWFF7+QakdFigo0B+0aa0ha9/Y/OADA
+ZrÕ«ö‰0/^´2µB
+oÒÀ’@3
±¡~qSò‰–û¥H	fa	¤¨Sœ0Àˆ•ŸrvŠ«ÑB+¿

secrets/rekeyed/helios/e09d8370465eb4038d032d0d84b700b1-open-webui-api-key.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 3xQa4Q 3I7Mpt3/StzFpy8/egW+PleMsKV/YFsw1lpzt0057ns
+Plc2u/sza/Fga8lnCMj4rH8midPdaFP+FZ1J8+pwRP8
+-> .-grease !Yk9l62 H3@'J 9Klw
+2fJgCUF22ciTm8EfYemHjA1uN1jkVGLGfcTllU8m08Ya2fUPig7ZK4fNLV3ttMc4
+uLthrVZFo1HKF2wQSMeDq+ITZItvxHg2NFxqkWRCJv4
+--- r3Fao3CQxFocTu4+9/Nh0zcCvTYQWpmRQD112YiAIwU
+[µXG¹àÞŒ¡ÑÝ€aFa‘‹K|Å' øËdOµX§ ¨éúùGÁLHÿ€’©<>4¥<34>

secrets/rekeyed/hypnos/c12ed3579ec35228529211b0f518d0fe-open-webui-api-key.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 5PDipg Eic12F37CNvDBqlFV17aMYXTS/eFKEd8SYfOvKV2CGY
+Co7whyv5vxJnlELVyIZJiNmj+hATpw1/QpK2t8CtcvE
+-> >e`c+0-grease D[m[ *0=DB?=
+uPUY90BUNR6Hm0F2Q0F+dXWkUOe4cLjrAvkcxaR79km0qMgJ/C7ribHeWpK3siOe
+2zz5YA
+--- XoQX1p09n36Cqyc0sEShbtcn4wbX68ULdGNrDzX5w04
+üš»AñXÖÓÄÝf’³(ã=<3D>†ÒeÈuϘÆz@ V.ù~Ê_Ié#å<>¤#2Q;9DÅ$e­l®H<C2AE>Ã;
+‘`5âÂ	

secrets/rekeyed/library/0a21efefa75a30ace89a3b082e980952-open-webui-env.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 QjbOZQ uJRXV06taQiHq9Um5E2FNNYo5oZP4M1mmY3OBRK7NSk
+4rcF2AJ5hsnTM1yUD37yWYtU2E7zAzHBKNVagfRgVGQ
+-> z[Ud1L%*-grease ]j 7_ ?+5
+pVP4JA8o5o5kWHoxuttfOdd2GLhCiANBrdbNXWhe7fMZy74Gsj0IX7caHcL/rNkM
+p/DF/V4Y5QUvgQ5y7F95tc36uvNzmcsKaKauk3yIdzp6+9nuu+hQ6Qbvr0liWkuR
+0pQB
+--- LeXXxszTuVoj2OE6m3yPEQe6hsQAFZkhPVXpspa40vo
+.GËî®7m¨­m=Æ2vªúùɼ®[÷ÿá.ο'ro­ù¢9kõNy½TúuB¢èlnkJ]¶=N^3	QJà:7]–YëþG¬ RÔˆ€¿tš€¿cNÑSžvÕ×wÿw`fT¤¸jÚ¸Ýö—«Í‚X¯ÈÊý4ï`èoí<6F>(—ÇKê^”ÅI3ógP‹ð”7²r`V<*êí9ïya	¼PÒJ<C392>Þ¬ä©<C3A4>‡Ñ³éi6ÃT¯þ>Þnâ"QzƒÅ`š…ù|èÌ;冼¸Í¾™Ïý)‡>Ü<> ÿßòEâ1ª†ˆNKJ‡ejªI<C2AA>

secrets/rekeyed/odyssey/c8231a45d0bb912d87bc291481a583cd-open-webui-api-key.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 jqV4bA 9vHES4DslQIplaJN4M+TnWzQxPwO0WOWnusIQxrQqh8
+oLran53jiS0hjirGdMD/akpaNCNvKY5M0+i/6ky5HNM
+-> 2ZC`)9-grease W G
+ZW4ghYvlO1xs0GHJldTD1ZdM+wXYQ4dNdZsg81dTE7VxIona+puaHU9MBq/v2+Sg
+qmqbacPFykJqeBG/uhJHYHgjbuHT8c0gTvWH3RCIQEPq
+--- fS6Rtw7zUkvtwfx1/GIHT40nzsmh5Nfj7/SG9svMXAQ
+käE8ÙÏ<EFBFBD>ôEƒrhé”@ìZ•U9›ën›¡teiŸËW6YèbjCÄ•·P
Í.rÝÁË­“<C2AD>÷Ìæ>

secrets/rekeyed/vps1/297ecb1d48e44e0f309958a6b43f58d4-mautrix-doublepuppet-registration.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA LfDvF0kXFmP4yGPz9A5uov9DbRfMeLniWQhgnYE3ZA0
+9GkGo/twG1cfOHZgRGAmAcfQlrgQ86QvgehbkleKyz0
+-> GEv|{-grease c)B+5+, \v$ piek
+hwIw75OzOhfdScMKrNZ5i+WWh5zcfMryQXdbz81yUkEjWm9P4UVOYee+zz4/PU+t
+6nEKEqvPf6RwBOzAlzx72Yi0l+onxh1CHOWRlfU
+--- dkZlSoaBUqLnMu25ocR0VwgPr190ZOmcMdxQ3KApFS0
+ƒþ<Ù²õŒ}M9Gdhœú’³0[ù¹ú¡²¯Ì®È¼ažjÅg–…¨:JÀ»Æ$:^èä€OÓeêø@÷žoé‡1
+¤r]I>†tü?°XãQٕى¡„A¯r)ab	§’”Ü$8e“ˆ<E2809C>½f¥Å<C2A5>zÍ7ÓÜÁlf)Õ|jl“%öâ
+v-òá!ª‘•(ÕÙ.qR…ÚÙ*yŽÁ¿¿XªÙµ

secrets/rekeyed/vps1/6a6726d70ccca930f798a32691ce17eb-mautrix-whatsapp-env.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA ZQWnreUg4ob9RmEKNrdJKWGRCC1k0HWc8op8ycG5uXU
+U6SEQWo1DoLxclnhkXJy3D93nuijiD4kk9qjMk61Yis
+-> b(/|-grease
+CUalICYuF4P5Ipe5C6gdrw
+--- OmIGQ6VJYZcCIkTPapXNIMJswGczS/1bp8A+AeAj0yU
+¡MÜlànY›K-ç‹ÝG·^\Žõêèk(—ZØþ•˜·Z›$-=(<28>¢å¨·ÅßHú¤Õ=4ŸÌÙ‹#ƒY
Ñ7òø‡tnÝ<6E>gØp>`ÄÈE©B
$ Â÷0Œ<30>¥ž8BWOá°Ù<C2B0>) (ŸüU®"Ͻî54U²Gþ‰oÈ¥?¯ðu§Aôâ
+z`¥d3Ij`†Ò€¬SK¤
Û}$ì×ã®<03>8%Ž·Á—ë9ÈÙÀ÷½?1tZ¤Av´+ê¢Jœ”Ï<E2809D>Z¥u˜lsôkJ+-Îhœ‚–µ

secrets/rekeyed/vps1/80ea265ad53ef54ed48c4e1d842774b1-kanidm-admin-password.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA OQXbnkBzK8DL7wJkbHWo/XUlLQHjBEVu1xMzmhB78Xc
+vGcN1v+YxXidGs7Z3hvZypklIZVF1/J6DZpx8JId/hw
+-> mfI^2]-grease ,
+2C8Bs6nnhfatjdqc/Wc
+--- tuwRBOHiF0e6lgo4bK4Ui+bjjuTf5uZJgDJnpqf1seU
+½J´\gù;ü†èòV½·qFNq[7ÏålŒ¯ðÅf¢˜°w	æã<C3A6>¯•<C2AF>i|RDLóR#œÀ%u-A1š£–âþ=€A†ÿöºW„c

secrets/rekeyed/vps1/87759af7d4ddc9e7d805487478d2f53e-vaultwarden-env.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA Tyyx5kyLTN9MI+Bc66Rh7RbQ+qZF0S5Y2HCTvUFRqBo
+lzPjwPDXjg8ioc4XAJewTDdzXN5QO3BeGbTVxGW1B0U
+-> *-grease >|vs MPFf.c. nm=m ^
+OHDKbCO9uIoRv9Ar2kbIENz1NLY8iUlzmV07SouSJcxNWyEAqsVzxAkLsIeQKYn5
+XbtjLv88wHhf2w
+--- 7kHTJevOeZdsk2v9qP1V7wL4/Qz8wmFgoQiPMcx56WU
+ÀLòÖȼamèüé°w½B]Ðý
+¦ÔmÁÚ¾Ú<EFBFBD>ÌåOd‘øL%ÐPó¿IÎÐ'•X·’<koÞ>OFÏj¥8‘ÿÇ8s®[€(Á¢CàlTd’ ¦HÖ[9ýÐ …§$AÊl¦Pf¹}äÁjCo]`ÏÙÊÁnÝ¢õjw*ÔY <iùMOç¨Dš×À[!T#¼§È•X<E280A2>Ù‚¿KëXà-ƒè×{fÃ$%«<>›¤g­T}<7D>Ók•R1ºQ?þƒ?Ù­Q¾®h­W· eÍà||zï—Xe‡rD3\';°j‚FÙþËhY
+¨øRùH1‚ÄRꑱ/*w	‘	3Ç·Y"¼{’§îLNÙs"«ˆÖ7Bô

secrets/rekeyed/vps1/a8f9724475694d2a470fc175c5a6d38e-kanidm-idm-admin-password.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA XbDvpING9Qe/x3sNWrqn2vqEw2SvgP79ApCrJTTGuiM
+cOaoXvYgPH7egMF1MT4gtaMHnoHWgeKeEjkwCoOQf74
+-> y''zjcK-grease J y ,CxRN3
+2kaqVO6qm24DPq5fhEN+AM+hPvW3VPHKlzuMy8SLeW/3um8bXNmFdxwzfkDoFSf3
+viYrDFmlY7+RTFt6JADBs67eYlQblBgZwTo
+--- NwBzcAYM5hOyvIsRVLYH8ez6gn8Z3yxmX8Tfz1hETz0
+¡g­>ð@‘ÉýlÖægè[‚RÙ½„ó™€XvŽÊ9ßµ"<22>ë\ÒhÛºU…y›¬ÁÚ4ÜžO¼½ =zˆÃxBé@DzIJÆ’åO•åÑü«M„ LH<

secrets/rekeyed/vps1/d4527fa57d6907c78335cdabd3e84d46-kanidm-oauth2-open-webui.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA VsJu05NEZogLfeKJ8f9PiUH9RZn2RKJ+/FYOTzUOIyY
+Zd5ze/ijrlRs948f6fhCR+IN6uXpck6ejMlpyGugOfQ
+-> z+o-grease +J< ey N"
+uAedOA+JGje0EKhTuQJj+RDh98H6dqryAUe7nC2iF6t7wAT1NHFLWWfRqw3nNtMb
+Cb0pH7hECmbW0vygVD67NusZOvleB2RHng
+--- KcTuAfeh0NIBLRmtXZFlbsAAmH9Eu2KmswfZzWgaeZ8
+íƒ9EœQÞªF¡`iÝÙ´oŠä~éõ/þV<*{°'A~”n0ÁÕôø'@œKý¿<øxǽ'AJMFN®ûÁ#»$CÜŠ=$ZH¼AØ

secrets/rekeyed/vps1/fca01dd09f0ae4a1ffdc7a24a884ae5a-kanidm-oauth2-vaultwarden.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA lN4CAdRzmrQqTaI75QwSyhPF34tXWvnyT3EF+wYp5H0
+z9b9Rm/zk4PHrw35EeLtx4Gyp6Nlv55SWM/OxuuqOcA
+-> CJNg-grease ^p}Pf r@D 94/&
+eM0eWh2/4FSBoFvqSvVI
+--- y0Tsd45+A1Q8XwnUee6RZJPkYiazusnxYkmBeHqru0E
+W`.)"<22>(¸ƒÖYs·²ãóûrœ¡²0Ê“ ƒŸrÇg‘Y‰‡»6®P=;[YÞì±&¼
bŒR¿ð6WvÑèÇ ¿÷Æsö&» <C2BB>=U

secrets/yubikey-nix-primary.pub

@@ -0,0 +1,7 @@
+#       Serial: 24187788, Slot: 1
+#         Name: YubiKey Nix Primary
+#      Created: Mon, 25 Aug 2025 21:00:00 +0000
+#   PIN policy: Once   (A PIN is required once per session, if set)
+# Touch policy: Cached (A physical touch is required for decryption, and is cached for 15 seconds)
+#    Recipient: age1yubikey1qwwyem3502gqenzet20xdpjnuhhv2cezvzk590jdta9wqkw48p8gj7n4x96
+AGE-PLUGIN-YUBIKEY-13SFHZQVZDDFHVHQGGYPC3

users/guest/common/optional/graphical/jellyfin.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    gamescope
+    jellyfin-media-player
+  ];
+
+  home.persistence."/state".directories = [
+    ".cache/jellyfin.org"
+  ];
+
+  home.persistence."/persist".directories = [
+    ".config/jellyfin.org"
+    ".local/share/jellyfinmediaplayer"
+    ".local/share/Jellyfin Media Player"
+  ];
+}

users/guest/common/optional/graphical/steam.nix

@@ -8,23 +8,10 @@
     steam
   ];
 
-  systemd.user.services.steam-big-picture = {
+  home.persistence."/persist".directories = [
-    Unit = {
+    ".config/gamescope"
-      Description = "Steam Big Picture in Gamescope";
+    ".local/share/Steam"
-      After = [
+    ".local/share/vulkan"
-        "graphical.target"
+    ".steam"
-        "default.target"
   ];
-    };
-    Service = {
-      ExecStart = ''
-        ${pkgs.gamescope}/bin/gamescope --rt --backend drm --steam -- \
-          ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot
-      '';
-      Restart = "always";
-    };
-    Install = {
-      WantedBy = [ "default.target" ];
-    };
-  };
 }

users/guest/default.nix

@@ -22,11 +22,13 @@ in
     ];
     group = "users";
     isNormalUser = true;
+    password = "";
     shell = pkgs.zsh;
   };
 
   home-manager.users.${name} = {
     imports = [
+      ./common/optional/graphical/jellyfin.nix
       ./common/optional/graphical/steam.nix
       {
         home.persistence."/state" = {
@@ -36,11 +38,7 @@ in
         };
         home.persistence."/persist" = {
           directories = [
-            ".config/gamescope"
             ".local/share/icons"
-            ".local/share/Steam"
-            ".local/share/vulkan"
-            ".steam"
           ];
         };
       }
@@ -48,17 +46,140 @@ in
     ++ optional (builtins.pathExists hostFile) hostFile;
 
     home = {
+      packages = with pkgs; [
+        adwaita-fonts
+      ];
       username = name;
+      sessionVariables = {
+        ZDOTDIR = "~/.config/zsh";
+      };
+      pointerCursor = {
+        enable = true;
+        size = 64;
+        name = "macOS";
+        package = pkgs.apple-cursor;
+        gtk.enable = true;
+        x11.enable = true;
+      };
+    };
+
+    fonts.fontconfig.enable = true;
+
+    programs.firefox = {
+      enable = true;
+      profiles.Default = {
+        search = {
+          default = "ddg";
+          privateDefault = "ddg";
+          force = true;
+        };
+        settings = {
+          "layout.css.devPixelsPerPx" = 1.5;
+        };
+      };
+    };
+
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
     };
 
     xdg.enable = true;
   };
 
-  services.getty = {
+  services.displayManager = {
-    autologinOnce = true;
+    enable = true;
-    autologinUser = "guest";
+    sessionPackages =
+      let
+        firefoxDesktopFile = pkgs.writeTextFile {
+          name = "firefox-desktop-entry";
+          destination = "/share/wayland-sessions/firefox.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Firefox
+            Comment=Desktop session for web browsing
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm --expose-wayland -W 3840 -H 2160 -- MOZ_ENABLE_WAYLAND=1 ${pkgs.firefox}/bin/firefox https://www.youtube.com/
+            Type=Application
+          '';
         };
 
+        jellyfinDesktopFile = pkgs.writeTextFile {
+          name = "jellyfin-desktop-entry";
+          destination = "/share/wayland-sessions/jellyfin.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Jellyfin
+            Comment=Desktop session for music, movies, and TV
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm -W 3840 -H 2160 -- ${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer --scale-factor 2 --tv --fullscreen
+            Type=Application
+          '';
+        };
+
+        steamDesktopFile = pkgs.writeTextFile {
+          name = "steam-desktop-entry";
+          destination = "/share/wayland-sessions/steam.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=Steam
+            Comment=Desktop session for gaming
+            Exec=${pkgs.gamescope}/bin/gamescope --rt --backend drm --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot
+            Type=Application
+          '';
+        };
+
+        firefoxSession = pkgs.symlinkJoin {
+          name = "firefox-session";
+          paths = [ firefoxDesktopFile ];
+          passthru.providedSessions = [ "firefox" ];
+        };
+
+        jellyfinSession = pkgs.symlinkJoin {
+          name = "jellyfin-session";
+          paths = [ jellyfinDesktopFile ];
+          passthru.providedSessions = [ "jellyfin" ];
+        };
+
+        steamSession = pkgs.symlinkJoin {
+          name = "steam-session";
+          paths = [ steamDesktopFile ];
+          passthru.providedSessions = [ "steam" ];
+        };
+      in
+      [
+        firefoxSession
+        jellyfinSession
+        steamSession
+      ];
+  };
+
+  services.greetd =
+    let
+      desktops = config.services.displayManager.sessionData.desktops;
+    in
+    {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
+        };
+      };
+    };
+
+  # security.pam.services = {
+  #   greetd.text = ''
+  #     auth      requisite     pam_nologin.so
+  #     auth      sufficient    pam_succeed_if.so user = ${name} quiet_success
+  #     auth      required      pam_unix.so
+  #
+  #     account   sufficient    pam_unix.so
+  #
+  #     password  required      pam_deny.so
+  #
+  #     session   optional      pam_keyinit.so revoke
+  #     session   include       login
+  #   '';
+  # };
+
   # Workaround: https://github.com/nix-community/home-manager/issues/7166
   systemd.services."home-manager-${name}".serviceConfig = {
     RemainAfterExit = "yes";

users/jordan/artemis.nix

@@ -12,9 +12,9 @@
   ];
 
   home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
-    lutris
+    unstable.lutris
-    unstable.pcsx2
+    pcsx2
     xemu
   ];
 }

users/jordan/atlas.nix

@@ -10,7 +10,7 @@
   ];
 
   home.packages = with pkgs; [
-    jellyfin-media-player
+    # jellyfin-media-player
     qbittorrent
   ];
 }

users/jordan/common/git.nix

@@ -5,6 +5,7 @@
 {
   programs.git = {
     enable = true;
+    settings = {
       aliases = {
         amend = "commit --amend";
         lg = "log --color --graph --abbrev-commit --";
@@ -12,6 +13,11 @@
         unadd = "reset HEAD";
         undo-commit = "reset --soft \"HEAD^\"";
       };
+      user = {
+        email = "jordan@vimium.com";
+        name = "Jordan Holt";
+      };
+    };
     ignores = [
       ".Trash-*"
       "[._]*.s[a-v][a-z]"
@@ -27,8 +33,6 @@
       "[._]*.un~"
       "cmake-build-*/"
     ];
-    userEmail = "jordan@vimium.com";
-    userName = "Jordan Holt";
     signing = {
       key = "B8CFFF61F1CCF520";
       signByDefault = true;

users/jordan/common/gpg.nix

@@ -9,7 +9,6 @@
 
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
   };
 
   home.persistence."/persist".directories = [

users/jordan/common/neovim.nix

@@ -1,4 +1,5 @@
 {
+  osConfig,
   ...
 }:
 
@@ -10,6 +11,17 @@
     viAlias = true;
     vimAlias = true;
 
+    extraConfigLua = ''
+      if vim.g.neovide then
+        vim.g.neovide_opacity = 0.8
+        vim.g.neovide_normal_opacity = 0.8
+        -- vim.g.neovide_cursor_vfx_mode = "pixiedust"
+        vim.g.neovide_floating_blur_amount_x = 2.0
+        vim.g.neovide_floating_blur_amount_y = 2.0
+        vim.g.neovide_floating_corner_radius = 0.2
+      end
+    '';
+
     opts = {
       number = true;
       tabstop = 2;
@@ -34,14 +46,88 @@
       providers.wl-copy.enable = true;
     };
 
+    colorschemes.onedark = {
+      enable = true;
+      settings = {
+        style = "darker";
+        transparent = true;
+      };
+    };
+
+    plugins.cmp = {
+      enable = true;
+      autoEnableSources = true;
+      settings = {
+        sources = [
+          { name = "nvim_lsp"; }
+          { name = "path"; }
+          { name = "buffer"; }
+        ];
+        mapping = {
+          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+          "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+        };
+      };
+    };
+
+    plugins.codecompanion = {
+      enable = true;
+
+      settings = {
+        adapters = {
+          http.opts.show_defaults = false;
+          http.openwebui.__raw = ''
+            function()
+              return require("codecompanion.adapters").extend("openai_compatible", {
+                name = "openwebui",
+                formatted_name = "Open WebUI",
+                opts = {
+                  stream = true,
+                  tools = true,
+                  vision = false,
+                },
+                url = "''${url}''${chat_endpoint}",
+                env = {
+                  api_key = "cmd:cat ${osConfig.age.secrets.open-webui-api-key.path}",
+                  url = "https://chat.ai.vimium.com",
+                  chat_endpoint = "/api/chat/completions",
+                  models_endpoint = "/api/models",
+                },
+                headers = {
+                  ["Content-Type"] = "application/json",
+                  Authorization = "Bearer ''${api_key}",
+                },
+                schema = {
+                  model = {
+                    default = "openai/gpt-5-chat",
+                  },
+                },
+              })
+            end
+          '';
+        };
+
+        strategies = {
+          chat = {
+            adapter = "openwebui";
+          };
+          inline = {
+            adapter = "openwebui";
+          };
+          cmd = {
+            adapter = "openwebui";
+          };
+        };
+      };
+    };
+
     plugins.comment.enable = true;
 
     plugins.hmts.enable = true;
 
     plugins.lightline.enable = true;
 
-    plugins.luasnip.enable = true;
-
     plugins.lsp = {
       enable = true;
       servers = {
@@ -63,24 +149,9 @@
       };
     };
 
-    plugins.nvim-autopairs.enable = true;
+    plugins.luasnip.enable = true;
 
-    plugins.cmp = {
+    plugins.nvim-autopairs.enable = true;
-      enable = true;
-      autoEnableSources = true;
-      settings = {
-        sources = [
-          { name = "nvim_lsp"; }
-          { name = "path"; }
-          { name = "buffer"; }
-        ];
-        mapping = {
-          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-          "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-          "<CR>" = "cmp.mapping.confirm({ select = true })";
-        };
-      };
-    };
 
     plugins.telescope = {
       enable = true;
@@ -105,9 +176,9 @@
 
     plugins.treesitter-refactor = {
       enable = true;
-      highlightDefinitions = {
+      settings.highlight_definitions = {
         enable = true;
-        clearOnCursorMove = false;
+        clear_on_cursor_move = false;
       };
     };
 
@@ -115,18 +186,41 @@
 
     plugins.vim-surround.enable = true;
 
+    plugins.visual-multi.enable = true;
+
     plugins.web-devicons.enable = true;
 
-    # plugins.gitsigns.enable = true;
+    plugins.yazi.enable = true;
-    # plugins.gitgutter.enable = true;
+
-    # plugins.goyo.enable = true;
+    plugins.zen-mode.enable = true;
+
+    # plugins.actions-preview.enable = true;
+    # plugins.aerial.enable = true;
+    # plugins.arrow.enable = true;
+    # plugins.blink.enable = true;
+    # plugins.bufferline.enable = true;
+    # plugins.fidget.enable = true;
+    # plugins.flash.enable = true;
     # plugins.fugitive.enable = true;
     # plugins.fzf-lua.enable = true;
+    # plugins.gitsigns.enable = true;
+    # plugins.gitgutter.enable = true;
+    # plugins.glance.enable = true;
+    # plugins.hop.enable = true;
+    # plugins.improved-search.enable = true;
+    # plugins.goto-preview.enable = true;
+    # plugins.kulala.enable = true;
     # plugins.neo-tree.enable = true;
     # plugins.none-ls.enable = true;
-    # plugins.nvim-tree.enable = true;
+    # plugins.nvim-dap.enable = true;
+    # plugins.nvim-dbee.enable = true;
+    # plugins.nvim-neoclip.enable = true;
     # plugins.oil.enable = true;
+    # plugins.persisted.enable = true;
+    # plugins.precognition.enable = true;
     # plugins.project-nvim.enable = true;
+    # plugins.tardis.enable = true;
+    # plugins.typescript-tools.enable = true;
   };
 
   home.sessionVariables.EDITOR = "nvim";

users/jordan/common/optional/graphical/firefox.nix

@@ -8,6 +8,39 @@
 
   programs.firefox = {
     enable = true;
+    policies = {
+      DisableFirefoxAccounts = true;
+      DisableFirefoxStudies = true;
+      DisableTelemetry = true;
+      DisableFeedbackCommands = true;
+      DisablePocket = true;
+      DisableSetDesktopBackground = true;
+      DontCheckDefaultBrowser = true;
+      NoDefaultBookmarks = true;
+      SkipTermsOfUse = true;
+      GenerativeAI = {
+        Chatbot = false;
+        LinkPreviews = false;
+        TabGroups = false;
+      };
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          installation_mode = "force_installed";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          private_browsing = true;
+        };
+      };
+      SearchEngines = {
+        Default = "DuckDuckGo";
+        Remove = [
+          "Amazon.com"
+          "Bing"
+          "eBay"
+          "Google"
+          "Perplexity"
+        ];
+      };
+    };
     profiles.Default = {
       search = {
         default = "ddg";
@@ -47,6 +80,9 @@
         "browser.urlbar.suggest.calculator" = true;
         "browser.urlbar.trending.featureGate" = false;
         "browser.urlbar.unitConversion.enabled" = true;
+        "browser.aboutConfig.showWarning" = false;
+        "browser.aboutwelcome.enabled" = false;
+        "browser.shell.checkDefaultBrowser" = false;
         "cookiebanners.service.mode" = 1;
         "cookiebanners.service.mode.privateBrowsing" = 1;
         "network.IDN_show_punycode" = true;
@@ -99,6 +135,7 @@
         ## Privacy
         "dom.private-attribution.submission.enabled" = false;
         # "privacy.resistFingerprinting" = true;
+        "privacy.resistFingerprinting.randomization.daily_reset.enabled" = true;
         "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
         "privacy.trackingprotection.enabled" = true;
         "privacy.trackingprotection.pbmode.enabled" = true;
@@ -135,6 +172,13 @@
         "dom.webnotifications.serviceworker.enabled" = false;
         "permissions.default.desktop-notification" = 2;
 
+        ## ML
+        "browser.ml.enable" = false;
+        "browser.ml.chat.enable" = false;
+        "browser.ml.chat.menu" = false;
+        "browser.ml.linkPreview.enable" = false;
+        "browser.tabs.groups.smart.enabled" = false;
+
         ## DOM / JavaScript
         # "dom.event.clipboardevents.enabled" = false;
         "middlemouse.paste" = false;
@@ -202,6 +246,31 @@
         "plugin.state.flash" = 0;
         "plugin.state.java" = 0;
 
+        # Fullscreen
+        "full-screen-api.transition-duration.enter" = "0 0";
+        "full-screen-api.transition-duration.leave" = "0";
+        "full-screen-api.warning.timeout" = 0;
+
+        # Update management
+        "app.update.auto" = false;
+        "app.update.background.enabled" = false;
+        "app.update.url" = "";
+
+        # Sync
+        "services.sync.engine.addresses" = false;
+        "services.sync.engine.creditcards" = false;
+        "services.sync.engine.addons" = false;
+        "services.sync.engine.bookmarks" = false;
+        "services.sync.engine.history" = false;
+        "services.sync.engine.passwords" = false;
+        "services.sync.engine.prefs" = false;
+        "services.sync.engine.tabs" = false;
+        "identity.fxaccounts.enabled" = false;
+
+        # Notifications and CFR
+        "browser.messaging-system.whatsNewPanel.enabled" = false;
+        "browser.cfr.enabled" = false;
+
         ## Misc
         "browser.selfsupport.url" = "";
       };

users/jordan/common/optional/graphical/hyprland/default.nix

@@ -61,13 +61,13 @@ in
     portalPackage =
       inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     plugins = [
-      pkgs.unstable.hyprlandPlugins.hyprbars
+      # pkgs.unstable.hyprlandPlugins.hyprbars
-      pkgs.unstable.hyprlandPlugins.hypr-dynamic-cursors
+      # pkgs.unstable.hyprlandPlugins.hypr-dynamic-cursors
     ];
     settings = {
       general = {
-        gaps_in = 5;
+        gaps_in = 0;
-        gaps_out = 20;
+        gaps_out = 0;
 
         border_size = 2;
 
@@ -77,7 +77,7 @@ in
 
       plugin = {
         dynamic-cursors = {
-          enabled = true;
+          enabled = false;
           mode = "none";
           shake = {
             enabled = true;
@@ -85,7 +85,7 @@ in
         };
 
         hyprbars = {
-          enabled = true;
+          enabled = false;
           bar_height = 20;
           bar_blur = true;
         };
@@ -115,7 +115,7 @@ in
       };
 
       decoration = {
-        rounding = 10;
+        rounding = 0;
 
         active_opacity = 1.0;
         inactive_opacity = 1.0;
@@ -299,7 +299,15 @@ in
     enable = true;
     settings = {
       background = "#000000";
-      background_opacity = 0.7;
+      background_opacity = 0.8;
+    };
+  };
+
+  programs.neovide = {
+    enable = true;
+    package = pkgs.unstable.neovide;
+    settings = {
+      font.size = 16.0;
     };
   };
 

users/jordan/common/optional/graphical/hyprland/waybar.css

@@ -3,7 +3,88 @@
 }
 
 window#waybar {
-  border-radius: 1em;
+  background: linear-gradient(
+    to bottom,
+    rgba(118, 118, 118, 0.78) 0%,
+    rgba(50, 50, 50, 0.78) 50%,
+    rgba(0, 0, 0, 0.74) 50%,
+    rgba(0, 0, 0, 0.76) 100%
+  );
+  border-top: 1px solid rgba(71, 71, 71, 0.90);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.97);
+  box-shadow: inset 0px 1px 0px 0px rgba(158, 158, 158, 0.90);
+  text-shadow: black 0px 0px 2px;
+  color: white;
+}
+
+#workspaces button {
+  margin: 2px;
+  background: linear-gradient(
+    to bottom,
+    rgba(255, 255, 255, 0.35) 0%,
+    rgba(255, 255, 255, 0.11) 50%,
+    rgba(255, 255, 255, 0) 50%
+  );
+  border: 1px solid rgba(0, 0, 0, 0.37);
+  border-radius: 4px;
+  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.25);
+  text-shadow: black 0px 0px 2px;
+  color: white;
+}
+
+#workspaces button:hover {
+  background:
+    linear-gradient(
+      to bottom,
+      rgba(255, 255, 255, 0.35) 0%,
+      rgba(255, 255, 255, 0.17) 50%,
+      rgba(255, 255, 255, 0) 50%
+    ),
+    radial-gradient(
+      ellipse 80% 80% at 50% 110%,
+      rgba(44, 126, 204, 1) 0%,
+      rgba(44, 126, 204, 0) 80%
+    );
+}
+
+#workspaces button.active {
+  background: linear-gradient(
+    to bottom,
+    rgba(0, 0, 0, 0.40) 0%,
+    rgba(0, 0, 0, 0.38) 50%,
+    rgba(0, 0, 0, 0.55) 50%
+  );
+  box-shadow: inset 0px 1px 0px 0px rgb(0, 0, 0);
+}
+
+#workspaces button.active:hover {
+  background:
+    linear-gradient(
+      to bottom,
+      rgba(0, 0, 0, 0.40) 0%,
+      rgba(0, 0, 0, 0.38) 50%,
+      rgba(0, 0, 0, 0.55) 50%
+    ),
+    radial-gradient(
+      ellipse 80% 80% at 50% 120%,
+      rgba(43, 143, 189, 1) 0%,
+      rgba(43, 143, 189, 0) 80%
+    );
+}
+
+#workspaces button.urgent {
+  background:
+    linear-gradient(
+      to bottom,
+      rgba(255, 255, 255, 0.35) 0%,
+      rgba(255, 255, 255, 0.11) 50%,
+      rgba(255, 255, 255, 0) 50%
+    ),
+    radial-gradient(
+      ellipse 80% 80% at 50% 100%,
+      rgba(199, 128, 14, 1) 0%,
+      rgba(170, 75, 12, 0) 100%
+    );
 }
 
 .modules-left {

users/jordan/common/optional/graphical/hyprland/waybar.nix

@@ -8,9 +8,8 @@
     settings = [
       {
         layer = "top";
-        position = "top";
+        position = "bottom";
         height = 30;
-        margin = "10 20 0 20";
         spacing = 10;
 
         modules-left = [

users/jordan/common/optional/graphical/niri.nix

@@ -0,0 +1,322 @@
+{
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
+let
+  inherit (lib)
+    getExe
+    ;
+in
+{
+  imports = [
+    inputs.niri.homeModules.niri
+  ];
+
+  services.gnome-keyring.enable = true;
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config.niri = {
+      default = [
+        "gtk"
+        "gnome"
+      ];
+      "org.freedesktop.impl.portal.Access" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Notification" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+      "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
+      "org.freedesktop.impl.portal.ScreenCast" = [ "xdg-desktop-portal-gnome" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "xdg-desktop-portal-gnome" ];
+    };
+    extraPortals = [
+      pkgs.gnome-keyring
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-gnome
+    ];
+  };
+
+  programs.zsh.initContent = lib.mkOrder 9999 ''
+    if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]]; then
+      echo "Login shell detected. Starting wayland..."
+      niri-session
+    fi
+  '';
+
+  programs.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+
+    settings = {
+      xwayland-satellite.path = getExe pkgs.xwayland-satellite-stable;
+
+      environment = {
+        "QT_QPA_PLATFORM" = "wayland";
+        "XDG_SESSION_TYPE" = "wayland";
+        "NIXOS_OZONE_WL" = "1";
+        "MOZ_ENABLE_WAYLAND" = "1";
+        "MOZ_WEBRENDER" = "1";
+        "_JAVA_AWT_WM_NONREPARENTING" = "1";
+        "QT_WAYLAND_DISABLE_WINDOWDECORATION" = "1";
+        "GDK_BACKEND" = "wayland";
+        "GBM_BACKEND" = "nvidia-drm";
+        "GSK_RENDERER" = "vulkan";
+        "LIBVA_DRIVER_NAME" = "nvidia";
+      };
+
+      input = {
+        keyboard = {
+          xkb = {
+            layout = "us";
+            options = "ctrl:nocaps";
+          };
+
+          repeat-delay = 235;
+          repeat-rate = 60;
+        };
+
+        touchpad = {
+          tap = true;
+          dwt = true;
+          dwtp = true;
+          natural-scroll = true;
+          accel-profile = "flat";
+        };
+
+        mouse = {
+          accel-speed = 0.2;
+          accel-profile = "flat";
+        };
+
+        power-key-handling.enable = false;
+        workspace-auto-back-and-forth = true;
+      };
+
+      gestures.hot-corners.enable = false;
+      debug.honor-xdg-activation-with-invalid-serial = true;
+
+      binds = with config.lib.niri.actions; {
+        "Mod+T".action = spawn "kitty";
+        "Mod+b".action = spawn "firefox";
+        "Super+Alt+L".action = spawn "systemctl suspend";
+        XF86AudioRaiseVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+          allow-when-locked = true;
+        };
+        XF86AudioLowerVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+          allow-when-locked = true;
+        };
+        XF86AudioMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
+          allow-when-locked = true;
+        };
+        XF86AudioMicMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
+          allow-when-locked = true;
+        };
+        "Mod+Q".action = close-window;
+
+        "Mod+n".action = focus-column-left;
+        "Mod+left".action = focus-column-left;
+        "Mod+Shift+n".action = move-column-left;
+        "Mod+Shift+left".action = move-column-left;
+
+        "Mod+r".action = focus-window-or-workspace-down;
+        "Mod+down".action = focus-window-or-workspace-down;
+        "Mod+Shift+r".action = move-window-down;
+        "Mod+Shift+down".action = move-window-down;
+
+        "Mod+l".action = focus-window-or-workspace-up;
+        "Mod+up".action = focus-window-or-workspace-up;
+        "Mod+Shift+l".action = move-window-up;
+        "Mod+Shift+up".action = move-window-up;
+
+        "Mod+s".action = focus-column-right;
+        "Mod+right".action = focus-column-right;
+        "Mod+Shift+s".action = move-column-right;
+        "Mod+Shift+right".action = move-column-right;
+
+        "Mod+h".action = focus-column-first;
+        "Mod+Shift+h".action = consume-or-expel-window-left;
+        "Mod+m".action = focus-column-last;
+        "Mod+Shift+m".action = consume-or-expel-window-right;
+
+        "Mod+Ctrl+n".action = focus-monitor-left;
+        "Mod+Shift+Ctrl+n".action = move-column-to-monitor-left;
+        "Mod+Ctrl+r".action = focus-monitor-down;
+        "Mod+Shift+Ctrl+r".action = move-column-to-monitor-down;
+        "Mod+Ctrl+l".action = focus-monitor-up;
+        "Mod+Shift+Ctrl+l".action = move-column-to-monitor-up;
+        "Mod+Ctrl+s".action = focus-monitor-right;
+        "Mod+Shift+Ctrl+s".action = move-column-to-monitor-right;
+
+        "Mod+Period".action = focus-workspace-down;
+        "Mod+Shift+Period".action = move-column-to-workspace-down;
+        "Mod+Ctrl+Period".action = move-workspace-down;
+        "Mod+comma".action = focus-workspace-up;
+        "Mod+Shift+comma".action = move-column-to-workspace-up;
+        "Mod+Ctrl+comma".action = move-workspace-up;
+
+        "Mod+WheelScrollDown" = {
+          action = focus-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollUp" = {
+          action = focus-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollDown" = {
+          action = move-column-to-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollUp" = {
+          action = move-column-to-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollRight".action = focus-column-right;
+        "Mod+WheelScrollLeft".action = focus-column-left;
+        "Mod+Ctrl+WheelScrollRight".action = move-column-right;
+        "Mod+Ctrl+WheelScrollLeft".action = move-column-left;
+        "Mod+Shift+WheelScrollDown".action = focus-column-right;
+        "Mod+Shift+WheelScrollUp".action = focus-column-left;
+        "Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
+        "Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
+
+        "Mod+V".action = maximize-column;
+        "Mod+Ctrl+V".action = expand-column-to-available-width;
+        "Mod+return".action = fullscreen-window;
+        "Mod+Minus".action = set-column-width "-10%";
+        "Mod+Shift+0".action = set-column-width "+10%";
+
+        "Mod+F".action = toggle-window-floating;
+        "Mod+Ctrl+F".action = switch-focus-between-floating-and-tiling;
+
+        "Mod+y".action = toggle-column-tabbed-display;
+
+        # "Print".action = screenshot;
+        # "Ctrl+Print".action = screenshot-screen { };
+        # "Alt+Print".action = screenshot-window;
+
+        "Mod+Escape" = {
+          action = toggle-keyboard-shortcuts-inhibit;
+          allow-inhibiting = false;
+        };
+
+        "Mod+Ctrl+Escape".action = quit;
+        "Mod+Shift+P".action = power-off-monitors;
+      };
+
+      spawn-at-startup = [
+        { command = [ "firefox" ]; }
+      ];
+
+      prefer-no-csd = true;
+      hotkey-overlay = {
+        skip-at-startup = true;
+      };
+      layout = {
+        gaps = 1;
+        center-focused-column = "never";
+        empty-workspace-above-first = true;
+        preset-column-widths = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        default-column-width = {
+          proportion = 0.5;
+        };
+        preset-window-heights = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        focus-ring = {
+          enable = true;
+          width = 2;
+          active.color = "#7fc8ff";
+          inactive.color = "#505050";
+        };
+        border = {
+          enable = false;
+          width = 2;
+          active.color = "#ffc87f";
+          inactive.color = "#505050";
+        };
+        shadow = {
+          softness = 30;
+          spread = 5;
+          offset = {
+            x = 0;
+            y = 5;
+          };
+          draw-behind-window = true;
+          color = "#00000070";
+        };
+        tab-indicator = {
+          hide-when-single-tab = true;
+          place-within-column = true;
+          gap = 5;
+          width = 4;
+          length = {
+            total-proportion = 1.0;
+          };
+          position = "right";
+          gaps-between-tabs = 2;
+          corner-radius = 8;
+          active.color = "red";
+          inactive.color = "gray";
+        };
+        insert-hint = {
+          display.color = "#ffc87f80";
+        };
+      };
+    };
+  };
+
+  home.packages = [
+    pkgs.dconf
+  ];
+
+  home.pointerCursor = {
+    enable = true;
+    gtk.enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 28;
+  };
+
+  gtk = {
+    enable = true;
+
+    iconTheme = {
+      name = "MoreWaita";
+      package = pkgs.unstable.morewaita-icon-theme;
+    };
+  };
+
+  fonts.fontconfig = {
+    enable = true;
+    defaultFonts = {
+      sansSerif = [
+        "Adwaita Sans"
+      ];
+      emoji = [
+        "Apple Color Emoji"
+      ];
+    };
+  };
+
+  programs.kitty = {
+    enable = true;
+    settings = {
+      background = "#000000";
+      background_opacity = 0.8;
+    };
+  };
+
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
+}

users/jordan/common/shell.nix

@@ -174,6 +174,7 @@ in
     mcfly.enable = true;
     navi.enable = true;
     nix-index.enable = true;
+    yazi.enable = true;
   };
 
   home.persistence."/persist" = {
@@ -189,10 +190,12 @@ in
     bat
     btop
     fd
+    file
     jq
     ncdu
     nix-zsh-completions
-    nnn
+    p7zip-rar
     ripgrep
+    unzip
   ];
 }

users/jordan/common/ssh.nix

@@ -3,11 +3,8 @@
 }:
 
 {
-  services.ssh-agent.enable = true;
-
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "yes";
   };
 
   home.persistence."/state".files = [

users/jordan/default.nix

@@ -15,6 +15,11 @@ in
 {
   age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
 
+  age.secrets.open-webui-api-key = {
+    rekeyFile = ./secrets/open-webui-api-key.age;
+    owner = "jordan";
+  };
+
   users.users.${name} = {
     description = "Jordan Holt";
     extraGroups = [
@@ -44,12 +49,14 @@ in
       ./common/ssh.nix
       {
         home.persistence."/state" = {
+          enable = false;
           directories = [
             "Downloads"
             ".local/state/wireplumber"
           ];
         };
         home.persistence."/persist" = {
+          enable = false;
           directories = [
             "Desktop"
             "Documents"