Modules/Impermanence: Persist some caches + lmstudio models

Home/Nixinator: Update opencode permissions
Modules/Packages: Add lmstudio
2026-06-17 13:56:50 +02:00 · 2026-06-17 13:56:41 +02:00 · 2026-06-14 21:01:24 +02:00 · 2026-06-14 21:01:18 +02:00 · 2026-06-14 21:01:02 +02:00 · 2026-06-13 17:53:45 +02:00
58 changed files with 1543 additions and 2229 deletions
@@ -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.
@@ -206,12 +206,12 @@ dos2unix <file>
 $ file: eza -1

 % unix2dos
-# Convert line endings to dos format
+Convert line endings to dos format
 unix2dos <file>
 $ file: eza -1

 % tiddl
-# Download stuff from tidal
+Download stuff from tidal
 tiddl download --track-quality max --path ~/Downloads/Beet/Albums --videos none url "<url>"

 ; ===========================
@@ -47,10 +47,6 @@
    nps.url = "github:OleMussmann/nps";
    nps.inputs.nixpkgs.follows = "nixpkgs";

-    # Nix Gaming
-    nix-gaming.url = "github:fufexan/nix-gaming";
-    nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
-
    # Run unpatched binaries on NixOS
    nix-alien.url = "github:thiagokokada/nix-alien";
    # Don't follow nixpkgs:
@@ -58,16 +54,9 @@
    # nix-alien.inputs.nixpkgs.follows = "nixpkgs";

    # Niri
-    # niri.url = "github:sodiboo/niri-flake";
-    niri.url = "github:epireyn/niri-flake"; # NOTE: Updated fork of sodiboo's
+    niri.url = "github:sodiboo/niri-flake";
    niri.inputs.nixpkgs.follows = "nixpkgs";

-    # Hyprland
-    hyprland.url = "github:hyprwm/Hyprland";
-    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
-    hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
-    hyprland-plugins.inputs.hyprland.follows = "hyprland";
-
    # Walker
    elephant.url = "github:abenz1267/elephant";
    walker.url = "github:abenz1267/walker";
@@ -97,9 +86,6 @@
    # musnix.url = "github:musnix/musnix";
    # musnix.inputs.nixpkgs.follows = "nixpkgs";

-    stylix.url = "github:nix-community/stylix";
-    stylix.inputs.nixpkgs.follows = "nixpkgs";
-
    # HyTale
    hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";

@@ -240,7 +226,6 @@
        headless = false;
        extraModules = [
          inputs.sops-nix.darwinModules.sops
-          inputs.stylix.darwinModules.stylix
        ];
      };
    };
@@ -267,8 +252,6 @@
        extraModules =
          [
            inputs.disko.nixosModules.disko
-            inputs.stylix.nixosModules.stylix
-            inputs.nix-gaming.nixosModules.platformOptimizations
          ]
          ++ commonModules;
      };
@@ -54,7 +54,7 @@ in
        cursorSize = 24;
        cursorPackage = pkgs.bibata-cursors;

-        iconTheme = "Papirus-Dark";
+        iconTheme = "Papirus";
        iconPackage = pkgs.papirus-icon-theme;

        scheme = "catppuccin-mocha";
@@ -77,193 +77,6 @@ in
        disableTabBar = true;
      };

-      hyprland = {
-        enable = nixosConfig.programs.hyprland.enable;
-        bars.enable = false;
-        hyprpanel.enable = false;
-
-        keybindings = {
-          main-mod = "SUPER";
-
-          bindings = let
-            sessionMenu = mylib.rofi.mkMenu {
-              prompt = "Session2";
-              layers = [
-                {
-                  "󰤂  Poweroff" = "poweroff";
-                  "󰜉  Reboot" = "reboot";
-                  "󰌾  Lock" = "loginctl lock-session";
-                  # "  Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
-                  "  Reload Hyprland" = "hyprctl reload";
-                  "  Exit Hyprland" = "hyprctl dispatch exit";
-                  # "  Exit Niri" = "niri msg action quit";
-                }
-              ];
-              prompts = ["Select Session Action"];
-              rofiCmd = "walker -d";
-            };
-          in
-            lib.mergeAttrsList [
-              {
-                "$mainMod SHIFT, a" = ["exec, walker -m providerlist"];
-                "$mainMod, a" = ["exec, walker -m desktopapplications"];
-                "$mainMod, c" = ["exec, walker -m clipboard"];
-                "$mainMod, Escape" = ["exec, ${sessionMenu}/bin/rofi-menu-Session2"];
-                "$mainMod CTRL, w" = ["exec, waypaper"];
-              }
-              {
-                # Applications
-                "$mainMod, t" = ["exec, kitty"];
-                "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
-                "$mainMod, n" = ["exec, neovide"];
-                # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
-                "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
-                "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
-                "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
-                # "ALT, tab" = ["exec, rofi -show window"];
-
-                # Screenshots
-                "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
-                "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
-                "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-
-                # Audio
-                ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
-                ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
-                ", XF86AudioPlay" = ["exec, playerctl play-pause"];
-                ", XF86AudioPrev" = ["exec, playerctl previous"];
-                ", XF86AudioNext" = ["exec, playerctl next"];
-
-                # Brightness
-                ", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
-                ", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
-                "$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
-                "$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
-
-                "CTRL ALT, f" = let
-                  hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
-                  grep = "${pkgs.gnugrep}/bin/grep";
-                  awk = "${pkgs.gawk}/bin/gawk";
-                  notify = "${pkgs.libnotify}/bin/notify-send";
-
-                  toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
-                    CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
-
-                    if [[ "$CURRENT" == "1" ]]; then
-                      ${hyprctl} keyword input:follow_mouse 0
-                      ${notify} "Disabled Mouse Focus!"
-                    else
-                      ${hyprctl} keyword input:follow_mouse 1
-                      ${notify} "Enabled Mouse Focus!"
-                    fi
-                  '';
-                in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
-
-                # "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
-              }
-            ];
-
-          ws-bindings = {
-            # "<Workspace>" = "<Key>";
-            "1" = "1";
-            "2" = "2";
-            "3" = "3";
-            "4" = "4";
-            "5" = "5";
-            "6" = "6";
-            "7" = "7";
-            "8" = "8";
-            "9" = "9";
-            "10" = "0";
-          };
-
-          # special-ws-bindings = {
-          #   "ferdium" = "x";
-          #   "msty" = "z";
-          #   "btop" = "b";
-          #   "rmpc" = "r";
-          # };
-        };
-
-        autostart = {
-          immediate = [
-            "kitty --hold fastfetch"
-            # "zeal"
-            # "protonvpn-app"
-
-            # "kdeconnect-indicator" # started by services.kdeconnect.indicator
-          ];
-
-          delayed = [
-            # "keepassxc" # The tray doesn't work when started too early
-            "nextcloud --background"
-          ];
-
-          special-silent = {
-            # "ferdium" = ["ferdium"];
-            # "msty" = ["msty"];
-            # "btop" = ["kitty --title=Btop btop"];
-            # "rmpc" = ["kitty --title=Rmpc rmpc"];
-          };
-        };
-
-        windowrules = [
-          # Fix jetbrains tooltip flicker
-          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
-          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
-        ];
-
-        workspacerules = {
-          "1" = [];
-          "2" = ["neovide" "code-url-handler" "dev.zed.Zed" "code" "jetbrains-(.+)"];
-          "3" = ["obsidian" "Zotero"];
-          "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
-          "5" = ["steam"];
-          "6" = ["steam_app_(.+)" "factorio"];
-          "7" = ["signal"];
-          "8" = [];
-          "9" = ["discord"];
-          "10" = [];
-        };
-
-        floating = [
-          {class = "org.kde.polkit-kde-authentication-agent-1";}
-          {
-            class = "thunar";
-            title = "File Operation Progress";
-          }
-          {class = "ffplay";}
-          {class = "Unity";}
-          {class = "code-url-handler";}
-        ];
-
-        transparent-opacity = "0.85";
-
-        transparent = [
-          "kitty"
-          "Alacritty"
-          "discord"
-          "signal"
-          "vesktop"
-          "Spotify"
-          "tidal-hifi"
-          "obsidian"
-          "firefox"
-          "org.qutebrowser.qutebrowser"
-          "jetbrains-clion"
-          "jetbrains-idea"
-          "jetbrains-pycharm"
-          "jetbrains-rustrover"
-          "jetbrains-rider"
-          "jetbrains-webstorm"
-          "code-url-handler"
-          "neovide"
-          "steam"
-          "ferdium"
-          "Msty"
-        ];
-      };
-
      mpd.enable = !headless;
      niri.enable = nixosConfig.programs.niri.enable;
      nnn.enable = false; # Use yazi
@@ -323,11 +136,9 @@ in

          # Enable wayland
          XDG_SESSION_TYPE = "wayland";
-          # QT_QPA_PLATFORM = "wayland;xcb";
          QT_QPA_PLATFORM = "wayland";
          NIXOS_OZONE_WL = "1";
-          # ELECTRON_OZONE_PLATFORM_HINT = "auto";
-          SDL_VIDEODRIVER = "wayland"; # Leave unset as gamescope uses xwayland
+          SDL_VIDEODRIVER = "wayland";

          # Run SSH_ASKPASS as GUI, not TTY for Obsidian git
          SSH_ASKPASS_REQUIRE = "prefer";
@@ -18,55 +18,6 @@
      # because it forces en-US keyboard layout.
      fcitx.enable = true;

-      helix.enable = true;
-
-      hyprland = {
-        keyboard = {
-          layout = "us";
-          variant = "altgr-intl";
-          option = "nodeadkeys";
-        };
-
-        monitors = {
-          "DP-1" = {
-            width = 3440;
-            height = 1440;
-            rate = 165;
-            x = 1920;
-            y = 0;
-            scale = 1;
-            bitdepth = 10;
-            cm = "auto"; # with render:cm_auto_hdr, we don't need hdr here
-          };
-
-          "DP-2" = {
-            width = 1920;
-            height = 1080;
-            rate = 60;
-            x = 0;
-            y = 0;
-            scale = 1;
-          };
-        };
-
-        workspaces = {
-          "DP-1" = [1 2 3 4 5 6 7 8 9];
-          "DP-2" = [10];
-        };
-
-        autostart = {
-          delayed = [
-            "fcitx5"
-          ];
-        };
-
-        floating = [
-          {
-            class = "fcitx";
-          }
-        ];
-      };
-
      waybar.monitors = ["DP-1" "DP-2"];
      vscode.enable = true;
      zed.enable = true;
@@ -78,56 +29,6 @@
        enableMcpIntegration = true;
      };

