System/Nixtop: Disable deprecated modules

Modules/Firefox: Set configPath after update
Modules/Niri: Replace swww with awww after update
2026-05-01 11:56:49 +02:00 · 2026-05-01 11:56:38 +02:00 · 2026-05-01 11:56:31 +02:00 · 2026-05-01 11:55:40 +02:00 · 2026-04-30 09:15:03 +02:00 · 2026-04-30 09:14:43 +02:00
37 changed files with 862 additions and 1529 deletions
--- a/FastFetch.png
+++ b/FastFetch.png
--- a/NeoVim.png
+++ b/NeoVim.png
--- a/README.md
+++ b/README.md
@ -1,159 +1,43 @@
-# NixFlake
+# NixOS Configuration

-NixOS flake with [Niri](https://github.com/niri-wm/niri), [Waybar](https://github.com/Alexays/Waybar) for a lightweight desktop and [home-manager](https://github.com/nix-community/home-manager) for declarative `~/` configuration.
+Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop.

-## Screenshots
+![](FastFetch.png)
+![](Darwin.png)

-![Fastfetch](FastFetch.png)
+To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
+Alternatively, use `nh os switch` or `nh os boot`.

-![Neovim](NeoVim.png)
+## NixFlake/system

-![Darwin](Darwin.png)
+Contains all the system configurations.

-## Hosts
+- There is a common configuration used for all systems: `NixFlake/system/default.nix`
+- Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix`
+- System modules are located in `NixFlake/system/systemmodules`
+- Hosted services are located in `NixFlake/system/services`

-| Host | Type | GPU | Features |
-|-|-|-|-|
-| `nixinator` | Desktop (x86_64) | NVIDIA | [disko](https://github.com/nix-community/disko) partitioning, [lanzaboote](https://github.com/nix-community/lanzaboote) Secure Boot, [impermanence](https://github.com/nix-community/impermanence) opt-in state, [sops-nix](https://github.com/Mic92/sops-nix) secrets |
-| `nixtop` | Laptop (x86_64) | Intel | Obsolete trash computer |
-| `servenix` | Headless (x86_64) | NVIDIA | Jellyfin, Nextcloud, Gitea, ... |
-| `thinknix` | Headless (x86_64) | - | AdGuard DNS, Nginx, ... |
-| `darwinix` | macOS (aarch64) | - | nix-darwin with home-manager |
+When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
+Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.

-## Usage
+## NixFlake/home

-```bash
-# Enter dev shell (provides helper utilities)
-nix develop
+Contains all the home-manager configurations.

-# Rebuild system + user config together
-nh os switch
-nh os boot
+- There is a common configuration for each user: `NixFlake/home/<username>/default.nix`
+- There is a configuration for a single system of this user: `NixFlake/home/<username>/<hostname>/default.nix`
+- Home-Manager modules are located in `NixFlake/home/homemodules`

-# Or with nixos-rebuild
-sudo nixos-rebuild switch --flake .#nixinator
-```
+When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
+Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.

-## Info
+## NixFlake/derivations

-Home-manager runs as a NixOS module (not standalone). A single `nixos-rebuild switch` rebuilds both system and user configuration together.
+Contains all the stuff I packaged.
+Each derivation is loaded into `NixFlake/derivations/default.nix`.

-### Components
+## NixFlake/overlays

-Per-host config consists of three layers:
-
-1. **Common Config**: `system/default.nix` (NixOS) / `home/christoph/default.nix` (home-manager)
-2. **Host Config**: `system/<hostname>/default.nix` (NixOS) / `home/christoph/<hostname>/default.nix` (home-manager)
-3. **Hardware**: `system/<hostname>/hardware-configuration.nix`
-
-### Modules
-
-There are two module hierarchies (NixOS and home-manager modules):
-
-```
-system/systemmodules/<name>/        home/homemodules/<name>/
- options.nix # declares options    - options.nix # declares options
- default.nix # implementation      - default.nix # implementation
-```
-
-## Files
-
-```
-NixFlake/
-├── flake.nix              # flake entrypoint: inputs, outputs, host definitions
-├── flake.lock             # flake lockfile
-├── shell.nix              # dev shell (nix develop)
-├── system/                # NixOS system configurations
-│   ├── default.nix        # global system defaults (all hosts)
-│   ├── <hostname>/        # per-host overrides + hardware-config
-│   ├── systemmodules/     # reusable system modules
-│   └── services/          # OCI container services
-├── home/                  # home-manager user configuration
-│   └── christoph/
-│       ├── default.nix    # global user defaults
-│       ├── <hostname>/    # per-host user overrides
-│       └── homemodules/   # reusable home-manager modules
-├── lib/                   # shared helpers
-├── derivations/           # custom packages
-├── overlays/              # package overrides
-├── config/                # linked dotfiles
-└── wallpapers/            # backgrounds
-```
-
-## System Modules
-
-| Module | Description |
-|--------|-------------|
-| `bootloader` | systemd-boot, lanzaboote Secure Boot signing |
-| `desktopportal` | xdg-desktop-portal backends (Niri, GTK) |
-| `docker` | Docker / podman daemon config |
-| `fonts` | System fonts and fontconfig |
-| `impermanence` | Opt-in state persistence (wipes `/` on boot) |
-| `mime` | MIME type associations |
-| `network` | systemd-networkd wired/wireless config |
-| `polkit` | Polkit rules for desktop users |
-| `sops-nix` | Secrets decryption at boot |
-
-## Home-Manager Modules
-
-### Shell & Terminal
-`fish` `terminal` `kitty` `tmux` `paths`
-
-### Editors
-`neovim` `vscode` `zed`
-
-### Desktop / WM
-`niri` `waybar` `rofi` `color` `fcitx`
-
-### Media
-`mpd` `rmpc` `cava` `beets` `jellyfin-tui`
-
-### Browsers
-`firefox` `qutebrowser`
-
-### Tools
-`git` `ssh` `bat` `btop` `fastfetch` `lazygit` `yazi` `zathura`
-
-## Services
-
-All server services run as OCI containers (podman). Each service is defined in `system/services/<name>.nix`.
-
-| Service | Purpose |
-|---------|---------|
-| `adguard` | DNS ad blocking |
-| `authelia` | SSO |
-| `fileflows` | Media processing |
-| `gitea` | Git server |
-| `immich` | Photo cloud |
-| `jellyfin` | Streaming server |
-| `kiwix` | Offline mirrors |
-| `kopia` | Docker volume backup |
-| `nextcloud` | File sync |
-| `nginx-proxy-manager` | Reverse proxy with Let's Encrypt |
-| `ntfy` | Push notification server |
-| `paperless` | Document management |
-| `portainer` | Container status monitor |
-| `teamspeak` | Voice chat server |
-| `tinymediamanager` | Media metadata management |
-
-## Overlays
-
-Package modifications live in `overlays/default.nix`.
-
-## Secrets
-
-Secrets are managed with sops-nix. Public age keys are stored in `flake.nix` under `publicKeys`. Encrypted `.yaml`/`.json` files are referenced via `sops.secrets.<name>`. Decryption happens at activation time.
-
-## Shared Helpers (`lib/`)
-
-| File | Purpose |
-|------|---------|
-| `nixos.nix` | Host config builders (NixOS + darwin) |
-| `modules.nix` | Option helpers |
-| `networking.nix` | systemd-networkd config generators |
-| `generators.nix` | Lua code generation |
-| `containers.nix` | OCI container helpers for services |
-| `color.nix` | Color utilities |
-| `rofi.nix` | Rofi menu helpers |
-
-Available to all modules as `mylib` (injected via special args).
+Contains all overlays, e.g. package version overrides.
+The `NixFlake/overlays/default.nix` imports all overlays and all derivations.
+It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations.
--- a/derivations/tiddl/default.nix
+++ b/derivations/tiddl/default.nix
@ -34,12 +34,12 @@
 in
  pythonPkgs.buildPythonApplication rec {
    pname = "tiddl";
-    version = "3.4.3";
+    version = "3.2.0";
    format = "pyproject";

    src = pythonPkgs.fetchPypi {
      inherit pname version;
-      sha256 = "sha256-45KHNS1IP59DsH8i2uQ7sua6T21vW/Yw1PQg55jzLGs=";
+      sha256 = "sha256-uLkGyIScYPqFgQdPAOYJDJG0jp+nDAwIl2kFkaJZFco=";
    };

    dontCheckRuntimeDeps = true;
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,24 @@
 {
  "nodes": {
+    "comfyui-nix": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1776979072,
+        "narHash": "sha256-1BUQDAMWGVcUhPuI5JFQmCTYlBmN/Fmon6MGmaKXrCk=",
+        "owner": "utensils",
+        "repo": "comfyui-nix",
+        "rev": "8a90889efc8fae81a8e03b8d9a8406c9f8ff425b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "utensils",
+        "repo": "comfyui-nix",
+        "type": "github"
+      }
+    },
    "crane": {
      "locked": {
        "lastModified": 1754269165,
@ -17,7 +36,7 @@
    },
    "devshell": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1768818222,
@ -33,6 +52,28 @@
        "type": "github"
      }
    },
+    "direnv-instant": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1776984766,
+        "narHash": "sha256-QkT7k2MCfPDcmAXwTC0ZDbMxD1UX2l7SkDPWWoAE4ZY=",
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "rev": "c51044f2cf19a5361bb8b3a50e9206ba4b6eaa26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "direnv-instant",
+        "type": "github"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@ -56,15 +97,15 @@
    },
    "elephant": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1781164160,
-        "narHash": "sha256-dxo3aPnfaQJt9K/3NhgKfu2Q9B42z4d4Or9Izoug+68=",
+        "lastModified": 1775706155,
+        "narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=",
        "owner": "abenz1267",
        "repo": "elephant",
-        "rev": "3296842820d04d5ec774afc7528492fcbb3c01f2",
+        "rev": "376ee71c66db38683daabd57350bf3f6f086eaf8",
        "type": "github"
      },
      "original": {
@ -142,6 +183,45 @@
      }
    },
    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "direnv-instant",
+          "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_3": {
      "inputs": {
        "nixpkgs-lib": [
          "lanzaboote",
@ -162,7 +242,7 @@
        "type": "github"
      }
    },
-    "flake-parts_2": {
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "nixvim",
@ -170,11 +250,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
        "type": "github"
      },
      "original": {
@ -183,7 +263,7 @@
        "type": "github"
      }
    },
-    "flake-parts_3": {
+    "flake-parts_5": {
      "inputs": {
        "nixpkgs-lib": [
          "nur",
@ -263,15 +343,12 @@
      }
    },
    "hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
      "locked": {
-        "lastModified": 1781168557,
-        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
+        "lastModified": 1776983936,
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
        "type": "github"
      },
      "original": {
@ -287,11 +364,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1781305496,
-        "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=",
+        "lastModified": 1777594677,
+        "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c87a39aa979acc4848016d2220c6238390d84779",
+        "rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
        "type": "github"
      },
      "original": {
@ -326,11 +403,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1781228795,
-        "narHash": "sha256-OSofuO5j7FLg2R7c9YQdK5epMqkQLucExcDNF7dqCMo=",
+        "lastModified": 1777394001,
+        "narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=",
        "owner": "JPyke3",
        "repo": "hytale-launcher-nix",
-        "rev": "efe21e31eb63d6db1a104c14bbb437ae5d03f73b",
+        "rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8",
        "type": "github"
      },
      "original": {
@ -362,7 +439,7 @@
      "inputs": {
        "crane": "crane",
        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_3",
        "nixpkgs": [
          "nixpkgs"
        ],
@ -408,7 +485,7 @@
    "naersk": {
      "inputs": {
        "fenix": "fenix",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
        "lastModified": 1763384566,
@ -436,11 +513,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1781234038,
-        "narHash": "sha256-jo4a47qDgsx1F1i0MtHZl12FfzqKJOES25vbm0ZUxeI=",
+        "lastModified": 1777542749,
+        "narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "eb5789cba8d37802d330df5a13c691622c83121f",
+        "rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
        "type": "github"
      },
      "original": {
@ -469,11 +546,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1780938415,
-        "narHash": "sha256-QHyIMGSbCQW8d5qbOrMsm6gem10bO3Au2YLa3alJfHo=",
+        "lastModified": 1777468255,
+        "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "6f1a2c5f0e8274223d4204b1f8d6f7f91538967e",
+        "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
        "type": "github"
      },
      "original": {
@ -489,11 +566,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1778849865,
-        "narHash": "sha256-HiVhuhD7Fvfje3iw4slmtcCckz/LbjLITa4g/iTEbw0=",
+        "lastModified": 1776242217,
+        "narHash": "sha256-TRts0fKUPFcf1i6rZHFGUDTfti/x3oKEg/CqsPRpSgs=",
        "owner": "thiagokokada",
        "repo": "nix-alien",
-        "rev": "1bb49f5aea63e95a3cf9c4b91f9f1331fef7a52b",
+        "rev": "4c5e52dda0d6ab3de814e364046769321d3e1021",
        "type": "github"
      },
      "original": {
@ -509,11 +586,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1781242433,
-        "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=",
+        "lastModified": 1775037210,
+        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b",
+        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
        "type": "github"
      },
      "original": {
@ -547,11 +624,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1778393439,
-        "narHash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=",
+        "lastModified": 1775970782,
+        "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "01466c414c7357ae2ce32be4a272a7c69e94ab5f",
+        "rev": "bedba5989b04614fc598af9633033b95a937933f",
        "type": "github"
      },
      "original": {
@ -561,6 +638,69 @@
      }
    },
    "nixpkgs": {
+      "locked": {
+        "lastModified": 1766902085,
+        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
      "locked": {
        "lastModified": 1762156382,
        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
@ -576,55 +716,7 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1775710090,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1764242076,
        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
@ -640,26 +732,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
        "type": "github"
      },
      "original": {
@ -687,11 +766,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
        "type": "github"
      },
      "original": {
@ -703,11 +782,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
        "type": "github"
      },
      "original": {
@ -718,22 +797,6 @@
      }
    },
    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1780336545,
-        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
      "locked": {
        "lastModified": 1752077645,
        "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -749,18 +812,36 @@
        "type": "github"
      }
    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_8",
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1781287460,
-        "narHash": "sha256-9hXtN4my7eBqHRVQ/t6FQZ4YqZ1KG6SsKSG4Hdtr+i0=",
+        "lastModified": 1777236345,
+        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "f2029d9a26266eb67f46b0c79bd0a3713839a57a",
+        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
        "type": "github"
      },
      "original": {
@ -794,17 +875,17 @@
    },
    "nur": {
      "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_5",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1781349989,
-        "narHash": "sha256-PTgbtYdDqSzfANBCI8g0iA5DdMGr5imJuWUH1w0RmWY=",
+        "lastModified": 1777624369,
+        "narHash": "sha256-nQOSodcDhXiKlfCKb4pE/4GBAs2FnBOD+AHVem0EqOc=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "6b2f93e70e526d09559f73dfc3760d489a5504bf",
+        "rev": "c3ec6b994c235a53a28304564da6422a45230603",
        "type": "github"
      },
      "original": {
@ -841,7 +922,9 @@
    },
    "root": {
      "inputs": {
+        "comfyui-nix": "comfyui-nix",
        "devshell": "devshell",
+        "direnv-instant": "direnv-instant",
        "disko": "disko",
        "elephant": "elephant",
        "hardware": "hardware",
@ -909,11 +992,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780547341,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "lastModified": 1777338324,
+        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
        "type": "github"
      },
      "original": {
@ -954,16 +1037,15 @@
    },
    "systems_3": {
      "locked": {
-        "lastModified": 1774449309,
-        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
-        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "ref": "future-26.11",
        "repo": "default",
        "type": "github"
      }
@ -1005,11 +1087,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780405768,
-        "narHash": "sha256-WhPHaupeq5yWP53anFH6vr/ZMQQtAYGtpgUhzqWx9Ws=",
+        "lastModified": 1777451299,
+        "narHash": "sha256-Okqpw+zxAwHKXuuxlwYy9Ge9JUpnTbsMXqws2eOKfKo=",
        "owner": "adriankarlen",
        "repo": "textfox",
-        "rev": "d6895da75f10fa17f1b637759aec3d84818b20e2",
+        "rev": "3af57df1ed3a38eb584475fd9e032d9643f2a94d",
        "type": "github"
      },
      "original": {
@ -1018,20 +1100,41 @@
        "type": "github"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "direnv-instant",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "walker": {
      "inputs": {
        "elephant": [
          "elephant"
        ],
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_9",
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1781164128,
-        "narHash": "sha256-xPcYrHdDXWykIi5/XXkLvliBArRnfzvs+atB9El1qhI=",
+        "lastModified": 1777299395,
+        "narHash": "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=",
        "owner": "abenz1267",
        "repo": "walker",
-        "rev": "aa1e4b7d59237e8c43dde58636bae476f23d9bfb",
+        "rev": "7b0cb0fd1f8b0a60b241081483aea4277f0b4500",
        "type": "github"
      },
      "original": {
@ -1060,11 +1163,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1781226823,
-        "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=",
+        "lastModified": 1773622265,
+        "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e",
+        "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -64,7 +64,7 @@

    # NeoVim <3
    nixvim.url = "github:nix-community/nixvim";
-    # nixvim.inputs.nixpkgs.follows = "nixpkgs";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";

    # Emacs nightly
    # emacs-overlay.url = "github:nix-community/emacs-overlay";
@ -79,13 +79,16 @@
    # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this

    # Instant Direnv (load environment in background)
-    # direnv-instant.url = "github:Mic92/direnv-instant";
-    # direnv-instant.inputs.nixpkgs.follows = "nixpkgs";
+    direnv-instant.url = "github:Mic92/direnv-instant";
+    direnv-instant.inputs.nixpkgs.follows = "nixpkgs";

    # Realtime audio
    # musnix.url = "github:musnix/musnix";
    # musnix.inputs.nixpkgs.follows = "nixpkgs";

+    # ComfyUI
+    comfyui-nix.url = "github:utensils/comfyui-nix";
+
    # HyTale
    hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";

@ -142,6 +145,7 @@
        inputs.nur.overlays.default
        inputs.niri.overlays.niri
        # inputs.emacs-overlay.overlay
+        inputs.comfyui-nix.overlays.default

        # All my own overlays (derivations + modifications)
        (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
@ -252,6 +256,8 @@
        extraModules =
          [
            inputs.disko.nixosModules.disko
+            # inputs.nixified-ai.nixosModules.comfyui
+            inputs.comfyui-nix.nixosModules.default
          ]
          ++ commonModules;
      };
--- a/home/christoph/nixinator/default.nix
+++ b/home/christoph/nixinator/default.nix
@ -3,7 +3,6 @@
  pkgs,
  nixosConfig,
  config,
-  hostname,
  lib,
  mylib,
  username,
@ -19,212 +18,6 @@
      fcitx.enable = true;

      waybar.monitors = ["DP-1" "DP-2"];
-      vscode.enable = true;
-      zed.enable = true;
-    };
-
-    programs = {
-      claude-code = {
-        enable = true;
-        enableMcpIntegration = true;
-      };
-
-      mcp = {
-        enable = true;
-        servers = {
-          nixos = {
-            command = "uvx";
-            args = ["mcp-nixos"];
-          };
-          svelte = {
-            # claude mcp add -t stdio -s [scope] svelte -- npx -y @sveltejs/mcp
-            command = "npx";
-            args = ["-y" "@sveltejs/mcp"];
-            type = "stdio";
-          };
-          shadcn = {
-            # npx shadcn@latest mcp init --client claude
-            command = "npx";
-            args = ["-y" "shadcn@latest" "mcp"];
-          };
-        };
-      };
-
-      opencode = {
-        enable = true;
-        enableMcpIntegration = true;
-        extraPackages = with pkgs; [
-          # opencode-claude-auth # Installed using npm
-        ];
-
-        # Writes opencode.json
-        settings = {
-          attachment = {
-            image = {
-              auto_resize = true;
-              max_width = 2000;
-              max_height = 2000;
-              max_base64_bytes = 5242880;
-            };
-          };
-          autoupdate = false;
-          compaction = {
-            auto = true;
-            prune = true;
-            reserved = 10000;
-          };
-          default_agent = "plan";
-          enabled_providers = [
-            "opencode"
-            "opencode-go"
-            "anthropic"
-          ];
-          formatter = {
-            nixfmt = {
-              disabled = true;
-            };
-            alejandra = {
-              command = ["alejandra" "$FILE"];
-              extensions = [".nix"];
-            };
-            perltidy = {
-              command = ["perltidy" "$FILE"];
-              extensions = [".pl"];
-            };
-          };
-          lsp = {
-            nixd = {
-              command = ["nixd"];
-              extensions = [".nix"];
-              initialization = {
-                preferences = {
-                  nixd = {
-                    nixpkgs = {expr = "import <nixpkgs> {}";};
-                    options = {
-                      nixos = {expr = "(builtins.getFlake \"/home/${username}/NixFlake\").nixosConfigurations.${hostname}.options";};
-                      home-manager = {expr = "(builtins.getFlake \"/home/${username}/NixFlake\").nixosConfigurations.\"${hostname}\".options.home-manager.users.type.getSubOptions []";};
-                    };
-                    diagnostic = {
-                      suppress = ["sema-escaping-with" "var-bind-to-this" "escaping-this-with"];
-                    };
-                  };
-                };
-              };
-            };
-            perlnavigator = {
-              command = ["perlnavigator"];
-              extensions = [".pl"];
-              initialization = {
-                preferences = {};
-              };
-            };
-            # perlpls = {
-            #   command = ["pls"];
-            #   extensions = [".pl"];
-            #   initialization = {
-            #     preferences = {
-            #       perl = {
-            #         perlcritic = {enabled = false;};
-            #         syntax = {enabled = true;};
-            #       };
-            #     };
-            #   };
-            # };
-            r-language-server = {
-              command = ["R" "--no-echo" "-e" "languageserver::run()"];
-              extensions = [".r" ".rmd" ".quarto"];
-            };
-          };
-          permission = {
-            "*" = "ask";
-            "bash" = {
-              "*" = "ask";
-              "ls *" = "allow";
-              "find *" = "ask"; # Don't want find -exec
-              "file *" = "allow";
-              "wc *" = "allow";
-              "grep *" = "allow";
-              "rg *" = "allow";
-              "test *" = "allow";
-              "echo *" = "allow";
-              "which *" = "allow";
-              "pwd *" = "allow";
-              "dirname *" = "allow";
-              "basename *" = "allow";
-              "readlink *" = "allow";
-
-              "cat *.env" = "deny";
-              "cat *.env.*" = "deny";
-              "cat *.env.example" = "allow";
-              "printenv *" = "deny";
-              "env *" = "deny";
-
-              "nix eval *" = "allow";
-              "nix flake metadata *" = "allow";
-              "nix flake show *" = "allow";
-              "nix path-info *" = "allow";
-              "nix why-depends *" = "allow";
-              "nix derivation show *" = "allow";
-              "nix store ping *" = "allow";
-              "nix stire diff-closures *" = "allow";
-
-              "git status *" = "allow";
-              "git log *" = "allow";
-              "git diff *" = "allow";
-            };
-            "external_directory" = {
-              "/nix/store/**" = "allow";
-              "/tmp" = "allow";
-              "/tmp/*" = "allow";
-            };
-            "read" = {
-              "*" = "allow";
-              "*.env" = "deny";
-              "*.env.*" = "deny";
-              "*.env.example" = "allow";
-            };
-            "grep" = "allow";
-            "glob" = "allow";
-            "lsp" = "allow";
-            "skill" = "allow";
-            "task" = "ask";
-            "todowrite" = "allow";
-            "webfetch" = "allow";
-            "websearch" = "allow";
-            "question" = "allow";
-          };
-          plugin = [
-            "opencode-claude-auth@latest" # https://github.com/griffinmartin/opencode-claude-auth
-            "@tarquinen/opencode-dcp@latest" # better compacting
-            # "@slkiser/opencode-quota"
-          ];
-          share = "disabled";
-          shell = "fish";
-          snapshot = false;
-          watcher = {
-            ignore = ["node_modules/**" "dist/**" ".git/**"];
-          };
-        };
-
-        # Writes tui.json
-        tui = {
-          theme = "system";
-          diff_style = "auto";
-          mouse = true;
-          attention = {
-            enabled = true;
-            notifications = true;
-            sound = true;
-            volume = "0.3";
-          };
-        };
-
-        agents = {};
-        commands = {};
-        context = '''';
-        skills = {};
-        tools = {};
-      };
    };

    home = let
@ -282,9 +75,9 @@
        # jetbrains.idea-ultimate
        # jetbrains.webstorm
        # jetbrains.rider
+        zed-editor
+        vscode
        # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra)
-        # zed-editor # Using module
-        # vscode # Using module

        # Unity Stuff
        # unityhub
--- a/home/homemodules/1_deprecated/vscode/default.nix
+++ b/home/homemodules/1_deprecated/vscode/default.nix
@ -0,0 +1,156 @@
+# TODO: Expose some settings
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}:
+with lib;
+with mylib.modules; let
+  cfg = config.homemodules.vscode;
+in {
+  options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
+
+  config = mkIf cfg.enable {
+    programs.vscode = {
+      enable = true;
+      enableExtensionUpdateCheck = false;
+      enableUpdateCheck = false;
+      extensions = with pkgs.vscode-extensions; [
+        # alefragnani.bookmarks # TODO: Use inline bookmarks instead
+        # alefragnani.project-manager # NOTE: Not much sense with flake dev environments
+        catppuccin.catppuccin-vsc
+        catppuccin.catppuccin-vsc-icons
+        christian-kohler.path-intellisense
+        # codezombiech.gitignore # NOTE: Superfluous
+        # coolbear.systemd-unit-file # NOTE: Unnecessary on NixOS
+        eamodio.gitlens
+        # formulahendry.auto-rename-tag
+        # formulahendry.auto-close-tag
+        # gitlab.gitlab-workflow
+        # irongeek.vscode-env
+        # jnoortheen.nix-ide
+        # kamadorueda.alejandra
+        # kamikillerto.vscode-colorize
+        # llvm-vs-code-extensions.vscode-clangd
+        # matklad.rust-analyzer
+        mechatroner.rainbow-csv
+        # mikestead.dotenv
+        # mkhl.direnv
+        # ms-azuretools.vscode-docker
+        # ms-kubernetes-tools.vscode-kubernetes-tools
+        ms-python.python
+        ms-toolsai.jupyter
+        ms-vscode.cmake-tools
+        ms-vscode.cpptools
+        # ms-vscode.hexeditor
+        # ms-vscode.makefile-tools
+        ms-python.black-formatter
+        ms-python.vscode-pylance
+        ms-vscode-remote.remote-ssh
+        # naumovs.color-highlight
+        njpwerner.autodocstring
+        # james-yu.latex-workshop
+        # redhat.java
+        # redhat.vscode-xml
+        # redhat.vscode-yaml
+        ritwickdey.liveserver
+        # rubymaniac.vscode-paste-and-indent
+        ryu1kn.partial-diff
+        # serayuzgur.crates
+        shd101wyy.markdown-preview-enhanced
+        # skyapps.fish-vscode
+        # tamasfe.even-better-toml
+        # timonwong.shellcheck
+        # tomoki1207.pdf # Incompatible with latex workshop
+        # valentjn.vscode-ltex
+        vscodevim.vim
+        vscode-icons-team.vscode-icons
+        # yzhang.markdown-all-in-one
+      ];
+      # haskell = {};
+      # keybindings = {};
+
+      userSettings = {
+        # VSCode Internals
+        "editor.fontFamily" = "JetBrainsMono Nerd Font Mono";
+        "editor.fontSize" = 16;
+        "editor.renderWhitespace" = "selection";
+        "editor.cursorStyle" = "line"; # Use line for vim plugin
+        "editor.lineNumbers" = "relative";
+        "editor.linkedEditing" = true;
+        "editor.smoothScrolling" = true;
+        "editor.stickyScroll.enabled" = true;
+        "editor.tabCompletion" = "on";
+        "editor.cursorSmoothCaretAnimation" = "on";
+        "editor.cursorSurroundingLines" = 10;
+        "editor.minimap.renderCharacters" = false;
+        "editor.bracketPairColorization.enabled" = true;
+        "editor.guides.bracketPairs" = "active";
+        "editor.guides.bracketPairsHorizontal" = "active";
+        "editor.guides.highlightActiveIndentation" = false;
+
+        "files.autoSave" = "onFocusChange";
+        "files.trimFinalNewlines" = true;
+        "files.trimTrailingWhitespace" = true; # NOTE: If this is enabled with frequent autosave, the current lines whitespace will always be removed, which is obnoxious
+
+        "window.restoreWindows" = "none";
+
+        "window.titleBarStyle" = "custom"; # NOTE: Should help with crashing on wayland
+        # "window.titleBarStyle" = "native";
+        # "window.menuBarVisibility" = "toggle";
+
+        "workbench.enableExperiments" = false;
+        "workbench.list.smoothScrolling" = true;
+        # "workbench.colorTheme" = "Default Light Modern";
+        # "workbench.iconTheme" = "vscode-icons";
+        "workbench.colorTheme" = "Catppuccin Latte";
+        "workbench.iconTheme" = "catppuccin-latte";
+
+        "remote.SSH.configFile" = "~/.ssh/custom-config";
+
+        "security.workspace.trust.enabled" = false;
+
+        # Language Tool
+        "ltex.checkFrequency" = "manual";
+
+        # LaTeX
+        "latex-workshop.latex.tools" = [
+          {
+            "name" = "latexmk";
+            "command" = "latexmk";
+            "args" = [
+              "-synctex=1"
+              "-shell-escape"
+              "-interaction=nonstopmode"
+              "-file-line-error"
+              "-pdf"
+              "-outdir=%OUTDIR%"
+              "%DOC%"
+            ];
+            "env" = {};
+          }
+        ];
+        "latex-workshop.latexindent.args" = [
+          "-c"
+          "%DIR%/"
+          "%TMPFILE%"
+          "-m"
+          "-y=defaultIndent: '%INDENT%'"
+        ];
+
+        # Nix
+        "[nix]"."editor.tabSize" = 2;
+        "nix.enableLanguageServer" = true;
+        "nix.serverPath" = "nil";
+        "nix.formatterPath" = "alejandra";
+
+        # C++
+        # "C_Cpp.intelliSenseEngine" = "disabled"; # IntelliSense conflics with Clangd
+      };
+      # TODO: Snippets
+    };
+  };
+}
--- a/home/homemodules/1_deprecated/vscode/options.nix
+++ b/home/homemodules/1_deprecated/vscode/options.nix
--- a/home/homemodules/beets/default.nix
+++ b/home/homemodules/beets/default.nix
@ -57,7 +57,7 @@ in {

        fetchart = {
          auto = "yes";
-          sources = "*"; # sources are queried in this order
+          sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
        };

        # lyrics = {
--- a/home/homemodules/default.nix
+++ b/home/homemodules/default.nix
@ -31,17 +31,15 @@
    ./ssh
    ./terminal
    ./tmux
-    ./vscode
    ./yazi
    ./zathura
-    ./zed

    # HM modules imported from the flake inputs
    inputs.nix-flatpak.homeManagerModules.nix-flatpak
    inputs.nixvim.homeModules.nixvim
    inputs.textfox.homeManagerModules.default
    inputs.walker.homeManagerModules.default
-    # inputs.direnv-instant.homeModules.direnv-instant
+    inputs.direnv-instant.homeModules.direnv-instant
    # inputs.niri.homeModules.niri # Imported by system module
    # inputs.noctalia.homeModules.default
    # inputs.caelestia.homeManagerModules.default
--- a/home/homemodules/firefox/default.nix
+++ b/home/homemodules/firefox/default.nix
@ -86,8 +86,7 @@ in {
    programs.firefox = {
      enable = true;

-      # configPath = "${config.xdg.configHome}/mozilla/firefox";
-      configPath = "${config.home.homeDirectory}/.mozilla/firefox";
+      configPath = "${config.xdg.configHome}/mozilla/firefox";

      # firefox-unwrapped is the pure firefox browser, wrapFirefox adds configuration ontop
      package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
--- a/home/homemodules/fish/default.nix
+++ b/home/homemodules/fish/default.nix
@ -93,7 +93,6 @@ in {
          shellInit = ''
            set fish_greeting
            yes | fish_config theme save "system-theme"
-            fish_vi_key_bindings

            # Because we can't source that in a project flake's shellHook (is POSIX), source it here
            function __project_shell_reload --on-variable INIT_PROJECT_SHELL
--- a/home/homemodules/kitty/default.nix
+++ b/home/homemodules/kitty/default.nix
@ -42,7 +42,6 @@ in {
          window_padding_width = 10; # Looks stupid with editors if bg doesn't match
          # hide_window_decorations = "yes";
          enabled_layouts = "grid,vertical,horizontal";
-          cursor_trail = 3;

          tab_bar_min_tabs = 2; # Don't show a single tab
          tab_bar_edge = "bottom";
--- a/home/homemodules/neovim/default.nix
+++ b/home/homemodules/neovim/default.nix
@ -40,9 +40,8 @@ in {
            just-lsp
            ltex-ls # TODO: Only enable on-demand
            lua-language-server
-            nil
+            # nil
            # perl5Packages.PLS
-            perlnavigator
            pyrefly
            # rPackages.languageserver
            rust-analyzer
@ -83,9 +82,6 @@ in {
            stylua
            tombi
            typstyle
-
-            nodejs_latest
-            uv
          ])

          [
@ -100,7 +96,6 @@ in {
            (perl.withPackages (p:
              with p; [
                PLS
-                PerlCritic
                PerlTidy
                NetOpenSSH
                DateTime
@ -135,9 +130,6 @@ in {
                readr
                tibble
                svglite
-                dplyr
-                tidyr
-                scales
              ];
            })

@ -148,8 +140,6 @@ in {
    };

    programs.nixvim = {
-      # nixpkgs.pkgs = pkgs;
-
      defaultEditor = true;
      enable = true;
      enableMan = false; # Nixvim man pages
@ -172,7 +162,7 @@ in {
      performance.byteCompileLua = {
        enable = true;
        configs = true;
-        initLua = true; # When debugging init.lua turn this off
+        initLua = false; # When debugging init.lua turn this off
        nvimRuntime = true;
        plugins = true;
      };
@ -308,15 +298,6 @@ in {
            require("${name}").setup(opts)
          end
        '';
-
-        # Like mkDefaultConfig but takes the Lua module name explicitly.
-        # Use when the Lua module name (e.g. "noice") differs from what
-        # lazy.nvim expects as the plugin name (e.g. "noice.nvim").
-        mkDefaultConfigFor = moduleName: ''
-          function(_, opts)
-            require("${moduleName}").setup(opts)
-          end
-        '';
      in {
        enable = true;

@ -1022,7 +1003,6 @@ in {
                  };
                }
                {name = "perlpls";}
-                {name = "perlnavigator";}
                {
                  name = "qmlls";
                  extraOptions.cmd = [
@ -1121,7 +1101,6 @@ in {
            pkg = pkgs.vimPlugins.lualine-nvim;
            lazy = true;
            event = ["BufReadPost" "BufNewFile"];
-            # dependencies = [opencode];
            config = ''
              function(_, opts)
                local lualine = require("lualine")
@ -1221,7 +1200,6 @@ in {
                lualine_c.__raw = ''{}''; # Use __raw: Nixvim does nothing with "[]", so the default config would be used

                lualine_x.__raw = ''{}'';
-                # lualine_x.__raw = ''{ { require("opencode").statusline, }, }'';
                lualine_y = ["filetype" "encoding" "fileformat"];
                lualine_z.__raw = ''{ { "location", separator = {}, } }'';
              };
@ -1387,19 +1365,19 @@ in {
          };

          _nui = {
-            name = "nui.nvim";
+            name = "nui"; # For noice
            pkg = pkgs.vimPlugins.nui-nvim;
            lazy = true;
          };

          noice = rec {
-            name = "noice.nvim";
+            name = "noice";
            pkg = pkgs.vimPlugins.noice-nvim;
            lazy = false;
            dependencies = [
              _nui
            ];
-            config = mkDefaultConfigFor "noice";
+            config = mkDefaultConfig name;
            opts = {
              presets = {
                bottom_search = false;
@ -1461,32 +1439,6 @@ in {
            };
          };

-          opencode = {
-            name = "opencode";
-            pkg = pkgs.vimPlugins.opencode-nvim;
-            lazy = false;
-            config = ''
-              function()
-                vim.g.opencode_opts = {
-                  server = {
-                    url = "http://localhost:12345",
-                    start = false,
-                  },
-                  events = {
-                    permissions = {
-                      edits = {
-                        -- Disable neovim diff popup tab
-                        enabled = false,
-                      },
-                    },
-                  },
-                }
-
-                vim.o.autoread = true -- Required for `vim.g.opencode_opts.events.reload`
-              end
-            '';
-          };
-
          # obsidian = rec {
          #   name = "obsidian";
          #   pkg = pkgs.vimPlugins.obsidian-nvim;
@ -1711,7 +1663,7 @@ in {
              gitbrowse.enabled = false;
              image.enabled = false;
              indent.enabled = false;
-              input.enabled = true;
+              input.enabled = false;
              keymap.enabled = false;
              layout.enabled = false;
              lazygit.enabled = true;
@ -1747,20 +1699,6 @@ in {
                    truncate = 80;
                  };
                };
-
-                actions = {
-                  opencode_send.__raw = ''
-                    function(picker)
-                      local items = vim.tbl_map(function(item)
-                        return item.file
-                          and require("opencode").format({ path = item.file, from = item.pos, to = item.end_pos })
-                          or item.text
-                      end, picker:selected({ fallback = true }))
-
-                      require("opencode").prompt(table.concat(items, ", ") .. " ")
-                    end
-                  '';
-                };
              };

              profiler.enabled = false;
@ -1831,7 +1769,7 @@ in {
          };

          _plenary = {
-            name = "plenary.nvim";
+            name = "plenary";
            pkg = pkgs.vimPlugins.plenary-nvim;
            lazy = true;
          };
@ -2250,12 +2188,12 @@ in {
          };

          yazi = rec {
-            name = "yazi.nvim";
+            name = "yazi";
            pkg = pkgs.vimPlugins.yazi-nvim;
            lazy = true;
            event = ["VeryLazy"];
            dependencies = [_plenary];
-            config = mkDefaultConfigFor "yazi";
+            config = mkDefaultConfig name;
            opts = {
              open_for_directories = true;
              highlight_hovered_buffers_in_same_directory = false;
@ -2317,7 +2255,6 @@ in {
          noice # Modern UI overhaul, e.g. floating cmdline
          # obsidian # Integration with Obsidian.md

-          opencode # TODO: Doesn't work, can't find "opencode --port" process
          # overseer # Run tasks from within neovim (e.g. cargo) # TODO:

          persisted # Session management
--- a/home/homemodules/neovim/mappings.nix
+++ b/home/homemodules/neovim/mappings.nix
@ -415,58 +415,6 @@ _: let
    }
  ];

-  leader-opencode = [
-    {
-      mode = ["n" "v"];
-      key = "<leader>o";
-      action = "+opencode";
-    }
-    {
-      mode = ["n" "v"];
-      key = "<leader>oo";
-      action.__raw = ''function() require("opencode").ask("@this: ") end'';
-      options.desc = "Ask about @this";
-    }
-    {
-      mode = ["n" "v"];
-      key = "<leader>od";
-      action.__raw = ''function() require("opencode").prompt("Explain @diagnostics") end'';
-      options.desc = "Explain @diagnostics";
-    }
-    {
-      mode = ["n" "v"];
-      key = "<leader>oe";
-      action.__raw = ''function() require("opencode").prompt("Explain @this and its context") end'';
-      options.desc = "Explain @this";
-    }
-    {
-      mode = ["n" "v"];
-      key = "<leader>or";
-      action.__raw = ''function() require("opencode").prompt("Review @this for correctness and readability") end'';
-      options.desc = "Review @this";
-    }
-    {
-      mode = ["n" "v"];
-      key = "<leader>os";
-      action.__raw = ''function() require("opencode").select() end'';
-      options.desc = "Select Action";
-    }
-    {
-      mode = "n";
-      key = "<leader>oa";
-      action.__raw = ''function() return require("opencode").operator("@this ") .. "_" end'';
-      options.desc = "Append Line to Prompt";
-      options.expr = true;
-    }
-    {
-      mode = "v";
-      key = "<leader>oa";
-      action.__raw = ''function() return require("opencode").operator("@this ") end'';
-      options.desc = "Append Range to Prompt";
-      options.expr = true;
-    }
-  ];
-
  leader-file = [
    {
      mode = "n";
@ -1057,7 +1005,6 @@ in
    no-leader

    leader
-    leader-opencode
    leader-file
    leader-help
    leader-quit
--- a/home/homemodules/niri/default.nix
+++ b/home/homemodules/niri/default.nix
@ -53,16 +53,8 @@ in {
    in
      gtkConfig
      // {
-        gtk3 =
-          gtkConfig
-          // {
-            extraConfig = gtkExtraConfig;
-          };
-        gtk4 =
-          gtkConfig
-          // {
-            extraConfig = gtkExtraConfig;
-          };
+        gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
+        gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
      };

    dconf = {
@ -461,27 +453,10 @@ in {
          prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)

          spawn-at-startup = [
-            {
-              argv = [
-                "ashell"
-                "-c"
-                "${config.paths.dotfiles}/ashell/config.toml"
-              ];
-            }
-            {
-              argv = [
-                "waypaper"
-                "--restore"
-              ];
-            }
+            {argv = ["ashell" "-c" "${config.paths.dotfiles}/ashell/config.toml"];}
+            {argv = ["waypaper" "--restore"];}

-            {
-              argv = [
-                "kitty"
-                "--hold"
-                "fastfetch"
-              ];
-            }
+            {argv = ["kitty" "--hold" "fastfetch"];}
            {argv = ["fcitx5"];}
            # {argv = ["zeal"];}
            # {argv = ["protonvpn-app"];}
@ -492,36 +467,16 @@ in {
          ];

          workspaces = {
-            "1" = {
-              open-on-output = "DP-1";
-            };
-            "2" = {
-              open-on-output = "DP-1";
-            };
-            "3" = {
-              open-on-output = "DP-1";
-            };
-            "4" = {
-              open-on-output = "DP-1";
-            };
-            "5" = {
-              open-on-output = "DP-1";
-            };
-            "6" = {
-              open-on-output = "DP-1";
-            };
-            "7" = {
-              open-on-output = "DP-1";
-            };
-            "8" = {
-              open-on-output = "DP-1";
-            };
-            "9" = {
-              open-on-output = "DP-1";
-            };
-            "10" = {
-              open-on-output = "DP-2";
-            };
+            "1" = {open-on-output = "DP-1";};
+            "2" = {open-on-output = "DP-1";};
+            "3" = {open-on-output = "DP-1";};
+            "4" = {open-on-output = "DP-1";};
+            "5" = {open-on-output = "DP-1";};
+            "6" = {open-on-output = "DP-1";};
+            "7" = {open-on-output = "DP-1";};
+            "8" = {open-on-output = "DP-1";};
+            "9" = {open-on-output = "DP-1";};
+            "10" = {open-on-output = "DP-2";};
          };

          outputs = {
@ -562,12 +517,8 @@ in {
            border = {
              enable = true;
              width = 2;
-              active = {
-                color = color.hex.accent;
-              };
-              inactive = {
-                color = color.hex.base;
-              };
+              active = {color = color.hex.accent;};
+              inactive = {color = color.hex.base;};
            };

            # This border is drawn OUTSIDE of the focused window
@ -578,9 +529,7 @@ in {
            # Hint where a dragged window will be inserted
            insert-hint = {
              enable = true;
-              display = {
-                color = color.hex.accentDim;
-              };
+              display = {color = color.hex.accentDim;};
            };

            always-center-single-column = true;
@ -603,9 +552,7 @@ in {
          };

          gestures = {
-            hot-corners = {
-              enable = false;
-            };
+            hot-corners = {enable = false;};
          };

          window-rules = [
@ -669,16 +616,16 @@ in {

            # Rules for specific windows
            {
-              matches = [
-                {app-id = "neovide";}
-                {app-id = "dev.zed.Zed";}
-                {app-id = "code";}
-                {app-id = "jetbrains-clion";}
-              ];
+              matches = [{app-id = "neovide";}];
              open-on-workspace = "2";
              open-maximized = true;
              open-focused = true;
            }
+            {
+              matches = [{app-id = "jetbrains-clion";}];
+              open-on-workspace = "2";
+              open-maximized = true;
+            }
            {
              matches = [{app-id = "code-url-handler";}];
              open-on-workspace = "2";
@ -756,14 +703,6 @@ in {
                draw-behind-window = true;
              };
            }
-            # TODO: Missing niri-flake update
-            # {
-            #   matches = [{namespace = "walker";}];
-            #
-            #   background-effect = {
-            #     blur = true;
-            #   };
-            # }
          ];

          debug = {
@ -846,101 +785,69 @@ in {
            # DMenu
            "Mod+Shift+A" = {
              action = spawn "walker" "-m" "providerlist";
-              hotkey-overlay = {
-                title = "Toggle the launcher.";
-              };
+              hotkey-overlay = {title = "Toggle the launcher.";};
            };
            "Mod+A" = {
              action = spawn "walker" "-m" "desktopapplications";
-              hotkey-overlay = {
-                title = "Toggle the application launcher.";
-              };
+              hotkey-overlay = {title = "Toggle the application launcher.";};
            };
            "Mod+C" = {
              action = spawn "walker" "-m" "clipboard";
-              hotkey-overlay = {
-                title = "Show clipboard history.";
-              };
+              hotkey-overlay = {title = "Show clipboard history.";};
            };
            "Mod+Escape" = {
              action = spawn "${sessionMenu}/bin/rofi-menu-Session";
-              hotkey-overlay = {
-                title = "Toggle the session menu.";
-              };
+              hotkey-overlay = {title = "Toggle the session menu.";};
            };
            "Mod+W" = {
              action = spawn "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
-              hotkey-overlay = {
-                title = "Open wallpaper menu.";
-              };
+              hotkey-overlay = {title = "Open wallpaper menu.";};
            };
            "Mod+D" = {
              action = spawn "${globalMenu}/bin/rofi-menu-Global";
-              hotkey-overlay = {
-                title = "Open global menu.";
-              };
+              hotkey-overlay = {title = "Open global menu.";};
            };

            # Applications
            "Mod+Ctrl+W" = {
              action = spawn "waypaper";
-              hotkey-overlay = {
-                title = "Open waypaper.";
-              };
+              hotkey-overlay = {title = "Open waypaper.";};
            };
            "Mod+Shift+W" = {
              action = spawn "waypaper" "--random";
-              hotkey-overlay = {
-                title = "Select random wallpaper.";
-              };
+              hotkey-overlay = {title = "Select random wallpaper.";};
            };
            "Mod+T" = {
              action = spawn "kitty";
-              hotkey-overlay = {
-                title = "Spawn Kitty.";
-              };
+              hotkey-overlay = {title = "Spawn Kitty.";};
            };
            "Mod+E" = {
              action = spawn "kitty" "--title=Yazi" "yazi";
-              hotkey-overlay = {
-                title = "Spawn Yazi.";
-              };
+              hotkey-overlay = {title = "Spawn Yazi.";};
            };
            "Mod+B" = {
              action = spawn "kitty" "--title=Btop" "btop";
-              hotkey-overlay = {
-                title = "Spawn Btop.";
-              };
+              hotkey-overlay = {title = "Spawn Btop.";};
            };
            "Mod+R" = {
              action = spawn "kitty" "--title=Rmpc" "rmpc";
-              hotkey-overlay = {
-                title = "Spawn Rmpc.";
-              };
+              hotkey-overlay = {title = "Spawn Rmpc.";};
            };
            "Mod+N" = {
              action = spawn "neovide";
-              hotkey-overlay = {
-                title = "Spawn Neovide.";
-              };
+              hotkey-overlay = {title = "Spawn Neovide.";};
            };
            "Mod+Ctrl+N" = {
              action = spawn "kitty" "--title=Navi" "navi";
-              hotkey-overlay = {
-                title = "Call Navi for help.";
-              };
+              hotkey-overlay = {title = "Call Navi for help.";};
            };
            "Mod+Shift+N" = {
              action = spawn "neovide" "${config.paths.dotfiles}/navi/christoph.cheat";
-              hotkey-overlay = {
-                title = "Edit the Navi cheats.";
-              };
+              hotkey-overlay = {title = "Edit the Navi cheats.";};
            };
            "Mod+Shift+F" = {
              action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
-              hotkey-overlay = {
-                title = "Edit the NixFlake.";
-              };
+              hotkey-overlay = {title = "Edit the NixFlake.";};
            };

            # Screenshots
@ -949,34 +856,24 @@ in {
                write-to-disk = true;
                show-pointer = false;
              };
-              hotkey-overlay = {
-                title = "Take a screenshot of the current window.";
-              };
+              hotkey-overlay = {title = "Take a screenshot of the current window.";};
            };
            "Mod+Ctrl+S" = {
              action.screenshot-screen = {
                write-to-disk = true;
                show-pointer = false;
              };
-              hotkey-overlay = {
-                title = "Take a screenshot of the current screen.";
-              };
+              hotkey-overlay = {title = "Take a screenshot of the current screen.";};
            };
            "Mod+Shift+S" = {
-              action.screenshot = {
-                show-pointer = false;
-              };
-              hotkey-overlay = {
-                title = "Take a screenshot of a region.";
-              };
+              action.screenshot = {show-pointer = false;};
+              hotkey-overlay = {title = "Take a screenshot of a region.";};
            };

            # Niri
            "Mod+Shift+Slash" = {
              action = show-hotkey-overlay;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            # "Alt+Tab" = {
            #   action = "next-window";
@ -990,283 +887,191 @@ in {
            # Audio
            "XF86AudioRaiseVolume" = {
              action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%+";
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "XF86AudioLowerVolume" = {
              action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%-";
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "XF86AudioPlay" = {
              action = spawn "playerctl" "play-pause";
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "XF86AudioPrev" = {
              action = spawn "playerctl" "previous";
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "XF86AudioNext" = {
              action = spawn "playerctl" "next";
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };

            # Niri windows
            "Mod+Q" = {
              action = close-window;
-              hotkey-overlay = {
-                title = "Close the current window.";
-              };
+              hotkey-overlay = {title = "Close the current window.";};
            };
            "Mod+F" = {
              action = fullscreen-window;
-              hotkey-overlay = {
-                title = "Toggle between fullscreen and tiled window.";
-              };
+              hotkey-overlay = {title = "Toggle between fullscreen and tiled window.";};
            };
            "Mod+Equal" = {
              action = set-column-width "+10%";
-              hotkey-overlay = {
-                title = "Increase column width";
-              };
+              hotkey-overlay = {title = "Increase column width";};
            };
            "Mod+Minus" = {
              action = set-column-width "-10%";
-              hotkey-overlay = {
-                title = "Decrease column width";
-              };
+              hotkey-overlay = {title = "Decrease column width";};
            };
            "Mod+Shift+M" = {
              action = set-column-width "50%";
-              hotkey-overlay = {
-                title = "Set column width to 50%";
-              };
+              hotkey-overlay = {title = "Set column width to 50%";};
            };
            "Mod+M" = {
              action = maximize-column;
-              hotkey-overlay = {
-                title = "Maximize column.";
-              };
+              hotkey-overlay = {title = "Maximize column.";};
            };
            "Mod+Comma" = {
              action = reset-window-height;
-              hotkey-overlay = {
-                title = "Reset window height.";
-              };
+              hotkey-overlay = {title = "Reset window height.";};
            };
            "Mod+V" = {
              action = toggle-window-floating;
-              hotkey-overlay = {
-                title = "Toggle between floating and tiled window.";
-              };
+              hotkey-overlay = {title = "Toggle between floating and tiled window.";};
            };
            "Mod+O" = {
              action = toggle-overview;
-              hotkey-overlay = {
-                title = "Toggle overlay.";
-              };
+              hotkey-overlay = {title = "Toggle overlay.";};
            };
            "Mod+H" = {
              action = focus-column-or-monitor-left;
-              hotkey-overlay = {
-                title = "Focus column on the left. Equivalent bindings for other directions.";
-              };
+              hotkey-overlay = {title = "Focus column on the left. Equivalent bindings for other directions.";};
            };
            "Mod+J" = {
              action = focus-window-or-workspace-down;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+K" = {
              action = focus-window-or-workspace-up;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+L" = {
              action = focus-column-or-monitor-right;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+WheelScrollUp" = {
              action = focus-column-left;
-              hotkey-overlay = {
-                title = "Focus column on the left. Equivalent binding for other direction.";
-              };
+              hotkey-overlay = {title = "Focus column on the left. Equivalent binding for other direction.";};
            };
            "Mod+WheelScrollDown" = {
              action = focus-column-right;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+WheelScrollUp" = {
              action = focus-workspace-up;
-              hotkey-overlay = {
-                title = "Focus previous workspace. Equivalent binding for other direction.";
-              };
+              hotkey-overlay = {title = "Focus previous workspace. Equivalent binding for other direction.";};
            };
            "Mod+Shift+WheelScrollDown" = {
              action = focus-workspace-down;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+H" = {
              action = move-column-left-or-to-monitor-left;
-              hotkey-overlay = {
-                title = "Move column to the left. Equivalent bindings for other directions.";
-              };
+              hotkey-overlay = {title = "Move column to the left. Equivalent bindings for other directions.";};
            };
            "Mod+Shift+J" = {
              action = move-window-down-or-to-workspace-down;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+K" = {
              action = move-window-up-or-to-workspace-up;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+L" = {
              action = move-column-right-or-to-monitor-right;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };

            # Niri workspaces
            "Mod+1" = {
              action = focus-workspace 1;
-              hotkey-overlay = {
-                title = "Focus workspace 1. Equivalent bindings for other workspaces.";
-              };
+              hotkey-overlay = {title = "Focus workspace 1. Equivalent bindings for other workspaces.";};
            };
            "Mod+2" = {
              action = focus-workspace 2;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+3" = {
              action = focus-workspace 3;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+4" = {
              action = focus-workspace 4;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+5" = {
              action = focus-workspace 5;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+6" = {
              action = focus-workspace 6;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+7" = {
              action = focus-workspace 7;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+8" = {
              action = focus-workspace 8;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+9" = {
              action = focus-workspace 9;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+0" = {
              action = focus-workspace 10;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+1" = {
              action.move-window-to-workspace = 1;
-              hotkey-overlay = {
-                title = "Move current window to workspace 1. Equivalent bindings for other workspaces.";
-              };
+              hotkey-overlay = {title = "Move current window to workspace 1. Equivalent bindings for other workspaces.";};
            };
            "Mod+Shift+2" = {
              action.move-window-to-workspace = 2;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+3" = {
              action.move-window-to-workspace = 3;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+4" = {
              action.move-window-to-workspace = 4;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+5" = {
              action.move-window-to-workspace = 5;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+6" = {
              action.move-window-to-workspace = 6;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+7" = {
              action.move-window-to-workspace = 7;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+8" = {
              action.move-window-to-workspace = 8;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+9" = {
              action.move-window-to-workspace = 9;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
            "Mod+Shift+0" = {
              action.move-window-to-workspace = 10;
-              hotkey-overlay = {
-                hidden = true;
-              };
+              hotkey-overlay = {hidden = true;};
            };
          };
        };
--- a/home/homemodules/packages/default.nix
+++ b/home/homemodules/packages/default.nix
@ -96,7 +96,6 @@ in {
          lurk # strace analysis
          radare2
          disktui
-          lldb

          # Hardware/Software info
          pciutils # lspci
@ -160,8 +159,6 @@ in {
          czkawka-full # file deduplicator
          binaryninja-free # reverse engineering
          tableplus # database explorer
-          # opencode-desktop
-          lmstudio # TODO: Ollama

          # Office
          kdePackages.wacomtablet # For xournalpp/krita
@ -180,7 +177,7 @@ in {
          gparted
          resources
          # celluloid
-          # cine
+          cine
          eyedropper
          junction
        ])
@ -209,7 +206,7 @@ in {

      direnv = {
        enable = true;
-        enableFishIntegration = true;
+        enableFishIntegration = !config.programs.direnv-instant.enable;
        silent = true;
        nix-direnv.enable = true;
      };
--- a/home/homemodules/rmpc/default.nix
+++ b/home/homemodules/rmpc/default.nix
@ -47,8 +47,6 @@ in {
            wrap_navigation: false,
            enable_mouse: true,
            enable_config_hot_reload: true,
-            enable_lyrics_hot_reload: true,
-            enable_lyrics_index: true,
            status_update_interval_ms: 1000,
            rewind_to_start_sec: 30,
            lyrics_dir: "${config.home.homeDirectory}/Music",
@ -90,37 +88,24 @@ in {
                (
                    name: "Queue (1)",
                    pane: Split(
+                        borders: "NONE",
                        direction: Horizontal,
                        panes: [
                            // Left Column (Queue + Cava)
                            (
                                size: "70%",
+                                borders: "NONE",
                                pane: Split(
                                    direction: Vertical,
                                    panes: [
                                        (
                                            size: "75%",
                                            borders: "ALL",
-                                            border_symbols: Rounded,
-                                            pane: Split(
-                                                direction: Vertical,
-                                                panes: [
-                                                    (
-                                                        size: "2",
-                                                        pane: Pane(QueueHeader()),
-                                                    ),
-                                                    (
-                                                        size: "100%",
-                                                        pane: Pane(Queue),
-                                                    ),
-
-                                                ],
-                                            ),
+                                            pane: Pane(Queue),
                                        ),
                                        (
                                            size: "25%",
                                            borders: "ALL",
-                                            border_symbols: Rounded,
                                            pane: Pane(Cava),
                                        )
                                    ]
@ -130,19 +115,18 @@ in {
                            // Right Column (AlbumArt + Lyrics)
                            (
                                size: "30%",
+                                borders: "NONE",
                                pane: Split(
                                    direction: Vertical,
                                    panes: [
                                        (
                                            size: "75%",
                                            borders: "ALL",
-                                            border_symbols: Rounded,
                                            pane: Pane(AlbumArt),
                                        ),
                                        (
                                            size: "25%",
                                            borders: "ALL",
-                                            border_symbols: Rounded,
                                            pane: Pane(Lyrics),
                                        ),
                                    ]
@ -153,59 +137,31 @@ in {
                ),
                (
                    name: "Albums (2)",
-                    pane: Split(
-                        size: "100%",
-                        direction: Vertical,
-                        panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Albums))],
-                    )
+                    pane: Pane(Albums),
                ),
                (
                    name: "Album Artists (3)",
-                    pane: Split(
-                        size: "100%",
-                        direction: Vertical,
-                        panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(AlbumArtists))],
-                    )
+                    pane: Pane(AlbumArtists),
                ),
                (
                    name: "Artists (4)",
-                    pane: Split(
-                        size: "100%",
-                        direction: Vertical,
-                        panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Artists))],
-                    )
+                    pane: Pane(Artists),
                ),
                (
                    name: "Playlists (5)",
-                    pane: Split(
-                        size: "100%",
-                        direction: Vertical,
-                        panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Playlists))],
-                    )
+                    pane: Pane(Playlists),
                ),
                // (
                //     name: "Directories (6)",
-                //     pane: Split(
-                //         size: "100%",
-                //         direction: Vertical,
-                //         panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Directories))],
-                //     )
+                //     pane: Pane(Directories),
                // ),
                (
                    name: "Search (6)",
-                    pane: Split(
-                        size: "100%",
-                        direction: Vertical,
-                        panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Search))],
-                    )
+                    pane: Pane(Search),
                ),
                // (
                //     name: "Visualizer (8)",
-                //     pane: Split(
-                //         size: "100%",
-                //         direction: Vertical,
-                //         panes: [(size: "100%", borders: "ALL", border_symbols: Rounded, pane: Pane(Cava))],
-                //     )
+                //     pane: Pane(Cava),
                // ),
            ],

@ -331,6 +287,8 @@ in {
        #![enable(unwrap_variant_newtypes)]
        (
            default_album_art_path: None,
+            show_song_table_header: true,
+            draw_borders: true,
            format_tag_separator: " | ",
            browser_column_widths: [20, 38, 42],
            modal_backdrop: false,
@ -437,8 +395,6 @@ in {
                    ),
                    (
                        pane: Pane(Tabs),
-                        borders: "ALL",
-                        border_symbols: Rounded,
                        size: "3",
                    ),
                    (
--- a/home/homemodules/ssh/default.nix
+++ b/home/homemodules/ssh/default.nix
@ -15,44 +15,44 @@ in {
      enable = true;
      enableDefaultConfig = false;

-      settings = {
+      matchBlocks = {
        "*" = {
-          ForwardAgent = false;
-          AddKeysToAgent =
+          forwardAgent = false;
+          addKeysToAgent =
            if pkgs.stdenv.isLinux
            then "no"
            else "yes"; # Don't have keychain on darwin
-          Compression = true;
-          ServerAliveInterval = 0;
-          ServerAliveCountMax = 3;
-          HashKnownHosts = false;
-          UserKnownHostsFile = "~/.ssh/known_hosts";
-          ControlMaster = "no";
-          ControlPath = "~/.ssh/master-%r@%n:%p";
-          ControlPersist = "no";
+          compression = true;
+          serverAliveInterval = 0;
+          serverAliveCountMax = 3;
+          hashKnownHosts = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
+          controlMaster = "no";
+          controlPath = "~/.ssh/master-%r@%n:%p";
+          controlPersist = "no";
        };
        "nixinator" = {
-          Port = 5432;
-          User = "christoph";
-          HostName = "vps.chriphost.de";
+          port = 5432;
+          user = "christoph";
+          hostname = "vps.chriphost.de";
        };
        "servenix" = {
-          User = "christoph";
-          HostName = "local.chriphost.de";
+          user = "christoph";
+          hostname = "local.chriphost.de";
        };
        "thinknix" = {
-          User = "christoph";
-          HostName = "think.chriphost.de";
+          user = "christoph";
+          hostname = "think.chriphost.de";
        };
        "vps" = {
-          User = "root";
-          HostName = "vps.chriphost.de";
+          user = "root";
+          hostname = "vps.chriphost.de";
        };
        "mars" = {
-          User = "smchurla";
-          HostName = "mars.cs.tu-dortmund.de";
-          ServerAliveInterval = 60;
-          LocalForward = [
+          user = "smchurla";
+          hostname = "mars.cs.tu-dortmund.de";
+          serverAliveInterval = 60;
+          localForwards = [
            {
              # Resultbrowser
              bind.port = 22941;
--- a/home/homemodules/vscode/default.nix
+++ b/home/homemodules/vscode/default.nix
@ -1,89 +0,0 @@
-# TODO: Expose some settings
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.homemodules.vscode;
-in {
-  options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
-
-  config = mkIf cfg.enable {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscode;
-      mutableExtensionsDir = false;
-
-      profiles.default = {
-        enableUpdateCheck = false;
-        enableExtensionUpdateCheck = false;
-        enableMcpIntegration = true;
-
-        extensions = with pkgs.vscode-extensions; [
-          # Theme
-          catppuccin.catppuccin-vsc
-          catppuccin.catppuccin-vsc-icons
-          vscode-icons-team.vscode-icons
-
-          # General
-          vscodevim.vim
-          christian-kohler.path-intellisense
-          ryu1kn.partial-diff
-          redhat.vscode-yaml
-          ms-vscode-remote.remote-ssh
-          ms-vscode-remote.remote-ssh-edit
-          ms-vscode.remote-explorer
-          anthropic.claude-code
-
-          # Python
-          ms-python.python
-          ms-python.vscode-pylance
-          ms-python.black-formatter
-
-          # C/C++
-          ms-vscode.cpptools
-          # llvm-vs-code-extensions.vscode-clangd
-          ms-vscode.cmake-tools
-          ms-vscode.makefile-tools
-          # llvm-org.lldb-vscode
-          vadimcn.vscode-lldb
-          # "13xforever".language-x86-64-assembly
-
-          # Latex
-          # james-yu.latex-workshop
-          # valentjn.vscode-ltex
-        ];
-
-        keybindings = [];
-        globalSnippets = {};
-        languageSnippets = {};
-        userMcp = {};
-
-        userSettings = {
-          "editor.fontFamily" = config.homemodules.color.font;
-          "editor.fontSize" = 14;
-          "editor.smoothScrolling" = true;
-          "editor.cursorSmoothCaretAnimation" = "on";
-          "workbench.enableExperiments" = false;
-          "workbench.list.smoothScrolling" = true;
-          "workbench.colorTheme" = "Catppuccin Mocha";
-          "workbench.iconTheme" = "catppuccin-mocha";
-          "remote.SSH.configFile" = "~/.ssh/custom-config";
-          "workbench.welcomePage.walkthroughs.openOnInstall" = false;
-          "security.workspace.trust.enabled" = false;
-          "chat.disableAIFeatures" = false;
-
-          # C++
-          # "C_Cpp.intelliSenseEngine" = "disabled"; # IntelliSense conflics with Clangd
-        };
-
-        userTasks = {};
-      };
-    };
-  };
-}
--- a/home/homemodules/yazi/default.nix
+++ b/home/homemodules/yazi/default.nix
@ -17,19 +17,7 @@ in {
      shellWrapperName = "y";

      plugins = {
-        inherit
-          (pkgs.yaziPlugins)
-          chmod
-          diff
-          full-border
-          git
-          lazygit
-          mount
-          ouch
-          rsync
-          starship
-          sudo
-          ; # smart-paste
+        inherit (pkgs.yaziPlugins) chmod diff full-border git lazygit mount ouch rsync starship sudo; # smart-paste
      };

      initLua = ''
@ -82,12 +70,7 @@ in {
            {
              run = ''mpv "$@"'';
              orphan = true;
-              desc = "Play selection with mpv";
-            }
-            {
-              run = ''vlc "$@"'';
-              orphan = true;
-              desc = "Play selection with vlc";
+              desc = "Play selection";
            }
          ];
          edit = [
@ -100,16 +83,12 @@ in {
          open = [
            {
              run = ''xdg-open "$@"'';
-              desc = "Open selection with xdg-open";
-            }
-            {
-              run = ''imv "$@"'';
-              desc = "Open selection with imv";
+              desc = "Open selection";
            }
            {
              # TODO: For some reason, junction does not exit after choosing an application...
              run = ''junction "$@"'';
-              desc = "Open selection with junction";
+              desc = "Open selection in chosen application";
            }
          ];
          extract = [
@ -127,13 +106,13 @@ in {

        plugin.prepend_fetchers = [
          {
-            group = "git";
-            url = "*";
+            id = "git";
+            name = "*";
            run = "git";
          }
          {
-            group = "git";
-            url = "*/";
+            id = "git";
+            name = "*/";
            run = "git";
          }
        ];
@ -183,66 +162,42 @@ in {

        mgr.prepend_keymap = [
          {
-            on = [
-              "<C-p>"
-              "m"
-            ];
+            on = ["<C-p>" "m"];
            run = "plugin mount";
            desc = "Manage device mounts";
          }
          {
-            on = [
-              "<C-p>"
-              "c"
-            ];
+            on = ["<C-p>" "c"];
            run = "plugin chmod";
            desc = "Chmod selection";
          }
          {
-            on = [
-              "<C-p>"
-              "g"
-            ];
+            on = ["<C-p>" "g"];
            run = "plugin lazygit";
            desc = "Run LazyGit";
          }
          {
-            on = [
-              "<C-p>"
-              "a"
-            ];
+            on = ["<C-p>" "a"];
            run = "plugin ouch";
            desc = "Add selection to archive";
          }
          {
-            on = [
-              "<C-p>"
-              "d"
-            ];
+            on = ["<C-p>" "d"];
            run = ''shell -- ripdrag -a -n "$@"'';
            desc = "Drag & drop selection";
          }
          {
-            on = [
-              "<C-p>"
-              "D"
-            ];
+            on = ["<C-p>" "D"];
            run = "plugin diff";
            desc = "Diff the selected with the hovered file";
          }
          {
-            on = [
-              "<C-p>"
-              "r"
-            ];
+            on = ["<C-p>" "r"];
            run = "plugin rsync";
            desc = "Copy files using rsync";
          }
          {
-            on = [
-              "<C-p>"
-              "w"
-            ];
+            on = ["<C-p>" "w"];
            run = ''wl-copy < "$0"'';
            desc = "Copy hovered file contents using wl-copy";
          }
@ -254,10 +209,7 @@ in {
          }
          {
            on = "y";
-            run = [
-              ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list''
-              "yank"
-            ];
+            run = [''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'' "yank"];
            desc = "Copy files to system clipboard on yank";
          }
          # {
@ -276,9 +228,7 @@ in {
      # https://github.com/catppuccin/yazi/blob/main/themes/mocha/catppuccin-mocha-lavender.toml
      theme = {
        mgr = {
-          cwd = {
-            fg = color.hexS.teal;
-          };
+          cwd = {fg = color.hexS.teal;};

          hovered = {
            fg = color.hexS.accentText;
@ -335,9 +285,7 @@ in {
          };

          border_symbol = "│";
-          border_style = {
-            fg = color.hexS.overlay0;
-          };
+          border_style = {fg = color.hexS.overlay0;};
        };

        tabs = {
@ -406,104 +354,58 @@ in {
            bg = color.hexS.surface0;
          };

-          perm_type = {
-            fg = color.hexS.blue;
-          };
-          perm_read = {
-            fg = color.hexS.yellow;
-          };
-          perm_write = {
-            fg = color.hexS.red;
-          };
-          perm_exec = {
-            fg = color.hexS.green;
-          };
-          perm_sep = {
-            fg = color.hexS.overlay0;
-          };
+          perm_type = {fg = color.hexS.blue;};
+          perm_read = {fg = color.hexS.yellow;};
+          perm_write = {fg = color.hexS.red;};
+          perm_exec = {fg = color.hexS.green;};
+          perm_sep = {fg = color.hexS.overlay0;};
        };

        input = {
-          border = {
-            fg = color.hexS.accentDim;
-          };
+          border = {fg = color.hexS.accentDim;};
          title = {};
          value = {};
-          selected = {
-            reversed = true;
-          };
+          selected = {reversed = true;};
        };

        pick = {
-          border = {
-            fg = color.hexS.accentDim;
-          };
-          active = {
-            fg = color.hexS.accentHl;
-          };
+          border = {fg = color.hexS.accentDim;};
+          active = {fg = color.hexS.accentHl;};
          inactive = {};
        };

        confirm = {
-          border = {
-            fg = color.hexS.accentDim;
-          };
-          title = {
-            fg = color.hexS.accentDim;
-          };
+          border = {fg = color.hexS.accentDim;};
+          title = {fg = color.hexS.accentDim;};
          content = {};
          list = {};
-          btn_yes = {
-            reversed = true;
-          };
+          btn_yes = {reversed = true;};
          btn_no = {};
        };

        cmp = {
-          border = {
-            fg = color.hexS.accentDim;
-          };
+          border = {fg = color.hexS.accentDim;};
        };

        tasks = {
-          border = {
-            fg = color.hexS.accentDim;
-          };
+          border = {fg = color.hexS.accentDim;};
          title = {};
-          hovered = {
-            underline = true;
-          };
+          hovered = {underline = true;};
        };

        which = {
-          cand = {
-            fg = color.hexS.accent;
-          };
-          desc = {
-            fg = color.hexS.accentHl;
-          };
-          mask = {
-            bg = color.hexS.surface0;
-          };
-          rest = {
-            fg = color.hexS.surface0;
-          };
+          cand = {fg = color.hexS.accent;};
+          desc = {fg = color.hexS.accentHl;};
+          mask = {bg = color.hexS.surface0;};
+          rest = {fg = color.hexS.surface0;};
          separator = "  ";
-          separator_style = {
-            fg = color.hexS.text;
-          };
+          separator_style = {fg = color.hexS.text;};
        };

        help = {
-          on = {
-            fg = color.hexS.accent;
-          };
-          run = {
-            fg = color.hexS.accentHl;
-          };
-          desc = {
-            fg = color.hexS.text;
-          };
+          on = {fg = color.hexS.accent;};
+          run = {fg = color.hexS.accentHl;};
+          desc = {fg = color.hexS.text;};
          hovered = {
            fg = color.hexS.accentText; # TODO: This is not applied

@ -518,31 +420,19 @@ in {
        };

        notify = {
-          title_info = {
-            fg = color.hexS.teal;
-          };
-          title_warn = {
-            fg = color.hexS.yellow;
-          };
-          title_error = {
-            fg = color.hexS.red;
-          };
+          title_info = {fg = color.hexS.teal;};
+          title_warn = {fg = color.hexS.yellow;};
+          title_error = {fg = color.hexS.red;};
        };

        spot = {
-          border = {
-            fg = color.hexS.lavender;
-          };
-          title = {
-            fg = color.hexS.lavender;
-          };
+          border = {fg = color.hexS.lavender;};
+          title = {fg = color.hexS.lavender;};
          tbl_cell = {
            fg = color.hexS.lavender;
            reversed = true;
          };
-          tbl_col = {
-            bold = true;
-          };
+          tbl_col = {bold = true;};
        };

        # Default rules good enough
--- a/home/homemodules/zed/default.nix
+++ b/home/homemodules/zed/default.nix
@ -1,199 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) zed color;
-in {
-  options.homemodules.zed = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf zed.enable {
-    programs.zed-editor = {
-      enable = true;
-      package = pkgs.zed-editor;
-      enableMcpIntegration = true;
-      mutableUserKeymaps = false;
-      mutableUserSettings = false;
-      mutableUserTasks = false;
-      mutableUserDebug = false;
-
-      extensions = [
-        "catppuccin"
-        "catppuccin-icons"
-        "comment"
-        "git-firefly"
-
-        "nix"
-        "perl"
-        "fish"
-        "lua"
-        "toml"
-        "csharp"
-        "java"
-        "latex"
-        "typst"
-        "haskell"
-        "glsl"
-        "mermaid"
-        "clojure"
-        "verilog"
-        "qml"
-        "plantuml"
-        "graphviz"
-
-        "dockerfile"
-        "docker-compose"
-
-        "html"
-        "xml"
-        "scss"
-        "rainbow-csv"
-        "sql"
-        "svelte"
-        "svelte-mcp"
-        "jinja2"
-
-        "just"
-        "make"
-        "neocmake"
-        "assembly"
-        "wat"
-        "linkerscript"
-        "r"
-      ];
-
-      themes = {};
-      userDebug = [];
-
-      # TODO: Add neovim keymaps
-      userKeymaps = [
-        {
-          context = "Workspace";
-          bindings = {
-            "ctrl-/" = "terminal_panel::Toggle";
-          };
-        }
-        {
-          context = "Editor";
-          unbind = {
-            "ctrl-/" = [
-              "editor::ToggleComments"
-              {
-                advance_downwards = false;
-              }
-            ];
-          };
-        }
-        {
-          context = "(vim_mode == normal || vim_mode == visual) && !menu";
-          bindings = {
-            "ctrl-c" = "editor::ToggleComments";
-          };
-        }
-      ];
-
-      userSettings = {
-        buffer_font_family = config.homemodules.color.font;
-        terminal.font_family = config.homemodules.color.font;
-        theme = "Catppuccin Mocha";
-        icon_theme = "Catppuccin Mocha";
-        ui_font_size = 16;
-        buffer_font_size = 14;
-
-        project_panel.dock = "left";
-        outline_panel.dock = "left";
-        collaboration_panel.dock = "left";
-        git_panel = {
-          dock = "left";
-          tree_view = true;
-        };
-
-        # TODO: Doesn't work, although perlnavigator advertises Perl::Tidy autoformatting...
-        languages = {
-          Perl = {
-            formatter = "language_server";
-          };
-        };
-
-        auto_signature_help = true;
-        lsp = {
-          nil = {
-            initialization_options = {
-              formatting = {
-                # command = null;
-                command = ["${pkgs.alejandra}/bin/alejandra"];
-              };
-            };
-          };
-          nixd = {
-            initialization_options = {
-              formatting = {
-                command = ["${pkgs.alejandra}/bin/alejandra"];
-              };
-            };
-          };
-          # No idea how to configure the formatter
-          # perlnavigator-server = let
-          #   # TODO: Duplicated in neovim/default.nix. Need Perl module.
-          #   perl = pkgs.perl.withPackages (p:
-          #     with p; [
-          #       PLS
-          #       PerlCritic
-          #       PerlTidy
-          #       NetOpenSSH
-          #       DateTime
-          #       DBI
-          #       DBDMariaDB
-          #       CursesUI
-          #       TextCSV_XS
-          #     ]);
-          # in {
-          #   initialization_options = {
-          #     "perlnavigator.perlPath" = "${perl}/bin";
-          #     "perlnavigator.includePaths" = ["${perl}/lib/perl5"];
-          #   };
-          # };
-        };
-
-        disable_ai = false;
-        agent = {
-          dock = "right";
-          sidebar_side = "right";
-        };
-        agent_servers = {
-          claude-acp = {
-            type = "registry";
-          };
-          codex-acp = {
-            type = "registry";
-          };
-          gemini = {
-            type = "registry";
-          };
-          mistral-vibe = {
-            type = "registry";
-          };
-          opencode = {
-            type = "registry";
-          };
-        };
-
-        telemetry = {
-          diagnostics = false;
-          metrics = false;
-        };
-
-        vim_mode = true;
-        which_key = {
-          enabled = true;
-          delay_ms = 10;
-        };
-      };
-
-      userTasks = [];
-    };
-  };
-}
--- a/home/homemodules/zed/options.nix
+++ b/home/homemodules/zed/options.nix
@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable zed editor";
-}
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@ -18,16 +18,18 @@
      trusted-users = ["root" username];
      auto-optimise-store = true;

-      download-buffer-size = 524288000; # 500MB
-
      substituters = [
        "https://cache.nixos.org"
        "https://nix-community.cachix.org"
+        "https://comfyui.cachix.org"
+        # "https://ai.cachix.org"
        # "https://app.cachix.org/cache/nixos-rocm"
      ];
      trusted-public-keys = [
        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec="
+        # "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
        # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
      ];
    };
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@ -12,6 +12,7 @@
    ./disks.nix

    # General services
+    # ../services/comfyui.nix
    ../services/fileflows-node.nix
  ];

@ -123,6 +124,7 @@
        # 31431 # Parsec
        5173 # SvelteKit
        8090 # PocketBase
+        8188 # ComfyUI
      ];

      allowedUDPPorts = [
@ -133,6 +135,7 @@
        # 31431 # Parsec
        5173 # SvelteKit
        8090 # PocketBase
+        8188 # ComfyUI
      ];
    };

@ -231,52 +234,76 @@
      fileSystems = ["/"];
    };

+    # Temporarily ban IPs for SSH after failed login attempts
+    fail2ban = {
+      enable = true;
+    };
+
+    greetd = {
+      enable = false;
+      restart = false;
+      useTextGreeter = true;
+
+      settings = {
+        terminal.vt = 1;
+
+        default_session = {
+          # command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd $SHELL";
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session";
+          user = "greeter";
+        };
+      };
+    };
+
    kmscon = {
      enable = false;
+      hwRender = true;
      useXkbConfig = true;
      # autologinUser = username;

-      config = let
-        color = config.home-manager.users.${username}.homemodules.color;
-      in {
-        # term=xterm-256color
-
-        hwaccel = true;
-
-        font-name = color.font;
-        font-size = 14;
-
-        mode = "3440x1440";
-        palette = "custom";
-
-        palette-black = "0,0,0";
-        pallette-white = "255,255,255";
-
-        palette-red = color.rgbS.red;
-        palette-light-red = color.rgbS.red;
-
-        palette-green = color.rgbS.green;
-        palette-light-green = color.rgbS.green;
-
-        palette-yellow = color.rgbS.yellow;
-        palette-light-yellow = color.rgbS.yellow;
-
-        palette-blue = color.rgbS.blue;
-        palette-light-blue = color.rgbS.blue;
-
-        palette-magenta = color.rgbS.pink;
-        palette-light-magenta = color.rgbS.pink;
-
-        palette-cyan = color.rgbS.teal;
-        palette-light-cyan = color.rgbS.teal;
-
-        palette-foreground = color.rgbS.text;
-        palette-background = "0,0,0";
-      };
+      fonts = [
+        {
+          name = "MonoLisa Alt Script";
+          package = pkgs.monolisa;
+        }
+      ];

      # NOTE: Do NOT use multline strings here!
      #       This will create a linebreak in the systemd service and break login!
      extraOptions = "";
+
+      extraConfig = let
+        color = config.home-manager.users.${username}.homemodules.color;
+      in ''
+        # term=xterm-256color
+        font-size=14
+        mode=3440x1440
+        palette=custom
+
+        palette-black=0,0,0
+        pallette-white=255,255,255
+
+        palette-red=${color.rgbS.red}
+        palette-light-red=${color.rgbS.red}
+
+        palette-green=${color.rgbS.green}
+        palette-light-green=${color.rgbS.green}
+
+        palette-yellow=${color.rgbS.yellow}
+        palette-light-yellow=${color.rgbS.yellow}
+
+        palette-blue=${color.rgbS.blue}
+        palette-light-blue=${color.rgbS.blue}
+
+        palette-magenta=${color.rgbS.pink}
+        palette-light-magenta=${color.rgbS.pink}
+
+        palette-cyan=${color.rgbS.teal}
+        palette-light-cyan=${color.rgbS.teal}
+
+        palette-foreground=${color.rgbS.text}
+        palette-background=0,0,0
+      '';
    };

    openssh = {
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@ -121,6 +121,12 @@
      fsType = "nfs";
      options = ["defaults" "rw" "noatime" "_netdev" "bg" "hard"];
    };
+
+    "/media/Box" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Box";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "hard"];
+    };
  };

  swapDevices = [
--- a/system/servenix/default.nix
+++ b/system/servenix/default.nix
@ -24,6 +24,7 @@
    # General services
    ../services/authelia.nix
    ../services/bazarr.nix
+    ../services/box.nix
    ../services/fileflows.nix
    ../services/gitea.nix
    ../services/immich.nix
--- a/system/servenix/hardware-configuration.nix
+++ b/system/servenix/hardware-configuration.nix
@ -69,6 +69,12 @@
      fsType = "nfs";
      options = ["defaults" "rw" "relatime" "_netdev" "bg" "hard"];
    };
+
+    "/media/Box" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Box";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "hard"];
+    };
  };

  swapDevices = [
@ -86,7 +92,7 @@
    nvidia-container-toolkit.enable = true;

    nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.legacy_580;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;

      modesetting.enable = false;
      open = false; # GTX 1070 is too old for open drivers
--- a/system/services/box.nix
+++ b/system/services/box.nix
@ -0,0 +1,53 @@
+{
+  mylib,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  boxVersion = "v0.31.0";
+in {
+  virtualisation.oci-containers.containers = {
+    box = {
+      image = "stashapp/stash:${boxVersion}";
+      autoStart = true;
+
+      login = mylib.containers.mkDockerLogin config;
+
+      dependsOn = [];
+
+      ports = [
+        # "9999:9999"
+      ];
+
+      volumes = [
+        "/etc/localtime:/etc/localtime:ro"
+
+        "/media/Box:/data"
+
+        "box_config:/root/.stash"
+        "box_metadata:/metadata"
+        "box_cache:/cache"
+        "box_blobs:/blobs"
+        "box_generated:/generated"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+
+        STASH_STASH = "/data/";
+        STASH_GENERATED = "/generated/";
+        STASH_METADATA = "/metadata/";
+        STASH_CACHE = "/cache/";
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}
--- a/system/services/comfyui.nix
+++ b/system/services/comfyui.nix
@ -0,0 +1,77 @@
+{
+  mylib,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  # comfyuiVersion = "cu128-slim-20260316";
+  # comfyuiVersion = "cu128-megapak-20260413";
+  # comfyuiVersion = "cu130-megapak-pt211-20260330";
+  comfyuiVersion = "cu130-megapak-pt211-20260413";
+in {
+  virtualisation.oci-containers.containers = {
+    comfyui = {
+      image = "yanwk/comfyui-boot:${comfyuiVersion}";
+      autoStart = false;
+
+      login = mylib.containers.mkDockerLogin config;
+
+      dependsOn = [];
+
+      ports = [
+        "8188:8188"
+      ];
+
+      volumes = let
+        rootDir = "/home/christoph/Games/ComfyUI";
+      in [
+        # cu128-slim / cu128-megapak
+        # "${rootDir}/storage:/root"
+        # "${rootDir}/storage-models/models:/root/ComfyUI/models"
+        # "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
+        # "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
+        # "${rootDir}/storage-user/input:/root/ComfyUI/input"
+        # "${rootDir}/storage-user/output:/root/ComfyUI/output"
+        # "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
+
+        # cu130-megapak
+        "${rootDir}/storage-cache/dot-cache:/root/.cache"
+        "${rootDir}/storage-cache/dot-config:/root/.config"
+        "${rootDir}/storage-nodes/dot-local:/root/.local"
+        "${rootDir}/storage-nodes/comfy-extras:/root/ComfyUI/comfy_extras"
+        "${rootDir}/storage-nodes/custom_nodes:/root/ComfyUI/custom_nodes"
+        "${rootDir}/storage-models/models:/root/ComfyUI/models"
+        "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
+        "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
+        "${rootDir}/storage-user/input:/root/ComfyUI/input"
+        "${rootDir}/storage-user/output:/root/ComfyUI/output"
+        "${rootDir}/storage-user/user-profile:/root/ComfyUI/user"
+        "${rootDir}/storage-user/user-scripts:/root/user-scripts"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        # https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
+        CLI_ARGS = lib.concatStringsSep " " [
+          # "--cache-none" # Leads to single nodes being executed multiple times for each output connection :/
+          "--lowvram"
+          "--disable-smart-memory"
+          "--disable-pinned-memory"
+          "--disable-xformers"
+          "--use-sage-attention" # Crashes
+          # "--reserve-vram 1" # (1 or 2) => Assume less vram is available to mitigate OOM due to wrong vram estimation
+        ];
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        # "--net=behind-nginx"
+      ];
+    };
+  };
+}
--- a/system/services/fileflows-node.nix
+++ b/system/services/fileflows-node.nix
@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  fileflowsVersion = "26.06";
+  fileflowsVersion = "26.01";
 in {
  virtualisation.oci-containers.containers = {
    fileflows-node = {
--- a/system/services/fileflows.nix
+++ b/system/services/fileflows.nix
@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  version = "26.06";
+  version = "26.01";
 in {
  virtualisation.oci-containers.containers = {
    fileflows = {
--- a/system/services/kiwix.nix
+++ b/system/services/kiwix.nix
@ -18,7 +18,8 @@ in {
      ];

      volumes = [
-        "/home/christoph/ssd/kiwix:/data"
+        # TODO: Add network location for .zim files
+        "kiwix_data:/data"
      ];

      environment = {
--- a/system/services/nextcloud.nix
+++ b/system/services/nextcloud.nix
@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  nextcloudVersion = "33.0.5-apache";
+  nextcloudVersion = "31.0.6-apache";
 in {
  systemd.services.nextcloud-cron = {
    enable = true;
--- a/system/services/teamspeak.nix
+++ b/system/services/teamspeak.nix
@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  teamspeakVersion = "6.0.0-beta10";
+  teamspeakVersion = "v6.0.0-beta8";
 in {
  virtualisation.oci-containers.containers = {
    teamspeak = {
--- a/system/systemmodules/impermanence/default.nix
+++ b/system/systemmodules/impermanence/default.nix
@ -70,6 +70,7 @@ in {
          (mkRDir "/usr/systemd-placeholder" m755)

          # TODO: Why does this use the mandb user?
+          # TODO: Why does this apparently conflict with comfyui-nix?
          # (mkDir "mandb" "/var/cache/man" m755)

          # (mkRDir "/var/cache/restic-backups-synology" m755)
@ -120,17 +121,14 @@ in {

            # The shit some applications add to ~/ without asking
            # (mkUDir ".android" m755) # Unity
-            (mkUDir ".claude" m755)
            # (mkUDir ".comfy" m755)
            (mkUDir ".docker" m755)
            # (mkUDir ".gradle" m755) # Unity
            (mkUDir ".java" m755) # JetBrains
-            (mkUDir ".lmstudio" m755)
            (mkUDir ".MakeMKV" m755)
            (mkUDir ".mozilla/firefox" m755) # TODO: Remove this someday
            (mkUDir ".mozilla/native-messaging-hosts" m755)
            (mkUDir ".nix-package-search" m755)
-            (mkUDir ".npm" m755) # Contains mcp servers :/
            # (mkUDir ".nv" m755) # Unity
            # (mkUDir ".ollama" m755)
            # (mkUDir ".plastic4" m755) # Unity
@ -138,21 +136,14 @@ in {
            (mkUDir ".tiddl" m755)
            (mkUDir ".var/app" m755)
            (mkUDir ".vim/undo" m755)
-            (mkUDir ".vscode" m755)
            (mkUDir ".zotero" m755)

            # Cache that's actually useful
-            (mkUDir ".cache/claude-cli-nodejs" m755)
-            (mkUDir ".cache/elephant" m755)
            (mkUDir ".cache/fish/generated_completions" m755)
-            (mkUDir ".cache/nix" m755)
            (mkUDir ".cache/nix-index" m755)
            (mkUDir ".cache/nix-search-tv" m755)
            (mkUDir ".cache/nvim" m755)
            (mkUDir ".cache/JetBrains" m755)
-            (mkUDir ".cache/keepassxc" m755)
-            (mkUDir ".cache/opencode" m755)
-            (mkUDir ".cache/uv" m755)

            # Config
            # (mkUDir ".config/.android" m755) # Unity
@ -160,7 +151,6 @@ in {
            (mkUDir ".config/beets" m755)
            (mkUDir ".config/blender" m755)
            (mkUDir ".config/chromium" m755) # TODO: Remove this someday
-            (mkUDir ".config/Code" m755)
            (mkUDir ".config/Ferdium" m755)
            (mkUDir ".config/feishin" m755)
            (mkUDir ".config/fish/completions" m755)
@ -171,13 +161,11 @@ in {
            (mkUDir ".config/JetBrains" m755)
            (mkUDir ".config/kdeconnect" m755)
            (mkUDir ".config/keepassxc" m755)
-            (mkUDir ".config/LM Studio" m755)
            (mkUDir ".config/Msty" m755)
            (mkUDir ".config/Nextcloud" m755)
            # (mkUDir ".config/niri/dms" m755)
            (mkUDir ".config/obsidian" m755)
            (mkUDir ".config/obs-studio" m755)
-            (mkUDir ".config/opencode" m755)
            (mkUDir ".config/Signal" m755)
            # (mkUDir ".config/singularitygroup-hotreload" m755) # Unity
            (mkUDir ".config/TeamSpeak" m755)
@ -209,7 +197,6 @@ in {
            (mkUDir ".local/share/net.lrclib.lrcget" m755)
            (mkUDir ".local/share/nix" m755)
            (mkUDir ".local/share/nvim" m755)
-            (mkUDir ".local/share/opencode" m755)
            (mkUDir ".local/share/qutebrowser" m755)
            (mkUDir ".local/share/systemd" m755)
            # (mkUDir ".local/share/unity3d" m755) # Unity
@ -222,7 +209,6 @@ in {
            (mkUDir ".local/state/lazygit" m755)
            (mkUDir ".local/state/nix" m755)
            (mkUDir ".local/state/nvim" m755)
-            (mkUDir ".local/state/opencode" m755)
            (mkUDir ".local/state/waypaper" m755)
            (mkUDir ".local/state/wireplumber" m755)
          ];