stuff

noc

.sops.yaml

@@ -1,13 +1,15 @@
 keys:
+  - &user_cschmatzler age1xate984yhl9qk9d4q99pyxmzz48sq56nfhu8weyzkgum4ed5tc5shjmrs7
   - &host_tahani age1njjegjjdqzfnrr54f536yl4lduqgna3wuv7ef6vtl9jw5cju0grsgy62tm
   - &host_michael age187jl7e4k9n4guygkmpuqzeh0wenefwrfkpvuyhvwjrjwxqpzassqq3x67j
-  - &host_jason age1ez6j3r5wdp0tjy7n5qzv5vfakdc2nh2zeu388zu7a80l0thv052syxq5e2
+  - &host_janet age1f9h725ewwwwwkelnrvdvrurg6fcsn3zxrxdt0v6v8ys0nzngcsvqu77nc8
   - &host_chidi age1tlymdmaukhwupzrhszspp26lgd8s64rw4vu9lwc7gsgrjm78095s9fe9l3
 creation_rules:
   - path_regex: secrets/[^/]+$
     key_groups:
       - age:
+        - *user_cschmatzler
         - *host_tahani
         - *host_michael
-        - *host_jason
+        - *host_janet
         - *host_chidi

AGENTS.md

@@ -5,7 +5,7 @@
 ### Local Development
 ```bash
 nix run .#build               # Build current host config
-nix run .#build -- <hostname> # Build specific host (chidi, jason, michael, tahani)
+nix run .#build -- <hostname> # Build specific host (chidi, janet, michael, tahani)
 nix run .#apply               # Build and apply locally (darwin-rebuild/nixos-rebuild switch)
 nix flake check               # Validate flake
 ```
@@ -33,11 +33,12 @@ alejandra .                   # Format all Nix files
 
 ### File Structure
 - **Modules**: `modules/` - All configuration (flake-parts modules, auto-imported by import-tree)
+  - `hosts/` - Per-host composition modules
+  - `profiles/` - Shared host and user profile bundles
   - `_lib/` - Utility functions (underscore = ignored by import-tree)
   - `_darwin/` - Darwin-specific sub-modules
   - `_neovim/` - Neovim plugin configs
-  - `_opencode/` - OpenCode agent/command/skill configs
-  - `_hosts/` - Host-specific sub-files (disk-config, hardware, etc.)
+  - `hosts/_parts/` - Host-specific leaf files (disk-config, hardware, service fragments, etc.)
 - **Apps**: `apps/` - Per-system app scripts (Nushell)
 - **Secrets**: `secrets/` - SOPS-encrypted secrets (`.sops.yaml` for config)
 
@@ -53,13 +54,15 @@ alejandra .                   # Format all Nix files
 - `homeManager` - Home Manager configuration
 - `os` - Applies to both NixOS and darwin
 
-**Hosts**: `den.hosts.<system>.<name>` defined in `modules/hosts.nix`
+**Hosts**: `den.hosts.<system>.<name>` declared in `modules/inventory.nix`
+
+**Profiles**: shared bundles live under `modules/profiles/{host,user}` and are exposed as `den.aspects.host-*` and `den.aspects.user-*`
 
 **Defaults**: `den.default.*` defined in `modules/defaults.nix`
 
 **Imports**: Auto-imported by import-tree; underscore-prefixed dirs (`_lib/`, `_darwin/`, etc.) are excluded from auto-import
 
-**Deployment**: deploy-rs for NixOS hosts (michael, tahani); darwin hosts (chidi, jason) are local-only
+**Deployment**: deploy-rs for NixOS hosts (michael, tahani); darwin hosts (chidi, janet) are local-only
 
 ### Nix Language Conventions
 
@@ -67,7 +70,7 @@ alejandra .                   # Format all Nix files
 ```nix
 {inputs, pkgs, lib, ...}:
 ```
-Destructure arguments on separate lines. Use `...` to capture remaining args.
+Use `...` to capture remaining args. Let Alejandra control the exact layout.
 
 **Attribute Sets**:
 ```nix
@@ -108,7 +111,6 @@ in {
   };
 }
 ```
-- Destructure args on separate lines
 - Use `with lib;` for brevity with NixOS lib functions
 - Define `cfg` for config options
 - Use `mkIf`, `mkForce`, `mkDefault` appropriately
@@ -126,13 +128,13 @@ in {
 
 ### Naming Conventions
 - **Aspect names**: `den.aspects.<name>.<class>` for feature configuration
-- **Hostnames**: Lowercase, descriptive (e.g., `michael`, `tahani`, `chidi`, `jason`)
+- **Hostnames**: Lowercase, descriptive (e.g., `michael`, `tahani`, `chidi`, `janet`)
 - **Module files**: Descriptive, lowercase with hyphens (e.g., `neovim-config.nix`)
 
 ### Secrets Management
 - Use SOPS for secrets (see `.sops.yaml`)
 - Never commit unencrypted secrets
-- Secret definitions live in per-host modules (`modules/michael.nix`, `modules/tahani.nix`, etc.)
+- Secret definitions live in per-host modules (`modules/hosts/michael.nix`, `modules/hosts/tahani.nix`, etc.)
 - Shared SOPS defaults (module imports, key paths) in `modules/secrets.nix`
 
 ### Aspect Composition

README.md

@@ -0,0 +1,64 @@
+# NixOS Config
+
+Personal Nix flake for four machines:
+
+- `michael` - x86_64 Linux server
+- `tahani` - x86_64 Linux home server / workstation
+- `chidi` - aarch64 Darwin work laptop
+- `janet` - aarch64 Darwin personal laptop
+
+## Repository Map
+
+- `modules/` - flake-parts modules, auto-imported via `import-tree`
+- `modules/hosts/` - per-host composition modules
+- `modules/hosts/_parts/` - host-private leaf modules like hardware, disks, and literal networking
+- `modules/profiles/` - shared host and user profile bundles
+- `modules/_lib/` - local helper functions
+- `modules/_notability/`, `modules/_paperless/` - feature-owned scripts and templates
+- `apps/` - Nushell apps exposed through the flake
+- `secrets/` - SOPS-encrypted secrets
+- `flake.nix` - generated flake entrypoint
+- `modules/dendritic.nix` - source of truth for flake inputs and `flake.nix` generation
+
+## How It Is Structured
+
+This repo uses `den` and organizes configuration around aspects instead of putting everything directly in host files.
+
+- shared behavior lives in `den.aspects.<name>.<class>` modules under `modules/*.nix`
+- the machine inventory lives in `modules/inventory.nix`
+- shared bundles live in `modules/profiles/{host,user}/`
+- host composition happens in `modules/hosts/<host>.nix`
+- host-private imports live in `modules/hosts/_parts/<host>/` and stay limited to true machine leaf files
+- feature-owned services live in top-level modules like `modules/gitea.nix`, `modules/notability.nix`, and `modules/paperless.nix`
+- user-level config mostly lives in Home Manager aspects
+
+Common examples:
+
+- `modules/core.nix` - shared Nix and shell foundation
+- `modules/dev-tools.nix` - VCS, language, and developer tooling
+- `modules/network.nix` - SSH, fail2ban, and tailscale aspects
+- `modules/gitea.nix` - Gitea, Litestream, and backup stack for `michael`
+- `modules/notability.nix` - Notability ingest services and user tooling for `tahani`
+- `modules/profiles/user/workstation.nix` - shared developer workstation user bundle
+- `modules/hosts/michael.nix` - server composition for `michael`
+- `modules/hosts/tahani.nix` - server/workstation composition for `tahani`
+
+## Common Commands
+
+```bash
+nix run .#build
+nix run .#build -- michael
+nix run .#apply
+nix run .#deploy -- .#tahani
+nix flake check
+alejandra .
+```
+
+## Updating The Flake
+
+`flake.nix` is generated. Update inputs in `modules/dendritic.nix`, then regenerate:
+
+```bash
+nix run .#write-flake
+alejandra .
+```

apps/aarch64-darwin/build

@@ -3,17 +3,5 @@
 use ../common.nu *
 
 def main [hostname?: string, ...rest: string] {
-    let host = if ($hostname | is-empty) {
-        try { scutil --get LocalHostName | str trim } catch { hostname -s | str trim }
-    } else { $hostname }
-    
-    print_info $"Building configuration for ($host)"
-    
-    nix build $".#darwinConfigurations.($host).system" --show-trace ...$rest
-    
-    if ("./result" | path exists) {
-        rm ./result
-    }
-    
-    print_success "Build completed successfully"
+	build-config "darwin" $hostname ...$rest
 }

apps/aarch64-darwin/update

@@ -1,21 +0,0 @@
-#!/usr/bin/env nu
-
-use ../common.nu *
-
-def main [...inputs: string] {
-	if ($inputs | is-empty) {
-		print_info "Updating all flake inputs"
-		nix flake update
-	} else {
-		print_info $"Updating flake inputs: ($inputs | str join ', ')"
-		nix flake update ...$inputs
-	}
-
-	print_info "Regenerating flake.nix"
-	nix run .#write-flake
-
-	print_info "Formatting"
-	alejandra .
-
-	print_success "Flake updated"
-}

apps/apply

@@ -2,18 +2,8 @@
 
 use ./common.nu *
 
-def get-hostname [] {
-	if $nu.os-info.name == "macos" {
-		try { ^scutil --get LocalHostName | str trim } catch { ^hostname -s | str trim }
-	} else {
-		^hostname | str trim
-	}
-}
-
 def main [hostname?: string, ...rest: string] {
-	let host = if ($hostname | is-empty) {
-		get-hostname
-	} else { $hostname }
+	let host = resolve-host $hostname
 
 	print_info $"Applying configuration for ($host)"
 

apps/common.nu

@@ -15,3 +15,58 @@ export def print_error [msg: string] {
 export def print_warning [msg: string] {
     print $"(ansi yellow)[WARN](ansi reset) ($msg)"
 }
+
+export def get-hostname [] {
+	if $nu.os-info.name == "macos" {
+		try { ^scutil --get LocalHostName | str trim } catch { ^hostname -s | str trim }
+	} else {
+		^hostname | str trim
+	}
+}
+
+export def resolve-host [hostname?: string] {
+	if ($hostname | is-empty) {
+		get-hostname
+	} else {
+		$hostname
+	}
+}
+
+export def cleanup-result-link [] {
+	if ("./result" | path exists) {
+		rm ./result
+	}
+}
+
+export def build-config [kind: string, hostname?: string, ...rest: string] {
+	let host = resolve-host $hostname
+
+	print_info $"Building configuration for ($host)"
+
+	if $kind == "darwin" {
+		nix build $".#darwinConfigurations.($host).system" --show-trace ...$rest
+	} else {
+		nix build $".#nixosConfigurations.($host).config.system.build.toplevel" --show-trace ...$rest
+	}
+
+	cleanup-result-link
+	print_success "Build completed successfully"
+}
+
+export def update-flake [inputs: list<string>] {
+	if ($inputs | is-empty) {
+		print_info "Updating all flake inputs"
+		nix flake update
+	} else {
+		print_info $"Updating flake inputs: ($inputs | str join ', ')"
+		nix flake update ...$inputs
+	}
+
+	print_info "Regenerating flake.nix"
+	nix run .#write-flake
+
+	print_info "Formatting"
+	alejandra .
+
+	print_success "Flake updated"
+}

apps/update

@@ -0,0 +1,7 @@
+#!/usr/bin/env nu
+
+use ./common.nu *
+
+def main [...inputs: string] {
+	update-flake $inputs
+}

apps/x86_64-linux/build

@@ -3,17 +3,5 @@
 use ../common.nu *
 
 def main [hostname?: string, ...rest: string] {
-    let host = if ($hostname | is-empty) {
-        hostname | str trim
-    } else { $hostname }
-    
-    print_info $"Building configuration for ($host)"
-    
-    nix build $".#nixosConfigurations.($host).config.system.build.toplevel" --show-trace ...$rest
-    
-    if ("./result" | path exists) {
-        rm ./result
-    }
-    
-    print_success "Build completed successfully"
+	build-config "nixos" $hostname ...$rest
 }

apps/x86_64-linux/update

@@ -1,21 +0,0 @@
-#!/usr/bin/env nu
-
-use ../common.nu *
-
-def main [...inputs: string] {
-	if ($inputs | is-empty) {
-		print_info "Updating all flake inputs"
-		nix flake update
-	} else {
-		print_info $"Updating flake inputs: ($inputs | str join ', ')"
-		nix flake update ...$inputs
-	}
-
-	print_info "Regenerating flake.nix"
-	nix run .#write-flake
-
-	print_info "Formatting"
-	alejandra .
-
-	print_success "Flake updated"
-}

flake.lock

@@ -28,16 +28,16 @@
     "brew-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1769363988,
-        "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=",
+        "lastModified": 1774235677,
+        "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=",
         "owner": "Homebrew",
         "repo": "brew",
-        "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2",
+        "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201",
         "type": "github"
       },
       "original": {
         "owner": "Homebrew",
-        "ref": "5.0.12",
+        "ref": "5.1.1",
         "repo": "brew",
         "type": "github"
       }
@@ -76,6 +76,22 @@
         "type": "github"
       }
     },
+    "code-review-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1765543014,
+        "narHash": "sha256-WpbQswkUpB4Nblos8+5UE5I/PHUQOi+RQ+hj4CCdL4o=",
+        "owner": "choplin",
+        "repo": "code-review.nvim",
+        "rev": "ed91462e20bd08c3be71efb11a4a7d00459f0b47",
+        "type": "github"
+      },
+      "original": {
+        "owner": "choplin",
+        "repo": "code-review.nvim",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1765739568,
@@ -98,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773000227,
-        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
+        "lastModified": 1775037210,
+        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
+        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
         "type": "github"
       },
       "original": {
@@ -114,11 +130,11 @@
     },
     "den": {
       "locked": {
-        "lastModified": 1773020651,
-        "narHash": "sha256-DlRAoa+Zr4GpdleJe2VO7MjZ4968ZinX/rxmR/w3cZo=",
+        "lastModified": 1775702491,
+        "narHash": "sha256-5BCNtE/zCLSheltliy4hTdwsq0Boj/W1XRIX8n89nqA=",
         "owner": "vic",
         "repo": "den",
-        "rev": "0b1d99f746da5d7128e2bea5c1b9a88b9ea7b441",
+        "rev": "d267c458e384b57317d06d45f7c65f7fb03fae4b",
         "type": "github"
       },
       "original": {
@@ -154,11 +170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773025010,
-        "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=",
+        "lastModified": 1773889306,
+        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3",
+        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
         "type": "github"
       },
       "original": {
@@ -170,11 +186,32 @@
     "fenix": {
       "inputs": {
         "nixpkgs": [
-          "himalaya",
           "nixpkgs"
         ],
         "rust-analyzer-src": "rust-analyzer-src"
       },
+      "locked": {
+        "lastModified": 1775721346,
+        "narHash": "sha256-ogqjruvVBYEj8sWM3viOucSo1Pna9c147EKQOfA+p3I=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "99fde43dfee2a672e4e37ef211e0844337e5b725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "fenix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "himalaya",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src_2"
+      },
       "locked": {
         "lastModified": 1767250179,
         "narHash": "sha256-PnQdWvPZqHp+7yaHWDFX3NYSKaOy0fjkwpR+rIQC7AY=",
@@ -190,32 +227,9 @@
         "type": "github"
       }
     },
-    "fenix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "naersk",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src_2"
-      },
-      "locked": {
-        "lastModified": 1752475459,
-        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "fenix_3": {
       "inputs": {
         "nixpkgs": [
-          "tuicr",
           "naersk",
           "nixpkgs"
         ],
@@ -237,11 +251,11 @@
     },
     "flake-aspects": {
       "locked": {
-        "lastModified": 1772999207,
-        "narHash": "sha256-dzZpKU1wS/9oMsgK9dqCD+wblBMj1EAhInQtvY2dLUI=",
+        "lastModified": 1773552804,
+        "narHash": "sha256-a0kjpCZGnD5lt7yW6C3hzPhSf5KjnTyvX6XZ2NuhGs4=",
         "owner": "vic",
         "repo": "flake-aspects",
-        "rev": "778d8d7c1352c3b173cdcb9fd0f65acbaf4744a6",
+        "rev": "56fa8d4d4772d58eb7f9d66c28c1cd2762b60423",
         "type": "github"
       },
       "original": {
@@ -268,11 +282,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1772999280,
-        "narHash": "sha256-XX60YlqSKa/QNIJVnLeEXNDQPwrQucMuITef6rEJqIs=",
+        "lastModified": 1774886516,
+        "narHash": "sha256-w2LoQVM6DXrSdGUZBZqa1nYkMzHoB0t82DrptzZKhTs=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "e2a19eb539fa7be4537f6e73e7556edf031eed7f",
+        "rev": "3daadf37de2bb85b0ff34e2a7ab0d71e077c2b9e",
         "type": "github"
       },
       "original": {
@@ -288,11 +302,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772408722,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -309,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772408722,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -323,6 +337,27 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -363,7 +398,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -381,7 +416,7 @@
     },
     "himalaya": {
       "inputs": {
-        "fenix": "fenix",
+        "fenix": "fenix_2",
         "nixpkgs": "nixpkgs_2",
         "pimalaya": "pimalaya"
       },
@@ -406,11 +441,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772985285,
-        "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
+        "lastModified": 1775683737,
+        "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
+        "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
         "type": "github"
       },
       "original": {
@@ -422,11 +457,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1773047020,
-        "narHash": "sha256-Lr8GGHucz8vdtmrZMS/IKgIN4FHnDmyCbIqg6AVKR8o=",
+        "lastModified": 1775700724,
+        "narHash": "sha256-qQm9uIF+tI7gamLMa7DSXSQQzLQalEtOa7PHPxNkbr8=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "6371c7494eba40052a5ad29e3f53ba32b6f5fc9d",
+        "rev": "c622bff3b88557e3c870104db0426b93e0767a8f",
         "type": "github"
       },
       "original": {
@@ -438,11 +473,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1773048776,
-        "narHash": "sha256-YHzMRHb2snzuaeSEFP0AhhZeqb8Mcg9SQqBpc3xJHJU=",
+        "lastModified": 1775721921,
+        "narHash": "sha256-s6K2QbKa4OJlblFp3zMSh0/2PM2zpWpAd4ZnREirj/I=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "dd1a14ba30dd3d4ffc9abf0266ecda0842001c62",
+        "rev": "70028a68b515145bbeccb2961240275ab6eb9e82",
         "type": "github"
       },
       "original": {
@@ -453,11 +488,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1772999353,
-        "narHash": "sha256-dPb0WxUhFaz6wuR3B6ysqFJpsu8txKDPZvS47AT2XLI=",
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "545a4df146fce44d155573e47f5a777985acf912",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
         "type": "github"
       },
       "original": {
@@ -481,6 +516,38 @@
         "type": "github"
       }
     },
+    "jj-diffconflicts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1774204449,
+        "narHash": "sha256-CDLOo07tGOg/7Sowb1d39k9Nq/RW50axGj8L1D3Be70=",
+        "owner": "rafikdraoui",
+        "repo": "jj-diffconflicts",
+        "rev": "58163ae8fe7646179dfd7741206dd9a2b4cdadc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafikdraoui",
+        "repo": "jj-diffconflicts",
+        "type": "github"
+      }
+    },
+    "jj-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1775551442,
+        "narHash": "sha256-hoU+DenrgxNwvLNmDtIsJ5yB5fhRjDRPOOL8WW9bpZM=",
+        "owner": "NicolasGB",
+        "repo": "jj.nvim",
+        "rev": "2dbe2c73c599a29e86e4123b42e430828b1f01d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NicolasGB",
+        "repo": "jj.nvim",
+        "type": "github"
+      }
+    },
     "jj-ryu": {
       "flake": false,
       "locked": {
@@ -526,11 +593,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1773048396,
-        "narHash": "sha256-qtGG8mtoCXriW2ccxvQxWifjwSwTFWaAnhZagq0a/l4=",
+        "lastModified": 1775705124,
+        "narHash": "sha256-OUtgrn0k7DYnAP9skY2rOJSWJyn4w5tnUcF3lSJdfME=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "f17d31cd025cdd10c8a72e1813e567cf0d06fcbd",
+        "rev": "ca76524952b00135dba57da62ce2dd123a1ba4be",
         "type": "github"
       },
       "original": {
@@ -541,7 +608,7 @@
     },
     "naersk": {
       "inputs": {
-        "fenix": "fenix_2",
+        "fenix": "fenix_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -561,26 +628,41 @@
         "type": "github"
       }
     },
-    "naersk_2": {
+    "neovim-nightly-overlay": {
       "inputs": {
-        "fenix": "fenix_3",
+        "flake-parts": "flake-parts_3",
+        "neovim-src": "neovim-src",
         "nixpkgs": [
-          "tuicr",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1769799857,
-        "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
+        "lastModified": 1775693082,
+        "narHash": "sha256-nnhkpfWsRutQh//KmVoIV7e9Gk90tBezjcoRr775BfU=",
         "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
+        "repo": "neovim-nightly-overlay",
+        "rev": "21b2795e6aeb4a0110bdc7bd81bad59c022c9986",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
+    "neovim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1775689880,
+        "narHash": "sha256-savZYhFAaBm3BQUdTrPOv7i5K18JFANJvyHv0uuvaWM=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "eefb50e352a689ec1a0a55d6827abea79960cd3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "neovim",
+        "repo": "neovim",
         "type": "github"
       }
     },
@@ -589,11 +671,11 @@
         "brew-src": "brew-src"
       },
       "locked": {
-        "lastModified": 1769437432,
-        "narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=",
+        "lastModified": 1774720267,
+        "narHash": "sha256-YYftFe8jyfpQI649yfr0E+dqEXE2jznZNcYvy/lKV1U=",
         "owner": "zhaofengli-wip",
         "repo": "nix-homebrew",
-        "rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5",
+        "rev": "a7760a3a83f7609f742861afb5732210fdc437ed",
         "type": "github"
       },
       "original": {
@@ -652,11 +734,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1772771118,
-        "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=",
+        "lastModified": 1775639890,
+        "narHash": "sha256-9O9gNidrdzcb7vgKGtff7QiLtr0IsVaCi0pAXm8anhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2",
+        "rev": "456e8a9468b9d46bd8c9524425026c00745bc4d2",
         "type": "github"
       },
       "original": {
@@ -668,11 +750,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1773048815,
-        "narHash": "sha256-WgPqAMBpQOPdxeDx+w8uMqliPTknQxClEpxlZsSzf6o=",
+        "lastModified": 1775722436,
+        "narHash": "sha256-Z7QmfL80jmUPoSQkMlCc+1MGfkugf7bG47H3UTsyi7Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ab709aeb112ebbc33ec809690f32c75a0726e228",
+        "rev": "e73a61d035ee91f95bb0a6b95ce0b9d2866bd332",
         "type": "github"
       },
       "original": {
@@ -699,22 +781,6 @@
       }
     },
     "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1771923393,
-        "narHash": "sha256-Fy0+UXELv9hOE8WjYhJt8fMDLYTU2Dqn3cX4BwoGBos=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
       "locked": {
         "lastModified": 1765934234,
         "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
@@ -732,16 +798,16 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": "nixpkgs_6",
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1772402258,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "lastModified": 1775307257,
+        "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff",
         "type": "github"
       },
       "original": {
@@ -750,22 +816,6 @@
         "type": "github"
       }
     },