-      # NOTE: Starts extremely slow
-      ghostty = {
-        enable = true;
-        enableFishIntegration = true;
-        systemd.enable = true;
-
-        settings = {
-          theme = "catppuccin-mocha";
-          font-family = config.homemodules.color.font;
-          font-size = 12;
-          window-padding-x = 10;
-          window-padding-y = 10;
-          adjust-cursor-thickness = 1;
-
-          cursor-click-to-move = true;
-          gtk-single-instance = true;
-          # link-previews = true;
-        };
-
-        themes = let
-          color = config.homemodules.color;
-        in {
-          catppuccin-mocha = {
-            background = color.hex.base;
-            cursor-color = color.hex.rosewater;
-            foreground = color.hex.text;
-            palette = [
-              "0=#${color.hex.surface1}"
-              "1=#${color.hex.red}"
-              "2=#${color.hex.green}"
-              "3=#${color.hex.yellow}"
-              "4=#${color.hex.blue}"
-              "5=#${color.hex.pink}"
-              "6=#${color.hex.teal}"
-              "7=#${color.hex.subtext1}"
-              "8=#${color.hex.surface2}"
-              "9=#${color.hex.red}"
-              "10=#${color.hex.green}"
-              "11=#${color.hex.yellow}"
-              "12=#${color.hex.blue}"
-              "13=#${color.hex.pink}"
-              "14=#${color.hex.teal}"
-              "15=#${color.hex.subtext0}"
-            ];
-            selection-background = color.hex.surface1;
-            selection-foreground = color.hex.text;
-          };
-        };
-      };
-
      mcp = {
        enable = true;
        servers = {
@@ -177,7 +78,6 @@
            "opencode"
            "opencode-go"
            "anthropic"
-            "lmstudio"
          ];
          formatter = {
            nixfmt = {
@@ -296,7 +196,6 @@
          plugin = [
            "opencode-claude-auth@latest" # https://github.com/griffinmartin/opencode-claude-auth
            "@tarquinen/opencode-dcp@latest" # better compacting
-            # "opencode-lmstudio@0.3.1"
            # "@slkiser/opencode-quota"
          ];
          share = "disabled";
@@ -451,43 +350,15 @@
      stateVersion = "22.05";
    };

-    # Cyberpunk 2077 NXM handler
-    xdg.desktopEntries."modorganizer2-nxm-handler-cyberpunk" = {
-      type = "Application";
-      categories = ["Game"];
-      name = "Mod Organizer 2 NXM Handler (Cyberpunk 2077)";
-      mimeType = ["x-scheme-handler/nxm"];
-      exec = let
-        # Paths seen from inside the Flatpak Steam sandbox
-        steam = "$HOME/.steam/steam";
-        steamapps = "$HOME/Games/SteamLibrary/steamapps";
-        proton = "Proton 11.0";
-
-        # Runs inside flatpak's sandbox
-        innerCommand = ''
-          export STEAM_COMPAT_CLIENT_INSTALL_PATH="${steam}"
-          export STEAM_COMPAT_DATA_PATH="${steamapps}/compatdata/1091500"
-          exec "${steam}/steamapps/common/${proton}/proton" run \
-            "$HOME/Games/CyberpunkMO2/nxmhandler.exe" "$1"
-        '';
-
-        # Important: Run through flatpak's/steam's runtimes
-        nxmHandler = pkgs.writeShellScript "cyberpunk-nxm-handler" ''
-          exec flatpak run --command=sh com.valvesoftware.Steam -c ${lib.escapeShellArg innerCommand} _ "$1"
-        '';
-      in "${nxmHandler} %u";
-    };
-
    services = {
      flatpak = {
        packages = [
          "com.valvesoftware.Steam"
          "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
-          "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/25.08" # TODO: Doesn't work
-          "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08"
+          "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
+          "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
          "io.github.Foldex.AdwSteamGtk"
          "com.vysp3r.ProtonPlus"
-          "com.github.Matoking.protontricks"
          # "net.davidotek.pupgui2"

          "org.prismlauncher.PrismLauncher"
@@ -508,34 +379,12 @@
            ];
          };

-          "com.github.Matoking.protontricks".Context = {
+          "com.valvesoftware.Steam".Context = {
            filesystems = [
-              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
              "${config.home.homeDirectory}/Games"
-            ];
-          };

-          "com.valvesoftware.Steam" = {
-            Environment = {
-              PATH = "/app/bin:/app/utils/bin:/usr/bin:/usr/lib/extensions/vulkan/gamescope/bin";
-            };
-            Context = {
-              filesystems = [
-                "${config.home.homeDirectory}/Games"
-
-                # This is Proton-GE installed from flatpak. ProtonUpQT doesn't require it.
-                "/var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE"
-
-                # This is gamescope installed from flatpak
-                "/usr/lib/extensions/vulkan/gamescope/bin"
-              ];
-            };
-          };
-
-          "com.valvesoftware.Steam.Utility.steamtinkerlaunch".Context = {
-            filesystems = [
-              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
-              "${config.home.homeDirectory}/Games"
+              # This is Proton-GE installed from flatpak. ProtonUpQT doesn't require it.
+              "/var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE"
            ];
          };

@@ -4,28 +4,28 @@
    homemodules = {
      # TODO: Niri config (needs to modularize niri module)

-      hyprland = {
-        keyboard = {
-          layout = "us";
-          variant = "altgr-intl";
-          option = "nodeadkeys";
-        };
-
-        monitors = {
-          "eDP-1" = {
-            width = 1920;
-            height = 1080;
-            rate = 60;
-            x = 0;
-            y = 0;
-            scale = 1;
-          };
-        };
-
-        workspaces = {
-          "eDP-1" = [1 2 3 4 5 6 7 8 9];
-        };
-      };
+      # hyprland = {
+      #   keyboard = {
+      #     layout = "us";
+      #     variant = "altgr-intl";
+      #     option = "nodeadkeys";
+      #   };
+      #
+      #   monitors = {
+      #     "eDP-1" = {
+      #       width = 1920;
+      #       height = 1080;
+      #       rate = 60;
+      #       x = 0;
+      #       y = 0;
+      #       scale = 1;
+      #     };
+      #   };
+      #
+      #   workspaces = {
+      #     "eDP-1" = [1 2 3 4 5 6 7 8 9];
+      #   };
+      # };

      waybar.monitors = ["eDP-1"];
    };
@@ -15,10 +15,10 @@ in {
  options.homemodules.helix = import ./options.nix {inherit lib mylib;};

  config = mkIf cfg.enable {
-    # home.sessionVariables = {
-    #   EDITOR = "hx";
-    #   VISUAL = "hx";
-    # };
+    home.sessionVariables = {
+      EDITOR = "hx";
+      VISUAL = "hx";
+    };

    programs.helix = {
      enable = true;
@@ -40,11 +40,11 @@ in {

      # https://docs.helix-editor.com/configuration.html
      settings = {
-        theme = "catppuccin_mocha";
+        theme = "catppuccin_latte";
        editor = {
          scrolloff = 10;
-          mouse = true;
-          middle-click-paste = true;
+          mouse = false; # Default true
+          middle-click-paste = false; # Default true
          line-number = "relative";
          cursorline = true;
          color-modes = true;
@@ -5,12 +5,16 @@
  hyprland,
 }:
 builtins.concatLists [
+  (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
  (lib.optionals hyprland.hyprpanel.enable ["hyprpanel"]) # Panel
+  (lib.optionals hyprland.caelestia.enable ["caelestia shell"]) # Panel/Shell # TODO: Crashes on startup
  [
+    # Start clipboard management
+    "wl-paste -t text --watch clipman store --no-persist"
+    "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
+
    "hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
    "hyprsunset --identity"
-    "waypaper --restore"
-    "fcitx5"

    # HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
    "setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
@@ -22,11 +26,6 @@ builtins.concatLists [
    # This is used for example when running systemd commands without root.
    # "systemctl --user start hyprpolkitagent.service"
    # "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
-
-    # TODO: This is started by niri already (extract to module so niri/hyprland can both use it)
-    # "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
-
-    # TODO: This is started by niri already (extract to module so niri/hyprland can both use it)
-    "dunst"
+    "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
  ]
 ]
@@ -0,0 +1,516 @@
+{
+  config,
+  hyprland,
+  color,
+}: {
+  enable = hyprland.caelestia.enable;
+
+  systemd = {
+    enable = false; # Start from hyprland autostart
+    target = "graphical-session.target";
+    environment = [];
+  };
+
+  settings = {
+    appearance = {
+      anim = {durations = {scale = 1;};};
+      font = {
+        family = {
+          clock = "Rubik";
+          material = "Material Symbols Rounded";
+          mono = color.font;
+          sans = color.font;
+        };
+        size = {scale = 1;};
+      };
+
+      padding = {scale = 1;};
+      rounding = {scale = 1;};
+      spacing = {scale = 1;};
+
+      transparency = {
+        base = 0.85;
+        enabled = false;
+        layers = 0.4;
+      };
+    };
+
+    background = {
+      desktopClock = {enabled = false;};
+      enabled = true;
+
+      # Lags when visible on both monitors (different refresh rates?)
+      visualiser = {
+        autoHide = true;
+        blur = true;
+        enabled = false;
+        rounding = 1;
+        spacing = 1;
+      };
+    };
+
+    bar = {
+      clock = {showIcon = true;};
+      dragThreshold = 20;
+
+      entries = [
+        {
+          enabled = true;
+          id = "logo";
+        }
+        {
+          enabled = true;
+          id = "workspaces";
+        }
+        {
+          enabled = true;
+          id = "spacer";
+        }
+        {
+          enabled = true;
+          id = "activeWindow";
+        }
+        {
+          enabled = true;
+          id = "spacer";
+        }
+        {
+          enabled = true;
+          id = "clock";
+        }
+        {
+          enabled = true;
+          id = "tray";
+        }
+        {
+          enabled = true;
+          id = "statusIcons";
+        }
+        {
+          enabled = true;
+          id = "power";
+        }
+      ];
+
+      persistent = true;
+
+      popouts = {
+        activeWindow = true;
+        statusIcons = true;
+        tray = true;
+      };
+
+      scrollActions = {
+        brightness = false;
+        volume = true;
+        workspaces = true;
+      };
+
+      showOnHover = true;
+
+      status = {
+        showAudio = true;
+        showBattery = false;
+        showBluetooth = true;
+        showKbLayout = false;
+        showLockStatus = true;
+        showMicrophone = false;
+        showNetwork = true;
+      };
+
+      tray = {
+        background = true;
+        compact = false;
+        iconSubs = [];
+        recolour = false;
+      };
+
+      workspaces = {
+        activeIndicator = true;
+        activeLabel = "󰮯";
+        activeTrail = true;
+        label = "  ";
+        occupiedBg = false;
+        occupiedLabel = "󰮯";
+        perMonitorWorkspaces = false;
+        showWindows = false;
+        shown = 10;
+
+        # Pick them here: https://fonts.google.com/icons
+        specialWorkspaceIcons = [
+          {
+            icon = "music_note";
+            name = "rmpc";
+          }
+          {
+            icon = "memory";
+            name = "btop";
+          }
+          {
+            icon = "mark_chat_unread";
+            name = "ferdium";
+          }
+          {
+            icon = "network_intelligence";
+            name = "msty";
+          }
+        ];
+      };
+    };
+
+    border = {
+      rounding = 25;
+      thickness = 10;
+    };
+
+    dashboard = {
+      dragThreshold = 50;
+      enabled = true;
+      mediaUpdateInterval = 500;
+      showOnHover = true;
+    };
+
+    general = {
+      apps = {
+        audio = ["kitty" "--title=NcpaMixer" "-e" "ncpamixer"];
+        explorer = ["kitty" "--title=Yazi" "-e" "yazi"];
+        playback = ["mpv"];
+        terminal = ["kitty"];
+      };
+
+      battery = {
+        criticalLevel = 3;
+        warnLevels = [
+          {
+            icon = "battery_android_frame_2";
+            level = 20;
+            message = "You might want to plug in a charger";
+            title = "Low battery";
+          }
+          {
+            icon = "battery_android_frame_1";
+            level = 10;
+            message = "You should probably plug in a charger <b>now</b>";
+            title = "Did you see the previous message?";
+          }
+          {
+            critical = true;
+            icon = "battery_android_alert";
+            level = 5;
+            message = "PLUG THE CHARGER RIGHT NOW!!";
+            title = "Critical battery level";
+          }
+        ];
+      };
+
+      idle = {
+        inhibitWhenAudio = true;
+        lockBeforeSleep = true;
+        timeouts = [
+          {
+            idleAction = "lock";
+            timeout = 600;
+          }
+          {
+            # idleAction = "dpms off";
+            # returnAction = "dpms on";
+            idleAction = "echo 'idle'";
+            returnAction = "echo 'return'";
+            timeout = 10000;
+          }
+          {
+            # idleAction = ["systemctl" "suspend-then-hibernate"];
+            idleAction = ["echo" "'idle'"];
+            timeout = 20000;
+          }
+        ];
+      };
+    };
+
+    launcher = {
+      actionPrefix = ">";
+      actions = [
+        {
+          command = ["autocomplete" "calc"];
+          dangerous = false;
+          description = "Do simple math equations (powered by Qalc)";
+          enabled = true;
+          icon = "calculate";
+          name = "Calculator";
+        }
+        {
+          command = ["autocomplete" "scheme"];
+          dangerous = false;
+          description = "Change the current colour scheme";
+          enabled = true;
+          icon = "palette";
+          name = "Scheme";
+        }
+        {
+          command = ["autocomplete" "wallpaper"];
+          dangerous = false;
+          description = "Change the current wallpaper";
+          enabled = true;
+          icon = "image";
+          name = "Wallpaper";
+        }
+        {
+          command = ["autocomplete" "variant"];
+          dangerous = false;
+          description = "Change the current scheme variant";
+          enabled = true;
+          icon = "colors";
+          name = "Variant";
+        }
+        {
+          command = ["autocomplete" "transparency"];
+          dangerous = false;
+          description = "Change shell transparency";
+          enabled = false;
+          icon = "opacity";
+          name = "Transparency";
+        }
+        {
+          command = ["caelestia" "wallpaper" "-r"];
+          dangerous = false;
+          description = "Switch to a random wallpaper";
+          enabled = false;
+          icon = "casino";
+          name = "Random";
+        }
+        {
+          command = ["setMode" "light"];
+          dangerous = false;
+          description = "Change the scheme to light mode";
+          enabled = true;
+          icon = "light_mode";
+          name = "Light";
+        }
+        {
+          command = ["setMode" "dark"];
+          dangerous = false;
+          description = "Change the scheme to dark mode";
+          enabled = true;
+          icon = "dark_mode";
+          name = "Dark";
+        }
+        {
+          command = ["systemctl" "poweroff"];
+          dangerous = true;
+          description = "Shutdown the system";
+          enabled = true;
+          icon = "power_settings_new";
+          name = "Shutdown";
+        }
+        {
+          command = ["systemctl" "reboot"];
+          dangerous = true;
+          description = "Reboot the system";
+          enabled = true;
+          icon = "cached";
+          name = "Reboot";
+        }
+        {
+          command = ["loginctl" "terminate-user" ""];
+          dangerous = true;
+          description = "Log out of the current session";
+          enabled = true;
+          icon = "exit_to_app";
+          name = "Logout";
+        }
+        {
+          command = ["loginctl" "lock-session"];
+          dangerous = false;
+          description = "Lock the current session";
+          enabled = true;
+          icon = "lock";
+          name = "Lock";
+        }
+        {
+          command = ["systemctl" "suspend-then-hibernate"];
+          dangerous = false;
+          description = "Suspend then hibernate";
+          enabled = false;
+          icon = "bedtime";
+          name = "Sleep";
+        }
+      ];
+
+      dragThreshold = 50;
+      enableDangerousActions = true;
+      hiddenApps = [];
+      maxShown = 7;
+      maxWallpapers = 9;
+      showOnHover = false;
+      specialPrefix = "@";
+      useFuzzy = {
+        actions = false;
+        apps = false;
+        schemes = false;
+        variants = false;
+        wallpapers = false;
+      };
+      vimKeybinds = false;
+    };
+
+    lock = {recolourLogo = false;};
+
+    notifs = {
+      actionOnClick = false;
+      clearThreshold = 0.3;
+      defaultExpireTimeout = 5000;
+      expandThreshold = 20;
+      expire = true;
+    };
+
+    osd = {
+      enableBrightness = false;
+      enableMicrophone = true;
+      enabled = true;
+      hideDelay = 2000;
+    };
+
+    paths = {
+      mediaGif = "root:/assets/bongocat.gif";
+      sessionGif = "root:/assets/kurukuru.gif";
+      wallpaperDir = "~/NixFlake/wallpapers";
+    };
+
+    services = {
+      audioIncrement = 0.1;
+      defaultPlayer = "MPD";
+      gpuType = "";
+      maxVolume = 1;
+      playerAliases = [
+        {
+          from = "com.github.th_ch.youtube_music";
+          to = "YT Music";
+        }
+      ];
+      smartScheme = true;
+      useFahrenheit = false;
+      useTwelveHourClock = false;
+      visualiserBars = 45;
+      weatherLocation = "Dortmund, Germany";
+    };
+
+    session = {
+      commands = {
+        hibernate = ["systemctl" "hibernate"];
+        logout = ["loginctl" "terminate-user" ""];
+        reboot = ["systemctl" "reboot"];
+        shutdown = ["systemctl" "poweroff"];
+      };
+      dragThreshold = 30;
+      enabled = true;
+      vimKeybinds = false;
+    };
+
+    sidebar = {
+      dragThreshold = 80;
+      enabled = true;
+    };
+
+    utilities = {
+      enabled = true;
+      maxToasts = 4;
+      toasts = {
+        audioInputChanged = true;
+        audioOutputChanged = true;
+        capsLockChanged = true;
+        chargingChanged = true;
+        configLoaded = true;
+        dndChanged = true;
+        gameModeChanged = true;
+        kbLayoutChanged = false;
+        nowPlaying = false;
+        numLockChanged = true;
+        vpnChanged = true;
+      };
+
+      vpn = {
+        enabled = false;
+        provider = [
+          {
+            displayName = "Wireguard (Your VPN)";
+            interface = "your-connection-name";
+            name = "wireguard";
+          }
+        ];
+      };
+    };
+  };
+
+  cli = {
+    enable = hyprland.caelestia.enable;
+
+    settings = {
+      record = {extraArgs = [];};
+
+      theme = {
+        enableBtop = false;
+        enableDiscord = false;
+        enableFuzzel = false;
+        enableGtk = false;
+        enableHypr = false;
+        enableQt = false;
+        enableSpicetify = false;
+        enableTerm = false;
+      };
+
+      toggles = {
+        communication = {
+          discord = {
+            command = ["discord"];
+            enable = false;
+            match = [{class = "discord";}];
+            move = true;
+          };
+          whatsapp = {
+            enable = false;
+            match = [{class = "whatsapp";}];
+            move = true;
+          };
+        };
+
+        music = {
+          feishin = {
+            enable = false;
+            match = [{class = "feishin";}];
+            move = true;
+          };
+          spotify = {
+            command = ["spicetify" "watch" "-s"];
+            enable = false;
+            match = [{class = "Spotify";} {initialTitle = "Spotify";} {initialTitle = "Spotify Free";}];
+            move = true;
+          };
+        };
+
+        sysmon = {
+          btop = {
+            command = ["kitty" "--title" "Btop" "-e" "btop"];
+            enable = false;
+            match = [
+              {
+                class = "btop";
+                title = "Btop";
+                workspace = {name = "special:sysmon";};
+              }
+            ];
+          };
+        };
+
+        todo = {
+          todoist = {
+            command = ["todoist"];
+            enable = false;
+            match = [{class = "Todoist";}];
+            move = true;
+          };
+        };
+      };
+      wallpaper = {postHook = "echo $WALLPAPER_PATH";};
+    };
+  };
+}
@@ -0,0 +1,180 @@
+{
+  inputs,
+  config,
+  lib,
+  mylib,
+  pkgs,
+  nixosConfig,
+  username,
+  ...
+}: let
+  inherit (config.homemodules) hyprland color;
+
+  # Autostart programs
+  always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
+
+  # Keybindings
+  always-bind = import ./mappings.nix {inherit lib config hyprland;};
+
+  # Mousebindings
+  always-bindm = {
+    "$mainMod, mouse:272" = ["movewindow"];
+    "$mainMod, mouse:273" = ["resizewindow"];
+  };
+in {
+  options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf hyprland.enable {
+    assertions = [
+      {
+        assertion = nixosConfig.programs.hyprland.enable;
+        message = "Can't enable Hyprland module with Hyprland disabled!";
+      }
+      {
+        assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services;
+        message = "Can't enable Hyprland module without Hyprlock PAM service!";
+      }
+      {
+        assertion = hyprland.hyprpanel.enable != hyprland.caelestia.enable;
+        message = "Can't enable Hyprpanel and Caelestia at the same time!";
+      }
+    ];
+
+    gtk = {
+      enable = true;
+      iconTheme.package = lib.mkDefault color.iconPackage;
+      iconTheme.name = color.iconTheme;
+    };
+
+    homemodules = {
+      hyprpanel.enable = hyprland.hyprpanel.enable;
+    };
+
+    home = {
+      pointerCursor = {
+        gtk.enable = lib.mkDefault true;
+        x11.enable = lib.mkDefault true;
+        package = lib.mkDefault color.cursorPackage;
+        name = color.cursor;
+        size = color.cursorSize;
+      };
+
+      packages = with pkgs; [
+        hyprpaper # Wallpaper setter
+        hyprpicker # Color picker
+        # hyprpolkitagent # Ugly polkit authentication GUI
+        hyprland-qt-support
+        hyprsunset # Blue light filter
+
+        wl-clipboard
+        clipman # Clipboard manager (wl-paste)
+        libnotify
+        inotify-tools # Includes inotifywait
+
+        ncpamixer # Audio control
+        slurp # Region selector for screensharing
+        grim # Grab images from compositor
+
+        # Deps for Qt5 and Qt6 apps (e.g., Nextcloud)
+        qt5.qtwayland
+        qt6.qtwayland
+      ];
+
+      file = {
+        ".config/hypr/keybindings.info".text = let
+          fixupHomeDir = key:
+            builtins.replaceStrings ["/home/${username}"] ["~"] key;
+
+          fixupNixStore = key: let
+            # The pattern has to match the entire string, otherwise it won't work
+            matches = builtins.match ".*/nix/store/(.*)/.*" key;
+          in
+            if (matches == null)
+            then key
+            else builtins.replaceStrings matches ["..."] key;
+
+          fixupNoMod = key:
+            builtins.replaceStrings ["<-"] ["<"] key;
+
+          mkBindHelpKey = key:
+            builtins.replaceStrings ["$mainMod" " " ","] ["${hyprland.keybindings.main-mod}" "-" ""] key;
+
+          mkBindHelpAction = action:
+            builtins.replaceStrings [","] [""] action;
+
+          mkBindHelp = key: action: "<${mkBindHelpKey key}>: ${mkBindHelpAction action}";
+
+          mkBindsHelp = key: actions:
+            actions
+            |> builtins.map (mkBindHelp key)
+            |> builtins.map fixupNoMod
+            |> builtins.map fixupNixStore
+            |> builtins.map fixupHomeDir;
+        in
+          (hyprland.keybindings.bindings // always-bind)
+          |> builtins.mapAttrs mkBindsHelp
+          |> builtins.attrValues
+          |> builtins.concatLists
+          |> builtins.concatStringsSep "\n";
+      };
+    };
+
+    programs = {
+      hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
+      caelestia = import ./caelestia.nix {inherit config hyprland color;};
+    };
+
+    services = {
+      dunst = import ./dunst.nix {inherit pkgs config hyprland color;};
+      hypridle = import ./hypridle.nix {inherit config hyprland color;};
+      hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
+    };
+
+    # Make sure the units only start when using Hyprland
+    systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+
+    wayland.windowManager.hyprland = {
+      enable = true;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+
+      systemd.enable = true; # Enable hyprland-session.target
+      systemd.variables = ["--all"]; # Import PATH into systemd
+      xwayland.enable = true;
+
+      plugins = builtins.concatLists [
+        (lib.optionals
+          hyprland.bars.enable
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
+        (lib.optionals
+          hyprland.dynamicCursor.enable
+          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
+        (lib.optionals
+          hyprland.trails.enable
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
+        (lib.optionals
+          hyprland.hyprspace.enable
+          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
+      ];
+
+      settings = import ./settings.nix {
+        inherit
+          lib
+          config
+          hyprland
+          color
+          always-exec
+          always-bind
+          always-bindm
+          ;
+      };
+    };
+  };
+}
@@ -0,0 +1,36 @@
+{
+  pkgs,
+  config,
+  hyprland,
+  color,
+}: {
+  enable = hyprland.dunst.enable;
+
+  iconTheme.package = color.iconPackage;
+  iconTheme.name = color.iconTheme;
+
+  settings = {
+    global = {
+      monitor = config.homemodules.waybar.monitor;
+      font = "${color.font} 11";
+      offset = "10x10";
+      background = color.hexS.base;
+      foreground = color.hexS.text;
+      frame_width = 2;
+      corner_radius = 6;
+      separator_color = "frame";
+    };
+
+    urgency_low = {
+      frame_color = color.hexS.green;
+    };
+
+    urgency_normal = {
+      frame_color = color.hexS.green;
+    };
+
+    urgency_critical = {
+      frame_color = color.hexS.red;
+    };
+  };
+}
@@ -3,7 +3,7 @@
  hyprland,
  color,
 }: {
-  enable = true;
+  enable = !hyprland.caelestia.enable;

  settings = {
    general = {
@@ -0,0 +1,44 @@
+{
+  keyboard = {
+    layout = "us";
+    variant = "altgr-intl";
+    option = "nodeadkeys";
+  };
+
+  monitors = {
+    "DP-1" = {
+      width = 3440;
+      height = 1440;
+      rate = 165;
+      x = 1920;
+      y = 0;
+      scale = 1;
+    };
+
+    "DP-2" = {
+      width = 1920;
+      height = 1080;
+      rate = 60;
+      x = 0;
+      y = 0;
+      scale = 1;
+    };
+  };
+
+  workspaces = {
+    "DP-1" = [1 2 3 4 5 6 7 8 9];
+    "DP-2" = [10];
+  };
+
+  autostart = {
+    delayed = [
+      "fcitx5"
+    ];
+  };
+
+  floating = [
+    {
+      class = "fcitx";
+    }
+  ];
+}
@@ -0,0 +1,186 @@
+{
+  nixosConfig,
+  config,
+  lib,
+  pkgs,
+}: {
+  enable = nixosConfig.programs.hyprland.enable;
+  dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
+  bars.enable = false;
+  dynamicCursor.enable = false;
+  trails.enable = true;
+  hyprspace.enable = false; # Always broken
+  hyprpanel.enable = true;
+  caelestia.enable = false;
+
+  keybindings = {
+    main-mod = "SUPER";
+
+    bindings = lib.mergeAttrsList [
+      # Use Rofi if we don't have caelestia
+      (lib.optionalAttrs (!config.homemodules.hyprland.caelestia.enable) {
+        "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
+        "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
+        "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
+      })
+
+      # Caelestia
+      (lib.optionalAttrs (config.homemodules.hyprland.caelestia.enable) {
+        "$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
+        # "$mainMod, c" = ["exec, caelestia clipboard"];
+        "$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
+
+        "$mainMod, escape" = ["exec, caelestia shell drawers toggle session"];
+      })
+
+      {
+        # Applications
+        "$mainMod, t" = ["exec, kitty"];
+        "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
+        "$mainMod, n" = ["exec, neovide"];
+        # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
+        "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
+        "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
+        "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
+        # "ALT, tab" = ["exec, rofi -show window"];
+
+        # Screenshots
+        "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
+        "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
+        "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
+
+        # Audio
+        ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
+        ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
+        ", XF86AudioPlay" = ["exec, playerctl play-pause"];
+        ", XF86AudioPrev" = ["exec, playerctl previous"];
+        ", XF86AudioNext" = ["exec, playerctl next"];
+
+        # Brightness
+        ", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
+        ", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
+        "$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
+        "$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
+
+        "CTRL ALT, f" = let
+          hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
+          grep = "${pkgs.gnugrep}/bin/grep";
+          awk = "${pkgs.gawk}/bin/gawk";
+          notify = "${pkgs.libnotify}/bin/notify-send";
+
+          toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
+            CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
+
+            if [[ "$CURRENT" == "1" ]]; then
+              ${hyprctl} keyword input:follow_mouse 0
+              ${notify} "Disabled Mouse Focus!"
+            else
+              ${hyprctl} keyword input:follow_mouse 1
+              ${notify} "Enabled Mouse Focus!"
+            fi
+          '';
+        in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
+
+        # "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
+      }
+    ];
+
+    ws-bindings = {
+      # "<Workspace>" = "<Key>";
+      "1" = "1";
+      "2" = "2";
+      "3" = "3";
+      "4" = "4";
+      "5" = "5";
+      "6" = "6";
+      "7" = "7";
+      "8" = "8";
+      "9" = "9";
+      "10" = "0";
+    };
+
+    special-ws-bindings = {
+      "ferdium" = "x";
+      "msty" = "z";
+      "btop" = "b";
+      "rmpc" = "r";
+    };
+  };
+
+  autostart = {
+    immediate = [
+      "kitty --hold fastfetch"
+      "zeal"
+      "nextcloud --background"
+      "protonvpn-app"
+
+      # "kdeconnect-indicator" # started by services.kdeconnect.indicator
+    ];
+
+    delayed = [
+      "keepassxc" # The tray doesn't work when started too early
+    ];
+
+    special-silent = {
+      "ferdium" = ["ferdium"];
+      "msty" = ["msty"];
+      "btop" = ["kitty --title=Btop btop"];
+      "rmpc" = ["kitty --title=Rmpc rmpc"];
+    };
+  };
+
+  windowrules = [
+    # Fix jetbrains tooltip flicker
+    "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
+    "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
+  ];
+
+  workspacerules = {
+    "1" = [];
+    "2" = ["Zotero" "neovide" "code-url-handler"];
+    "3" = ["obsidian"];
+    "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
+    "5" = ["steam"];
+    "6" = ["steam_app_(.+)"];
+    "7" = ["signal"];
+    "8" = ["tidal-hifi"];
+    "9" = ["discord"];
+    "10" = ["python3"];
+  };
+
+  floating = [
+    {class = "org.kde.polkit-kde-authentication-agent-1";}
+    {
+      class = "thunar";
+      title = "File Operation Progress";
+    }
+    {class = "ffplay";}
+    {class = "Unity";}
+  ];
+
+  transparent-opacity = "0.75";
+
+  transparent = [
+    "kitty"
+    "Alacritty"
+    "discord"
+    "signal"
+    "vesktop"
+    "Spotify"
+    "tidal-hifi"
+    "obsidian"
+    "firefox"
+    "org.qutebrowser.qutebrowser"
+    "jetbrains-clion"
+    "jetbrains-idea"
+    "jetbrains-pycharm"
+    "jetbrains-rustrover"
+    "jetbrains-rider"
+    "jetbrains-webstorm"
+    "code-url-handler"
+    "neovide"
+    "steam"
+    "ferdium"
+    "Msty"
+  ];
+}
@@ -0,0 +1,28 @@
+{
+  config,
+  hyprland,
+  color,
+}: {
+  enable = !hyprland.caelestia.enable;
+
+  settings = {
+    ipc = "on";
+    splash = false;
+    splash_offset = 2.0;
+
+    # Wallpapers have to be preloaded to be displayed
+    preload = let
+      mkPreload = name: "${config.paths.nixflake}/wallpapers/${name}.jpg";
+    in
+      color.wallpapers |> builtins.map mkPreload;
+
+    wallpaper = let
+      mkWallpaper = monitor:
+        "${monitor}, "
+        + "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
+    in
+      hyprland.monitors
+      |> builtins.attrNames
+      |> builtins.map mkWallpaper;
+  };
+}
@@ -5,8 +5,13 @@
 }: {
  enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";

+  dunst.enable = lib.mkEnableOption "Enable Dunst notification daemon";
  bars.enable = lib.mkEnableOption "Enable window bars";
+  dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
+  trails.enable = lib.mkEnableOption "Enable dynamic window trails";
+  hyprspace.enable = lib.mkEnableOption "Enable Hyprspace workspace overview";
  hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
+  caelestia.enable = lib.mkEnableOption "Enable Caelestia";

  keyboard = {
    layout = lib.mkOption {
@@ -137,12 +137,8 @@
      hyprland.windowrules
    ];

-  render = {
-    cm_enabled = true;
-    cm_auto_hdr = true;
-  };
-
  dwindle = {
+    pseudotile = true;
    preserve_split = true;
  };

@@ -241,5 +237,123 @@
        on_double_click = "hyprctl dispatch fullscreen 1";
      };
    })
+
+    (lib.optionalAttrs hyprland.dynamicCursor.enable {
+      dynamic-cursors = {
+        # enables the plugin
+        enabled = true;
+
+        # sets the cursor behaviour, supports these values:
+        # tilt    - tilt the cursor based on x-velocity
+        # rotate  - rotate the cursor based on movement direction
+        # stretch - stretch the cursor shape based on direction and velocity
+        # none    - do not change the cursors behaviour
+        mode = "rotate";
+
+        # minimum angle difference in degrees after which the shape is changed
+        # smaller values are smoother, but more expensive for hw cursors
+        threshold = 2;
+
+        # for mode = rotate
+        rotate = {
+          # length in px of the simulated stick used to rotate the cursor
+          # most realistic if this is your actual cursor size
+          length = 20;
+
+          # clockwise offset applied to the angle in degrees
+          # this will apply to ALL shapes
+          offset = 0.0;
+        };
+
+        # for mode = tilt
+        tilt = {
+          # controls how powerful the tilt is, the lower, the more power
+          # this value controls at which speed (px/s) the full tilt is reached
+          # the full tilt being 60° in both directions
+          limit = 1000;
+
+          # relationship between speed and tilt, supports these values:
+          # linear             - a linear function is used
+          # quadratic          - a quadratic function is used (most realistic to actual air drag)
+          # negative_quadratic - negative version of the quadratic one, feels more aggressive
+          # see `activation` in `src/mode/utils.cpp` for how exactly the calculation is done
+          function = "negative_quadratic";
+
+          # time window (ms) over which the speed is calculated
+          # higher values will make slow motions smoother but more delayed
+          window = 100;
+        };
+
+        # configure shake to find
+        # magnifies the cursor if its is being shaken
+        shake = {
+          # enables shake to find
+          enabled = false;
+
+          # use nearest-neighbour (pixelated) scaling when shaking
+          # may look weird when effects are enabled
+          nearest = true;
+
+          # controls how soon a shake is detected
+          # lower values mean sooner
+          threshold = 3.0;
+
+          # magnification level immediately after shake start
+          base = 1.5;
+          # magnification increase per second when continuing to shake
+          speed = 0.0;
+          # how much the speed is influenced by the current shake intensitiy
+          influence = 0.0;
+
+          # maximal magnification the cursor can reach
+          # values below 1 disable the limit (e.g. 0)
+          limit = 0.0;
+
+          # time in millseconds the cursor will stay magnified after a shake has ended
+          timeout = 1000;
+
+          # show cursor behaviour `tilt`, `rotate`, etc. while shaking
+          effects = true;
+
+          # enable ipc events for shake
+          # see the `ipc` section below
+          ipc = false;
+        };
+
+        # use hyprcursor to get a higher resolution texture when the cursor is magnified
+        # see the `hyprcursor` section below
+        hyprcursor = {
+          # use nearest-neighbour (pixelated) scaling when magnifing beyond texture size
+          # this will also have effect without hyprcursor support being enabled
+          # 0 / false - never use pixelated scaling
+          # 1 / true  - use pixelated when no highres image
+          # 2         - always use pixleated scaling
+          nearest = true;
+
+          # enable dedicated hyprcursor support
+          enabled = true;
+
+          # resolution in pixels to load the magnified shapes at
+          # be warned that loading a very high-resolution image will take a long time and might impact memory consumption
+          # -1 means we use [normal cursor size] * [shake:base option]
+          resolution = -1;
+
+          # shape to use when clientside cursors are being magnified
+          # see the shape-name property of shape rules for possible names
+          # specifying clientside will use the actual shape, but will be pixelated
+          fallback = "clientside";
+        };
+      };
+    })
+
+    (lib.optionalAttrs hyprland.trails.enable {
+      hyprtrails = {
+        color = "rgb(${color.hex.accent})";
+      };
+    })
+
+    (lib.optionalAttrs hyprland.hyprspace.enable {
+      overview = {};
+    })
  ];
 }
@@ -15,9 +15,6 @@
    ./firefox
    ./fish
    ./git
-    ./helix
-    ./hyprland
-    ./hyprpanel
    ./jellyfin-tui
    ./kitty
    ./lazygit
@@ -44,7 +41,6 @@
    inputs.nixvim.homeModules.nixvim
    inputs.textfox.homeManagerModules.default
    inputs.walker.homeManagerModules.default
-    # inputs.stylix.homeModules.stylix
    # inputs.direnv-instant.homeModules.direnv-instant
    # inputs.niri.homeModules.niri # Imported by system module
    # inputs.noctalia.homeModules.default
@@ -63,7 +63,7 @@ in [
      # Coding

      {
-        name = "Code";
+        name = "Coding";
        bookmarks = [
          (mkBm "C++Ref" "https://en.cppreference.com/w/")
          (mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
@@ -72,21 +72,21 @@ in [
          (mkBm "Godbolt" "https://godbolt.org")
        ];
      }
-      # {
-      #   name = "AI";
-      #   bookmarks = [
-      #     (mkBm "Mistral Chat" "https://chat.mistral.ai/chat")
-      #     (mkBm "DeepSeek Chat" "https://chat.deepseek.com/")
-      #     (mkBm "Claude Chat" "https://claude.ai/new")
-      #     (mkBm "ChatGPT" "https://chatgpt.com/")
-      #     (mkBm "DeepWiki" "https://deepwiki.com/")
-      #     "separator"
-      #     (mkBm "Mistral API" "https://console.mistral.ai/usage")
-      #     (mkBm "DeepSeek API" "https://platform.deepseek.com/usage")
-      #     (mkBm "Claude API" "https://console.anthropic.com/usage")
-      #     (mkBm "OpenRouter API" "https://openrouter.ai/activity")
-      #   ];
-      # }
+      {
+        name = "\"AI\"";
+        bookmarks = [
+          (mkBm "Mistral Chat" "https://chat.mistral.ai/chat")
+          (mkBm "DeepSeek Chat" "https://chat.deepseek.com/")
+          (mkBm "Claude Chat" "https://claude.ai/new")
+          (mkBm "ChatGPT" "https://chatgpt.com/")
+          (mkBm "DeepWiki" "https://deepwiki.com/")
+          "separator"
+          (mkBm "Mistral API" "https://console.mistral.ai/usage")
+          (mkBm "DeepSeek API" "https://platform.deepseek.com/usage")
+          (mkBm "Claude API" "https://console.anthropic.com/usage")
+          (mkBm "OpenRouter API" "https://openrouter.ai/activity")
+        ];
+      }
      (mkBm "GH" "https://github.com/churl")
      (mkBm "GL" "https://gitlab.com/churl")
      (mkBm "SO" "https://stackoverflow.com/users/saves/17337508/all")
@@ -221,10 +221,6 @@ in {
              ns = "nix shell nixpkgs#";
              nr = "nix run";
              nps = "nps -e";
-
-              # Systemctl
-              st = "sudo systemctl-tui";
-              sf = "systemctl --failed";
            }

            # Abbrs only available if package is installed
@@ -1,121 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  mylib,
-  pkgs,
-  nixosConfig,
-  username,
-  ...
-}: let
-  inherit (config.homemodules) hyprland color;
-
-  # Autostart programs
-  always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
-
-  # Keybindings
-  always-bind = import ./mappings.nix {inherit lib config hyprland;};
-
-  # Mousebindings
-  always-bindm = {
-    "$mainMod, mouse:272" = ["movewindow"];
-    "$mainMod, mouse:273" = ["resizewindow"];
-  };
-in {
-  options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf hyprland.enable {
-    assertions = [
-      {
-        assertion = nixosConfig.programs.hyprland.enable;
-        message = "Can't enable Hyprland module with Hyprland disabled!";
-      }
-      {
-        assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services;
-        message = "Can't enable Hyprland module without Hyprlock PAM service!";
-      }
-    ];
-
-    gtk = {
-      enable = true;
-      iconTheme.package = lib.mkDefault color.iconPackage;
-      iconTheme.name = color.iconTheme;
-    };
-
-    homemodules = {
-      hyprpanel.enable = hyprland.hyprpanel.enable;
-    };
-
-    home = {
-      pointerCursor = {
-        gtk.enable = lib.mkDefault true;
-        x11.enable = lib.mkDefault true;
-        package = lib.mkDefault color.cursorPackage;
-        name = color.cursor;
-        size = color.cursorSize;
-      };
-
-      packages = with pkgs; [
-        hyprpicker # Color picker
-        # hyprpolkitagent # Ugly polkit authentication GUI
-        hyprland-qt-support
-        hyprsunset # Blue light filter
-
-        wl-clipboard
-        # clipman # Clipboard manager (wl-paste)
-        libnotify
-        inotify-tools # Includes inotifywait
-
-        # ncpamixer # Audio control
-        slurp # Region selector for screensharing
-        grim # Grab images from compositor
-
-        # Deps for Qt5 and Qt6 apps (e.g., Nextcloud)
-        qt5.qtwayland
-        qt6.qtwayland
-
-        # xwayland
-        # wayland-protocols
-      ];
-    };
-
-    programs = {
-      hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
-    };
-
-    services = {
-      hypridle = import ./hypridle.nix {inherit config hyprland color;};
-    };
-
-    # Make sure the units only start when using Hyprland
-    systemd.user.services.hypridle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.hypridle.Unit.After = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.hypridle.Unit.PartOf = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.elephant.Install.WantedBy = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-    systemd.user.services.elephant.Unit.After = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-    systemd.user.services.elephant.Unit.PartOf = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-
-    wayland.windowManager.hyprland = {
-      enable = true;
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-      configType = "hyprlang";
-
-      systemd.enable = true; # Enable hyprland-session.target
-      systemd.variables = ["--all"]; # Import PATH into systemd
-      xwayland.enable = true;
-
-      settings = import ./settings.nix {
-        inherit
-          lib
-          config
-          hyprland
-          color
-          always-exec
-          always-bind
-          always-bindm
-          ;
-      };
-    };
-  };
-}
@@ -26,12 +26,6 @@ in {
        "kitty_mod+j" = "next_window";
        "kitty_mod+k" = "previous_window";
        "kitty_mod+l" = "next_layout";
-        "kitty_mod+p" = "command_palette";
-
-        "kitty_mod+c" = "copy_to_clipboard";
-        "ctrl+c" = "copy_or_interrupt";
-        "kitty_mod+v" = "paste_from_clipboard";
-        "ctrl+v" = "paste_from_clipboard";
      };

      settings = lib.mkMerge [
@@ -123,7 +123,6 @@ in {
                numpy
                matplotlib
                requests
-                pygments
              ]))

            (rWrapper.override {
@@ -158,15 +157,6 @@ in {
      viAlias = neovim.alias;
      vimAlias = neovim.alias;

-      # extraPackages = let
-      #   yazi-termfix = pkgs.writeShellScriptBin "yazi" ''
-      #     export TERM=xterm-kitty
-      #     exec ${pkgs.yazi}/bin/yazi "@$"
-      #   '';
-      # in [
-      #   yazi-termfix
-      # ];
-
      # Configured using plugin
      # colorschemes.catppuccin = {
      #   enable = true;
@@ -225,16 +215,6 @@ in {
        #   fg = "#${color.hex.dark.text}";
        #   bold = false;
        # };
-        # NeoTreeNormal = {bg = "#${color.hex.base}";};
-        # NeoTreeNormalNC = {bg = "#${color.hex.base}";};
-        # NeoTreeWinSeparator = {
-        #   fg = "#${color.hex.crust}";
-        #   bg = "#${color.hex.base}";
-        # };
-        # NeoTreeVertSplit = {
-        #   fg = "#${color.hex.crust}";
-        #   bg = "#${color.hex.base}";
-        # };
      };

      # extraLuaPackages = with pkgs.lua51Packages; [];
@@ -252,7 +232,7 @@ in {
        #       local renderer = require("neo-tree.ui.renderer")
        #       local state = manager.get_state("filesystem")
        #       local window_exists = renderer.window_exists(state)
-        #
+
        #       if window_exists then
        #         require("neo-tree.sources.filesystem.commands").refresh(state)
        #       end
@@ -386,7 +366,6 @@ in {
                light = "latte";
                dark = "mocha";
              };
-              term_colors = true;
              # https://github.com/catppuccin/nvim/tree/main?tab=readme-ov-file#integrations
              default_integrations = true;
              integrations = {
@@ -423,7 +402,6 @@ in {
                  # custom_bg = "crust";
                };
                notify = true;
-                terminal = true;
                treesitter = true;
                ufo = true;
                rainbow_delimiters = true;
@@ -435,15 +413,6 @@ in {
                };
                which_key = true;
              };
-
-              highlight_overrides.mocha.__raw = ''
-                function(colors)
-                  return {
-                    NeoTreeWinSeparator = { fg = colors.crust, bg = colors.base, },
-                    NeoTreeVertSplit = { fg = colors.crust, bg = colors.base, },
-                  }
-                end
-              '';
            };
          };

@@ -465,7 +434,6 @@ in {
            # pkg = inputs.blink-cmp.packages.${system}.default;
            pkg = pkgs.vimPlugins.blink-cmp;
            lazy = true;
-            dependencies = [luasnip];
            event = ["InsertEnter"];
            config = mkDefaultConfig name;

@@ -513,17 +481,13 @@ in {
                };
              };

-              snippets = {
-                preset = "luasnip";
-              };
-
              fuzzy = {
                frecency.enabled = true;
                use_proximity = true;
              };

              sources = {
-                default = ["lsp" "path" "snippets" "omni"]; # No "buffer"
+                default = ["lsp" "path" "snippets"]; # No "buffer"
              };

              cmdline = {
@@ -1007,15 +971,15 @@ in {
                {name = "html";} # vscode-langservers-extracted
                {name = "just";}
                {name = "lua_ls";}
-                # {
-                #   name = "ltex";
-                #   extraOptions.settings = {
-                #     ltex = {
-                #       checkFrequency = "save";
-                #       enabled = ["markdown" "org" "tex" "latex" "plaintext"];
-                #     };
-                #   };
-                # }
+                {
+                  name = "ltex";
+                  extraOptions.settings = {
+                    ltex = {
+                      checkFrequency = "save";
+                      enabled = ["markdown" "org" "tex" "latex" "plaintext"];
+                    };
+                  };
+                }
                # {name = "nil_ls";}
                {
                  name = "nixd";
@@ -1827,7 +1791,6 @@ in {
                function(line)
                  local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
                  local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
-                  local mantle = { fg = "#${color.hex.mantle}", bg = "#${color.hex.mantle}" }
                  local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
                  local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" }

@@ -1853,14 +1816,14 @@ in {
                        line.sep(sep_start, accent, crust),
                        tab.number(),
                        tab.name(),
-                        line.sep(sep_end, crust, mantle),
+                        line.sep(sep_end, crust, base),
                        hl = hl,
                        margin = " ",
                      }
                    end),

                    -- Background
-                    hl = mantle,
+                    hl = bg,
                  }
                end
              '';
@@ -1969,12 +1932,11 @@ in {
              shell = "fish";
              direction = "horizontal"; # 'vertical' | 'horizontal' | 'window' | 'float'
              auto_scroll = true;
-              # clear_env = false;

              float_opts = {
                border = "curved"; # 'single' | 'double' | 'shadow' | 'curved'
-                width.__raw = "function() return math.floor(vim.o.columns * 0.95) end";
-                height.__raw = "function() return math.floor(vim.o.lines * 0.85) end";
+                width = 80;
+                height = 80;
                winblend = 0;
              };
            };
@@ -2147,40 +2109,18 @@ in {
            pkg = pkgs.vimPlugins.vimtex;
            init = ''
              function()
-                vim.g.vimtex_mappings_enabled = true
+                vim.g.vimtex_mappings_enabled = false
                vim.g.vimtex_view_method = "zathura"
-                vim.g.vimtex_syntax_conceal_disable = false
-                vim.g.vimtex_syntax_conceal = {
-                  accents = 1,
-                  ligatures = 1,
-                  cites = 1,
-                  fancy = 1,
-                  texTabularChar = 1,
-                  spacing = 1,
-                  greek = 1,
-                  math_bounds = 1,
-                  math_delimiters = 1,
-                  math_fracs = 1,
-                  math_super_sub = 1,
-                  math_symbols = 1,
-                  sections = 1,
-                  styles = 1,
-                }
-
-                vim.g.vimtex_compiler_method = "latexmk"
-                vim.g.vimtex_compiler_clean_paths = {"_minted*", "svg-inkscape*"}
                vim.g.vimtex_compiler_latexmk = {
                  options = {
-                    "-verbose",
+                    "-shell-escape",
                    "-file-line-error",
                    "-synctex=1",
                    "-interaction=nonstopmode",
-                    "-shell-escape",
                  },
                  aux_dir = ".aux",
                  out_dir = ".out",
                }
-
              end
            '';
          };
@@ -60,13 +60,8 @@ end, {

 -- Toggle Rmpc
 local Terminal = require("toggleterm.terminal").Terminal
-local rmpc = Terminal:new({
-	cmd = "rmpc",
-	hidden = true,
-	close_on_exit = true,
-	auto_scroll = false,
-	direction = "float",
-})
+local rmpc =
+	Terminal:new({ cmd = "rmpc", hidden = true, close_on_exit = true, auto_scroll = false, direction = "float" })

 vim.g.toggle_rmpc = function()
 	rmpc:toggle()
@@ -20,7 +20,7 @@ if g.neovide then

 	-- Neovide Fonts
 	-- o.guifont = "JetBrainsMono Nerd Font Mono:h12:Medium"
-	o.guifont = "MonoLisa Alt Script:h12:Medium"
+	o.guifont = "MonoLisa Alt:h12:Medium"
 else
 	-- require("notify").notify("Not running in NeoVide")
 end
@@ -340,12 +340,13 @@ _: let
      action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua
      options.desc = "Show Rmpc";
    }
-    {
-      mode = "n";
-      key = "<leader>.";
-      action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
-      options.desc = "Show FailNix";
-    }
+    # TODO: Something with the environment activation doesn't work
+    # {
+    #   mode = "n";
+    #   key = "<leader>.";
+    #   action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
+    #   options.desc = "Show FailNix";
+    # }
    {
      mode = "n";
      key = "<leader>i";
@@ -937,12 +938,6 @@ _: let
      action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
      options.desc = "Trouble Diagnostics";
    }
-    {
-      mode = "n";
-      key = "<leader>tT";
-      action = "<cmd>ToggleTerm direction=float<cr>";
-      options.desc = "Floating Terminal";
-    }
    {
      mode = "n";
      key = "<leader>tD";
@@ -1,18 +1,3 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local sn = ls.snippet_node
-local isn = ls.indent_snippet_node
-local t = ls.text_node
-local i = ls.insert_node
-local f = ls.function_node
-local c = ls.choice_node
-local d = ls.dynamic_node
-local r = ls.restore_node
-local extras = require("luasnip.extras")
-local rep = extras.rep
-local fmt = require("luasnip.extras.fmt").fmt
-local fmta = require("luasnip.extras.fmt").fmta
-
 return {
 	-- The first list contains manually expanded snippts
 	--
@@ -33,7 +18,7 @@ return {

 	-- \begin{environment}
 	s(
-		{ trig = "beg", name = "begin/end", descr = "begin/end environment (generic)" },
+		"beg",
 		fmta(
 			[[
 		        \begin{<>}
@@ -43,28 +28,6 @@ return {
 			{ i(1), i(0), rep(1) }
 		)
 	),
-	s(
-		{ trig = "item", name = "itemize", dscr = "bullet points (itemize)" },
-		fmta(
-			[[
-				\begin{itemize}
-				\item <>
-				\end{itemize}
-			]],
-			{ i(0) }
-		)
-	),
-	s(
-		{ trig = "enum", name = "enumerate", dscr = "bullet points (enumerate)" },
-		fmta(
-			[[
-				\begin{enumerate}
-				\item <>
-				\end{enumerate}
-			]],
-			{ i(0) }
-		)
-	),
 }, {
 	-- The second list contains autosnippets
 }
@@ -74,90 +74,8 @@ in {
      };
    };

-    qt = let
-      qtConfig = qtct: {
-        Appearance = {
-          icon_theme = color.iconTheme;
-          standard_dialogs = "xdgdesktopportal";
-          style = "kvantum";
-          custom_palette = true;
-          color_scheme_path = "${config.home.homeDirectory}/.config/${qtct}/colors/catppuccin-mocha-mauve.conf";
-          # color_scheme_path = "${pkgs.catppuccin-qt5ct}/share/${qtct}/colors/catppuccin-mocha-mauve.conf";
-        };
-        Fonts = {
-          fixed = color.font;
-          general = nixosConfig.fonts.fontconfig.defaultFonts.sansSerif;
-        };
-      };
-    in {
-      enable = true;
-      platformTheme.name = "qtct";
-      # style.name = "kvantum";
-
-      kvantum = {
-        enable = true;
-
-        themes = with pkgs; [
-          (catppuccin-kvantum.override {
-            variant = "mocha";
-            accent = "mauve";
-          })
-        ];
-
-        settings = {
-          General.theme = "catppuccin-mocha-mauve";
-        };
-      };
-
-      qt5ctSettings = qtConfig "qt5ct";
-      qt6ctSettings = qtConfig "qt6ct";
-    };
-
-    xdg.configFile = {
-      "qt5ct/colors/catppuccin-mocha-mauve.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-mauve.conf";
-      "qt6ct/colors/catppuccin-mocha-mauve.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-mauve.conf";
-      "dolphinrc".source = (pkgs.formats.ini {}).generate "dolphinrc" {
-        General = {
-          BrowseThroughArchives = true;
-          ConfirmClosingMultipleTabs = false;
-          OpenExternallyCalledFolderInNewTab = false;
-          RememberOpenedTabs = false;
-          ShowSelectionToggle = false;
-          ShowToolTips = true;
-        };
-
-        CompactMode.PreviewSize = 32;
-        ContextMenu.ShowViewMode = false;
-        DetailsMode.PreviewSize = 32;
-        Icons.Theme = color.iconTheme;
-        "KFileDialog Settings"."Places Icons Static Size" = 32;
-        MainWindow.MenuBar = "Disabled";
-        PlacesPanel.IconSize = 32;
-        UiSettings.ColorScheme = "*";
-      };
-      "kdeglobals".source = (pkgs.formats.ini {}).generate "kdeglobals" {
-        KDE.ShowDeleteCommand = true;
-        PreviewSettings.EnableRemoteFolderThumbnail = true;
-      };
-      "kservicemenurc".source = (pkgs.formats.ini {}).generate "kservicemenurc" {
-        Show = {
-          forgetfileitemaction = true;
-          hidefileitemaction = false;
-          kactivitymanagerd_fileitem_linking_plugin = false;
-          makefileactions = true;
-          mountisoaction = true;
-          movetonewfolderaitemaction = false;
-          nextclouddolphinactionplugin = true;
-          setfoldericonitemaction = false;
-          tagsfileitemaction = false;
-        };
-      };
-    };
-
    # Disable Niri's kde auth agent and start gnome auth agent instead
    systemd.user.services.niri-flake-polkit = lib.mkForce {};
-
-    # TODO: Module
    systemd.user.services.polkit-gnome-authentication-agent-1 = {
      Unit = {
        Description = "polkit-gnome-authentication-agent-1";
@@ -181,7 +99,6 @@ in {
        # Link theme for flatpak
        ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";

-        # TODO: Module
        ".config/waypaper/config.ini".text = lib.generators.toINI {} {
          Settings = {
            use_xdg_state = true;
@@ -218,9 +135,8 @@ in {
      };

      sessionVariables = {
-        # QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
-        # GDK_BACKEND = "wayland,x11"; # For screen sharing
-        GDK_BACKEND = "wayland";
+        QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
+        GDK_BACKEND = "wayland"; # For screen sharing
      };

      pointerCursor = {
@@ -239,25 +155,14 @@ in {
        waypaper
        wtype # For elephant

-        # GTK
+        # GTK apps (look good and work well with xdg portals)
        nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
+
+        # Catppuccin-GTK theme
        sassc
        gtk-engine-murrine
        gnome-themes-extra

-        # Qt
-        libsForQt5.qtstyleplugin-kvantum
-        kdePackages.qtstyleplugin-kvantum
-        libsForQt5.qt5ct
-        kdePackages.qt6ct
-        kdePackages.ark
-        kdePackages.dolphin
-        kdePackages.dolphin-plugins
-        kdePackages.qtsvg
-        kdePackages.kio
-        kdePackages.kio-fuse
-        kdePackages.kio-extras
-
        # In case we fallback to the default niri config/keybindings
        alacritty
        fuzzel
@@ -265,7 +170,6 @@ in {
    };

    services = {
-      # TODO: Module
      dunst = {
        enable = true;

@@ -301,7 +205,6 @@ in {
    };

    programs = {
-      # TODO: Module
      walker = {
        enable = true;
        runAsService = true;
@@ -529,7 +432,7 @@ in {
          input = {
            focus-follows-mouse = {
              enable = true;
-              max-scroll-amount = "10%"; # Skip partial windows that would scroll the viewport on focus
+              max-scroll-amount = "0%"; # Skip partial windows that would scroll the viewport on focus
            };

            keyboard = {
@@ -558,13 +461,13 @@ 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 = [
+                "ashell"
+                "-c"
+                "${config.paths.dotfiles}/ashell/config.toml"
+              ];
+            }
            {
              argv = [
                "waypaper"
@@ -731,32 +634,6 @@ in {
              # opacity = 0.8;
            }

-            # Blurred windows
-            {
-              matches = [
-                # {app-id = "code";}
-                # {app-id = "code-url-handler";}
-                # {app-id = "dev.zed.Zed";}
-                # {app-id = "discord";}
-                # {app-id = "firefox";}
-                # {app-id = "jetbrains-clion";}
-                # {app-id = "jetbrains-idea";}
-                # {app-id = "jetbrains-pycharm";}
-                # {app-id = "jetbrains-rustrover";}
-                # {app-id = "jetbrains-rider";}
-                # {app-id = "jetbrains-webstorm";}
-                {app-id = "kitty";}
-                {app-id = "neovide";}
-                # {app-id = "obsidian";}
-                # {app-id = "org.qutebrowser.qutebrowser";}
-                # {app-id = "signal";}
-                # {app-id = "steam";}
-              ];
-
-              opacity = 0.9;
-              background-effect.blur = true;
-            }
-
            # Floating + unmaximized windows
            {
              matches = [
@@ -878,15 +755,14 @@ in {
                enable = true;
                draw-behind-window = true;
              };
-
-              background-effect.blur = true;
            }
-            # TODO: Makes entire screen blank and blurred?
+            # TODO: Missing niri-flake update
            # {
            #   matches = [{namespace = "walker";}];
            #
-            #   opacity = 0.0;
-            #   background-effect.blur = true;
+            #   background-effect = {
+            #     blur = true;
+            #   };
            # }
          ];

@@ -897,7 +773,6 @@ in {

          # TODO: Move values to config option and set in home/christoph/niri.nix
          binds = with config.lib.niri.actions; let
-            # TODO: Module
            sessionMenu = mylib.rofi.mkMenu {
              prompt = "Session";
              layers = [
@@ -940,38 +815,18 @@ in {
              command = "xdg-open ~/Notes/TU/$OPTION0/$OPTION1/$OPTION2";
              rofiCmd = "walker -d";
            };
-            screenshotMenu = mylib.rofi.mkMenu {
-              prompt = "Screenshot";
-              layers = [
-                {
-                  # -p: Show pointer
-                  # -d: Write to disk
-                  "󰹑  Take Region Screenshot" = "niri msg action screenshot -p false";
-                  "󰹑  Take Window Screenshot" = "niri msg action screenshot-window -p false -d true";
-                  "󰹑  Take Full-Screen Screenshot" = "niri msg action screenshot-screen -p false -d true";
-                }
-              ];
-              prompts = ["Execute Screenshot Action"];
-              rofiCmd = "walker -d";
-            };
-            sshMenu = mylib.rofi.mkMenu {
-              prompt = "SSH";
-              layers = [
-                "grep -E '^Host ' ~/.ssh/config | awk '{print $2}'"
-              ];
-              prompts = ["Select Host"];
-              command = "kitty ssh $OPTION0";
-              rofiCmd = "walker -d";
-            };
-            projectMenu = mylib.rofi.mkMenu {
-              prompt = "Project";
-              layers = [
-                "eza -1 -D ~/Projects"
-              ];
-              prompts = ["Select Project"];
-              command = "neovide ~/Projects/$OPTION0";
-              rofiCmd = "walker -d";
-            };
+            # niriMenu = mylib.rofi.mkMenu {
+            #   prompt = "Niri";
+            #   layers = [
+            #     {
+            #       "󰹑  Take Region Screenshot" = "niri msg action screenshot -p false";
+            #       "󰹑  Take Window Screenshot" = "niri msg action screenshot-window -p false -d true";
+            #       "󰹑  Take Full-Screen Screenshot" = "niri msg action screenshot-screen -p false -d true";
+            #     }
+            #   ];
+            #   prompts = ["Execute Niri Action"];
+            #   rofiCmd = "walker -d";
+            # };
            globalMenu = mylib.rofi.mkMenu {
              prompt = "Global";
              layers = [
@@ -980,11 +835,8 @@ in {
                  "󰸉  Change Wallpaper" = "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
                  "󰋗  View Keybindings" = "niri msg action show-hotkey-overlay";
                  "  Open Lecture Material" = "${lecturesMenu}/bin/rofi-menu-Lecture";
-                  "󰹑  Screenshot" = "${screenshotMenu}/bin/rofi-menu-Screenshot";
-                  # "🤪 Pick Symbols" = "walker -m symbols";
-                  "  Color Picker" = "hyprpicker --autocopy";
-                  "󰣀  SSH" = "${sshMenu}/bin/rofi-menu-SSH";
-                  "  Open Project" = "${projectMenu}/bin/rofi-menu-Project";
+                  # "  Niri Actions" = "${niriMenu}/bin/rofi-menu-Niri";
+                  # TODO: What else? SSH menu?
                }
              ];
              prompts = ["Select Action"];
@@ -1093,20 +945,14 @@ in {

            # Screenshots
            "Mod+S" = {
-              action = spawn "${screenshotMenu}/bin/rofi-menu-Screenshot";
+              action.screenshot-window = {
+                write-to-disk = true;
+                show-pointer = false;
+              };
              hotkey-overlay = {
-                title = "Screenshot menu.";
+                title = "Take a screenshot of the current window.";
              };
            };
-            # "Mod+S" = {
-            #   action.screenshot-window = {
-            #     write-to-disk = true;
-            #     show-pointer = false;
-            #   };
-            #   hotkey-overlay = {
-            #     title = "Take a screenshot of the current window.";
-            #   };
-            # };
            "Mod+Ctrl+S" = {
              action.screenshot-screen = {
                write-to-disk = true;
@@ -97,8 +97,6 @@ in {
          radare2
          disktui
          lldb
-          inotify-tools
-          xdotool

          # Hardware/Software info
          pciutils # lspci
@@ -140,7 +138,6 @@ in {
        # Linux exclusive packages (!headless)
        (lib.optionals (pkgs.stdenv.isLinux && (!headless)) [
          wl-clipboard
-          asciicam

          # Proton
          proton-vpn
@@ -178,14 +175,13 @@ in {
          # gnome-calendar
          # helvum # unmaintained
          crosspipe
-          # nautilus # This is the worst file manager I've ever used
+          nautilus # Just in case
          font-manager # Previews fonts, but doesn't set them
          gparted
          resources
          # celluloid
          # cine
-          # eyedropper
-          hyprpicker
+          eyedropper
          junction
        ])

@@ -23,7 +23,7 @@ in {
          fixed-center = true;
          output = waybar.monitors;

-          modules-left = ["custom/launcher" "niri/workspaces" "niri/window" "hyprland/workspaces" "hyprland/window"]; # "user"
+          modules-left = ["custom/launcher" "niri/workspaces" "niri/window"]; # "user"
          modules-center = ["mpris"]; # "systemd-failed-units"
          modules-right = ["privacy" "pulseaudio" "network" "disk" "cpu" "memory" "clock" "tray"];

@@ -58,27 +58,6 @@ in {
            icon-size = 22;
          };

-          "hyprland/workspaces" = {
-            all-outputs = false;
-            format = "{icon}";
-            format-icons = {
-              default = "";
-              focused = "";
-              active = "";
-            };
-            persistent-workspaces = {
-              DP-1 = [1 2 3 4 5 6 7 8 9];
-              DP-2 = [0];
-            };
-          };
-
-          "hyprland/window" = {
-            format = "{title}";
-            separate-outputs = false;
-            icon = true;
-            icon-size = 22;
-          };
-
          mpris = {
            format = "<span>󰎇</span> {dynamic}";
            format-paused = "<span>{status_icon}</span> <i>{dynamic}</i>";
@@ -200,7 +179,7 @@ in {
          border-width: ${border-width};
          border-radius: ${border-radius};
          border-color: #${color.hex.accent};
-          background-color: rgba(${color.rgbS.mantle}, 0.7);
+          background-color: rgba(${color.rgbS.mantle}, 1.0);
        }

        tooltip {
@@ -270,11 +270,6 @@ in {
            run = "remove --permanently";
            desc = "Delete selection";
          }
-          {
-            on = ["g" "m"];
-            run = ''cd ~/Notes/TU/MastersThesis'';
-            desc = "Go to MastersThesis";
-          }
        ];
      };

@@ -14,7 +14,7 @@
      experimental-features = nix-command flakes pipe-operators
    '';

-    settings = rec {
+    settings = {
      trusted-users = ["root" username];
      auto-optimise-store = true;

@@ -23,16 +23,16 @@
      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"
-        "https://hyprland.cachix.org"
-        "https://nix-gaming.cachix.org"
      ];
      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="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
      ];
    };

@@ -337,8 +337,7 @@ with mylib.networking; {

    niri = {
      enable = !headless;
-      package = pkgs.niri;
-      # package = pkgs.niri-unstable; # TODO: Can remove this again once niri-flake is updated for 25.11
+      package = pkgs.niri-unstable; # TODO: Can remove this again once niri-flake is updated for 25.11
    };

    ssh.startAgent = true; # Use gnupg
@@ -12,6 +12,7 @@
    ./disks.nix

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

@@ -195,34 +196,6 @@
    spice-gtk
  ];

-  stylix = {
-    enable = true;
-    autoEnable = false;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-
-    # TODO: Duplicated from fonts module (set this inside fonts module?)
-    fonts = {
-      serif = {
-        package = pkgs.noto-fonts-cjk-serif;
-        name = "Noto Serif CJK SC";
-      };
-      sansSerif = {
-        package = pkgs.noto-fonts-cjk-sans;
-        name = "Noto Sans CJK SC";
-      };
-      monospace = {
-        package = pkgs.monolisa;
-        name = "MonoLisa Alt Script";
-      };
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-    };
-
-    targets = {};
-  };
-
  virtualisation = {
    libvirtd = {
      enable = true;
@@ -244,25 +217,15 @@
      openFirewall = true; # Directly set port in firewall
    };

-    # TODO: Doesn't work with steam flatpak
-    # gamescope = {
-    #   enable = true;
-    #   enableWsi = true;
-    # };
-
    ghidra = {
      enable = true;
      gdb = true;
    };

-    steam.platformOptimizations.enable = true; # From nix-gaming module
    virt-manager.enable = true;
  };

  services = {
-    # desktopManager.plasma6.enable = true;
-    # displayManager.gdm.enable = true; # Somehow, Plasma's own manager didn't work
-
    btrfs.autoScrub = {
      enable = true;
      interval = "weekly";
@@ -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 = [
@@ -160,9 +166,6 @@

        # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/3
        nvidia-vaapi-driver # Experimental, doesn't work with chromium
-
-        # Hdr in games with DXVK_HDR=1 ENABLE_HDR_WSI=1
-        vulkan-hdr-layer-kwin6
      ];
    };

@@ -19,12 +19,12 @@
    ../services/formula10.nix
    ../services/formula11.nix
    ../services/formula12.nix
-    # ../services/statespaces.nix
+    ../services/statespaces.nix

    # General services
-    ../services/arcane-agent.nix
    ../services/authelia.nix
    ../services/bazarr.nix
+    ../services/box.nix
    ../services/fileflows.nix
    ../services/gitea.nix
    ../services/immich.nix
@@ -36,8 +36,8 @@
    ../services/nginx-proxy-manager.nix
    ../services/paperless.nix
    # ../services/plex.nix # Their monetization strategy is absolutely atrocious
-    # ../services/portainer-agent.nix
-    # ../services/pulse-agent-servenix.nix
+    ../services/portainer-agent.nix
+    ../services/pulse-agent-servenix.nix
    ../services/prowlarr.nix
    ../services/radarr.nix
    ../services/sabnzbd-movies.nix
@@ -45,7 +45,7 @@
    ../services/sonarr.nix
    ../services/teamspeak.nix
    ../services/tinymediamanager.nix
-    # ../services/whats-up-docker.nix
+    ../services/whats-up-docker.nix
  ];

  systemmodules = {
@@ -85,7 +85,6 @@
        443 # HTTPS (Nginx Proxy Manager)

        3000 # Gitea (runner needs to reach local gitea instance)
-        3553 # Arcane

        30033 # Teamspeak
        10080 # Teamspeak
@@ -98,7 +97,6 @@
        443 # HTTPS (Nginx Proxy Manager)

        3000 # Gitea (runner needs to reach local gitea instance)
-        3553 # Arcane

        5520 # HyTale

@@ -115,7 +113,6 @@
      "paperless-nextcloud-sync-password"
      "ntfy-auth-users"
      "ntfy-auth-tokens"
-      "arcane-agent-key"
    ];
  };

@@ -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 = [
@@ -1,56 +0,0 @@
-{
-  mylib,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  arcaneVersion = "v2.3.0";
-in {
-  # If we need to pass secrets to containers we can't use plain env variables.
-  sops.templates."arcane-agent_secrets.env".content = ''
-    AGENT_TOKEN=${config.sops.placeholder.arcane-agent-key}
-  '';
-
-  virtualisation.oci-containers.containers = {
-    arcane-agent = {
-      image = "ghcr.io/getarcaneapp/arcane-headless:${arcaneVersion}";
-      autoStart = true;
-
-      login = mylib.containers.mkDockerLogin config;
-
-      dependsOn = [];
-
-      ports = [
-        "3553:3553"
-      ];
-
-      volumes = [
-        "/var/run/docker.sock:/var/run/docker.sock"
-
-        "arcane-agent_data:/app/data"
-        "/media/synology-syncthing:/backups"
-      ];
-
-      environment = {
-        MANAGER_API_URL = "https://arcane.think.chriphost.de";
-        AGENT_MODE = "true";
-        EDGE_TRANSPORT = "poll";
-
-        PUID = "1000";
-        PGID = "1000";
-        TZ = "Europe/Berlin";
-      };
-
-      environmentFiles = [
-        config.sops.templates."arcane-agent_secrets.env".path
-      ];
-
-      extraOptions = [
-        # "--privileged"
-        # "--device=nvidia.com/gpu=all"
-        "--net=behind-nginx"
-      ];
-    };
-  };
-}
@@ -1,55 +0,0 @@
-{
-  mylib,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  arcaneVersion = "v2.3.0";
-in {
-  # If we need to pass secrets to containers we can't use plain env variables.
-  sops.templates."arcane_secrets.env".content = ''
-    ENCRYPTION_KEY=${config.sops.placeholder.arcane-encryption-key}
-    JWT_SECRET=${config.sops.placeholder.arcane-jwt-secret}
-  '';
-
-  virtualisation.oci-containers.containers = {
-    arcane = {
-      image = "ghcr.io/getarcaneapp/manager:${arcaneVersion}";
-      autoStart = true;
-
-      login = mylib.containers.mkDockerLogin config;
-
-      dependsOn = [];
-
-      ports = [
-        # "3552:3552"
-      ];
-
-      volumes = [
-        "/var/run/docker.sock:/var/run/docker.sock"
-
-        "arcane_data:/app/data"
-        "/media/synology-syncthing:/backups"
-      ];
-
-      environment = {
-        APP_URL = "https://arcane.think.chriphost.de";
-
-        PUID = "1000";
-        PGID = "1000";
-        TZ = "Europe/Berlin";
-      };
-
-      environmentFiles = [
-        config.sops.templates."arcane_secrets.env".path
-      ];
-
-      extraOptions = [
-        # "--privileged"
-        # "--device=nvidia.com/gpu=all"
-        "--net=behind-nginx"
-      ];
-    };
-  };
-}
@@ -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"
+      ];
+    };
+  };
+}
@@ -0,0 +1,79 @@
+{
+  mylib,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  # comfyuiVersion = "cu128-slim-20260316";
+  # comfyuiVersion = "cu128-megapak-20260413";
+  # comfyuiVersion = "cu130-megapak-pt211-20260413";
+  # comfyuiVersion = "cu130-megapak-pt211-20260508";
+  comfyuiVersion = "cu130-megapak-pt211-20260604";
+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-dynamic-vram"
+          # "--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"
+      ];
+    };
+  };
+}
@@ -5,8 +5,8 @@
  pkgs,
  ...
 }: let
-  giteaVersion = "1.27.0";
-  runnerVersion = "0.6.1";
+  giteaVersion = "1.24.2";
+  runnerVersion = "0.2.12";
 in {
  users = {
    groups.git = {};
@@ -7,7 +7,7 @@
 }: let
  vectorchordVersion = "0.4.2";
  pgvectorsVersion = "0.2.0";
-  immichVersion = "3.0.1-cuda";
+  immichVersion = "2.5.2";
 in {
  virtualisation.oci-containers.containers = {
    immich-database = {
@@ -30,24 +30,20 @@ in {
      volumes = let
        # TODO: Setup on ThinkNix: adguard_config, adguard_work, portainer_config
        backup = [
-          "arcane-agent_data"
          "authelia_config"
-          "bazarr_config"
-          "fileflows_data"
+          "formula10_cache"
          "formula10_data"
          "formula11_pb_data"
-          "formula12_pb_data"
          "gitea-db_data"
+          "gitea_data"
          "gitea-runner_config"
          "gitea-runner_data"
-          "gitea_data"
          "heidi_config"
          "immich-database_data"
          "immich_config"
          "immich_data"
          "immich_machine-learning"
          "jellyfin_config"
-          "kopia_config"
          "nextcloud-db_data"
          "nextcloud_data"
          "nginx_config"
@@ -55,13 +51,6 @@ in {
          "nginx_snippets"
          "paperless-postgres_data"
          "paperless_data"
-          "prowlarr_config"
-          "radarr_config"
-          "sabnzbd-movies_config"
-          "sabnzbd-shows_config"
-          "sonarr_config"
-          "teamspeak_data2"
-          "tinymediamanager_data"
        ];

        mkVolume = name: "${name}:/data/${name}:ro";
@@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  nextcloudVersion = "33.0.5-apache";
+  nextcloudVersion = "31.0.6-apache";
 in {
  systemd.services.nextcloud-cron = {
    enable = true;
@@ -5,7 +5,7 @@
  pkgs,
  ...
 }: let
-  teamspeakVersion = "6.0.0-beta11";
+  teamspeakVersion = "6.0.0-beta10";
 in {
  virtualisation.oci-containers.containers = {
    teamspeak = {
@@ -30,7 +30,6 @@ in {
        # Sans/Serif fonts
        noto-fonts
        noto-fonts-color-emoji
-        noto-fonts-cjk-serif
        noto-fonts-cjk-sans
        lxgw-wenkai
      ];
@@ -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)
@@ -17,20 +17,18 @@ restic-repo-key: ENC[AES256_GCM,data:lSFuhjbhdQq4cabAVFGQ4kuaJxb7EhXgBDlgoEQWJhs
 heidi-discord-token: ENC[AES256_GCM,data:FYvfUn8tG7glqIomSDj9rGyNQjnHSCsD/C3Kk/JR1vm/xkrxzXwP3rpyxAzqRQ7vd+zFBf2BJfV/zMk=,iv:b+aKcu98rxslEGSYf6t/jGwPfS256WQ3B/iuQ4Qeykk=,tag:e48Q0BraIvItyD2WBfbYEA==,type:str]
 kopia-server-username: ENC[AES256_GCM,data:4onewFkWpi9g,iv:aA4WSS8T6KUcGbAIHDd8BjE0sRK/Qz0j4QvEnKdlt2U=,tag:FQlB0Wx2u8wT3TKIhMAyLg==,type:str]
 kopia-server-password: ENC[AES256_GCM,data:6nMnhRA=,iv:Qz9qP+m0obzL+eHFmW1qVmc/0TR4Iw4X1GL4zACOSMk=,tag:v3v+33+g4y6se5q+b4e8mA==,type:str]
-kopia-user-password: ENC[AES256_GCM,data:W8BdbqI=,iv:JoH0ig8X+h/+bmQvzWnDo8yu1SZyE8fCwTLyyZHmDAI=,tag:foH5Es/5CBOysD4JjQzDdA==,type:str]
+kopia-user-password: ENC[AES256_GCM,data:jPWeru4e2w9qzA==,iv:WpZS3Qmx8v12v3q1Lq1YrPnWw7BY0FhxurXYuaOdfwA=,tag:+8bQAnHRh55rUMdyoK6N8w==,type:str]
 paperless-nextcloud-sync-password: ENC[AES256_GCM,data:pfLg3OVBqLsM4R7mSgLQEachj9gMkexPjBMSyzU=,iv:XBe1cdwlTjPfQW70NIEjD8CikK58iGErI9ZTlLWtCA4=,tag:qO35GdjljgS3/z5/1fCOFg==,type:str]
 ntfy-auth-users: ENC[AES256_GCM,data:IHnJJgUL9RqkEAoJ2Q9Oo0RkfgLXG7vih5NFPrPNBoIzMafdLXxHqNOAd1oRaOUd6AKmWdQ3uKAZINj7oGZEKMsMxUEv1WW6IXUuPnDeJe5EthINWCuaW2Z64PJl+uqgnWr4wDi7QT0zwjb/oL3gYfjH1xtfMadTzkWbmnxQ9jlP/nXe9JR1/oCrHv3dio5uU017cA==,iv:JmWnu25ZB/qqI2RsgHQ0bcat69V7p5MJ6cf5eFcSsns=,tag:6Z2LseCav/qyLh2nn+7uuw==,type:str]
 ntfy-auth-tokens: ENC[AES256_GCM,data:C23r9djvEukUgDDloFGm52spwcW1DB5Jcwt9kxghLjL3vNiQ9HzGrvlSl5oEppoNa23BF0+t,iv:O9LepUKGbyXTHMvwn1avdJEhcMgtr2Sb1imIJ8ALMYY=,tag:o3g6f7YZL2VfgfeymzJK1g==,type:str]
-arcane-agent-key: ENC[AES256_GCM,data:jbk1yiE1R2teclJc233qVvHOf+fvmQR/trPoVPMmnLz12rPFa/pciwaIne2SjacpJjxzqYDuJJqcwdYtOXAHzLBCXaQ=,iv:tZGQxfaUEccH/n62H5oP8X3K+UWrIvmthiywpSrejkY=,tag:UEGPBox7j2qiF+uyWRTZaw==,type:str]
 #
 #ENC[AES256_GCM,data:Gdh/hjCaOuAE,iv:XjPXn3SskpUPUkDIEDl5701/g9QhuS83fACMaoPMiIM=,tag:Q7s8xZG/GsOtQrasekBnkQ==,type:comment]
 #
 wireguard-vps-private-key: ENC[AES256_GCM,data:B6IWYuzKV9YZ+G9GIjOsXVEVugwMY14PrwmYyHsFAJEb1OJRXMg8+zeFnqs=,iv:2QroGA10UVSmNIBHFSTeCgMBD3VjtiUnng3pkR/mPVQ=,tag:FGlCrmdccgsObyut6E5ggA==,type:str]
-arcane-encryption-key: ENC[AES256_GCM,data:4H2kaQwIV5m0FVv+3IlNaw85V00r8W4SQ5cOSOskljtaUkFUteHzamj9KH7NxdKY+pxFkrvwIOIAhNYQTMRBSQ==,iv:FDx8IYu7B7jENtGnFiS7U7W2pDIwz9ibfuCNL0UBX6c=,tag:WSm/SwCs8sSynXeXi3+muw==,type:str]
-arcane-jwt-secret: ENC[AES256_GCM,data:BMC/Hju/FkHxXjdZrVr9xjiqs9Uny/w/k14K+b+DYgPOlPYMH+YSZQ/3/yyw5j52FNcm+lDG2drTaO0NfBKJsQ==,iv:gHU78Fw1L6Igp+Jewq5xqW39tSGvGh/HREcd+HX/nO4=,tag:KTL21t2kKWsB3zm7x+T0SA==,type:str]
 sops:
    age:
-        - enc: |
+        - recipient: age14ph8vrj657e7s35d60xehzuq46t9zd6pzcm6pw4jragzrvf6xs9s77usnm
+          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWSVRhVDREMXduZElrRklE
            R2s3Y081TGVTOCtKWVVWN0RLb0ZIT3lmMTNZCjFaNmRqb2hRVXFDSU12dFhDNmJo
@@ -38,8 +36,7 @@ sops:
            SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h
            FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA==
            -----END AGE ENCRYPTED FILE-----
-          recipient: age14ph8vrj657e7s35d60xehzuq46t9zd6pzcm6pw4jragzrvf6xs9s77usnm
-    lastmodified: "2026-07-02T19:27:51Z"
-    mac: ENC[AES256_GCM,data:IkpzDK4F1pEoGx1WyG8ksgMFuEa2h9KeF3m3PzM8KQkWo9iVt3jJn80jHEzWAm8riWIbo7fRkxyRetlSFTZf+MrByotgkWVVx6dMIVNYAOcg2IOK3s4NnX0L65MjbfWGQp/d27QzzEbd14WyklMWm2UO3ei82tF+UKYUEFJ2BWk=,iv:8LimsncylU+HhvVKNnjfyqZskZA72FQe92C4VrNWyQ0=,tag:L6CEno9m3ZncOskjZibq+Q==,type:str]
+    lastmodified: "2026-04-17T12:17:23Z"
+    mac: ENC[AES256_GCM,data:YEHM2ebPhV6ycj8OxNy7mOlpy6VrvV6Gz9sHEWc9alnrwZ0qLzp5m4AUMuWBSfFTMtVgeAFdJ8Nf4X5b+AzQXahlHWJVAwiMiE8KqhRLGWF21OyDN2aIdwd4ue2vYyPDGYP43mC+19v9SW5isF901G28e5Q9SxmGJjNOkiVuiCI=,iv:WFvCN/7YGQnCSqjXBkkfiuPoNQ37bpxHx9jreZDc3EM=,tag:AUjFpbJ6//eScnn6P2QMgA==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.13.1
+    version: 3.12.2
@@ -16,12 +16,11 @@

    # General services
    ../services/adguard.nix
-    ../services/arcane.nix
    ../services/nginx-proxy-manager.nix
-    # ../services/portainer.nix
-    # ../services/pulse.nix
-    # ../services/pulse-agent-thinknix.nix
-    # ../services/whats-up-docker.nix
+    ../services/portainer.nix
+    ../services/pulse.nix
+    ../services/pulse-agent-thinknix.nix
+    ../services/whats-up-docker.nix
  ];

  systemmodules = {
@@ -68,8 +67,7 @@
    };

    sops-nix.secrets.${username} = [
-      "arcane-encryption-key"
-      "arcane-jwt-secret"
+      # "wireguard-vps-private-key"
    ];
  };