-    "nono": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1773040967,
-        "narHash": "sha256-9UcBf9QhgVE6jlR4jdcSabEi2S2u7bi9Kk2FrhQs+3g=",
-        "owner": "always-further",
-        "repo": "nono",
-        "rev": "9e036bb1262df9ef18cf47d06d08a42491741bce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "always-further",
-        "repo": "nono",
-        "type": "github"
-      }
-    },
     "pimalaya": {
       "flake": false,
       "locked": {
@@ -784,10 +834,12 @@
     },
     "root": {
       "inputs": {
+        "code-review-nvim": "code-review-nvim",
         "darwin": "darwin",
         "den": "den",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
+        "fenix": "fenix",
         "flake-aspects": "flake-aspects",
         "flake-file": "flake-file",
         "flake-parts": "flake-parts",
@@ -796,30 +848,31 @@
         "homebrew-cask": "homebrew-cask",
         "homebrew-core": "homebrew-core",
         "import-tree": "import-tree",
+        "jj-diffconflicts": "jj-diffconflicts",
+        "jj-nvim": "jj-nvim",
         "jj-ryu": "jj-ryu",
         "jj-starship": "jj-starship",
         "llm-agents": "llm-agents",
         "naersk": "naersk",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-lib": [
           "nixpkgs"
         ],
         "nixvim": "nixvim",
-        "nono": "nono",
         "sops-nix": "sops-nix",
-        "tuicr": "tuicr",
         "zjstatus": "zjstatus"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1767191410,
-        "narHash": "sha256-cCZGjubgDWmstvFkS6eAw2qk2ihgWkycw55u2dtLd70=",
+        "lastModified": 1775663707,
+        "narHash": "sha256-3cSvpBETRa8aDSrUCX1jGc6FSse3OWB7cXACIZW8BYI=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "a9026e6d5068172bf5a0d52a260bb290961d1cb4",
+        "rev": "8c5af725817905e462052d91a8d229b85ffa83a5",
         "type": "github"
       },
       "original": {
@@ -832,11 +885,11 @@
     "rust-analyzer-src_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1752428706,
-        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
+        "lastModified": 1767191410,
+        "narHash": "sha256-cCZGjubgDWmstvFkS6eAw2qk2ihgWkycw55u2dtLd70=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
+        "rev": "a9026e6d5068172bf5a0d52a260bb290961d1cb4",
         "type": "github"
       },
       "original": {
@@ -891,11 +944,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772944399,
-        "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
+        "lastModified": 1775682595,
+        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
+        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
         "type": "github"
       },
       "original": {
@@ -979,21 +1032,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1002,11 +1040,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772660329,
-        "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "3710e0e1218041bbad640352a0440114b1e10428",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
         "type": "github"
       },
       "original": {
@@ -1015,26 +1053,6 @@
         "type": "github"
       }
     },
-    "tuicr": {
-      "inputs": {
-        "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_7",
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1772695807,
-        "narHash": "sha256-w0ZxBEwmVsIwD5ePef3OvL1Lb3pFIHAj42x6j5toNxc=",
-        "owner": "agavra",
-        "repo": "tuicr",
-        "rev": "3ccf3d262641f6078ffa1e2155897284fcdee925",
-        "type": "github"
-      },
-      "original": {
-        "owner": "agavra",
-        "repo": "tuicr",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -1053,37 +1071,19 @@
         "type": "github"
       }
     },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "zjstatus": {
       "inputs": {
         "crane": "crane",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1771148613,
-        "narHash": "sha256-nLzdw8jskekSRrunxBDCA0NCHr/2aJjcXqZ1Fcqm5eY=",
+        "lastModified": 1773119656,
+        "narHash": "sha256-AE6SthrvDyUU70myW7wAq4mzQbtmK5Spng7Y/OdCdhI=",
         "owner": "dj95",
         "repo": "zjstatus",
-        "rev": "7a039f56da80681408454d6e175fde3f54b9e592",
+        "rev": "e80d508ffbff6ab6b39a481ae9986109d3c313ac",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,59 +4,74 @@
 	outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
 
 	inputs = {
+		code-review-nvim = {
+			url = "github:choplin/code-review.nvim";
+			flake = false;
+		};
 		darwin = {
-			inputs.nixpkgs.follows = "nixpkgs";
 			url = "github:LnL7/nix-darwin/master";
+			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		den.url = "github:vic/den";
 		deploy-rs.url = "github:serokell/deploy-rs";
 		disko = {
-			inputs.nixpkgs.follows = "nixpkgs";
 			url = "github:nix-community/disko";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+		fenix = {
+			url = "github:nix-community/fenix";
+			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		flake-aspects.url = "github:vic/flake-aspects";
 		flake-file.url = "github:vic/flake-file";
 		flake-parts = {
-			inputs.nixpkgs-lib.follows = "nixpkgs";
 			url = "github:hercules-ci/flake-parts";
+			inputs.nixpkgs-lib.follows = "nixpkgs";
 		};
 		himalaya.url = "github:pimalaya/himalaya";
 		home-manager = {
-			inputs.nixpkgs.follows = "nixpkgs";
 			url = "github:nix-community/home-manager";
+			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		homebrew-cask = {
-			flake = false;
 			url = "github:homebrew/homebrew-cask";
+			flake = false;
 		};
 		homebrew-core = {
-			flake = false;
 			url = "github:homebrew/homebrew-core";
+			flake = false;
 		};
 		import-tree.url = "github:vic/import-tree";
-		jj-ryu = {
+		jj-diffconflicts = {
+			url = "github:rafikdraoui/jj-diffconflicts";
 			flake = false;
+		};
+		jj-nvim = {
+			url = "github:NicolasGB/jj.nvim";
+			flake = false;
+		};
+		jj-ryu = {
 			url = "github:dmmulroy/jj-ryu";
+			flake = false;
 		};
 		jj-starship.url = "github:dmmulroy/jj-starship";
 		llm-agents.url = "github:numtide/llm-agents.nix";
 		naersk = {
-			inputs.nixpkgs.follows = "nixpkgs";
 			url = "github:nix-community/naersk/master";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+		neovim-nightly-overlay = {
+			url = "github:nix-community/neovim-nightly-overlay";
+			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
 		nixpkgs.url = "github:nixos/nixpkgs/master";
 		nixpkgs-lib.follows = "nixpkgs";
 		nixvim.url = "github:nix-community/nixvim";
-		nono = {
-			flake = false;
-			url = "github:always-further/nono";
-		};
 		sops-nix = {
-			inputs.nixpkgs.follows = "nixpkgs";
 			url = "github:Mic92/sops-nix";
+			inputs.nixpkgs.follows = "nixpkgs";
 		};
-		tuicr.url = "github:agavra/tuicr";
 		zjstatus.url = "github:dj95/zjstatus";
 	};
 }

modules/_darwin/dock.nix

@@ -6,7 +6,9 @@
 }:
 with lib; let
 	cfg = config.local.dock;
-	inherit (pkgs) stdenv dockutil;
+	inherit (pkgs) dockutil stdenv;
+	local = import ../_lib/local.nix;
+	userHome = "/Users/${local.user.name}";
 in {
 	options = {
 		local.dock = {
@@ -37,7 +39,7 @@ in {
 								};
 							});
 					default = [
-						{path = "/Applications/Helium.app/";}
+						{path = "/Applications/Safari.app/";}
 						{path = "/Applications/Ghostty.app/";}
 						{path = "/System/Applications/Calendar.app/";}
 						{path = "/System/Applications/Mail.app/";}
@@ -45,7 +47,7 @@ in {
 						{path = "/System/Applications/Music.app/";}
 						{path = "/System/Applications/System Settings.app/";}
 						{
-							path = "${config.users.users.cschmatzler.home}/Downloads";
+							path = "${userHome}/Downloads";
 							section = "others";
 							options = "--sort name --view grid --display stack";
 						}
@@ -56,7 +58,7 @@ in {
 				mkOption {
 					description = "Username to apply the dock settings to";
 					type = types.str;
-					default = "cschmatzler";
+					default = local.user.name;
 				};
 		};
 	};

modules/_dev-tools/tuist-pr.nu

@@ -0,0 +1,67 @@
+#!/usr/bin/env nu
+
+const repo = "tuist/tuist"
+
+def fail [msg: string] {
+	error make {msg: $msg}
+}
+
+def clean [s: string] {
+	$s | str replace --all "\t" " " | str replace --all "\n" " "
+}
+
+def pick-pr [] {
+	let prs = (
+		gh pr list --repo $repo --state open --limit 200 --json number,title,headRefName,author
+		| from json
+	)
+
+	if ($prs | is-empty) {
+		fail $"No open PRs found for ($repo)"
+	}
+
+	let choice = (
+		$prs
+		| each {|pr|
+			let title = (clean $pr.title)
+			let branch = (clean $pr.headRefName)
+			let author = $pr.author.login
+			$"($pr.number)\t($title)\t($author)\t($branch)"
+		}
+		| str join (char newline)
+		| fzf --prompt "tuist pr > " --delimiter "\t" --with-nth "1,2,3,4" --preview "gh pr view --repo tuist/tuist {1}" --preview-window "right:70%"
+	)
+
+	if ($choice | str trim | is-empty) {
+		exit 130
+	}
+
+	$choice | split row "\t" | first | into int
+}
+
+def main [pr_number?: int] {
+	let number = if ($pr_number | is-empty) { pick-pr } else { $pr_number }
+	let pr = (
+		gh pr view --repo $repo $number --json number,title,url
+		| from json
+	)
+
+	let base = ([$env.HOME "Projects" "Work"] | path join)
+	let dest = ([$base $"tuist-pr-($pr.number)"] | path join)
+
+	if ($dest | path exists) {
+		fail $"Destination already exists: ($dest)"
+	}
+
+	^mkdir -p $base
+
+	print $"Cloning ($repo) PR #($pr.number): ($pr.title)"
+	jj git clone $"https://github.com/($repo).git" $dest
+
+	do {
+		cd $dest
+		gh pr checkout $pr.number
+	}
+
+	print $"Ready: ($dest)"
+}

modules/_hosts/tahani/adguardhome.nix

@@ -1,60 +0,0 @@
-{
-	services.adguardhome = {
-		enable = true;
-		host = "0.0.0.0";
-		port = 10000;
-		settings = {
-			dhcp = {
-				enabled = false;
-			};
-			dns = {
-				upstream_dns = [
-					"1.1.1.1"
-					"1.0.0.1"
-				];
-			};
-			filtering = {
-				protection_enabled = true;
-				filtering_enabled = true;
-				safe_search = {
-					enabled = false;
-				};
-				safebrowsing_enabled = true;
-				blocked_response_ttl = 10;
-				filters_update_interval = 24;
-				blocked_services = {
-					ids = [
-						"reddit"
-						"twitter"
-					];
-				};
-			};
-			filters = [
-				{
-					enabled = true;
-					url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/pro.txt";
-					name = "HaGeZi Multi PRO";
-					id = 1;
-				}
-				{
-					enabled = true;
-					url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/tif.txt";
-					name = "HaGeZi Threat Intelligence Feeds";
-					id = 2;
-				}
-				{
-					enabled = true;
-					url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/gambling.txt";
-					name = "HaGeZi Gambling";
-					id = 3;
-				}
-				{
-					enabled = true;
-					url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/nsfw.txt";
-					name = "HaGeZi NSFW";
-					id = 4;
-				}
-			];
-		};
-	};
-}

modules/_hosts/tahani/cache.nix

@@ -1,10 +0,0 @@
-{...}: {
-	services.caddy.virtualHosts."cache.manticore-hippocampus.ts.net" = {
-		extraConfig = ''
-			tls {
-				get_certificate tailscale
-			}
-			reverse_proxy localhost:32843
-		'';
-	};
-}

modules/_hosts/tahani/paperless.nix

@@ -1,73 +0,0 @@
-{config, ...}: {
-	services.caddy = {
-		enable = true;
-		globalConfig = ''
-			admin off
-		'';
-		virtualHosts."docs.manticore-hippocampus.ts.net" = {
-			extraConfig = ''
-				tls {
-					get_certificate tailscale
-				}
-				reverse_proxy localhost:${toString config.services.paperless.port}
-			'';
-		};
-		virtualHosts."docs-ai.manticore-hippocampus.ts.net" = {
-			extraConfig = ''
-				tls {
-					get_certificate tailscale
-				}
-				reverse_proxy localhost:3000
-			'';
-		};
-	};
-
-	virtualisation.oci-containers = {
-		backend = "docker";
-		containers.paperless-ai = {
-			image = "clusterzx/paperless-ai:latest";
-			autoStart = true;
-			volumes = [
-				"paperless-ai-data:/app/data"
-			];
-			environment = {
-				PUID = "1000";
-				PGID = "1000";
-				PAPERLESS_AI_PORT = "3000";
-				# Initial setup wizard will configure the rest
-				PAPERLESS_AI_INITIAL_SETUP = "yes";
-				# Paperless-ngx API URL accessible from container (using host network)
-				PAPERLESS_API_URL = "http://127.0.0.1:${toString config.services.paperless.port}/api";
-			};
-			extraOptions = [
-				"--network=host"
-			];
-		};
-	};
-
-	services.redis.servers.paperless = {
-		enable = true;
-		port = 6379;
-		bind = "127.0.0.1";
-		settings = {
-			maxmemory = "256mb";
-			maxmemory-policy = "allkeys-lru";
-		};
-	};
-
-	services.paperless = {
-		enable = true;
-		address = "0.0.0.0";
-		passwordFile = config.sops.secrets.tahani-paperless-password.path;
-		settings = {
-			PAPERLESS_DBENGINE = "sqlite";
-			PAPERLESS_REDIS = "redis://127.0.0.1:6379";
-			PAPERLESS_CONSUMER_IGNORE_PATTERN = [
-				".DS_STORE/*"
-				"desktop.ini"
-			];
-			PAPERLESS_OCR_LANGUAGE = "deu+eng";
-			PAPERLESS_CSRF_TRUSTED_ORIGINS = "https://docs.manticore-hippocampus.ts.net";
-		};
-	};
-}

modules/_lib/caddy.nix

@@ -0,0 +1,19 @@
+let
+	local = import ./local.nix;
+in {
+	inherit (local) tailscaleHost;
+
+	mkTailscaleVHost = {
+		name,
+		configText,
+	}: {
+		"${local.tailscaleHost name}" = {
+			extraConfig = ''
+				tls {
+					get_certificate tailscale
+				}
+				${configText}
+			'';
+		};
+	};
+}

modules/_lib/constants.nix

@@ -1,14 +0,0 @@
-{
-	user = "cschmatzler";
-
-	sshKeys = [
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHfRZQ+7ejD3YHbyMTrV0gN1Gc0DxtGgl5CVZSupo5ws"
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/I+/2QT47raegzMIyhwMEPKarJP/+Ox9ewA4ZFJwk/"
-	];
-
-	stateVersions = {
-		darwin = 6;
-		nixos = "25.11";
-		homeManager = "25.11";
-	};
-}

modules/_lib/hosts.nix

@@ -0,0 +1,37 @@
+{
+	den,
+	lib,
+}: let
+	merge = lib.recursiveUpdate;
+in {
+	mkUserHost = {
+		system,
+		host,
+		user,
+		userAspect ? "${host}-${user}",
+		includes ? [],
+		homeManager ? null,
+	}:
+		merge
+		(lib.setAttrByPath ["den" "hosts" system host "users" user "aspect"] userAspect)
+		(lib.setAttrByPath ["den" "aspects" userAspect] ({inherit includes;}
+				// lib.optionalAttrs (homeManager != null) {
+					inherit homeManager;
+				}));
+
+	mkPerHostAspect = {
+		host,
+		includes ? [],
+		darwin ? null,
+		nixos ? null,
+	}:
+		lib.setAttrByPath ["den" "aspects" host "includes"] [
+			(den.lib.perHost ({inherit includes;}
+					// lib.optionalAttrs (darwin != null) {
+						inherit darwin;
+					}
+					// lib.optionalAttrs (nixos != null) {
+						inherit nixos;
+					}))
+		];
+}

modules/_lib/local.nix

@@ -0,0 +1,33 @@
+rec {
+	user = {
+		name = "cschmatzler";
+		fullName = "Christoph Schmatzler";
+		emails = {
+			personal = "christoph@schmatzler.com";
+			work = "christoph@tuist.dev";
+			icloud = "christoph.schmatzler@icloud.com";
+		};
+	};
+
+	secretPath = name: "/run/secrets/${name}";
+
+	mkHome = system:
+		if builtins.match ".*-darwin" system != null
+		then "/Users/${user.name}"
+		else "/home/${user.name}";
+
+	mkHost = system: {
+		inherit system;
+		home = mkHome system;
+	};
+
+	hosts = {
+		chidi = mkHost "aarch64-darwin";
+		janet = mkHost "aarch64-darwin";
+		michael = mkHost "x86_64-linux";
+		tahani = mkHost "x86_64-linux";
+	};
+
+	tailscaleDomain = "manticore-hippocampus.ts.net";
+	tailscaleHost = name: "${name}.${tailscaleDomain}";
+}

modules/_lib/open-project.nix

@@ -1,10 +0,0 @@
-{pkgs}:
-pkgs.writeShellScriptBin "open-project" ''
-	TARGET=$(fd -t d --exact-depth 1 . $HOME/Projects |
-		sed "s~$HOME/Projects/~~" |
-		fzf --prompt "project > ")
-
-	if [ -n "$TARGET" ]; then
-		echo "$HOME/Projects/$TARGET"
-	fi
-''

modules/_lib/secrets.nix

@@ -0,0 +1,44 @@
+{lib}: let
+	local = import ./local.nix;
+in rec {
+	mkBinarySecret = {
+		name,
+		sopsFile,
+		owner ? null,
+		group ? null,
+		path ? local.secretPath name,
+	}:
+		{
+			inherit path sopsFile;
+			format = "binary";
+		}
+		// lib.optionalAttrs (owner != null) {
+			inherit owner;
+		}
+		// lib.optionalAttrs (group != null) {
+			inherit group;
+		};
+
+	mkUserBinarySecret = {
+		name,
+		sopsFile,
+		owner ? local.user.name,
+		path ? local.secretPath name,
+	}:
+		mkBinarySecret {
+			inherit name owner path sopsFile;
+		};
+
+	mkServiceBinarySecret = {
+		name,
+		sopsFile,
+		serviceUser,
+		serviceGroup ? serviceUser,
+		path ? local.secretPath name,
+	}:
+		mkBinarySecret {
+			inherit name path sopsFile;
+			group = serviceGroup;
+			owner = serviceUser;
+		};
+}

modules/_lib/theme.nix

@@ -0,0 +1,46 @@
+{
+	rosePineDawn = {
+		slug = "rose-pine-dawn";
+		displayName = "Rosé Pine Dawn";
+		ghosttyName = "Rose Pine Dawn";
+
+		hex = {
+			love = "#b4637a";
+			gold = "#ea9d34";
+			rose = "#d7827e";
+			pine = "#286983";
+			foam = "#56949f";
+			iris = "#907aa9";
+			leaf = "#6d8f89";
+			text = "#575279";
+			subtle = "#797593";
+			muted = "#9893a5";
+			highlightHigh = "#cecacd";
+			highlightMed = "#dfdad9";
+			highlightLow = "#f4ede8";
+			overlay = "#f2e9e1";
+			surface = "#fffaf3";
+			base = "#faf4ed";
+		};
+
+		rgb = {
+			love = "180 99 122";
+			gold = "234 157 52";
+			rose = "215 130 126";
+			pine = "40 105 131";
+			foam = "86 148 159";
+			iris = "144 122 169";
+			leaf = "109 143 137";
+			text = "87 82 121";
+			subtle = "121 117 147";
+			muted = "152 147 165";
+			highlightHigh = "206 202 205";
+			highlightMed = "223 218 217";
+			highlightLow = "244 237 232";
+			overlay = "242 233 225";
+			surface = "255 250 243";
+			base = "250 244 237";
+			black = "0 0 0";
+		};
+	};
+}

modules/_neovim/autocmd.nix

@@ -5,6 +5,24 @@
 		};
 
 		autoCmd = [
+			{
+				event = ["VimEnter" "ColorScheme"];
+				group = "Christoph";
+				pattern = "*";
+				callback.__raw = ''
+					function()
+						local p = require("rose-pine.palette")
+						vim.api.nvim_set_hl(0, "NormalFloat", { bg = p.base })
+						vim.api.nvim_set_hl(0, "FloatTitle", { fg = p.foam, bg = p.base, bold = true })
+						vim.api.nvim_set_hl(0, "Pmenu", { fg = p.subtle, bg = p.base })
+						vim.api.nvim_set_hl(0, "PmenuExtra", { fg = p.muted, bg = p.base })
+						vim.api.nvim_set_hl(0, "PmenuKind", { fg = p.foam, bg = p.base })
+						vim.api.nvim_set_hl(0, "PmenuSbar", { bg = p.base })
+						vim.api.nvim_set_hl(0, "MiniPickPrompt", { bg = p.base, bold = true })
+						vim.api.nvim_set_hl(0, "MiniPickBorderText", { bg = p.base })
+					end
+				'';
+			}
 			{
 				event = "BufWritePre";
 				group = "Christoph";
@@ -26,7 +44,7 @@
 			{
 				event = "FileType";
 				group = "Christoph";
-				pattern = "*.ex,*.exs,*.heex";
+				pattern = "elixir,eelixir,heex";
 				command = "setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2";
 			}
 		];

modules/_neovim/default.nix

@@ -1,17 +1,22 @@
-{
+{inputs', ...}: {
 	imports = [
 		./autocmd.nix
 		./mappings.nix
 		./options.nix
 		./plugins/blink-cmp.nix
+		./plugins/code-review.nix
 		./plugins/conform.nix
+		./plugins/diffview.nix
 		./plugins/grug-far.nix
+		./plugins/hardtime.nix
 		./plugins/harpoon.nix
 		./plugins/hunk.nix
 		./plugins/jj-diffconflicts.nix
+		./plugins/jj-nvim.nix
 		./plugins/lsp.nix
 		./plugins/mini.nix
 		./plugins/oil.nix
+		./plugins/render-markdown.nix
 		./plugins/toggleterm.nix
 		./plugins/treesitter.nix
 		./plugins/zk.nix
@@ -20,16 +25,18 @@
 	programs.nixvim = {
 		enable = true;
 		defaultEditor = true;
+		package = inputs'.neovim-nightly-overlay.packages.default;
 		luaLoader.enable = true;
-		colorschemes.catppuccin = {
+		colorschemes.rose-pine = {
 			enable = true;
 			settings = {
-				flavour = "latte";
+				variant = "dawn";
+				extend_background_behind_borders = false;
+				styles = {
+					italic = false;
+				};
 			};
 		};
-		extraConfigLua = ''
-			vim.ui.select = MiniPick.ui_select
-		'';
 	};
 
 	home.shellAliases = {

modules/_neovim/mappings.nix

@@ -117,23 +117,182 @@
 			action = ":Pick visit_paths<CR>";
 			options.desc = "Visit paths (cwd)";
 		}
-		# g - git
+		# v - vcs
 		{
 			mode = "n";
-			key = "<leader>gc";
+			key = "<leader>va";
+			action = ":J annotate<CR>";
+			options.desc = "Annotate (blame)";
+		}
+		{
+			mode = "n";
+			key = "<leader>vc";
 			action = ":JJDiffConflicts<CR>";
 			options.desc = "Resolve conflicts";
 		}
 		{
 			mode = "n";
-			key = "<leader>gg";
+			key = "<leader>vd";
 			action.__raw = ''
-						function()
-				require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle()
-						end
+				function()
+					require('jj.cmd').diff()
+				end
+			'';
+			options.desc = "Diff (current file)";
+		}
+		{
+			mode = "n";
+			key = "<leader>vD";
+			action.__raw = ''
+				function()
+					require('jj.diff').show_revision({})
+				end
+			'';
+			options.desc = "Diff (all changes)";
+		}
+		{
+			mode = "n";
+			key = "<leader>ve";
+			action.__raw = ''
+				function()
+					require('jj.cmd').describe()
+				end
+			'';
+			options.desc = "Describe (edit message)";
+		}
+		{
+			mode = "n";
+			key = "<leader>vf";
+			action = ":J fetch<CR>";
+			options.desc = "Fetch";
+		}
+		{
+			mode = "n";
+			key = "<leader>vv";
+			action.__raw = ''
+				function()
+					require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle()
+				end
 			'';
 			options.desc = "jjui";
 		}
+		{
+			mode = "n";
+			key = "<leader>vh";
+			action.__raw = ''
+				function()
+					require('jj.diff').show_revision({ rev = '@-' })
+				end
+			'';
+			options.desc = "Diff parent revision";
+		}
+		{
+			mode = "n";
+			key = "<leader>vl";
+			action.__raw = ''
+				function()
+					require('jj.cmd').log()
+				end
+			'';
+			options.desc = "Log";
+		}
+		{
+			mode = "n";
+			key = "<leader>vn";
+			action.__raw = ''
+				function()
+					require('jj.cmd').new()
+				end
+			'';
+			options.desc = "New change";
+		}
+		{
+			mode = "n";
+			key = "<leader>vp";
+			action = ":J git push<CR>";
+			options.desc = "Push";
+		}
+		{
+			mode = "n";
+			key = "<leader>vq";
+			action = ":DiffviewClose<CR>";
+			options.desc = "Close diffview";
+		}
+		{
+			mode = "n";
+			key = "<leader>vR";
+			action.__raw = ''
+				function()
+					require('jj.diff').diff_revisions({ left = 'trunk()', right = '@' })
+				end
+			'';
+			options.desc = "Review bookmark (trunk..@)";
+		}
+		{
+			mode = "n";
+			key = "<leader>vs";
+			action.__raw = ''
+				function()
+					require('jj.cmd').status()
+				end
+			'';
+			options.desc = "Status";
+		}
+		# r - review
+		{
+			mode = ["n" "v"];
+			key = "<leader>rc";
+			action = ":CodeReviewComment<CR>";
+			options.desc = "Add comment";
+		}
+		{
+			mode = "n";
+			key = "<leader>rd";
+			action = ":CodeReviewDeleteComment<CR>";
+			options.desc = "Delete comment";
+		}
+		{
+			mode = "n";
+			key = "<leader>rl";
+			action = ":CodeReviewList<CR>";
+			options.desc = "List comments";
+		}
+		{
+			mode = "n";
+			key = "<leader>ro";
+			action = ":CodeReviewResolve<CR>";
+			options.desc = "Resolve thread";
+		}
+		{
+			mode = "n";
+			key = "<leader>rp";
+			action = ":CodeReviewPreview<CR>";
+			options.desc = "Preview review";
+		}
+		{
+			mode = "n";
+			key = "<leader>rr";
+			action = ":CodeReviewReply<CR>";
+			options.desc = "Reply to comment";
+		}
+		{
+			mode = "n";
+			key = "<leader>rs";
+			action = ":CodeReviewShowComment<CR>";
+			options.desc = "Show comment";
+		}
+		{
+			mode = "n";
+			key = "<leader>rx";
+			action = ":CodeReviewClear<CR>";
+			options.desc = "Clear all comments";
+		}
+		{
+			mode = "n";
+			key = "<leader>ry";
+			action = ":CodeReviewCopy<CR>";
+			options.desc = "Copy review to clipboard";
+		}
 		# l - lsp/formatter
 		{
 			mode = "n";
@@ -162,13 +321,13 @@
 		{
 			mode = "n";
 			key = "<leader>lj";
-			action = ":lua vim.diagnostic.goto_next()<CR>";
+			action = ":lua vim.diagnostic.jump({ count = 1 })<CR>";
 			options.desc = "Next diagnostic";
 		}
 		{
 			mode = "n";
 			key = "<leader>lk";
-			action = ":lua vim.diagnostic.goto_prev()<CR>";
+			action = ":lua vim.diagnostic.jump({ count = -1 })<CR>";
 			options.desc = "Prev diagnostic";
 		}
 		{
@@ -189,6 +348,111 @@
 			action = ":lua vim.lsp.buf.definition()<CR>";
 			options.desc = "Source definition";
 		}
+		# t - tab
+		{
+			mode = "n";
+			key = "<leader>tc";
+			action = ":tabclose<CR>";
+			options.desc = "Close tab";
+		}
+		{
+			mode = "n";
+			key = "<leader>tn";
+			action = ":tabnew<CR>";
+			options.desc = "New tab";
+		}
+		{
+			mode = "n";
+			key = "<leader>to";
+			action = ":tabonly<CR>";
+			options.desc = "Close other tabs";
+		}
+		{
+			mode = "n";
+			key = "<leader>th";
+			action = ":tabprevious<CR>";
+			options.desc = "Previous tab";
+		}
+		{
+			mode = "n";
+			key = "<leader>tl";
+			action = ":tabnext<CR>";
+			options.desc = "Next tab";
+		}
+		# w - window
+		{
+			mode = "n";
+			key = "<leader>wh";
+			action = "<C-w>h";
+			options.desc = "Go left";
+		}
+		{
+			mode = "n";
+			key = "<leader>wj";
+			action = "<C-w>j";
+			options.desc = "Go down";
+		}
+		{
+			mode = "n";
+			key = "<leader>wk";
+			action = "<C-w>k";
+			options.desc = "Go up";
+		}
+		{
+			mode = "n";
+			key = "<leader>wl";
+			action = "<C-w>l";
+			options.desc = "Go right";
+		}
+		{
+			mode = "n";
+			key = "<leader>ws";
+			action = ":split<CR>";
+			options.desc = "Split horizontal";
+		}
+		{
+			mode = "n";
+			key = "<leader>wv";
+			action = ":vsplit<CR>";
+			options.desc = "Split vertical";
+		}
+		{
+			mode = "n";
+			key = "<leader>wc";
+			action = ":close<CR>";
+			options.desc = "Close window";
+		}
+		{
+			mode = "n";
+			key = "<leader>wq";
+			action = ":q<CR>";
+			options.desc = "Quit window";
+		}
+		{
+			mode = "n";
+			key = "<leader>wo";
+			action = ":only<CR>";
+			options.desc = "Close other windows";
+		}
+		{
+			mode = "n";
+			key = "<leader>w=";
+			action = "<C-w>=";
+			options.desc = "Equalize windows";
+		}
+		# scrolling
+		{
+			mode = "n";
+			key = "<C-d>";
+			action = "<C-d>zz";
+			options.desc = "Scroll down and center";
+		}
+		{
+			mode = "n";
+			key = "<C-u>";
+			action = "<C-u>zz";
+			options.desc = "Scroll up and center";
+		}
 		# other
 		{
 			mode = "n";

modules/_neovim/options.nix

@@ -4,14 +4,17 @@
 			clipboard = "osc52";
 		};
 		opts = {
+			winborder = "single";
 			expandtab = false;
 			tabstop = 2;
 			ignorecase = true;
 			list = false;
 			mouse = "";
 			relativenumber = true;
+			scrolloff = 8;
 			shiftwidth = 2;
 			smartcase = true;
+			undofile = true;
 		};
 	};
 }

modules/_neovim/plugins/code-review.nix

@@ -0,0 +1,39 @@
+{
+	pkgs,
+	nvim-plugin-sources,
+	...
+}: let
+	code-review-nvim =
+		pkgs.vimUtils.buildVimPlugin {
+			pname = "code-review-nvim";
+			version = "unstable";
+			src = nvim-plugin-sources.code-review-nvim;
+			doCheck = false;
+		};
+in {
+	programs.nixvim = {
+		extraPlugins = [
+			code-review-nvim
+		];
+		extraConfigLua = ''
+			require('code-review').setup({
+				keymaps = false,
+				comment = {
+					storage = {
+						backend = "file",
+					},
+				},
+				ui = {
+					input_window = {
+						border = "single",
+					},
+					preview = {
+						float = {
+							border = "single",
+						},
+					},
+				},
+			})
+		'';
+	};
+}

modules/_neovim/plugins/conform.nix

@@ -5,9 +5,8 @@
 			format_on_save = {};
 			formatters_by_ft = {
 				nix = ["alejandra"];
-				javascript = ["prettier"];
-				typescript = ["prettier"];
-				vue = ["prettier"];
+				javascript = ["oxfmt"];
+				typescript = ["oxfmt"];
 			};
 		};
 	};

modules/_neovim/plugins/diffview.nix

@@ -0,0 +1,26 @@
+{pkgs, ...}: {
+	programs.nixvim = {
+		extraPlugins = with pkgs.vimPlugins; [
+			diffview-nvim
+		];
+		extraConfigLua = ''
+			require('diffview').setup({
+				enhanced_diff_hl = true,
+				view = {
+					default = { layout = "diff2_horizontal" },
+					merge_tool = { layout = "diff3_mixed", disable_diagnostics = true },
+					file_history = { layout = "diff2_horizontal" },
+				},
+				default_args = {
+					DiffviewOpen = { "--imply-local" },
+				},
+				hooks = {
+					diff_buf_read = function(bufnr)
+						vim.opt_local.wrap = false
+						vim.opt_local.list = false
+					end,
+				},
+			})
+		'';
+	};
+}

modules/_neovim/plugins/hardtime.nix

@@ -0,0 +1,7 @@
+{
+	programs.nixvim.plugins = {
+		hardtime = {
+			enable = true;
+		};
+	};
+}

modules/_neovim/plugins/jj-diffconflicts.nix

@@ -1,14 +1,12 @@
-{pkgs, ...}: {
+{
+	pkgs,
+	nvim-plugin-sources,
+	...
+}: {
 	programs.nixvim.extraPlugins = [
 		(pkgs.vimUtils.buildVimPlugin {
 				name = "jj-diffconflicts";
-				src =
-					pkgs.fetchFromGitHub {
-						owner = "rafikdraoui";
-						repo = "jj-diffconflicts";
-						rev = "main";
-						hash = "sha256-nzjRWHrE2jIcaDoPbixzpvflrtLhPZrihOEQWwqqU0s=";
-					};
+				src = nvim-plugin-sources.jj-diffconflicts;
 			})
 	];
 }

modules/_neovim/plugins/jj-nvim.nix

@@ -0,0 +1,39 @@
+{
+	pkgs,
+	nvim-plugin-sources,
+	...
+}: let
+	jj-nvim =
+		pkgs.vimUtils.buildVimPlugin {
+			pname = "jj-nvim";
+			version = "unstable";
+			src = nvim-plugin-sources.jj-nvim;
+			doCheck = false;
+		};
+in {
+	programs.nixvim = {
+		extraPlugins = [
+			jj-nvim
+		];
+		extraConfigLua = ''
+			require('jj').setup({
+				diff = {
+					backend = "diffview",
+				},
+				cmd = {
+					describe = {
+						editor = { type = "buffer" },
+					},
+					log = {
+						close_on_edit = false,
+					},
+				},
+				ui = {
+					log = {
+						keymaps = true,
+					},
+				},
+			})
+		'';
+	};
+}

modules/_neovim/plugins/mini.nix

@@ -1,158 +1,175 @@
 {
-	programs.nixvim.plugins.mini = {
-		enable = true;
-		modules = {
-			ai = {
-				custom_textobjects = {
-					B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
-					F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
-				};
-			};
-			align = {};
-			basics = {
-				options = {
-					basic = true;
-					extra_ui = true;
-				};
-				mappings = {
-					basic = false;
-				};
-				autocommands = {
-					basic = true;
-				};
-			};
-			bracketed = {};
-			clue = {
-				clues.__raw = ''
-					{
-					  { mode = 'n', keys = '<Leader>e', desc = '+Explore/+Edit' },
-					  { mode = 'n', keys = '<Leader>f', desc = '+Find' },
-					  { mode = 'n', keys = '<Leader>g', desc = '+Git' },
-					  { mode = 'n', keys = '<Leader>l', desc = '+LSP' },
-					  { mode = 'x', keys = '<Leader>l', desc = '+LSP' },
-					  require("mini.clue").gen_clues.builtin_completion(),
-					  require("mini.clue").gen_clues.g(),
-					  require("mini.clue").gen_clues.marks(),
-					  require("mini.clue").gen_clues.registers(),
-					  require("mini.clue").gen_clues.windows({ submode_resize = true }),
-					  require("mini.clue").gen_clues.z(),
-					}
-				'';
-				triggers = [
-					{
-						mode = "n";
-						keys = "<Leader>";
-					}
-					{
-						mode = "x";
-						keys = "<Leader>";
-					}
-					{
-						mode = "n";
-						keys = "[";
-					}
-					{
-						mode = "n";
-						keys = "]";
-					}
-					{
-						mode = "x";
-						keys = "[";
-					}
-					{
-						mode = "x";
-						keys = "]";
-					}
-					{
-						mode = "i";
-						keys = "<C-x>";
-					}
-					{
-						mode = "n";
-						keys = "g";
-					}
-					{
-						mode = "x";
-						keys = "g";
-					}
-
-					{
-						mode = "n";
-						keys = "\"";
-					}
-					{
-						mode = "x";
-						keys = "\"";
-					}
-					{
-						mode = "i";
-						keys = "<C-r>";
-					}
-					{
-						mode = "c";
-						keys = "<C-r>";
-					}
-					{
-						mode = "n";
-						keys = "<C-w>";
-					}
-					{
-						mode = "n";
-						keys = "z";
-					}
-					{
-						mode = "x";
-						keys = "z";
-					}
-					{
-						mode = "n";
-						keys = "'";
-					}
-					{
-						mode = "n";
-						keys = "`";
-					}
-					{
-						mode = "x";
-						keys = "'";
-					}
-					{
-						mode = "x";
-						keys = "`";
-					}
-				];
-			};
-			cmdline = {};
-			comment = {};
-			diff = {};
-			extra = {};
-			git = {};
-			icons = {};
-			indentscope = {
-				settings = {
-					symbol = "|";
-				};
-			};
-			jump = {};
-			jump2d = {
-				settings = {
-					spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
-					labels = "asdfghjkl";
-					view = {
-						dim = true;
-						n_steps_ahead = 2;
+	programs.nixvim = {
+		plugins.mini = {
+			enable = true;
+			modules = {
+				ai = {
+					custom_textobjects = {
+						B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
+						F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
 					};
 				};
+				align = {};
+				basics = {
+					options = {
+						basic = true;
+						extra_ui = true;
+					};
+					mappings = {
+						basic = false;
+					};
+					autocommands = {
+						basic = true;
+					};
+				};
+				bracketed = {};
+				clue = {
+					clues.__raw = ''
+						{
+						  { mode = 'n', keys = '<Leader>e', desc = '+Explore/+Edit' },
+						  { mode = 'n', keys = '<Leader>f', desc = '+Find' },
+						  { mode = 'n', keys = '<Leader>v', desc = '+VCS' },
+							{ mode = 'n', keys = '<Leader>l', desc = '+LSP' },
+							{ mode = 'x', keys = '<Leader>l', desc = '+LSP' },
+							{ mode = 'n', keys = '<Leader>r', desc = '+Review' },
+							{ mode = 'v', keys = '<Leader>r', desc = '+Review' },
+							{ mode = 'n', keys = '<Leader>t', desc = '+Tab' },
+							{ mode = 'n', keys = '<Leader>w', desc = '+Window' },
+						  require("mini.clue").gen_clues.builtin_completion(),
+						  require("mini.clue").gen_clues.g(),
+						  require("mini.clue").gen_clues.marks(),
+						  require("mini.clue").gen_clues.registers(),
+						  require("mini.clue").gen_clues.windows({ submode_resize = true }),
+						  require("mini.clue").gen_clues.z(),
+						}
+					'';
+					triggers = [
+						{
+							mode = "n";
+							keys = "<Leader>";
+						}
+						{
+							mode = "x";
+							keys = "<Leader>";
+						}
+						{
+							mode = "n";
+							keys = "[";
+						}
+						{
+							mode = "n";
+							keys = "]";
+						}
+						{
+							mode = "x";
+							keys = "[";
+						}
+						{
+							mode = "x";
+							keys = "]";
+						}
+						{
+							mode = "i";
+							keys = "<C-x>";
+						}
+						{
+							mode = "n";
+							keys = "g";
+						}
+						{
+							mode = "x";
+							keys = "g";
+						}
+
+						{
+							mode = "n";
+							keys = "\"";
+						}
+						{
+							mode = "x";
+							keys = "\"";
+						}
+						{
+							mode = "i";
+							keys = "<C-r>";
+						}
+						{
+							mode = "c";
+							keys = "<C-r>";
+						}
+						{
+							mode = "n";
+							keys = "<C-w>";
+						}
+						{
+							mode = "n";
+							keys = "z";
+						}
+						{
+							mode = "x";
+							keys = "z";
+						}
+						{
+							mode = "n";
+							keys = "'";
+						}
+						{
+							mode = "n";
+							keys = "`";
+						}
+						{
+							mode = "x";
+							keys = "'";
+						}
+						{
+							mode = "x";
+							keys = "`";
+						}
+					];
+				};
+				cmdline = {};
+				comment = {};
+				diff = {};
+				extra = {};
+				git = {};
+				hipatterns = {
+					highlighters = {
+						fixme.__raw = "{ pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' }";
+						hack.__raw = "{ pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' }";
+						todo.__raw = "{ pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }";
+						note.__raw = "{ pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' }";
+						hex_color.__raw = "require('mini.hipatterns').gen_highlighter.hex_color()";
+					};
+				};
+				icons = {};
+				indentscope = {
+					settings = {
+						symbol = "|";
+					};
+				};
+				jump = {};
+				jump2d = {
+					settings = {
+						spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
+						labels = "asdfghjkl";
+						view = {
+							dim = true;
+							n_steps_ahead = 2;
+						};
+					};
+				};
+				move = {};
+				notify = {};
+				pairs = {};
+				pick = {};
+				splitjoin = {};
+				starter = {};
+				statusline = {};
+				surround = {};
+				trailspace = {};
+				visits = {};
 			};
-			move = {};
-			pairs = {};
-			pick = {};
-			starter = {};
-			statusline = {};
-			surround = {};
-			trailspace = {};
-			visits = {};
+			mockDevIcons = true;
 		};
-		mockDevIcons = true;
 	};
 }

modules/_neovim/plugins/render-markdown.nix

@@ -0,0 +1,9 @@
+{
+	programs.nixvim.plugins.render-markdown = {
+		enable = true;
+		settings = {
+			anti_conceal = {enabled = false;};
+			file_types = ["markdown"];
+		};
+	};
+}

modules/_neovim/plugins/treesitter.nix

@@ -3,38 +3,20 @@
 		plugins.treesitter = {
 			enable = true;
 			nixGrammars = true;
-			grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
+			grammarPackages = with pkgs.vimPlugins.nvim-treesitter-parsers; [
+				css
+				elixir
+				javascript
+				lua
+				markdown
+				markdown_inline
+				nix
+				typescript
+			];
 			settings = {
 				highlight.enable = true;
 				indent.enable = true;
 			};
 		};
-
-		# Register missing treesitter predicates for compatibility with newer grammars
-		extraConfigLuaPre = ''
-			do
-				local query = require("vim.treesitter.query")
-				local predicates = query.list_predicates()
-				if not vim.tbl_contains(predicates, "is-not?") then
-					query.add_predicate("is-not?", function(match, pattern, source, predicate)
-						local dominated_by = predicate[2]
-						local dominated = false
-						for _, node in pairs(match) do
-							if type(node) == "userdata" then
-								local current = node:parent()
-								while current do
-									if current:type() == dominated_by then
-										dominated = true
-										break
-									end
-									current = current:parent()
-								end
-							end
-						end
-						return not dominated
-					end, { force = true, all = true })
-				end
-			end
-		'';
 	};
 }

modules/_opencode/AGENTS.md

@@ -1,11 +1,28 @@
-# Global AGENTS.md
+# AGENTS.md
 
 ## Version Control
 
-- Use `jj` for VCS, not `git`
-- `jj tug` is an alias for `jj bookmark move --from closest_bookmark(@-) --to @-`
+- Use `jj` for version control, not `git`.
+- `jj tug` is an alias for `jj bookmark move --from closest_bookmark(@-) --to @-`.
+- Never attempt historically destructive Git commands.
+- Make small, frequent commits.
+- "Commit" means `jj commit`, not `jj desc`; `desc` stays on the same working copy.
 
 ## Scripting
 
-- Always use Nushell (`nu`) for scripting
-- Never use Python, Perl, Lua, awk, or any other scripting language
+- Use Nushell (`nu`) for scripting.
+- Do not use Python, Perl, Lua, awk, or any other scripting language. You are programatically blocked from doing so.
+
+## Workflow
+
+- Always complete the requested work.
+- If there is any ambiguity about what to do next, do NOT make a decision yourself. Stop your work and ask.
+- Do not end with “If you want me to…” or “I can…”; take the next necessary step and finish the job without waiting for additional confirmation.
+- Do not future-proof things. Stick to the original plan.
+- Do not add fallbacks or backward compatibility unless explicitly required by the user. By default, replace the previous implementation with the new one entirely.
+
+## Validation
+
+- Do not ignore failing tests or checks, even if they appear unrelated to your changes.
+- After completing and validating your work, the final step is to run the project's full validation and test commands and ensure they all pass.
+

modules/_opencode/agent/review.md

@@ -1,45 +0,0 @@
----
-description: Reviews code for quality, bugs, security, and best practices
-mode: subagent
-temperature: 0.1
-tools:
-  write: false
-  edit: false
-permission:
-  edit: deny
-  webfetch: allow
----
-You are a code reviewer. Provide actionable feedback on code changes.
-
-**Diffs alone are not enough.** Read the full file(s) being modified to understand context. Code that looks wrong in isolation may be correct given surrounding logic.
-
-## What to Look For
-
-**Bugs** — Primary focus.
-- Logic errors, off-by-one mistakes, incorrect conditionals
-- Missing guards, unreachable code paths, broken error handling
-- Edge cases: null/empty inputs, race conditions
-- Security: injection, auth bypass, data exposure
-
-**Structure** — Does the code fit the codebase?
-- Follows existing patterns and conventions?
-- Uses established abstractions?
-- Excessive nesting that could be flattened?
-
-**Performance** — Only flag if obviously problematic.
-- O(n²) on unbounded data, N+1 queries, blocking I/O on hot paths
-
-## Before You Flag Something
-
-- **Be certain.** Don't flag something as a bug if you're unsure — investigate first.
-- **Don't invent hypothetical problems.** If an edge case matters, explain the realistic scenario.
-- **Don't be a zealot about style.** Some "violations" are acceptable when they're the simplest option.
-- Only review the changes — not pre-existing code that wasn't modified.
-
-## Output
-
-- Be direct about bugs and why they're bugs
-- Communicate severity honestly — don't overstate
-- Include file paths and line numbers
-- Suggest fixes when appropriate
-- Matter-of-fact tone, no flattery

modules/_opencode/command/code-review.md

@@ -1,10 +0,0 @@
----
-description: Review changes with parallel @code-review subagents
----
-Review the code changes using THREE (3) @code-review subagents and correlate results into a summary ranked by severity. Use the provided user guidance to steer the review and focus on specific code paths, changes, and/or areas of concern. Once all three @code-review subagents return their findings and you have correlated and summarized the results, consult the @oracle subagent to perform a deep review on the findings focusing on accuracy and correctness by evaluating the surrounding code, system, subsystems, abstractions, and overall architecture of each item. Apply any recommendations from the oracle. NEVER SKIP ORACLE REVIEW.
-
-Guidance: $ARGUMENTS
-
-First, call `skill({ name: 'vcs-detect' })` to determine whether the repo uses git or jj, then use the appropriate VCS commands throughout.
-
-Review uncommitted changes by default. If no uncommitted changes, review the last commit. If the user provides a pull request/merge request number or link, use CLI tools (gh/glab) to fetch it and then perform your review.

modules/_opencode/command/inbox-triage.md

@@ -10,6 +10,7 @@ Hard requirements:
 - Do not use pattern-matching commands or searches (`grep`, `rg`, `awk`, `sed`, `himalaya envelope list` query filters, etc.).
 - Always inspect current folders first, then triage.
 - Treat this as a single deterministic run over a snapshot of message IDs discovered during this run.
+- Ingest valuable document attachments into Paperless (see Document Ingestion section below).
 
 Workflow:
 1. Run `himalaya folder list` first and use those folders as the primary taxonomy.
@@ -35,8 +36,9 @@ Workflow:
 5. For each single envelope ID, do all checks before any move/delete:
     - Check envelope flags from the JSON listing (seen/answered/flagged) before reading.
     - Read the message: `himalaya message read -f "<source>" <id>`.
-    - If needed for classification, inspect attachments: `himalaya attachment download -f "<source>" <id> --dir /tmp/himalaya-triage`.
-    - If attachments are downloaded, inspect them and `rm` the downloaded files from `/tmp/himalaya-triage` after use.
+    - If needed for classification or ingestion, download attachments: `himalaya attachment download -f "<source>" <id> --dir /tmp/himalaya-triage`.
+    - If the message qualifies for document ingestion (see Document Ingestion below), copy eligible attachments to the Paperless consume directory before cleanup.
+    - Always `rm` downloaded files from `/tmp/himalaya-triage` after processing (whether ingested or not).
     - Move: `himalaya message move -f "<source>" "<destination>" <id>`.
     - Delete: `himalaya message delete -f "<source>" <id>`.
 6. Classification precedence (higher rule wins on conflict):
@@ -58,6 +60,30 @@ Workflow:
    - Naming constraints: concise topic name, avoid duplicates, and avoid broad catch-all names.
    - Command: `himalaya folder add "<new-folder>"`.
 
+Document Ingestion (Paperless):
+- **Purpose**: Automatically archive valuable document attachments into Paperless via its consumption directory.
+- **Ingestion path**: `/var/lib/paperless/consume/inbox-triage/`
+- **When to ingest**: Only for messages whose attachments have long-term archival value. Eligible categories:
+  - Invoices, receipts, and billing statements (messages going to `Orders and Invoices` or `Payments`)
+  - Contracts, agreements, and legal documents
+  - Tax documents, account statements, and financial summaries
+  - Insurance documents and policy papers
+  - Official correspondence with document attachments (government, institutions)
+- **When NOT to ingest**:
+  - Marketing emails, newsletters, promotional material
+  - Shipping/tracking notifications without invoice attachments
+  - OTP codes, login alerts, password resets, ephemeral notifications
+  - Subscription renewal reminders without actual invoices
+  - Duplicate documents already seen in this run
+  - Inline images, email signatures, logos, and non-document attachments
+- **Eligible file types**: PDF, PNG, JPG/JPEG, TIFF, WEBP (documents and scans only). Skip archive files (ZIP, etc.), calendar invites (ICS), and other non-document formats.
+- **Procedure**:
+  1. After downloading attachments to `/tmp/himalaya-triage`, check if any are eligible documents.
+  2. Copy eligible files: `cp /tmp/himalaya-triage/<filename> /var/lib/paperless/consume/inbox-triage/`
+  3. If multiple messages could produce filename collisions, prefix the filename with the message ID: `<id>-<filename>`.
+  4. Log each ingested file in the action log at the end of the run.
+- **Conservative rule**: When in doubt whether an attachment is worth archiving, skip it. Paperless storage is cheap, but noise degrades searchability. Prefer false negatives over false positives for marketing material, but prefer false positives over false negatives for anything that looks like a financial or legal document.
+
 Execution rules:
 - Never perform bulk operations. One message ID per `read`, `move`, `delete`, and attachment command.
 - Always use page size 20 for envelope listing (`-s 20`).
@@ -74,6 +100,7 @@ Execution rules:
   - counts by action (untouched/moved-to-folder/deleted),
   - per-destination-folder counts,
   - created folders,
+  - documents ingested to Paperless (count and filenames),
   - short rationale for non-obvious classifications.
 
 <user-request>

modules/_opencode/command/plan-spec.md

@@ -1,17 +0,0 @@
----
-description: Dialogue-driven spec development through skeptical questioning
----
-
-Develop implementation-ready specs through iterative dialogue and skeptical questioning.
-
-First, invoke the skill tool to load the spec-planner skill:
-
-```
-skill({ name: 'spec-planner' })
-```
-
-Then follow the skill instructions to develop the spec.
-
-<user-request>
-$ARGUMENTS
-</user-request>

modules/_opencode/command/session-export.md

@@ -1,17 +0,0 @@
----
-description: Add AI session summary to GitHub PR or GitLab MR description
----
-
-Update the PR/MR description with an AI session export summary.
-
-First, invoke the skill tool to load the session-export skill:
-
-```
-skill({ name: 'session-export' })
-```
-
-Then follow the skill instructions to export the session summary.
-
-<user-request>
-$ARGUMENTS
-</user-request>

modules/_opencode/command/supermemory-init.md

@@ -0,0 +1,150 @@
+---
+description: Initialize Supermemory with comprehensive codebase knowledge
+---
+
+# Initializing Supermemory
+
+You are initializing persistent memory for this codebase. This is not just data collection - you're building context that will make you significantly more effective across all future sessions.
+
+## Understanding Context
+
+You are a **stateful** coding agent. Users expect to work with you over extended periods - potentially the entire lifecycle of a project. Your memory is how you get better over time and maintain continuity.
+
+## What to Remember
+
+### 1. Procedures (Rules & Workflows)
+Explicit rules that should always be followed:
+- "Never commit directly to main - always use feature branches"
+- "Always run lint before tests"
+- "Use conventional commits format"
+
+### 2. Preferences (Style & Conventions)
+Project and user coding style:
+- "Prefer functional components over class components"
+- "Use early returns instead of nested conditionals"
+- "Always add JSDoc to exported functions"
+
+### 3. Architecture & Context
+How the codebase works and why:
+- "Auth system was refactored in v2.0 - old patterns deprecated"
+- "The monorepo used to have 3 modules before consolidation"
+- "This pagination bug was fixed before - similar to PR #234"
+
+## Memory Scopes
+
+**Project-scoped** (\`scope: "project"\`):
+- Build/test/lint commands
+- Architecture and key directories
+- Team conventions specific to this codebase
+- Technology stack and framework choices
+- Known issues and their solutions
+
+**User-scoped** (\`scope: "user"\`):
+- Personal coding preferences across all projects
+- Communication style preferences
+- General workflow habits
+
+## Research Approach
+
+This is a **deep research** initialization. Take your time and be thorough (~50+ tool calls). The goal is to genuinely understand the project, not just collect surface-level facts.
+
+**What to uncover:**
+- Tech stack and dependencies (explicit and implicit)
+- Project structure and architecture
+- Build/test/deploy commands and workflows
+- Contributors & team dynamics (who works on what?)
+- Commit conventions and branching strategy
+- Code evolution (major refactors, architecture changes)
+- Pain points (areas with lots of bug fixes)
+- Implicit conventions not documented anywhere
+
+## Research Techniques
+
+### File-based
+- README.md, CONTRIBUTING.md, AGENTS.md, CLAUDE.md
+- Package manifests (package.json, Cargo.toml, pyproject.toml, go.mod)
+- Config files (.eslintrc, tsconfig.json, .prettierrc)
+- CI/CD configs (.github/workflows/)
+
+### Git-based
+- \`git log --oneline -20\` - Recent history
+- \`git branch -a\` - Branching strategy
+- \`git log --format="%s" -50\` - Commit conventions
+- \`git shortlog -sn --all | head -10\` - Main contributors
+
+### Explore Agent
+Fire parallel explore queries for broad understanding:
+\`\`\`
+Task(explore, "What is the tech stack and key dependencies?")
+Task(explore, "What is the project structure? Key directories?")
+Task(explore, "How do you build, test, and run this project?")
+Task(explore, "What are the main architectural patterns?")
+Task(explore, "What conventions or patterns are used?")
+\`\`\`
+
+## How to Do Thorough Research
+
+**Don't just collect data - analyze and cross-reference.**
+
+Bad (shallow):
+- Run commands, copy output
+- List facts without understanding
+
+Good (thorough):
+- Cross-reference findings (if inconsistent, dig deeper)
+- Resolve ambiguities (don't leave questions unanswered)
+- Read actual file content, not just names
+- Look for patterns (what do commits tell you about workflow?)
+- Think like a new team member - what would you want to know?
+
+## Saving Memories
+
+Use the \`supermemory\` tool for each distinct insight:
+
+\`\`\`
+supermemory(mode: "add", content: "...", type: "...", scope: "project")
+\`\`\`
+
+**Types:**
+- \`project-config\` - tech stack, commands, tooling
+- \`architecture\` - codebase structure, key components, data flow
+- \`learned-pattern\` - conventions specific to this codebase
+- \`error-solution\` - known issues and their fixes
+- \`preference\` - coding style preferences (use with user scope)
+
+**Guidelines:**
+- Save each distinct insight as a separate memory
+- Be concise but include enough context to be useful
+- Include the "why" not just the "what" when relevant
+- Update memories incrementally as you research (don't wait until the end)
+
+**Good memories:**
+- "Uses Bun runtime and package manager. Commands: bun install, bun run dev, bun test"
+- "API routes in src/routes/, handlers in src/handlers/. Hono framework."
+- "Auth uses Redis sessions, not JWT. Implementation in src/lib/auth.ts"
+- "Never use \`any\` type - strict TypeScript. Use \`unknown\` and narrow."
+- "Database migrations must be backward compatible - we do rolling deploys"
+
+## Upfront Questions
+
+Before diving in, ask:
+1. "Any specific rules I should always follow?"
+2. "Preferences for how I communicate? (terse/detailed)"
+
+## Reflection Phase
+
+Before finishing, reflect:
+1. **Completeness**: Did you cover commands, architecture, conventions, gotchas?
+2. **Quality**: Are memories concise and searchable?
+3. **Scope**: Did you correctly separate project vs user knowledge?
+
+Then ask: "I've initialized memory with X insights. Want me to continue refining, or is this good?"
+
+## Your Task
+
+1. Ask upfront questions (research depth, rules, preferences)
+2. Check existing memories: \`supermemory(mode: "list", scope: "project")\`
+3. Research based on chosen depth
+4. Save memories incrementally as you discover insights
+5. Reflect and verify completeness
+6. Summarize what was learned and ask if user wants refinement

modules/_opencode/plugin/block-git.ts

@@ -1,13 +1,44 @@
 import type { Plugin } from "@opencode-ai/plugin";
 
-const GIT_PATTERN = /(?:^|[;&|]\s*|&&\s*|\|\|\s*|\$\(\s*|`\s*)git\s/;
+const COMMAND_PREFIXES = new Set([
+	"env",
+	"command",
+	"builtin",
+	"time",
+	"sudo",
+	"nohup",
+	"nice",
+]);
+
+function findCommandWord(words: string[]): string | undefined {
+	for (const word of words) {
+		if (COMMAND_PREFIXES.has(word)) continue;
+		if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(word)) continue;
+		return word;
+	}
+	return undefined;
+}
+
+function segmentHasGit(words: string[]): boolean {
+	const cmd = findCommandWord(words);
+	return cmd === "git";
+}
+
+function containsBlockedGit(command: string): boolean {
+	const segments = command.split(/\s*(?:&&|\|\||[;&|]|\$\(|`)\s*/);
+	for (const segment of segments) {
+		const words = segment.trim().split(/\s+/).filter(Boolean);
+		if (segmentHasGit(words)) return true;
+	}
+	return false;
+}
 
 export const BlockGitPlugin: Plugin = async () => {
 	return {
 		"tool.execute.before": async (input, output) => {
 			if (input.tool === "bash") {
 				const command = output.args.command as string;
-				if (GIT_PATTERN.test(command)) {
+				if (containsBlockedGit(command)) {
 					throw new Error(
 						"This project uses jj, only use `jj` commands, not `git`.",
 					);

modules/_opencode/plugin/block-scripting.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from "@opencode-ai/plugin";
 
 const SCRIPTING_PATTERN =
-	/(?:^|[;&|]\s*|&&\s*|\|\|\s*|\$\(\s*|`\s*)(?:python[23]?|perl|ruby|php|lua|bash\s+-c|sh\s+-c)\s/;
+	/(?:^|[;&|]\s*|&&\s*|\|\|\s*|\$\(\s*|`\s*)(?:python[23]?|perl|ruby|php|lua|node\s+-e|bash\s+-c|sh\s+-c)\s/;
 
 export const BlockScriptingPlugin: Plugin = async () => {
 	return {

modules/_opencode/skill/librarian/SKILL.md

@@ -1,123 +0,0 @@
----
-name: librarian
-description: Multi-repository codebase exploration. Research library internals, find code patterns, understand architecture, compare implementations across GitHub/npm/PyPI/crates. Use when needing deep understanding of how libraries work, finding implementations across open source, or exploring remote repository structure.
-references:
-  - references/tool-routing.md
-  - references/opensrc-api.md
-  - references/opensrc-examples.md
-  - references/linking.md
-  - references/diagrams.md
----
-
-# Librarian Skill
-
-Deep codebase exploration across remote repositories.
-
-## How to Use This Skill
-
-### Reference Structure
-
-| File | Purpose | When to Read |
-|------|---------|--------------|
-| `tool-routing.md` | Tool selection decision trees | **Always read first** |
-| `opensrc-api.md` | API reference, types | Writing opensrc code |
-| `opensrc-examples.md` | JavaScript patterns, workflows | Implementation examples |
-| `linking.md` | GitHub URL patterns | Formatting responses |
-| `diagrams.md` | Mermaid patterns | Visualizing architecture |
-
-### Reading Order
-
-1. **Start** with `tool-routing.md` → choose tool strategy
-2. **If using opensrc:**
-   - Read `opensrc-api.md` for API details
-   - Read `opensrc-examples.md` for patterns
-3. **Before responding:** `linking.md` + `diagrams.md` for output formatting
-
-## Tool Arsenal
-
-| Tool | Best For | Limitations |
-|------|----------|-------------|
-| **grep_app** | Find patterns across ALL public GitHub | Literal search only |
-| **context7** | Library docs, API examples, usage | Known libraries only |
-| **opensrc** | Fetch full source for deep exploration | Must fetch before read |
-
-## Quick Decision Trees
-
-### "How does X work?"
-
-```
-Known library?
-├─ Yes → context7.resolve-library-id → context7.query-docs
-│        └─ Need internals? → opensrc.fetch → read source
-└─ No  → grep_app search → opensrc.fetch top result
-```
-
-### "Find pattern X"
-
-```
-Specific repo?
-├─ Yes → opensrc.fetch → opensrc.grep → read matches
-└─ No  → grep_app (broad) → opensrc.fetch interesting repos
-```
-
-### "Explore repo structure"
-
-```
-1. opensrc.fetch(target)
-2. opensrc.tree(source.name) → quick overview
-3. opensrc.files(source.name, "**/*.ts") → detailed listing
-4. Read: README, package.json, src/index.*
-5. Create architecture diagram (see diagrams.md)
-```
-
-### "Compare X vs Y"
-
-```
-1. opensrc.fetch(["X", "Y"])
-2. Use source.name from results for subsequent calls
-3. opensrc.grep(pattern, { sources: [nameX, nameY] })
-4. Read comparable files, synthesize differences
-```
-
-## Critical: Source Naming Convention
-
-**After fetching, always use `source.name` for subsequent calls:**
-
-```javascript
-const [{ source }] = await opensrc.fetch("vercel/ai");
-const files = await opensrc.files(source.name, "**/*.ts");
-```
-
-| Type | Fetch Spec | Source Name |
-|------|------------|-------------|
-| npm | `"zod"` | `"zod"` |
-| npm scoped | `"@tanstack/react-query"` | `"@tanstack/react-query"` |
-| pypi | `"pypi:requests"` | `"requests"` |
-| crates | `"crates:serde"` | `"serde"` |
-| GitHub | `"vercel/ai"` | `"github.com/vercel/ai"` |
-| GitLab | `"gitlab:org/repo"` | `"gitlab.com/org/repo"` |
-
-## When NOT to Use opensrc
-
-| Scenario | Use Instead |
-|----------|-------------|
-| Simple library API questions | context7 |
-| Finding examples across many repos | grep_app |
-| Very large monorepos (>10GB) | Clone locally |
-| Private repositories | Direct access |
-
-## Output Guidelines
-
-1. **Comprehensive final message** - only last message returns to main agent
-2. **Parallel tool calls** - maximize efficiency
-3. **Link every file reference** - see `linking.md`
-4. **Diagram complex relationships** - see `diagrams.md`
-5. **Never mention tool names** - say "I'll search" not "I'll use opensrc"
-
-## References
-
-- [Tool Routing Decision Trees](references/tool-routing.md)
-- [opensrc API Reference](references/opensrc-api.md)
-- [opensrc Code Examples](references/opensrc-examples.md)
-- [GitHub Linking Patterns](references/linking.md)
-- [Mermaid Diagram Patterns](references/diagrams.md)

modules/_opencode/skill/librarian/references/diagrams.md

@@ -1,51 +0,0 @@
-# Mermaid Diagram Patterns
-
-Create diagrams for:
-- Architecture (component relationships)
-- Data flow (request → response)
-- Dependencies (import graph)
-- Sequences (step-by-step processes)
-
-## Architecture
-
-```mermaid
-graph TD
-    A[Client] --> B[API Gateway]
-    B --> C[Auth Service]
-    B --> D[Data Service]
-    D --> E[(Database)]
-```
-
-## Flow
-
-```mermaid
-flowchart LR
-    Input --> Parse --> Validate --> Transform --> Output
-```
-
-## Sequence
-
-```mermaid
-sequenceDiagram
-    Client->>+Server: Request
-    Server->>+DB: Query
-    DB-->>-Server: Result
-    Server-->>-Client: Response
-```
-
-## When to Use
-
-| Type | Use For |
-|------|---------|
-| `graph TD` | Component hierarchy, dependencies |
-| `flowchart LR` | Data transformation, pipelines |
-| `sequenceDiagram` | Request/response, multi-party interaction |
-| `classDiagram` | Type relationships, inheritance |
-| `stateDiagram` | State machines, lifecycle |
-
-## Tips
-
-- Keep nodes short (3-4 words max)
-- Use subgraphs for grouping related components
-- Arrow labels for relationship types
-- Prefer LR (left-right) for flows, TD (top-down) for hierarchies

modules/_opencode/skill/librarian/references/linking.md

@@ -1,61 +0,0 @@
-# GitHub Linking Patterns
-
-All file/dir/code refs → fluent markdown links. Never raw URLs.
-
-## URL Formats
-
-### File
-```
-https://github.com/{owner}/{repo}/blob/{ref}/{path}
-```
-
-### File + Lines
-```
-https://github.com/{owner}/{repo}/blob/{ref}/{path}#L{start}-L{end}
-```
-
-### Directory
-```
-https://github.com/{owner}/{repo}/tree/{ref}/{path}
-```
-
-### GitLab (note `/-/blob/`)
-```
-https://gitlab.com/{owner}/{repo}/-/blob/{ref}/{path}
-```
-
-## Ref Resolution
-
-| Source | Use as ref |
-|--------|------------|
-| Known version | `v{version}` |
-| Default branch | `main` or `master` |
-| opensrc fetch | ref from result |
-| Specific commit | full SHA |
-
-## Examples
-
-### Correct
-```markdown
-The [`parseAsync`](https://github.com/colinhacks/zod/blob/main/src/types.ts#L450-L480) method handles...
-```
-
-### Wrong
-```markdown
-See https://github.com/colinhacks/zod/blob/main/src/types.ts#L100
-The parseAsync method in src/types.ts handles...
-```
-
-## Line Numbers
-
-- Single: `#L42`
-- Range: `#L42-L50`
-- Prefer ranges for context (2-5 lines around key code)
-
-## Registry → GitHub
-
-| Registry | Find repo in |
-|----------|--------------|
-| npm | `package.json` → `repository` |
-| PyPI | `pyproject.toml` or setup.py |
-| crates | `Cargo.toml` |

modules/_opencode/skill/librarian/references/opensrc-api.md

@@ -1,235 +0,0 @@
-# opensrc API Reference
-
-## Tool
-
-Use the **opensrc MCP server** via single tool:
-
-| Tool | Purpose |
-|------|---------|
-| `opensrc_execute` | All operations (fetch, read, grep, files, remove, etc.) |
-
-Takes a `code` parameter: JavaScript async arrow function executed server-side. Source trees stay on server, only results return.
-
-## API Surface
-
-### Read Operations
-
-```typescript
-// List all fetched sources
-opensrc.list(): Source[]
-
-// Check if source exists
-opensrc.has(name: string, version?: string): boolean
-
-// Get source metadata
-opensrc.get(name: string): Source | undefined
-
-// List files with optional glob
-opensrc.files(sourceName: string, glob?: string): Promise<FileEntry[]>
-
-// Get directory tree structure (default depth: 3)
-opensrc.tree(sourceName: string, options?: { depth?: number }): Promise<TreeNode>
-
-// Regex search file contents
-opensrc.grep(pattern: string, options?: GrepOptions): Promise<GrepResult[]>
-
-// AST-based semantic code search
-opensrc.astGrep(sourceName: string, pattern: string, options?: AstGrepOptions): Promise<AstGrepMatch[]>
-
-// Read single file
-opensrc.read(sourceName: string, filePath: string): Promise<string>
-
-// Batch read multiple files (supports globs!)
-opensrc.readMany(sourceName: string, paths: string[]): Promise<Record<string, string>>
-
-// Parse fetch spec
-opensrc.resolve(spec: string): Promise<ParsedSpec>
-```
-
-### Mutation Operations
-
-```typescript
-// Fetch packages/repos
-opensrc.fetch(specs: string | string[], options?: { modify?: boolean }): Promise<FetchedSource[]>
-
-// Remove sources
-opensrc.remove(names: string[]): Promise<RemoveResult>
-
-// Clean by type
-opensrc.clean(options?: CleanOptions): Promise<RemoveResult>
-```
-
-## Types
-
-### Source
-
-```typescript
-interface Source {
-  type: "npm" | "pypi" | "crates" | "repo";
-  name: string;           // Use this for all subsequent calls
-  version?: string;
-  ref?: string;
-  path: string;
-  fetchedAt: string;
-  repository: string;
-}
-```
-
-### FetchedSource
-
-```typescript
-interface FetchedSource {
-  source: Source;         // IMPORTANT: use source.name for subsequent calls
-  alreadyExists: boolean;
-}
-```
-
-### GrepOptions
-
-```typescript
-interface GrepOptions {
-  sources?: string[];     // Filter to specific sources
-  include?: string;       // File glob pattern (e.g., "*.ts")
-  maxResults?: number;    // Limit results (default: 100)
-}
-```
-
-### GrepResult
-
-```typescript
-interface GrepResult {
-  source: string;
-  file: string;
-  line: number;
-  content: string;
-}
-```
-
-### AstGrepOptions
-
-```typescript
-interface AstGrepOptions {
-  glob?: string;            // File glob pattern (e.g., "**/*.ts")
-  lang?: string | string[]; // Language(s): "js", "ts", "tsx", "html", "css"
-  limit?: number;           // Max results (default: 1000)
-}
-```
-
-### AstGrepMatch
-
-```typescript
-interface AstGrepMatch {
-  file: string;
-  line: number;
-  column: number;
-  endLine: number;
-  endColumn: number;
-  text: string;                       // Matched code text
-  metavars: Record<string, string>;   // Captured $VAR → text
-}
-```
-
-#### AST Pattern Syntax
-
-| Pattern | Matches |
-|---------|---------|
-| `$NAME` | Single node, captures to metavars |
-| `$$$ARGS` | Zero or more nodes (variadic), captures |
-| `$_` | Single node, no capture |
-| `$$$` | Zero or more nodes, no capture |
-
-### FileEntry
-
-```typescript
-interface FileEntry {
-  path: string;
-  size: number;
-  isDirectory: boolean;
-}
-```
-
-### TreeNode
-
-```typescript
-interface TreeNode {
-  name: string;
-  type: "file" | "dir";
-  children?: TreeNode[];  // only for dirs
-}
-```
-
-### CleanOptions
-
-```typescript
-interface CleanOptions {
-  packages?: boolean;
-  repos?: boolean;
-  npm?: boolean;
-  pypi?: boolean;
-  crates?: boolean;
-}
-```
-
-### RemoveResult
-
-```typescript
-interface RemoveResult {
-  success: boolean;
-  removed: string[];
-}
-```
-
-## Error Handling
-
-Operations throw on errors. Wrap in try/catch if needed:
-
-```javascript
-async () => {
-  try {
-    const content = await opensrc.read("zod", "missing.ts");
-    return content;
-  } catch (e) {
-    return { error: e.message };
-  }
-}
-```
-
-`readMany` returns errors as string values prefixed with `[Error:`:
-
-```javascript
-const files = await opensrc.readMany("zod", ["exists.ts", "missing.ts"]);
-// { "exists.ts": "content...", "missing.ts": "[Error: ENOENT...]" }
-
-// Filter successful reads
-const successful = Object.entries(files)
-  .filter(([_, content]) => !content.startsWith("[Error:"));
-```
-
-## Package Spec Formats
-
-| Format | Example | Source Name After Fetch |
-|--------|---------|------------------------|
-| `<name>` | `"zod"` | `"zod"` |
-| `<name>@<version>` | `"zod@3.22.0"` | `"zod"` |
-| `pypi:<name>` | `"pypi:requests"` | `"requests"` |
-| `crates:<name>` | `"crates:serde"` | `"serde"` |
-| `owner/repo` | `"vercel/ai"` | `"github.com/vercel/ai"` |
-| `owner/repo@ref` | `"vercel/ai@v1.0.0"` | `"github.com/vercel/ai"` |
-| `gitlab:owner/repo` | `"gitlab:org/repo"` | `"gitlab.com/org/repo"` |
-
-## Critical Pattern
-
-**Always capture `source.name` from fetch results:**
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("vercel/ai");
-
-  // GitHub repos: "vercel/ai" → "github.com/vercel/ai"
-  const sourceName = source.name;
-
-  // Use sourceName for ALL subsequent calls
-  const files = await opensrc.files(sourceName, "src/**/*.ts");
-  return files;
-}
-```

modules/_opencode/skill/librarian/references/opensrc-examples.md

@@ -1,336 +0,0 @@
-# opensrc Code Examples
-
-## Workflow: Fetch → Explore
-
-### Basic Fetch and Explore with tree()
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("vercel/ai");
-  // Get directory structure first
-  const tree = await opensrc.tree(source.name, { depth: 2 });
-  return tree;
-}
-```
-
-### Fetch and Read Key Files
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("vercel/ai");
-  const sourceName = source.name; // "github.com/vercel/ai"
-
-  const files = await opensrc.readMany(sourceName, [
-    "package.json",
-    "README.md",
-    "src/index.ts"
-  ]);
-
-  return { sourceName, files };
-}
-```
-
-### readMany with Globs
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("zod");
-  // Read all package.json files in monorepo
-  const files = await opensrc.readMany(source.name, [
-    "packages/*/package.json"  // globs supported!
-  ]);
-  return Object.keys(files);
-}
-```
-
-### Batch Fetch Multiple Packages
-
-```javascript
-async () => {
-  const results = await opensrc.fetch(["zod", "valibot", "yup"]);
-  const names = results.map(r => r.source.name);
-
-  // Compare how each handles string validation
-  const comparisons = {};
-  for (const name of names) {
-    const matches = await opensrc.grep("string.*validate|validateString", {
-      sources: [name],
-      include: "*.ts",
-      maxResults: 10
-    });
-    comparisons[name] = matches.map(m => `${m.file}:${m.line}`);
-  }
-  return comparisons;
-}
-```
-
-## Search Patterns
-
-### Grep → Read Context
-
-```javascript
-async () => {
-  const matches = await opensrc.grep("export function parse\\(", {
-    sources: ["zod"],
-    include: "*.ts"
-  });
-
-  if (matches.length === 0) return "No matches";
-
-  const match = matches[0];
-  const content = await opensrc.read(match.source, match.file);
-  const lines = content.split("\n");
-
-  // Return 40 lines starting from match
-  return {
-    file: match.file,
-    code: lines.slice(match.line - 1, match.line + 39).join("\n")
-  };
-}
-```
-
-### Search Across All Fetched Sources
-
-```javascript
-async () => {
-  const sources = opensrc.list();
-  const results = {};
-
-  for (const source of sources) {
-    const errorHandling = await opensrc.grep("throw new|catch \\(|\\.catch\\(", {
-      sources: [source.name],
-      include: "*.ts",
-      maxResults: 20
-    });
-    results[source.name] = {
-      type: source.type,
-      errorPatterns: errorHandling.length
-    };
-  }
-
-  return results;
-}
-```
-
-## AST-Based Search
-
-Use `astGrep` for semantic code search with pattern matching.
-
-### Find Function Declarations
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("lodash");
-
-  const fns = await opensrc.astGrep(source.name, "function $NAME($$$ARGS) { $$$BODY }", {
-    lang: "js",
-    limit: 20
-  });
-
-  return fns.map(m => ({
-    file: m.file,
-    line: m.line,
-    name: m.metavars.NAME
-  }));
-}
-```
-
-### Find React Hooks Usage
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("vercel/ai");
-
-  const stateHooks = await opensrc.astGrep(
-    source.name,
-    "const [$STATE, $SETTER] = useState($$$INIT)",
-    { lang: ["ts", "tsx"], limit: 50 }
-  );
-
-  return stateHooks.map(m => ({
-    file: m.file,
-    state: m.metavars.STATE,
-    setter: m.metavars.SETTER
-  }));
-}
-```
-
-### Find Class Definitions with Context
-
-```javascript
-async () => {
-  const [{ source }] = await opensrc.fetch("zod");
-
-  const classes = await opensrc.astGrep(source.name, "class $NAME", {
-    glob: "**/*.ts"
-  });
-
-  const details = [];
-  for (const cls of classes.slice(0, 5)) {
-    const content = await opensrc.read(source.name, cls.file);
-    const lines = content.split("\n");
-    details.push({
-      name: cls.metavars.NAME,
-      file: cls.file,
-      preview: lines.slice(cls.line - 1, cls.line + 9).join("\n")
-    });
-  }
-  return details;
-}
-```
-
-### Compare Export Patterns Across Libraries
-
-```javascript
-async () => {
-  const results = await opensrc.fetch(["zod", "valibot"]);
-  const names = results.map(r => r.source.name);
-
-  const exports = {};
-  for (const name of names) {
-    const matches = await opensrc.astGrep(name, "export const $NAME = $_", {
-      lang: "ts",
-      limit: 30
-    });
-    exports[name] = matches.map(m => m.metavars.NAME);
-  }
-  return exports;
-}
-```
-
-### grep vs astGrep
-
-| Use Case | Tool |
-|----------|------|
-| Text/regex pattern | `grep` |
-| Function declarations | `astGrep`: `function $NAME($$$) { $$$ }` |
-| Arrow functions | `astGrep`: `const $N = ($$$) => $_` |
-| Class definitions | `astGrep`: `class $NAME extends $PARENT` |
-| Import statements | `astGrep`: `import { $$$IMPORTS } from "$MOD"` |
-| JSX components | `astGrep`: `<$COMP $$$PROPS />` |
-
-## Repository Exploration
-
-### Find Entry Points
-
-```javascript
-async () => {
-  const name = "github.com/vercel/ai";
-
-  const allFiles = await opensrc.files(name, "**/*.{ts,js}");
-  const entryPoints = allFiles.filter(f =>
-    f.path.match(/^(src\/)?(index|main|mod)\.(ts|js)$/) ||
-    f.path.includes("/index.ts")
-  );
-
-  // Read all entry points
-  const contents = {};
-  for (const ep of entryPoints.slice(0, 5)) {
-    contents[ep.path] = await opensrc.read(name, ep.path);
-  }
-
-  return {
-    totalFiles: allFiles.length,
-    entryPoints: entryPoints.map(f => f.path),
-    contents
-  };
-}
-```
-
-### Explore Package Structure
-
-```javascript
-async () => {
-  const name = "zod";
-
-  // Get all TypeScript files
-  const tsFiles = await opensrc.files(name, "**/*.ts");
-
-  // Group by directory
-  const byDir = {};
-  for (const f of tsFiles) {
-    const dir = f.path.split("/").slice(0, -1).join("/") || ".";
-    byDir[dir] = (byDir[dir] || 0) + 1;
-  }
-
-  // Read key files
-  const pkg = await opensrc.read(name, "package.json");
-  const readme = await opensrc.read(name, "README.md");
-
-  return {
-    structure: byDir,
-    package: JSON.parse(pkg),
-    readmePreview: readme.slice(0, 500)
-  };
-}
-```
-
-## Batch Operations
-
-### Read Many with Error Handling
-
-```javascript
-async () => {
-  const files = await opensrc.readMany("zod", [
-    "src/index.ts",
-    "src/types.ts",
-    "src/ZodError.ts",
-    "src/helpers/parseUtil.ts"
-  ]);
-
-  // files is Record<string, string> - errors start with "[Error:"
-  const successful = Object.entries(files)
-    .filter(([_, content]) => !content.startsWith("[Error:"))
-    .map(([path, content]) => ({ path, lines: content.split("\n").length }));
-
-  return successful;
-}
-```
-
-### Parallel Grep Across Multiple Sources
-
-```javascript
-async () => {
-  const targets = ["zod", "valibot"];
-  const pattern = "export (type|interface)";
-
-  const results = await Promise.all(
-    targets.map(async (name) => {
-      const matches = await opensrc.grep(pattern, {
-        sources: [name],
-        include: "*.ts",
-        maxResults: 50
-      });
-      return { name, count: matches.length, matches };
-    })
-  );
-
-  return results;
-}
-```
-
-## Workflow Checklist
-
-### Comprehensive Repository Analysis
-
-```
-Repository Analysis Progress:
-- [ ] 1. Fetch repository
-- [ ] 2. Read package.json + README
-- [ ] 3. Identify entry points (src/index.*)
-- [ ] 4. Read main entry file
-- [ ] 5. Map exports and public API
-- [ ] 6. Trace key functionality
-- [ ] 7. Create architecture diagram
-```
-
-### Library Comparison
-
-```
-Comparison Progress:
-- [ ] 1. Fetch all libraries
-- [ ] 2. Grep for target pattern in each
-- [ ] 3. Read matching implementations
-- [ ] 4. Create comparison table
-- [ ] 5. Synthesize findings
-```

modules/_opencode/skill/librarian/references/tool-routing.md

@@ -1,109 +0,0 @@
-# Tool Routing
-
-## Decision Flowchart
-
-```mermaid
-graph TD
-    Q[User Query] --> T{Query Type?}
-    T -->|Understand/Explain| U[UNDERSTAND]
-    T -->|Find/Search| F[FIND]
-    T -->|Explore/Architecture| E[EXPLORE]
-    T -->|Compare| C[COMPARE]
-
-    U --> U1{Known library?}
-    U1 -->|Yes| U2[context7.resolve-library-id]
-    U2 --> U3[context7.query-docs]
-    U3 --> U4{Need source?}
-    U4 -->|Yes| U5[opensrc.fetch → read]
-    U1 -->|No| U6[grep_app → opensrc.fetch]
-
-    F --> F1{Specific repo?}
-    F1 -->|Yes| F2[opensrc.fetch → grep → read]
-    F1 -->|No| F3[grep_app broad search]
-    F3 --> F4[opensrc.fetch interesting repos]
-
-    E --> E1[opensrc.fetch]
-    E1 --> E2[opensrc.files]
-    E2 --> E3[Read entry points]
-    E3 --> E4[Create diagram]
-
-    C --> C1["opensrc.fetch([X, Y])"]
-    C1 --> C2[grep same pattern]
-    C2 --> C3[Read comparable files]
-    C3 --> C4[Synthesize comparison]
-```
-
-## Query Type Detection
-
-| Keywords | Query Type | Start With |
-|----------|------------|------------|
-| "how does", "why does", "explain", "purpose of" | UNDERSTAND | context7 |
-| "find", "where is", "implementations of", "examples of" | FIND | grep_app |
-| "explore", "walk through", "architecture", "structure" | EXPLORE | opensrc |
-| "compare", "vs", "difference between" | COMPARE | opensrc |
-
-## UNDERSTAND Queries
-
-```
-Known library? → context7.resolve-library-id → context7.query-docs
-                 └─ Need source? → opensrc.fetch → read
-
-Unknown?      → grep_app search → opensrc.fetch top result → read
-```
-
-**When to transition context7 → opensrc:**
-- Need implementation details (not just API docs)
-- Question about internals/private methods
-- Tracing code flow through library
-
-## FIND Queries
-
-```
-Specific repo? → opensrc.fetch → opensrc.grep → read matches
-
-Broad search?  → grep_app → analyze → opensrc.fetch interesting repos
-```
-
-**grep_app query tips:**
-- Use literal code patterns: `useState(` not "react hooks"
-- Filter by language: `language: ["TypeScript"]`
-- Narrow by repo: `repo: "vercel/"` for org
-
-## EXPLORE Queries
-
-```
-1. opensrc.fetch(target)
-2. opensrc.files → understand structure
-3. Identify entry points: README, package.json, src/index.*
-4. Read entry → internals
-5. Create architecture diagram
-```
-
-## COMPARE Queries
-
-```
-1. opensrc.fetch([X, Y])
-2. Extract source.name from each result
-3. opensrc.grep same pattern in both
-4. Read comparable files
-5. Synthesize → comparison table
-```
-
-## Tool Capabilities
-
-| Tool | Best For | Not For |
-|------|----------|---------|
-| **grep_app** | Broad search, unknown scope, finding repos | Semantic queries |
-| **context7** | Library APIs, best practices, common patterns | Library internals |
-| **opensrc** | Deep exploration, reading internals, tracing flow | Initial discovery |
-
-## Anti-patterns
-
-| Don't | Do |
-|-------|-----|
-| grep_app for known library docs | context7 first |
-| opensrc.fetch before knowing target | grep_app to discover |
-| Multiple small reads | opensrc.readMany batch |
-| Describe without linking | Link every file ref |
-| Text for complex relationships | Mermaid diagram |
-| Use tool names in responses | "I'll search..." not "I'll use opensrc" |

modules/_opencode/skill/session-export/SKILL.md

@@ -1,122 +0,0 @@
----
-name: session-export
-description: Update GitHub PR descriptions with AI session export summaries. Use when user asks to add session summary to PR/MR, document AI assistance in PR/MR, or export conversation summary to PR/MR description.
----
-
-# Session Export
-
-Update PR/MR descriptions with a structured summary of the AI-assisted conversation.
-
-## Output Format
-
-```markdown
-> [!NOTE]
-> This PR was written with AI assistance.
-
-<details><summary>AI Session Export</summary>
-<p>
-
-```json
-{
-  "info": {
-    "title": "<brief task description>",
-    "agent": "opencode",
-    "models": ["<model(s) used>"]
-  },
-  "summary": [
-    "<action 1>",
-    "<action 2>",
-    ...
-  ]
-}
-```
-
-</p>
-</details>
-```
-
-## Workflow
-
-### 1. Export Session Data
-
-Get session data using OpenCode CLI:
-
-```bash
-opencode export [sessionID]
-```
-
-Returns JSON with session info including models used. Use current session if no sessionID provided.
-
-### 2. Generate Summary JSON
-
-From exported data and conversation context, create summary:
-
-- **title**: 2-5 word task description (lowercase)
-- **agent**: always "opencode"
-- **models**: array from export data
-- **summary**: array of terse action statements
-  - Use past tense ("added", "fixed", "created")
-  - Start with "user requested..." or "user asked..."
-  - Chronological order
-  - Attempt to keep the summary to a max of 25 turns ("user requested", "agent did")
-  - **NEVER include sensitive data**: API keys, credentials, secrets, tokens, passwords, env vars
-
-### 3. Update PR/MR Description
-
-**GitHub:**
-```bash
-gh pr edit <PR_NUMBER> --body "$(cat <<'EOF'
-<existing description>
-
-> [!NOTE]
-> This PR was written with AI assistance.
-
-<details><summary>AI Session Export</summary>
-...
-</details>
-EOF
-)"
-```
-
-### 4. Preserve Existing Content
-
-Always fetch and preserve existing PR/MR description:
-
-```bash
-# GitHub
-gh pr view <PR_NUMBER> --json body -q '.body'
-
-Append session export after existing content with blank line separator.
-
-## Example Summary
-
-For a session where user asked to add dark mode:
-
-```json
-{
-  "info": {
-    "title": "dark mode implementation",
-    "agent": "opencode",
-    "models": ["claude sonnet 4"]
-  },
-  "summary": [
-    "user requested dark mode toggle in settings",
-    "agent explored existing theme system",
-    "agent created ThemeContext for state management",
-    "agent added DarkModeToggle component",
-    "agent updated CSS variables for dark theme",
-    "agent ran tests and fixed 2 failures",
-    "agent committed changes"
-  ]
-}
-```
-
-## Security
-
-**NEVER include in summary:**
-- API keys, tokens, secrets
-- Passwords, credentials
-- Environment variable values
-- Private URLs with auth tokens
-- Personal identifiable information
-- Internal hostnames/IPs

modules/_opencode/skill/vcs-detect/SKILL.md

@@ -1,70 +0,0 @@
----
-name: vcs-detect
-description: Detect whether the current project uses jj (Jujutsu) or git for version control. Run this BEFORE any VCS command to use the correct tool.
----
-
-# VCS Detection Skill
-
-Detect the version control system in use before running any VCS commands.
-
-## Why This Matters
-
-- jj (Jujutsu) and git have different CLIs and workflows
-- Running `git` commands in a jj repo (or vice versa) causes errors
-- Some repos use jj with git colocated (both `.jj/` and `.git/` exist)
-
-## Detection Logic
-
-Both `jj root` and `git rev-parse --show-toplevel` walk up the filesystem to find repo root.
-
-**Priority order:**
-
-1. `jj root` succeeds → jj (handles colocated too)
-2. `git rev-parse` succeeds → git
-3. Both fail → no VCS
-
-## Detection Command
-
-```bash
-if jj root &>/dev/null; then echo "jj"
-elif git rev-parse --show-toplevel &>/dev/null; then echo "git"
-else echo "none"
-fi
-```
-
-## Command Mappings
-
-| Operation | git | jj |
-|-----------|-----|-----|
-| Status | `git status` | `jj status` |
-| Log | `git log` | `jj log` |
-| Diff | `git diff` | `jj diff` |
-| Commit | `git commit` | `jj commit` / `jj describe` |
-| Branch list | `git branch` | `jj branch list` |
-| New branch | `git checkout -b <name>` | `jj branch create <name>` |
-| Push | `git push` | `jj git push` |
-| Pull/Fetch | `git pull` / `git fetch` | `jj git fetch` |
-| Rebase | `git rebase` | `jj rebase` |
-
-## Usage
-
-Before any VCS operation:
-
-1. Run detection command
-2. Use appropriate CLI based on result
-3. If `none`, warn user directory is not version controlled
-
-## Example Integration
-
-```
-User: Show me the git log
-Agent: [Runs detection] -> Result: jj
-Agent: [Runs `jj log` instead of `git log`]
-```
-
-## Colocated Repos
-
-When both `.jj/` and `.git/` exist, the repo is "colocated":
-- jj manages the working copy
-- git is available for compatibility (GitHub, etc.)
-- **Always prefer jj commands** in colocated repos

modules/_overlays/ast-grep.nix

@@ -0,0 +1,6 @@
+{inputs, ...}: final: prev: {
+	ast-grep =
+		prev.ast-grep.overrideAttrs (old: {
+				doCheck = false;
+			});
+}

modules/_overlays/cog-cli.nix

@@ -0,0 +1,44 @@
+{inputs, ...}: final: prev: let
+	version = "0.24.1";
+	srcs = {
+		x86_64-linux =
+			prev.fetchurl {
+				url = "https://github.com/trycog/cog-cli/releases/download/v${version}/cog-linux-x86_64.tar.gz";
+				hash = "sha256-/ioEuM58F3ppO0wlc5nw7ZNHunoweOXL/Gda65r0Ig4=";
+			};
+		aarch64-darwin =
+			prev.fetchurl {
+				url = "https://github.com/trycog/cog-cli/releases/download/v${version}/cog-darwin-arm64.tar.gz";
+				hash = "sha256-o/A2hVU3Jzmlzx5RbGLFCpfGAghcLGTD8Bm+bVR5OkQ=";
+			};
+	};
+in {
+	cog-cli =
+		prev.stdenvNoCC.mkDerivation {
+			pname = "cog-cli";
+			inherit version;
+			src =
+				srcs.${prev.stdenv.hostPlatform.system}
+				or (throw "Unsupported system for cog-cli: ${prev.stdenv.hostPlatform.system}");
+
+			dontUnpack = true;
+			dontConfigure = true;
+			dontBuild = true;
+
+			installPhase = ''
+				runHook preInstall
+				tar -xzf "$src"
+				install -Dm755 cog "$out/bin/cog"
+				runHook postInstall
+			'';
+
+			meta = with prev.lib; {
+				description = "Memory, code intelligence, and debugging for AI agents";
+				homepage = "https://github.com/trycog/cog-cli";
+				license = licenses.mit;
+				mainProgram = "cog";
+				platforms = builtins.attrNames srcs;
+				sourceProvenance = [sourceTypes.binaryNativeCode];
+			};
+		};
+}

modules/_overlays/himalaya.nix

@@ -0,0 +1,3 @@
+{inputs, ...}: final: prev: {
+	himalaya = inputs.himalaya.packages.${prev.stdenv.hostPlatform.system}.default;
+}

modules/_overlays/jj-ryu.nix

@@ -0,0 +1,15 @@
+{inputs, ...}: final: prev: let
+	naersk-lib = prev.callPackage inputs.naersk {};
+	manifest = (prev.lib.importTOML "${inputs.jj-ryu}/Cargo.toml").package;
+in {
+	jj-ryu =
+		naersk-lib.buildPackage {
+			pname = manifest.name;
+			version = manifest.version;
+			src = inputs.jj-ryu;
+			nativeBuildInputs = [prev.pkg-config];
+			buildInputs = [prev.openssl];
+			OPENSSL_NO_VENDOR = 1;
+			doCheck = false;
+		};
+}

modules/_overlays/jj-starship.nix

@@ -0,0 +1 @@
+{inputs, ...}: inputs.jj-starship.overlays.default

modules/_overlays/zjstatus.nix

@@ -0,0 +1,3 @@
+{inputs, ...}: final: prev: {
+	zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default;
+}

modules/_paperless/tag_prompt.tmpl

@@ -0,0 +1,26 @@
+I will provide you with the content and title of a document. Your task is to select appropriate tags for the document from the available list.
+Only select tags from the provided list.
+
+Rules:
+1. Focus on WHAT the document IS (document type) and what TOPIC it relates to — not on incidental details mentioned in the content.
+   - GOOD tags for a server hosting invoice: "Invoice", "Hosting"
+   - BAD tags for a server hosting invoice: "IBAN", "VAT", "Bank account" — these are just details that appear on any invoice.
+2. Pick 1-4 tags maximum. Fewer is better. Every tag must add distinct, meaningful categorisation value.
+3. All tags must be in English.
+4. Never tag based on formatting details, payment methods, reference numbers, or boilerplate text.
+
+The content is likely in {{.Language}}, but tags must always be in English.
+
+<available_tags>
+{{.AvailableTags | join ", "}}
+</available_tags>
+
+<title>
+{{.Title}}
+</title>
+
+<content>
+{{.Content}}
+</content>
+
+Respond only with the selected tags as a comma-separated list, without any additional information.

modules/_paperless/title_prompt.tmpl

@@ -0,0 +1,26 @@
+I will provide you with the content of a document that has been partially read by OCR (so it may contain errors).
+Your task is to generate a clear, consistent document title for use in paperless-ngx.
+
+Title format: "YYYY-MM-DD - Sender - Description"
+- YYYY-MM-DD: The document date (issue date, statement date, etc.). Use the most specific date available. If no date is found, omit the date prefix.
+- Sender: The company, organisation, or person who sent/issued the document. Use their common short name (e.g. "Hetzner" not "Hetzner Online GmbH").
+- Description: A brief description of what the document is (e.g. "Server hosting invoice", "Payslip January", "Employment contract", "Tax assessment 2024"). Keep it concise but specific enough to distinguish from similar documents.
+
+Examples:
+- "2025-03-01 - Hetzner - Server hosting invoice"
+- "2024-12-15 - Techniker Krankenkasse - Health insurance statement"
+- "2024-06-30 - Acme Corp - Payslip June"
+- "2024-01-10 - Finanzamt Berlin - Tax assessment 2023"
+
+Rules:
+1. Always write the title in English, regardless of the document language.
+2. Keep the description part under 6 words.
+3. If the original title contains useful information, use it to inform your suggestion.
+4. Respond only with the title, without any additional information.
+
+The content is likely in {{.Language}}.
+
+<original_title>{{.Title}}</original_title>
+<content>
+{{.Content}}
+</content>

modules/_terminal/rose-pine-dawn-glow.json

@@ -0,0 +1,181 @@
+{
+  "document": {
+    "block_prefix": "\n",
+    "block_suffix": "\n",
+    "color": "#575279",
+    "margin": 2
+  },
+  "block_quote": {
+    "color": "#797593",
+    "italic": true,
+    "indent": 1,
+    "indent_token": "│ "
+  },
+  "list": {
+    "color": "#575279",
+    "level_indent": 2
+  },
+  "heading": {
+    "block_suffix": "\n",
+    "color": "#907aa9",
+    "bold": true
+  },
+  "h1": {
+    "prefix": "# ",
+    "bold": true
+  },
+  "h2": {
+    "prefix": "## "
+  },
+  "h3": {
+    "prefix": "### "
+  },
+  "h4": {
+    "prefix": "#### "
+  },
+  "h5": {
+    "prefix": "##### "
+  },
+  "h6": {
+    "prefix": "###### "
+  },
+  "strikethrough": {
+    "crossed_out": true
+  },
+  "emph": {
+    "italic": true,
+    "color": "#d7827e"
+  },
+  "strong": {
+    "bold": true,
+    "color": "#286983"
+  },
+  "hr": {
+    "color": "#dfdad9",
+    "format": "\n--------\n"
+  },
+  "item": {
+    "block_prefix": "• "
+  },
+  "enumeration": {
+    "block_prefix": ". ",
+    "color": "#286983"
+  },
+  "task": {
+    "ticked": "[✓] ",
+    "unticked": "[ ] "
+  },
+  "link": {
+    "color": "#286983",
+    "underline": true
+  },
+  "link_text": {
+    "color": "#56949f"
+  },
+  "image": {
+    "color": "#286983",
+    "underline": true
+  },
+  "image_text": {
+    "color": "#56949f",
+    "format": "Image: {{.text}} →"
+  },
+  "code": {
+    "color": "#ea9d34",
+    "background_color": "#f2e9e1",
+    "prefix": " ",
+    "suffix": " "
+  },
+  "code_block": {
+    "color": "#ea9d34",
+    "margin": 2,
+    "chroma": {
+      "text": {
+        "color": "#575279"
+      },
+      "error": {
+        "color": "#faf4ed",
+        "background_color": "#b4637a"
+      },
+      "comment": {
+        "color": "#9893a5"
+      },
+      "comment_preproc": {
+        "color": "#56949f"
+      },
+      "keyword": {
+        "color": "#b4637a"
+      },
+      "keyword_reserved": {
+        "color": "#b4637a"
+      },
+      "keyword_namespace": {
+        "color": "#b4637a"
+      },
+      "keyword_type": {
+        "color": "#907aa9"
+      },
+      "operator": {
+        "color": "#56949f"
+      },
+      "punctuation": {
+        "color": "#797593"
+      },
+      "name": {
+        "color": "#286983"
+      },
+      "name_constant": {
+        "color": "#907aa9"
+      },
+      "name_builtin": {
+        "color": "#d7827e"
+      },
+      "name_tag": {
+        "color": "#b4637a"
+      },
+      "name_attribute": {
+        "color": "#d7827e"
+      },
+      "name_class": {
+        "color": "#907aa9"
+      },
+      "name_decorator": {
+        "color": "#56949f"
+      },
+      "name_function": {
+        "color": "#286983"
+      },
+      "literal_number": {
+        "color": "#ea9d34"
+      },
+      "literal_string": {
+        "color": "#ea9d34"
+      },
+      "literal_string_escape": {
+        "color": "#d7827e"
+      },
+      "generic_deleted": {
+        "color": "#b4637a"
+      },
+      "generic_emph": {
+        "italic": true
+      },
+      "generic_inserted": {
+        "color": "#286983"
+      },
+      "generic_strong": {
+        "bold": true
+      },
+      "generic_subheading": {
+        "color": "#907aa9"
+      },
+      "background": {
+        "background_color": "#f2e9e1"
+      }
+    }
+  },
+  "table": {},
+  "definition_description": {
+    "block_prefix": "\n🠶 "
+  }
+}

modules/adguardhome.nix

@@ -0,0 +1,62 @@
+{...}: let
+	caddyLib = import ./_lib/caddy.nix;
+in {
+	den.aspects.adguardhome.nixos = {config, ...}: {
+		services.adguardhome = {
+			enable = true;
+			host = "127.0.0.1";
+			port = 10000;
+			settings = {
+				dhcp.enabled = false;
+				dns.upstream_dns = [
+					"1.1.1.1"
+					"1.0.0.1"
+				];
+				filtering = {
+					protection_enabled = true;
+					filtering_enabled = true;
+					safe_search.enabled = false;
+					safebrowsing_enabled = true;
+					blocked_response_ttl = 10;
+					filters_update_interval = 24;
+					blocked_services.ids = [
+						"reddit"
+						"twitter"
+					];
+				};
+				filters = [
+					{
+						enabled = true;
+						url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/pro.txt";
+						name = "HaGeZi Multi PRO";
+						id = 1;
+					}
+					{
+						enabled = true;
+						url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/tif.txt";
+						name = "HaGeZi Threat Intelligence Feeds";
+						id = 2;
+					}
+					{
+						enabled = true;
+						url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/gambling.txt";
+						name = "HaGeZi Gambling";
+						id = 3;
+					}
+					{
+						enabled = true;
+						url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/nsfw.txt";
+						name = "HaGeZi NSFW";
+						id = 4;
+					}
+				];
+			};
+		};
+
+		services.caddy.virtualHosts =
+			caddyLib.mkTailscaleVHost {
+				name = "adguard";
+				configText = "reverse_proxy localhost:${toString config.services.adguardhome.port}";
+			};
+	};
+}

modules/ai-tools.nix

@@ -1,32 +1,129 @@
-{
+{inputs, ...}: let
+	local = import ./_lib/local.nix;
+	inherit (local) secretPath;
+	opencodeSecretPath = secretPath "opencode-api-key";
+in {
 	den.aspects.ai-tools.homeManager = {
+		lib,
 		pkgs,
 		inputs',
 		...
 	}: {
+		home.packages = [
+			inputs'.llm-agents.packages.claude-code
+			pkgs.cog-cli
+		];
+
+		programs.nushell.extraEnv =
+			lib.mkAfter ''
+				if ("${opencodeSecretPath}" | path exists) {
+					$env.OPENCODE_API_KEY = (open --raw "${opencodeSecretPath}" | str trim)
+				}
+			'';
+
 		programs.opencode = {
 			enable = true;
 			package = inputs'.llm-agents.packages.opencode;
+			tui = {
+				theme = "rosepine";
+				plugin = ["./plugin/review.ts"];
+			};
 			settings = {
-				model = "anthropic/claude-opus-4-6";
-				small_model = "anthropic/claude-haiku-4-5";
-				theme = "catppuccin";
-				plugin = ["oh-my-openagent@latest" "opencode-anthropic-auth@latest"];
+				model = "openai/gpt-5.4";
+				small_model = "openai/gpt-5.1-codex-mini";
+				plugin = [
+					"opencode-claude-auth"
+					"opencode-supermemory"
+				];
 				permission = {
+					external_directory = {
+						"*" = "allow";
+						"**/.gnupg/**" = "deny";
+						"**/.ssh/**" = "deny";
+						"~/.config/gh/hosts.yml" = "deny";
+						"~/.config/sops/age/keys.txt" = "deny";
+						"~/.local/share/opencode/mcp-auth.json" = "deny";
+						"/etc/ssh/ssh_host_*" = "deny";
+						"/run/secrets/*" = "deny";
+					};
+					bash = {
+						"*" = "allow";
+						env = "deny";
+						"env *" = "deny";
+						printenv = "deny";
+						"printenv *" = "deny";
+						"export *" = "deny";
+						"gh auth *" = "deny";
+						ssh = "ask";
+						"ssh *" = "ask";
+						mosh = "ask";
+						"mosh *" = "ask";
+						"cat *.env" = "deny";
+						"cat *.env.*" = "deny";
+						"cat **/.env" = "deny";
+						"cat **/.env.*" = "deny";
+						"cat *.envrc" = "deny";
+						"cat **/.envrc" = "deny";
+						"cat .dev.vars" = "deny";
+						"cat **/.dev.vars" = "deny";
+						"cat *.pem" = "deny";
+						"cat *.key" = "deny";
+						"cat **/.gnupg/**" = "deny";
+						"cat **/.ssh/**" = "deny";
+						"cat ~/.config/gh/hosts.yml" = "deny";
+						"cat ~/.config/sops/age/keys.txt" = "deny";
+						"cat ~/.local/share/opencode/mcp-auth.json" = "deny";
+						"cat /etc/ssh/ssh_host_*" = "deny";
+						"cat /run/secrets/*" = "deny";
+					};
+					edit = {
+						"*" = "allow";
+						"**/.gnupg/**" = "deny";
+						"**/.ssh/**" = "deny";
+						"**/secrets/**" = "deny";
+						"secrets/*" = "deny";
+						"~/.config/gh/hosts.yml" = "deny";
+						"~/.config/sops/age/keys.txt" = "deny";
+						"~/.local/share/opencode/mcp-auth.json" = "deny";
+						"/etc/ssh/ssh_host_*" = "deny";
+						"/run/secrets/*" = "deny";
+					};
+					glob = "allow";
+					grep = "allow";
+					list = "allow";
+					lsp = "allow";
+					question = "allow";
 					read = {
 						"*" = "allow";
 						"*.env" = "deny";
 						"*.env.*" = "deny";
 						"*.envrc" = "deny";
+						"**/.env" = "deny";
+						"**/.env.*" = "deny";
+						"**/.envrc" = "deny";
+						".dev.vars" = "deny";
+						"**/.dev.vars" = "deny";
+						"**/.gnupg/**" = "deny";
+						"**/.ssh/**" = "deny";
+						"*.key" = "deny";
+						"*.pem" = "deny";
+						"**/secrets/**" = "deny";
 						"secrets/*" = "deny";
+						"~/.config/gh/hosts.yml" = "deny";
+						"~/.config/sops/age/keys.txt" = "deny";
+						"~/.local/share/opencode/mcp-auth.json" = "deny";
+						"/etc/ssh/ssh_host_*" = "deny";
+						"/run/secrets/*" = "deny";
 					};
+					skill = "allow";
+					task = "allow";
+					webfetch = "allow";
+					websearch = "allow";
+					codesearch = "allow";
 				};
 				agent = {
-					plan = {
-						model = "anthropic/claude-opus-4-6";
-					};
 					explore = {
-						model = "anthropic/claude-haiku-4-5";
+						model = "openai/gpt-5.1-codex-mini";
 					};
 				};
 				instructions = [
@@ -44,26 +141,27 @@
 					opensrc = {
 						enabled = true;
 						type = "local";
-						command = ["bunx" "opensrc-mcp"];
+						command = ["node" "/home/cschmatzler/.bun/bin/opensrc-mcp"];
+					};
+					context7 = {
+						enabled = true;
+						type = "remote";
+						url = "https://mcp.context7.com/mcp";
+					};
+					grep_app = {
+						enabled = true;
+						type = "remote";
+						url = "https://mcp.grep.app";
 					};
 				};
 			};
 		};
 
-		home.shellAliases = {
-			noc = "RUST_LOG=error nono -s wrap --allow-cwd --profile opencode -- opencode";
-		};
-
-		home.packages = [
-			inputs'.llm-agents.packages.claude-code
-			pkgs.nono
-		];
-
 		xdg.configFile = {
-			"opencode/agent" = {
-				source = ./_opencode/agent;
-				recursive = true;
-			};
+			# "opencode/agent" = {
+			# 	source = ./_opencode/agent;
+			# 	recursive = true;
+			# };
 			"opencode/command" = {
 				source = ./_opencode/command;
 				recursive = true;
@@ -72,65 +170,11 @@
 				source = ./_opencode/skill;
 				recursive = true;
 			};
-			"opencode/tool" = {
-				source = ./_opencode/tool;
-				recursive = true;
-			};
 			"opencode/plugin" = {
 				source = ./_opencode/plugin;
 				recursive = true;
 			};
 			"opencode/AGENTS.md".source = ./_opencode/AGENTS.md;
-			"opencode/oh-my-opencode.json".text =
-				builtins.toJSON {
-					"$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
-					disabled_skills = ["playwright" "dev-browser" "git-master"];
-					disabled_hooks = ["keyword-detector" "todo-continuation-enforcer"];
-					git_master = {
-						commit_footer = false;
-						include_co_authored_by = false;
-					};
-					runtime_fallback = true;
-					agents = {
-						explore = {
-							model = "opencode-go/minimax-m2.5";
-							fallback_models = ["anthropic/claude-haiku-4-5"];
-						};
-						librarian = {
-							model = "opencode-go/minimax-m2.5";
-							fallback_models = ["opencode-go/glm-5"];
-						};
-						sisyphus = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-					};
-					categories = {
-						"visual-engineering" = {
-							fallback_models = ["opencode-go/glm-5" "opencode-go/kimi-k2.5"];
-						};
-						ultrabrain = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						deep = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						artistry = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						quick = {
-							fallback_models = ["opencode-go/minimax-m2.5"];
-						};
-						"unspecified-low" = {
-							fallback_models = ["opencode-go/minimax-m2.5" "opencode-go/kimi-k2.5"];
-						};
-						"unspecified-high" = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						writing = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/minimax-m2.5"];
-						};
-					};
-				};
 		};
 	};
 }

modules/apps.nix

@@ -26,8 +26,8 @@
 				'')}/bin/${name}";
 			meta.description = descriptions.${name};
 		};
-		platformAppNames = ["build" "rollback" "update"];
-		sharedAppNames = ["apply"];
+		platformAppNames = ["build" "rollback"];
+		sharedAppNames = ["apply" "update"];
 	in {
 		apps =
 			pkgs.lib.genAttrs platformAppNames mkPlatformApp

modules/cache.nix

@@ -0,0 +1,11 @@
+{...}: let
+	caddyLib = import ./_lib/caddy.nix;
+in {
+	den.aspects.cache.nixos = {
+		services.caddy.virtualHosts =
+			caddyLib.mkTailscaleVHost {
+				name = "cache";
+				configText = "reverse_proxy localhost:32843";
+			};
+	};
+}

modules/chidi.nix

@@ -1,29 +0,0 @@
-{den, ...}: {
-	den.aspects.chidi.includes = [
-		den.aspects.darwin-system
-		den.aspects.core
-		den.aspects.tailscale
-		den.aspects.desktop
-		den.aspects.terminal
-		den.aspects.atuin
-		den.aspects.dev-tools
-		den.aspects.neovim
-		den.aspects.ai-tools
-		den.aspects.zellij
-		den.aspects.zk
-	];
-
-	den.aspects.chidi.darwin = {pkgs, ...}: {
-		networking.hostName = "chidi";
-		networking.computerName = "chidi";
-
-		environment.systemPackages = with pkgs; [
-			slack
-		];
-	};
-
-	den.aspects.chidi.homeManager = {...}: {
-		fonts.fontconfig.enable = true;
-		programs.git.settings.user.email = "christoph@tuist.dev";
-	};
-}

modules/core.nix

@@ -4,6 +4,12 @@
 		lib,
 		...
 	}: {
+		# System utilities
+		environment.systemPackages =
+			lib.optionals pkgs.stdenv.isLinux [
+				pkgs.lm_sensors
+			];
+
 		programs.fish.enable = true;
 		environment.shells = [pkgs.nushell];
 
@@ -16,6 +22,7 @@
 		nix = {
 			package = pkgs.nix;
 			settings = {
+				cores = 4;
 				substituters = [
 					"https://nix-community.cachix.org"
 					"https://cache.nixos.org"
@@ -33,11 +40,5 @@
 				experimental-features = nix-command flakes
 			'';
 		};
-
-		# System utilities
-		environment.systemPackages =
-			lib.optionals pkgs.stdenv.isLinux [
-				pkgs.lm_sensors
-			];
 	};
 }

modules/darwin.nix

@@ -1,4 +1,7 @@
-{inputs, ...}: {
+{inputs, ...}: let
+	local = import ./_lib/local.nix;
+	userHome = "/Users/${local.user.name}";
+in {
 	den.aspects.darwin-system.darwin = {pkgs, ...}: {
 		imports = [
 			inputs.nix-homebrew.darwinModules.nix-homebrew
@@ -6,7 +9,13 @@
 			./_darwin/dock.nix
 		];
 
-		system.primaryUser = "cschmatzler";
+		system.primaryUser = local.user.name;
+
+		# Darwin system utilities
+		environment.systemPackages = with pkgs; [
+			dockutil
+			mas
+		];
 
 		system.defaults = {
 			NSGlobalDomain = {
@@ -35,7 +44,7 @@
 				autohide = true;
 				show-recents = false;
 				launchanim = true;
-				orientation = "bottom";
+				orientation = "left";
 				tilesize = 60;
 				minimize-to-application = true;
 				mru-spaces = false;
@@ -96,13 +105,16 @@
 					allowApplePersonalizedAdvertising = false;
 				};
 				"com.apple.Spotlight" = {
-					MenuItemHidden = true;
+					"NSStatusItem Visible Item-0" = false;
+				};
+				"com.apple.TextInputMenu" = {
+					visible = false;
 				};
 			};
 		};
 
 		nix = {
-			settings.trusted-users = ["@admin" "cschmatzler"];
+			settings.trusted-users = [local.user.name];
 			gc.interval = {
 				Weekday = 0;
 				Hour = 2;
@@ -110,18 +122,16 @@
 			};
 		};
 
-		users.users.cschmatzler = {
-			name = "cschmatzler";
-			home = "/Users/cschmatzler";
+		users.users.${local.user.name} = {
+			name = local.user.name;
+			home = userHome;
 			isHidden = false;
 			shell = pkgs.nushell;
 		};
 
-		home-manager.useGlobalPkgs = true;
-
 		nix-homebrew = {
 			enable = true;
-			user = "cschmatzler";
+			user = local.user.name;
 			mutableTaps = true;
 			taps = {
 				"homebrew/homebrew-core" = inputs.homebrew-core;
@@ -131,18 +141,25 @@
 
 		homebrew = {
 			enable = true;
+			onActivation = {
+				autoUpdate = true;
+				cleanup = "uninstall";
+				upgrade = true;
+			};
+			taps = [
+				"homebrew/cask"
+			];
 			casks = [
+				"1password"
+				"alcove"
+				"aqua-voice"
+				"chatgpt"
 				"ghostty@tip"
-				"helium-browser"
-				"tidal"
+				"raycast"
+				"spotify"
+				"tailscale"
+				"whatsapp"
 			];
 		};
-
-		# Darwin system utilities
-		environment.systemPackages = with pkgs; [
-			alcove
-			dockutil
-			mas
-		];
 	};
 }

modules/defaults.nix

@@ -23,26 +23,42 @@
 
 	config = {
 		flake.flakeModules = {
+			# Shared system foundations
+			core = ./core.nix;
+			darwin = ./darwin.nix;
+			network = ./network.nix;
+			nixos-system = ./nixos-system.nix;
+			overlays = ./overlays.nix;
+			secrets = ./secrets.nix;
+
+			# Shared host features
+			adguardhome = ./adguardhome.nix;
+			cache = ./cache.nix;
+			gitea = ./gitea.nix;
+			opencode = ./opencode.nix;
+			paperless = ./paperless.nix;
+
+			# User environment
 			ai-tools = ./ai-tools.nix;
 			atuin = ./atuin.nix;
-			core = ./core.nix;
 			desktop = ./desktop.nix;
 			dev-tools = ./dev-tools.nix;
 			email = ./email.nix;
-			finance = ./finance.nix;
 			neovim = ./neovim.nix;
-			network = ./network.nix;
-			nixos-system = ./nixos-system.nix;
 			shell = ./shell.nix;
 			ssh-client = ./ssh-client.nix;
 			terminal = ./terminal.nix;
-			user = ./user.nix;
 			zellij = ./zellij.nix;
 			zk = ./zk.nix;
 		};
 		den.default.nixos.system.stateVersion = "25.11";
 		den.default.darwin.system.stateVersion = 6;
-		den.default.homeManager.home.stateVersion = "25.11";
+		den.default.homeManager = {
+			home.stateVersion = "25.11";
+			programs.home-manager.enable = true;
+		};
+		den.default.nixos.home-manager.useGlobalPkgs = true;
+		den.default.darwin.home-manager.useGlobalPkgs = true;
 
 		den.default.includes = [
 			den.provides.define-user

modules/dendritic.nix

@@ -49,6 +49,10 @@
 			flake = false;
 		};
 		nixvim.url = "github:nix-community/nixvim";
+		neovim-nightly-overlay = {
+			url = "github:nix-community/neovim-nightly-overlay";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
 		llm-agents.url = "github:numtide/llm-agents.nix";
 		# Overlay inputs
 		himalaya.url = "github:pimalaya/himalaya";
@@ -58,13 +62,25 @@
 		};
 		jj-starship.url = "github:dmmulroy/jj-starship";
 		zjstatus.url = "github:dj95/zjstatus";
-		tuicr.url = "github:agavra/tuicr";
+		fenix = {
+			url = "github:nix-community/fenix";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
 		naersk = {
 			url = "github:nix-community/naersk/master";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
-		nono = {
-			url = "github:always-further/nono";
+		# Neovim plugin inputs
+		code-review-nvim = {
+			url = "github:choplin/code-review.nvim";
+			flake = false;
+		};
+		jj-nvim = {
+			url = "github:NicolasGB/jj.nvim";
+			flake = false;
+		};
+		jj-diffconflicts = {
+			url = "github:rafikdraoui/jj-diffconflicts";
 			flake = false;
 		};
 		# Secrets inputs

modules/deploy.nix

@@ -2,24 +2,36 @@
 	inputs,
 	config,
 	...
-}: {
+}: let
+	local = import ./_lib/local.nix;
+	acceptNewHostKeys = [
+		"-o"
+		"StrictHostKeyChecking=accept-new"
+	];
+	mkSystemNode = {
+		hostname,
+		host,
+	}: {
+		inherit hostname;
+		sshUser = local.user.name;
+		sshOpts = acceptNewHostKeys;
+		profiles.system = {
+			user = "root";
+			path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos config.flake.nixosConfigurations.${host};
+		};
+	};
+in {
 	flake.deploy.nodes = {
-		michael = {
-			hostname = "michael";
-			sshUser = "cschmatzler";
-			profiles.system = {
-				user = "root";
-				path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos config.flake.nixosConfigurations.michael;
+		michael =
+			mkSystemNode {
+				hostname = "git.schmatzler.com";
+				host = "michael";
 			};
-		};
-		tahani = {
-			hostname = "tahani";
-			sshUser = "cschmatzler";
-			profiles.system = {
-				user = "root";
-				path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos config.flake.nixosConfigurations.tahani;
+		tahani =
+			mkSystemNode {
+				hostname = "127.0.0.1";
+				host = "tahani";
 			};
-		};
 	};
 
 	flake.checks.x86_64-linux = inputs.deploy-rs.lib.x86_64-linux.deployChecks config.flake.deploy;

modules/desktop.nix

@@ -1,7 +1,7 @@
 {...}: {
 	den.aspects.desktop.homeManager = {
-		pkgs,
 		lib,
+		pkgs,
 		...
 	}: {
 		programs.aerospace = {
@@ -56,7 +56,7 @@
 					}
 					{
 						"if" = {
-							"app-id" = "net.imput.helium";
+							"app-id" = "com.apple.Safari";
 						};
 						run = "move-node-to-workspace 2";
 					}
@@ -144,11 +144,5 @@
 				};
 			};
 		};
-
-		home.packages = with pkgs;
-			lib.optionals stdenv.isDarwin [
-				_1password-gui
-				raycast
-			];
 	};
 }

modules/dev-tools.nix

@@ -1,11 +1,56 @@
-{...}: {
+{...}: let
+	local = import ./_lib/local.nix;
+	palette = (import ./_lib/theme.nix).rosePineDawn.hex;
+in {
 	den.aspects.dev-tools.homeManager = {
 		pkgs,
 		lib,
 		...
 	}: let
-		name = "Christoph Schmatzler";
+		name = local.user.fullName;
 	in {
+		home.packages = with pkgs;
+			[
+				alejandra
+				ast-grep
+				bun
+				delta
+				deadnix
+				devenv
+				docker
+				docker-compose
+				lazydocker
+				gh
+				gnumake
+				hyperfine
+				jj-ryu
+				jj-starship
+				nil
+				nodejs_24
+				nurl
+				pnpm
+				postgresql_17
+				serie
+				sqlite
+				statix
+				tea
+				tokei
+				tree-sitter
+				(pkgs.writeShellApplication {
+						name = "tuist-pr";
+						runtimeInputs = with pkgs; [coreutils fzf gh git nushell];
+						text = ''
+							exec nu ${./_dev-tools/tuist-pr.nu} "$@"
+						'';
+					})
+			]
+			++ lib.optionals stdenv.isDarwin [
+				xcodes
+			]
+			++ lib.optionals stdenv.isLinux [
+				gcc15
+			];
+
 		# Git configuration
 		programs.git = {
 			enable = true;
@@ -44,207 +89,13 @@
 			};
 		};
 
-		# Git shell aliases
-		home.shellAliases = {
-			g = "git";
-			ga = "git add";
-			gaa = "git add --all";
-			gapa = "git add --patch";
-			gau = "git add --update";
-			gav = "git add --verbose";
-			gap = "git apply";
-			gapt = "git apply --3way";
-			gb = "git branch";
-			gba = "git branch --all";
-			gbd = "git branch --delete";
-			gbD = "git branch --delete --force";
-			gbl = "git blame -w";
-			gbnm = "git branch --no-merged";
-			gbr = "git branch --remote";
-			gbs = "git bisect";
-			gbsb = "git bisect bad";
-			gbsg = "git bisect good";
-			gbsn = "git bisect new";
-			gbso = "git bisect old";
-			gbsr = "git bisect reset";
-			gbss = "git bisect start";
-			gc = "git commit --verbose";
-			gca = "git commit --verbose --all";
-			gcam = "git commit --all --message";
-			gcas = "git commit --all --signoff";
-			gcasm = "git commit --all --signoff --message";
-			gcb = "git checkout -b";
-			gcB = "git checkout -B";
-			gcf = "git config --list";
-			gclean = "git clean --interactive -d";
-			gcl = "git clone --recurse-submodules";
-			gclf = "git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules";
-			gcm = "git checkout main";
-			gcmsg = "git commit --message";
-			gcn = "git commit --verbose --no-edit";
-			gco = "git checkout";
-			gcor = "git checkout --recurse-submodules";
-			gcount = "git shortlog --summary --numbered";
-			gcp = "git cherry-pick";
-			gcpa = "git cherry-pick --abort";
-			gcpc = "git cherry-pick --continue";
-			gcs = "git commit --gpg-sign";
-			gcss = "git commit --gpg-sign --signoff";
-			gcssm = "git commit --gpg-sign --signoff --message";
-			gcsm = "git commit --signoff --message";
-			gd = "git diff";
-			gdca = "git diff --cached";
-			gdcw = "git diff --cached --word-diff";
-			gds = "git diff --staged";
-			gdw = "git diff --word-diff";
-			gdt = "git diff-tree --no-commit-id --name-only -r";
-			gdup = "git diff @{upstream}";
-			gf = "git fetch";
-			gfa = "git fetch --all --tags --prune";
-			gfo = "git fetch origin";
-			gg = "git gui citool";
-			gga = "git gui citool --amend";
-			ghh = "git help";
-			gignore = "git update-index --assume-unchanged";
-			gl = "git pull";
-			glg = "git log --stat";
-			glgp = "git log --stat --patch";
-			glgg = "git log --graph";
-			glgga = "git log --graph --decorate --all";
-			glgm = "git log --graph --max-count=10";
-			glo = "git log --oneline --decorate";
-			glog = "git log --oneline --decorate --graph";
-			gloga = "git log --oneline --decorate --graph --all";
-			glol = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\"";
-			glola = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --all";
-			glols = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --stat";
-			glod = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\"";
-			glods = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset\" --date=short";
-			glum = "git pull upstream main";
-			gm = "git merge";
-			gma = "git merge --abort";
-			gmc = "git merge --continue";
-			gms = "git merge --squash";
-			gmff = "git merge --ff-only";
-			gmtl = "git mergetool --no-prompt";
-			gmtlvim = "git mergetool --no-prompt --tool=vimdiff";
-			gmum = "git merge upstream/main";
-			gmom = "git merge origin/main";
-			gp = "git push";
-			gpd = "git push --dry-run";
-			gpf = "git push --force-with-lease";
-			gpod = "git push origin --delete";
-			gpr = "git pull --rebase";
-			gpra = "git pull --rebase --autostash";
-			gprav = "git pull --rebase --autostash -v";
-			gprom = "git pull --rebase origin main";
-			gpromi = "git pull --rebase=interactive origin main";
-			gprv = "git pull --rebase -v";
-			gprum = "git pull --rebase upstream main";
-			gprumi = "git pull --rebase=interactive upstream main";
-			gpv = "git push --verbose";
-			gpu = "git push upstream";
-			gr = "git remote";
-			gra = "git remote add";
-			grb = "git rebase";
-			grba = "git rebase --abort";
-			grbc = "git rebase --continue";
-			grbd = "git rebase develop";
-			grbi = "git rebase --interactive";
-			grbm = "git rebase main";
-			grbo = "git rebase --onto";
-			grbom = "git rebase origin/main";
-			grbs = "git rebase --skip";
-			grbum = "git rebase upstream/main";
-			grev = "git revert";
-			greva = "git revert --abort";
-			grevc = "git revert --continue";
-			grf = "git reflog";
-			grh = "git reset";
-			grhh = "git reset --hard";
-			grhk = "git reset --keep";
-			grhs = "git reset --soft";
-			grm = "git rm";
-			grmc = "git rm --cached";
-			grmv = "git remote rename";
-			grrm = "git remote remove";
-			grs = "git restore";
-			grset = "git remote set-url";
-			grss = "git restore --source";
-			grst = "git restore --staged";
-			gru = "git reset --";
-			grup = "git remote update";
-			grv = "git remote --verbose";
-			gsb = "git status --short --branch";
-			gsh = "git show";
-			gsi = "git submodule init";
-			gsps = "git show --pretty=short --show-signature";
-			gss = "git status --short";
-			gst = "git status";
-			gsta = "git stash push";
-			gstaa = "git stash apply";
-			gstall = "git stash --all";
-			gstc = "git stash clear";
-			gstd = "git stash drop";
-			gstl = "git stash list";
-			gstp = "git stash pop";
-			gsts = "git stash show --patch";
-			gstu = "git stash push --include-untracked";
-			gsu = "git submodule update";
-			gsw = "git switch";
-			gswc = "git switch --create";
-			gswd = "git switch develop";
-			gswm = "git switch main";
-			gta = "git tag --annotate";
-			gts = "git tag --sign";
-			gunignore = "git update-index --no-assume-unchanged";
-			gwch = "git whatchanged -p --abbrev-commit --pretty=medium";
-			gwt = "git worktree";
-			gwta = "git worktree add";
-			gwtls = "git worktree list";
-			gwtmv = "git worktree move";
-			gwtrm = "git worktree remove";
-			lg = "lazygit";
-		};
-
-		# Complex git aliases that require pipes/subshells — nushell `alias` can't
-		# handle these, so they're defined as custom commands instead.
-		programs.nushell.extraConfig = ''
-			def ggpull [] { git pull origin (git branch --show-current | str trim) }
-			def ggpush [] { git push origin (git branch --show-current | str trim) }
-			def ggsup [] { git branch $"--set-upstream-to=origin/(git branch --show-current | str trim)" }
-			def gluc [] { git pull upstream (git branch --show-current | str trim) }
-			def gpsup [] { git push --set-upstream origin (git branch --show-current | str trim) }
-			def gpsupf [] { git push --set-upstream origin (git branch --show-current | str trim) --force-with-lease }
-			def groh [] { git reset $"origin/(git branch --show-current | str trim)" --hard }
-			def --env grt [] {
-				let toplevel = (do { git rev-parse --show-toplevel } | complete | get stdout | str trim)
-				if ($toplevel | is-not-empty) { cd $toplevel } else { cd . }
-			}
-			def gfg [...pattern: string] { git ls-files | lines | where {|f| $f =~ ($pattern | str join ".*") } }
-			def gignored [] { git ls-files -v | lines | where {|l| ($l | str substring 0..1) =~ "[a-z]" } }
-			def gpoat [] { git push origin --all; git push origin --tags }
-			def gtv [] { git tag | lines | sort }
-			def gwipe [] { git reset --hard; git clean --force -df }
-			def gunwip [] {
-				let msg = (git rev-list --max-count=1 --format="%s" HEAD | lines | get 1)
-				if ($msg | str contains "--wip--") { git reset HEAD~1 }
-			}
-			def gwip [] {
-				git add -A
-				let deleted = (git ls-files --deleted | lines)
-				if ($deleted | is-not-empty) { git rm ...$deleted }
-				git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"
-			}
-		'';
-
 		# Jujutsu configuration
 		programs.jujutsu = {
 			enable = true;
 			settings = {
 				user = {
 					name = name;
-					email = "christoph@schmatzler.com";
+					email = local.user.emails.personal;
 				};
 				git = {
 					sign-on-push = true;
@@ -276,7 +127,7 @@
 				revset-aliases = {
 					"closest_bookmark(to)" = "heads(::to & bookmarks())";
 					"closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:\"\") & (~empty() | merges()))";
-					"mine()" = "author(\"christoph@schmatzler.com\")";
+					"mine()" = "author(\"${local.user.emails.personal}\")";
 					"wip()" = "mine() ~ immutable()";
 					"open()" = "mine() ~ ::trunk()";
 					"current()" = "@:: & mutable()";
@@ -298,63 +149,83 @@
 			};
 		};
 
-		# Lazygit configuration
-		programs.lazygit = {
-			enable = true;
-			settings = {
-				git = {
-					commit.signOff = true;
-					pagers = [
-						{
-							delta = {
-								colorArg = "always";
-								pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\"";
-							};
-						}
-					];
-				};
-
-				gui = {
-					authorColors = {
-						"*" = "#7287fd";
-					};
-					theme = {
-						activeBorderColor = [
-							"#8839ef"
-							"bold"
-						];
-						inactiveBorderColor = [
-							"#6c6f85"
-						];
-						optionsTextColor = [
-							"#1e66f5"
-						];
-						selectedLineBgColor = [
-							"#ccd0da"
-						];
-						cherryPickedCommitBgColor = [
-							"#bcc0cc"
-						];
-						cherryPickedCommitFgColor = [
-							"#8839ef"
-						];
-						defaultFgColor = [
-							"#4c4f69"
-						];
-						searchingActiveBorderColor = [
-							"#df8e1d"
-						];
-						unstagedChangesColor = [
-							"#d20f39"
-						];
-					};
-				};
-			};
-		};
-
 		# JJUI configuration
 		programs.jjui = {
 			enable = true;
+			settings.ui.colors = {
+				text = {fg = palette.text;};
+				dimmed = {fg = palette.muted;};
+				selected = {
+					bg = palette.overlay;
+					fg = palette.text;
+					bold = true;
+				};
+				border = {fg = palette.muted;};
+				title = {
+					fg = palette.iris;
+					bold = true;
+				};
+				shortcut = {
+					fg = palette.pine;
+					bold = true;
+				};
+				matched = {
+					fg = palette.gold;
+					bold = true;
+				};
+				"revisions selected" = {
+					bg = palette.overlay;
+					fg = palette.text;
+					bold = true;
+				};
+				"status" = {bg = palette.overlay;};
+				"status title" = {
+					bg = palette.iris;
+					fg = palette.base;
+					bold = true;
+				};
+				"status shortcut" = {fg = palette.pine;};
+				"status dimmed" = {fg = palette.muted;};
+				"menu" = {bg = palette.base;};
+				"menu selected" = {
+					bg = palette.overlay;
+					fg = palette.text;
+					bold = true;
+				};
+				"menu border" = {fg = palette.muted;};
+				"menu title" = {
+					fg = palette.iris;
+					bold = true;
+				};
+				"menu shortcut" = {fg = palette.pine;};
+				"menu matched" = {
+					fg = palette.gold;
+					bold = true;
+				};
+				"preview border" = {fg = palette.muted;};
+				"help" = {bg = palette.base;};
+				"help border" = {fg = palette.muted;};
+				"help title" = {
+					fg = palette.iris;
+					bold = true;
+				};
+				"confirmation" = {bg = palette.base;};
+				"confirmation border" = {fg = palette.muted;};
+				"confirmation selected" = {
+					bg = palette.overlay;
+					fg = palette.text;
+					bold = true;
+				};
+				"confirmation dimmed" = {fg = palette.muted;};
+				source_marker = {
+					fg = palette.foam;
+					bold = true;
+				};
+				target_marker = {
+					fg = palette.rose;
+					bold = true;
+				};
+			};
 		};
 
 		# Direnv configuration
@@ -371,37 +242,5 @@
 				auto_install = false;
 			};
 		};
-
-		home.packages = with pkgs;
-			[
-				alejandra
-				ast-grep
-				bun
-				delta
-				devenv
-				docker
-				docker-compose
-				gh
-				git
-				gnumake
-				hyperfine
-				jj-ryu
-				jj-starship
-				nodejs_24
-				nurl
-				pnpm
-				postgresql_17
-				serie
-				sqlite
-				tea
-				tokei
-				tree-sitter
-			]
-			++ lib.optionals stdenv.isDarwin [
-				xcodes
-			]
-			++ lib.optionals stdenv.isLinux [
-				gcc15
-			];
 	};
 }

modules/email.nix

@@ -1,5 +1,12 @@
-{...}: {
+{...}: let
+	local = import ./_lib/local.nix;
+in {
 	den.aspects.email.homeManager = {pkgs, ...}: {
+		programs.aerc = {
+			enable = true;
+			extraConfig.general.unsafe-accounts-conf = true;
+		};
+
 		programs.himalaya = {
 			enable = true;
 			package =
@@ -19,13 +26,13 @@
 		};
 
 		accounts.email = {
-			accounts."christoph@schmatzler.com" = {
+			accounts.${local.user.emails.personal} = {
 				primary = true;
-				maildir.path = "christoph@schmatzler.com";
-				address = "christoph@schmatzler.com";
-				userName = "christoph.schmatzler@icloud.com";
-				realName = "Christoph Schmatzler";
-				passwordCommand = ["cat" "/run/secrets/tahani-email-password"];
+				maildir.path = local.user.emails.personal;
+				address = local.user.emails.personal;
+				userName = local.user.emails.icloud;
+				realName = local.user.fullName;
+				passwordCommand = ["${pkgs.coreutils}/bin/cat" (local.secretPath "tahani-email-password")];
 				folders = {
 					inbox = "INBOX";
 					drafts = "Drafts";
@@ -48,6 +55,7 @@
 					port = 993;
 					tls.enable = true;
 				};
+				aerc.enable = true;
 			};
 		};
 	};

modules/finance.nix

@@ -1,5 +0,0 @@
-{...}: {
-	den.aspects.finance.homeManager = {pkgs, ...}: {
-		home.packages = [pkgs.hledger];
-	};
-}

modules/gitea.nix

@@ -1,51 +1,31 @@
-{
-	inputs,
-	den,
-	...
-}: {
-	den.aspects.michael.includes = [
-		den.aspects.nixos-system
-		den.aspects.core
-		den.aspects.openssh
-		den.aspects.fail2ban
-		den.aspects.tailscale
-	];
-
-	den.aspects.michael.nixos = {
+{lib, ...}: let
+	secretLib = import ./_lib/secrets.nix {inherit lib;};
+in {
+	den.aspects.gitea.nixos = {
 		config,
-		pkgs,
 		lib,
-		modulesPath,
+		pkgs,
 		...
 	}: {
-		imports = [
-			(modulesPath + "/installer/scan/not-detected.nix")
-			./_hosts/michael/disk-config.nix
-			./_hosts/michael/hardware-configuration.nix
-			inputs.disko.nixosModules.default
-		];
-
-		networking.hostName = "michael";
-
 		sops.secrets = {
-			michael-gitea-litestream = {
-				sopsFile = ../secrets/michael-gitea-litestream;
-				format = "binary";
-				owner = "gitea";
-				group = "gitea";
-			};
-			michael-gitea-restic-password = {
-				sopsFile = ../secrets/michael-gitea-restic-password;
-				format = "binary";
-				owner = "gitea";
-				group = "gitea";
-			};
-			michael-gitea-restic-env = {
-				sopsFile = ../secrets/michael-gitea-restic-env;
-				format = "binary";
-				owner = "gitea";
-				group = "gitea";
-			};
+			michael-gitea-litestream =
+				secretLib.mkServiceBinarySecret {
+					name = "michael-gitea-litestream";
+					serviceUser = "gitea";
+					sopsFile = ../secrets/michael-gitea-litestream;
+				};
+			michael-gitea-restic-password =
+				secretLib.mkServiceBinarySecret {
+					name = "michael-gitea-restic-password";
+					serviceUser = "gitea";
+					sopsFile = ../secrets/michael-gitea-restic-password;
+				};
+			michael-gitea-restic-env =
+				secretLib.mkServiceBinarySecret {
+					name = "michael-gitea-restic-env";
+					serviceUser = "gitea";
+					sopsFile = ../secrets/michael-gitea-restic-env;
+				};
 		};
 
 		networking.firewall.allowedTCPPorts = [80 443];
@@ -98,28 +78,24 @@
 		services.litestream = {
 			enable = true;
 			environmentFile = config.sops.secrets.michael-gitea-litestream.path;
-			settings = {
-				dbs = [
-					{
-						path = "/var/lib/gitea/data/gitea.db";
-						replicas = [
-							{
-								type = "s3";
-								bucket = "michael-gitea-litestream";
-								path = "gitea";
-								endpoint = "s3.eu-central-003.backblazeb2.com";
-							}
-						];
-					}
-				];
-			};
+			settings.dbs = [
+				{
+					path = "/var/lib/gitea/data/gitea.db";
+					replicas = [
+						{
+							type = "s3";
+							bucket = "michael-gitea-litestream";
+							path = "gitea";
+							endpoint = "s3.eu-central-003.backblazeb2.com";
+						}
+					];
+				}
+			];
 		};
 
-		systemd.services.litestream = {
-			serviceConfig = {
-				User = lib.mkForce "gitea";
-				Group = lib.mkForce "gitea";
-			};
+		systemd.services.litestream.serviceConfig = {
+			User = lib.mkForce "gitea";
+			Group = lib.mkForce "gitea";
 		};
 
 		services.caddy = {

modules/hosts.nix

@@ -1,6 +0,0 @@
-{...}: {
-	den.hosts.aarch64-darwin.chidi.users.cschmatzler = {};
-	den.hosts.aarch64-darwin.jason.users.cschmatzler = {};
-	den.hosts.x86_64-linux.michael.users.cschmatzler = {};
-	den.hosts.x86_64-linux.tahani.users.cschmatzler = {};
-}

modules/hosts/_parts/tahani/networking.nix

@@ -13,7 +13,7 @@
 		nameservers = ["1.1.1.1"];
 		firewall = {
 			enable = true;
-			trustedInterfaces = ["eno1" "tailscale0"];
+			trustedInterfaces = ["eno1" "tailscale0" "docker0"];
 			allowedUDPPorts = [
 				53
 				config.services.tailscale.port

modules/hosts/chidi.nix

@@ -0,0 +1,35 @@
+{
+	den,
+	lib,
+	...
+}: let
+	hostLib = import ../_lib/hosts.nix {inherit den lib;};
+	local = import ../_lib/local.nix;
+	host = "chidi";
+	hostMeta = local.hosts.chidi;
+in
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
+			system = hostMeta.system;
+			inherit host;
+			user = local.user.name;
+			includes = [den.aspects.user-darwin-laptop];
+			homeManager = {...}: {
+				programs.git.settings.user.email = local.user.emails.work;
+			};
+		})
+	(hostLib.mkPerHostAspect {
+			inherit host;
+			includes = [
+				den.aspects.host-darwin-base
+				den.aspects.opencode-api-key
+			];
+			darwin = {...}: {
+				networking.hostName = host;
+				networking.computerName = host;
+
+				homebrew.casks = [
+					"slack"
+				];
+			};
+		})

modules/hosts/janet.nix

@@ -0,0 +1,31 @@
+{
+	den,
+	lib,
+	...
+}: let
+	hostLib = import ../_lib/hosts.nix {inherit den lib;};
+	local = import ../_lib/local.nix;
+	host = "janet";
+	hostMeta = local.hosts.janet;
+in
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
+			system = hostMeta.system;
+			inherit host;
+			user = local.user.name;
+			includes = [
+				den.aspects.user-darwin-laptop
+				den.aspects.user-personal
+			];
+		})
+	(hostLib.mkPerHostAspect {
+			inherit host;
+			includes = [
+				den.aspects.host-darwin-base
+				den.aspects.opencode-api-key
+			];
+			darwin = {...}: {
+				networking.hostName = host;
+				networking.computerName = host;
+			};
+		})

modules/hosts/michael.nix

@@ -0,0 +1,35 @@
+{
+	den,
+	inputs,
+	lib,
+	...
+}: let
+	hostLib = import ../_lib/hosts.nix {inherit den lib;};
+	local = import ../_lib/local.nix;
+	host = "michael";
+	hostMeta = local.hosts.michael;
+in
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
+			system = hostMeta.system;
+			inherit host;
+			user = local.user.name;
+			includes = [den.aspects.user-minimal];
+		})
+	(hostLib.mkPerHostAspect {
+			inherit host;
+			includes = [
+				den.aspects.host-public-server
+				den.aspects.gitea
+			];
+			nixos = {modulesPath, ...}: {
+				imports = [
+					(modulesPath + "/installer/scan/not-detected.nix")
+					./_parts/michael/disk-config.nix
+					./_parts/michael/hardware-configuration.nix
+					inputs.disko.nixosModules.default
+				];
+
+				networking.hostName = host;
+			};
+		})

modules/hosts/tahani.nix

@@ -0,0 +1,109 @@
+{
+	den,
+	lib,
+	...
+}: let
+	hostLib = import ../_lib/hosts.nix {inherit den lib;};
+	local = import ../_lib/local.nix;
+	secretLib = import ../_lib/secrets.nix {inherit lib;};
+	host = "tahani";
+	hostMeta = local.hosts.tahani;
+in
+	lib.recursiveUpdate
+	(hostLib.mkUserHost {
+			system = hostMeta.system;
+			inherit host;
+			user = local.user.name;
+			includes = [
+				den.aspects.user-workstation
+				den.aspects.user-personal
+				den.aspects.email
+			];
+			homeManager = {
+				config,
+				inputs',
+				...
+			}: let
+				opencode = inputs'.llm-agents.packages.opencode;
+			in {
+				programs.opencode.settings.permission.external_directory = {
+					"/tmp/himalaya-triage/*" = "allow";
+					"/var/lib/paperless/consume/inbox-triage/*" = "allow";
+				};
+
+				programs.nushell.extraConfig = ''
+					if $nu.is-interactive and ('SSH_CONNECTION' in ($env | columns)) and ('ZELLIJ' not-in ($env | columns)) {
+						try {
+							zellij attach -c main
+							exit
+						} catch {
+							print "zellij auto-start failed; staying in shell"
+						}
+					}
+				'';
+
+				systemd.user.services.opencode-inbox-triage = {
+					Unit = {
+						Description = "OpenCode inbox triage";
+					};
+					Service = {
+						Type = "oneshot";
+						ExecStart = "${opencode}/bin/opencode run --command inbox-triage --model opencode-go/glm-5";
+						Environment = "PATH=${config.home.profileDirectory}/bin:/run/current-system/sw/bin";
+					};
+				};
+
+				systemd.user.timers.opencode-inbox-triage = {
+					Unit = {
+						Description = "Run OpenCode inbox triage every 12 hours";
+					};
+					Timer = {
+						OnCalendar = "*-*-* 0/12:00:00";
+						Persistent = true;
+					};
+					Install = {
+						WantedBy = ["timers.target"];
+					};
+				};
+			};
+		})
+	(hostLib.mkPerHostAspect {
+			inherit host;
+			includes = [
+				den.aspects.host-nixos-base
+				den.aspects.opencode-api-key
+				den.aspects.adguardhome
+				den.aspects.cache
+				den.aspects.paperless
+			];
+			nixos = {...}: {
+				imports = [
+					./_parts/tahani/networking.nix
+				];
+
+				networking.hostName = host;
+
+				sops.secrets.tahani-email-password =
+					secretLib.mkUserBinarySecret {
+						name = "tahani-email-password";
+						sopsFile = ../../secrets/tahani-email-password;
+					};
+
+				virtualisation.docker.enable = true;
+				users.users.${local.user.name}.extraGroups = [
+					"docker"
+					"paperless"
+				];
+
+				systemd.tmpfiles.rules = [
+					"d /var/lib/paperless/consume 2775 paperless paperless -"
+					"d /var/lib/paperless/consume/inbox-triage 2775 paperless paperless -"
+				];
+				swapDevices = [
+					{
+						device = "/swapfile";
+						size = 16 * 1024;
+					}
+				];
+			};
+		})

modules/inventory.nix

@@ -0,0 +1,10 @@
+{lib, ...}: let
+	local = import ./_lib/local.nix;
+in
+	lib.foldl' lib.recursiveUpdate {} (
+		lib.mapAttrsToList (
+			host: hostMeta:
+				lib.setAttrByPath ["den" "hosts" hostMeta.system host "users" local.user.name] {}
+		)
+		local.hosts
+	)

modules/jason.nix

@@ -1,25 +0,0 @@
-{den, ...}: {
-	den.aspects.jason.includes = [
-		den.aspects.darwin-system
-		den.aspects.core
-		den.aspects.tailscale
-		den.aspects.desktop
-		den.aspects.terminal
-		den.aspects.atuin
-		den.aspects.dev-tools
-		den.aspects.neovim
-		den.aspects.ai-tools
-		den.aspects.zellij
-		den.aspects.zk
-	];
-
-	den.aspects.jason.darwin = {...}: {
-		networking.hostName = "jason";
-		networking.computerName = "jason";
-	};
-
-	den.aspects.jason.homeManager = {...}: {
-		fonts.fontconfig.enable = true;
-		programs.git.settings.user.email = "christoph@schmatzler.com";
-	};
-}

modules/neovim.nix

@@ -4,5 +4,11 @@
 			inputs.nixvim.homeModules.nixvim
 			./_neovim/default.nix
 		];
+
+		_module.args.nvim-plugin-sources = {
+			code-review-nvim = inputs.code-review-nvim;
+			jj-nvim = inputs.jj-nvim;
+			jj-diffconflicts = inputs.jj-diffconflicts;
+		};
 	};
 }

modules/network.nix

@@ -21,24 +21,20 @@
 				overalljails = true;
 			};
 			jails = {
-				sshd = {
-					settings = {
-						enabled = true;
-						port = "ssh";
-						filter = "sshd";
-						maxretry = 3;
-					};
+				sshd.settings = {
+					enabled = true;
+					port = "ssh";
+					filter = "sshd";
+					maxretry = 3;
 				};
-				gitea = {
-					settings = {
-						enabled = true;
-						filter = "gitea";
-						logpath = "/var/lib/gitea/log/gitea.log";
-						maxretry = 10;
-						findtime = 3600;
-						bantime = 900;
-						action = "iptables-allports";
-					};
+				gitea.settings = {
+					enabled = true;
+					filter = "gitea";
+					logpath = "/var/lib/gitea/log/gitea.log";
+					maxretry = 10;
+					findtime = 3600;
+					bantime = 900;
+					action = "iptables-allports";
 				};
 			};
 		};
@@ -53,30 +49,28 @@
 	den.aspects.tailscale.nixos = {
 		services.tailscale = {
 			enable = true;
+			extraSetFlags = ["--ssh"];
 			openFirewall = true;
 			permitCertUid = "caddy";
 			useRoutingFeatures = "server";
 		};
 	};
 
-	den.aspects.tailscale.darwin = {
-		services.tailscale = {
+	den.aspects.mosh.nixos = {
+		programs.mosh = {
 			enable = true;
+			openFirewall = false;
 		};
+
+		networking.firewall.interfaces.tailscale0.allowedUDPPortRanges = [
+			{
+				from = 60000;
+				to = 61000;
+			}
+		];
 	};
 
-	# Network tools
-	den.aspects.network.homeManager = {
-		pkgs,
-		lib,
-		...
-	}: {
-		home.packages = with pkgs;
-			[
-				dig
-			]
-			++ lib.optionals stdenv.isDarwin [
-				tailscale
-			];
+	den.aspects.tailscale.darwin = {
+		services.tailscale.enable = true;
 	};
 }

modules/nixos-system.nix

@@ -1,11 +1,14 @@
-{inputs, ...}: {
+{inputs, ...}: let
+	local = import ./_lib/local.nix;
+	userHome = "/home/${local.user.name}";
+in {
 	den.aspects.nixos-system.nixos = {pkgs, ...}: {
 		imports = [inputs.home-manager.nixosModules.home-manager];
 
 		security.sudo.enable = true;
 		security.sudo.extraRules = [
 			{
-				users = ["cschmatzler"];
+				users = [local.user.name];
 				commands = [
 					{
 						command = "/run/current-system/sw/bin/nix-env";
@@ -46,9 +49,9 @@
 		time.timeZone = "UTC";
 
 		nix = {
-			settings.trusted-users = ["cschmatzler"];
+			settings.trusted-users = [local.user.name];
 			gc.dates = "weekly";
-			nixPath = ["nixos-config=/home/cschmatzler/.local/share/src/nixos-config:/etc/nixos"];
+			nixPath = ["nixos-config=${userHome}/.local/share/src/nixos-config:/etc/nixos"];
 		};
 
 		boot = {
@@ -67,13 +70,13 @@
 				"usb_storage"
 				"sd_mod"
 			];
-			kernelPackages = pkgs.linuxPackages_latest;
+			kernelPackages = pkgs.linuxPackages;
 		};
 
 		users.users = {
-			cschmatzler = {
+			${local.user.name} = {
 				isNormalUser = true;
-				home = "/home/cschmatzler";
+				home = userHome;
 				extraGroups = [
 					"wheel"
 					"sudo"
@@ -93,7 +96,5 @@
 				];
 			};
 		};
-
-		home-manager.useGlobalPkgs = true;
 	};
 }

modules/opencode.nix

@@ -0,0 +1,11 @@
+{lib, ...}: let
+	secretLib = import ./_lib/secrets.nix {inherit lib;};
+in {
+	den.aspects.opencode-api-key.os = {
+		sops.secrets.opencode-api-key =
+			secretLib.mkUserBinarySecret {
+				name = "opencode-api-key";
+				sopsFile = ../secrets/opencode-api-key;
+			};
+	};
+}

modules/overlays.nix

@@ -1,57 +1,29 @@
 {inputs, ...}: let
 	overlays = [
 		# himalaya
-		(final: prev: {
-				himalaya = inputs.himalaya.packages.${prev.stdenv.hostPlatform.system}.default;
-			})
+		(import ./_overlays/himalaya.nix {inherit inputs;})
+		# direnv (Go 1.26 on darwin disables cgo, but direnv forces external linking)
+		(final: prev:
+				prev.lib.optionalAttrs prev.stdenv.hostPlatform.isDarwin {
+					direnv =
+						prev.direnv.overrideAttrs (old: {
+								env =
+									(old.env or {})
+									// {
+										CGO_ENABLED = 1;
+									};
+							});
+				})
 		# ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox)
-		(final: prev: {
-				ast-grep = prev.ast-grep.overrideAttrs (old: {
-					doCheck = false;
-				});
-			})
+		(import ./_overlays/ast-grep.nix {inherit inputs;})
 		# jj-ryu
-		(final: prev: let
-				naersk-lib = prev.callPackage inputs.naersk {};
-				manifest = (prev.lib.importTOML "${inputs.jj-ryu}/Cargo.toml").package;
-			in {
-				jj-ryu =
-					naersk-lib.buildPackage {
-						pname = manifest.name;
-						version = manifest.version;
-						src = inputs.jj-ryu;
-						nativeBuildInputs = [prev.pkg-config];
-						buildInputs = [prev.openssl];
-						OPENSSL_NO_VENDOR = 1;
-						doCheck = false;
-					};
-			})
-		# nono (AI agent sandbox CLI — Cargo workspace)
-		(final: prev: let
-				naersk-lib = prev.callPackage inputs.naersk {};
-				manifest = (prev.lib.importTOML "${inputs.nono}/crates/nono-cli/Cargo.toml").package;
-			in {
-				nono =
-					naersk-lib.buildPackage {
-						pname = manifest.name;
-						version = manifest.version;
-						src = inputs.nono;
-						nativeBuildInputs = [prev.pkg-config prev.cmake prev.perl];
-						buildInputs = [prev.openssl] ++ prev.lib.optionals prev.stdenv.isLinux [prev.dbus];
-						OPENSSL_NO_VENDOR = 1;
-						doCheck = false;
-					};
-			})
+		(import ./_overlays/jj-ryu.nix {inherit inputs;})
+		# cog-cli
+		(import ./_overlays/cog-cli.nix {inherit inputs;})
 		# jj-starship (passes through upstream overlay)
-		inputs.jj-starship.overlays.default
+		(import ./_overlays/jj-starship.nix {inherit inputs;})
 		# zjstatus
-		(final: prev: {
-				zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default;
-			})
-		# tuicr
-		(final: prev: {
-				tuicr = inputs.tuicr.defaultPackage.${prev.stdenv.hostPlatform.system};
-			})
+		(import ./_overlays/zjstatus.nix {inherit inputs;})
 	];
 in {
 	den.default.nixos.nixpkgs.overlays = overlays;

modules/paperless.nix

@@ -0,0 +1,100 @@
+{lib, ...}: let
+	caddyLib = import ./_lib/caddy.nix;
+	local = import ./_lib/local.nix;
+	secretLib = import ./_lib/secrets.nix {inherit lib;};
+	paperlessPrompts = ./_paperless;
+in {
+	den.aspects.paperless.nixos = {config, ...}: {
+		sops.secrets = {
+			tahani-paperless-password =
+				secretLib.mkBinarySecret {
+					name = "tahani-paperless-password";
+					sopsFile = ../secrets/tahani-paperless-password;
+				};
+			tahani-paperless-gpt-env =
+				secretLib.mkBinarySecret {
+					name = "tahani-paperless-gpt-env";
+					sopsFile = ../secrets/tahani-paperless-gpt-env;
+				};
+		};
+
+		services.caddy = {
+			enable = true;
+			enableReload = false;
+			globalConfig = ''
+				admin off
+			'';
+			virtualHosts =
+				caddyLib.mkTailscaleVHost {
+					name = "docs";
+					configText = "reverse_proxy localhost:${toString config.services.paperless.port}";
+				}
+				// caddyLib.mkTailscaleVHost {
+					name = "docs-ai";
+					configText = "reverse_proxy localhost:8081";
+				};
+		};
+
+		virtualisation.oci-containers = {
+			backend = "docker";
+			containers.paperless-gpt = {
+				image = "icereed/paperless-gpt:latest";
+				autoStart = true;
+				ports = [
+					"127.0.0.1:8081:8080"
+				];
+				volumes = [
+					"paperless-gpt-data:/app/data"
+					"paperless-gpt-prompts:/app/prompts"
+					"${paperlessPrompts}/tag_prompt.tmpl:/app/prompts/tag_prompt.tmpl:ro"
+					"${paperlessPrompts}/title_prompt.tmpl:/app/prompts/title_prompt.tmpl:ro"
+				];
+				environment = {
+					PAPERLESS_BASE_URL = "http://host.docker.internal:${toString config.services.paperless.port}";
+					LLM_PROVIDER = "openai";
+					LLM_MODEL = "gpt-5.4";
+					LLM_LANGUAGE = "German";
+					VISION_LLM_PROVIDER = "openai";
+					VISION_LLM_MODEL = "gpt-5.4";
+					LOG_LEVEL = "info";
+				};
+				environmentFiles = [
+					config.sops.secrets.tahani-paperless-gpt-env.path
+				];
+				extraOptions = [
+					"--add-host=host.docker.internal:host-gateway"
+				];
+			};
+		};
+
+		services.redis.servers.paperless = {
+			enable = true;
+			port = 6379;
+			bind = "127.0.0.1";
+			settings = {
+				maxmemory = "256mb";
+				maxmemory-policy = "allkeys-lru";
+			};
+		};
+
+		services.paperless = {
+			enable = true;
+			address = "0.0.0.0";
+			consumptionDir = "/var/lib/paperless/consume";
+			passwordFile = config.sops.secrets.tahani-paperless-password.path;
+			settings = {
+				PAPERLESS_DBENGINE = "sqlite";
+				PAPERLESS_REDIS = "redis://127.0.0.1:6379";
+				PAPERLESS_CONSUMER_IGNORE_PATTERN = [
+					".DS_STORE/*"
+					"desktop.ini"
+				];
+				PAPERLESS_CONSUMER_POLLING = 30;
+				PAPERLESS_CONSUMER_RECURSIVE = true;
+				PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS = true;
+				PAPERLESS_OCR_LANGUAGE = "deu+eng";
+				PAPERLESS_CSRF_TRUSTED_ORIGINS = "https://${local.tailscaleHost "docs"}";
+			};
+		};
+	};
+}

modules/profiles/host/darwin-base.nix

@@ -0,0 +1,7 @@
+{den, ...}: {
+	den.aspects.host-darwin-base.includes = [
+		den.aspects.darwin-system
+		den.aspects.core
+		den.aspects.tailscale
+	];
+}

modules/profiles/host/nixos-base.nix

@@ -0,0 +1,9 @@
+{den, ...}: {
+	den.aspects.host-nixos-base.includes = [
+		den.aspects.nixos-system
+		den.aspects.core
+		den.aspects.mosh
+		den.aspects.openssh
+		den.aspects.tailscale
+	];
+}

modules/profiles/host/public-server.nix

@@ -0,0 +1,6 @@
+{den, ...}: {
+	den.aspects.host-public-server.includes = [
+		den.aspects.host-nixos-base
+		den.aspects.fail2ban
+	];
+}

modules/profiles/user/base.nix

@@ -0,0 +1,11 @@
+{den, ...}: {
+	den.aspects.user-base.includes = [
+		den.aspects.shell
+		den.aspects.ssh-client
+		den.aspects.terminal
+		den.aspects.atuin
+		den.aspects.secrets
+		den.aspects.zellij
+		den.aspects.zk
+	];
+}