Modules/Neovim: Rewrite clangd root_dir expression for neovim v0.11

.gitignore

@@ -11,4 +11,3 @@ config/neovim/store
 home/modules/ags/config/types
 home/modules/ags/config/tsconfig.json
 system/modules/agenix/secrets.nix
-config/neovim/nvim_bundle

README.md

@@ -1,159 +1,50 @@
-# 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 Hyprland (yikes) or Niri for a tiling/scrolling desktop.
 
-## Screenshots
+![](FastFetch.png)
 
-![Fastfetch](FastFetch.png)
+<p float="left" align="middle">
+  <img src="/NeoVim.png" width="33%" />
+  <img src="/Rmpc.png" width="33%" />
+  <img src="/Btop.png" width="33%" />
+</p>
 
-![Neovim](NeoVim.png)
+![](Niri.png)
 
-![Darwin](Darwin.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`.
 
-## Hosts
+## NixFlake/system
 
-| Host | Type | GPU | Features |
+Contains all the system configurations.
-|-|-|-|-|
-| `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 |
 
-## Usage
+- 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/modules`
+- Hosted services are located in `NixFlake/system/services`
 
-```bash
+When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
-# Enter dev shell (provides helper utilities)
+Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
-nix develop
 
-# Rebuild system + user config together
+## NixFlake/home
-nh os switch
-nh os boot
 
-# Or with nixos-rebuild
+Contains all the home-manager configurations.
-sudo nixos-rebuild switch --flake .#nixinator
-```
 
-## Info
+- 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/modules`
 
-Home-manager runs as a NixOS module (not standalone). A single `nixos-rebuild switch` rebuilds both system and user configuration together.
+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.
 
-### Components
+## NixFlake/derivations
 
-Per-host config consists of three layers:
+Contains all the stuff I packaged.
+Each derivation is loaded into `NixFlake/derivations/default.nix`.
 
-1. **Common Config**: `system/default.nix` (NixOS) / `home/christoph/default.nix` (home-manager)
+## NixFlake/overlays
-2. **Host Config**: `system/<hostname>/default.nix` (NixOS) / `home/christoph/<hostname>/default.nix` (home-manager)
-3. **Hardware**: `system/<hostname>/hardware-configuration.nix`
 
-### Modules
+Contains all overlays, e.g. package version overrides.
-
+The `NixFlake/overlays/default.nix` imports all overlays and all derivations.
-There are two module hierarchies (NixOS and home-manager modules):
+It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations.
-
-```
-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).

config/flake.nix

@@ -21,9 +21,6 @@ rec {
   }:
   # Create a shell (and possibly package) for each possible system, not only x86_64-linux
     flake-utils.lib.eachDefaultSystem (system: let
-      # =========================================================================================
-      # Define pkgs/stdenvs
-      # =========================================================================================
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
@@ -31,140 +28,8 @@ rec {
           rust-overlay.overlays.default
         ];
       };
-
-      # clangPkgs = import nixpkgs {
-      #   inherit system;
-      #   config.allowUnfree = true;
-      #   overlays = [];
-      #
-      #   # Use this to change the compiler:
-      #   # - GCC: pkgs.stdenv
-      #   # - Clang: pkgs.clangStdenv
-      #   # NixOS packages are built using GCC by default. Using clang requires a full rebuild/redownload.
-      #   config.replaceStdenv = {pkgs}: pkgs.clangStdenv;
-      # };
-
-      # Package set for cross-compilation
-      # windowsPkgs = import nixpkgs {
-      #   inherit system;
-      #   crossSystem = {
-      #     config = "x86_64-w64-mingw32";
-      #   };
-      #   config.allowUnfree = true;
-      # };
-
       inherit (pkgs) lib stdenv;
 
-      # =========================================================================================
-      # Define shell environment
-      # =========================================================================================
-
-      # Setup the shell when entering the "nix develop" environment (bash script).
-      shellHook = let
-        mkCmakeScript = type: let
-          typeLower = lib.toLower type;
-        in
-          pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
-            cd $FLAKE_PROJECT_ROOT
-
-            echo "Removing build directory ./cmake-build-${typeLower}/"
-            rm -rf ./cmake-build-${typeLower}
-
-            echo "Creating build directory"
-            mkdir cmake-build-${typeLower}
-            cd cmake-build-${typeLower}
-
-            echo "Running cmake"
-            cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
-
-            echo "Linking compile_commands.json"
-            cd ..
-            ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json
-          '';
-
-        cmakeDebug = mkCmakeScript "Debug";
-        cmakeRelease = mkCmakeScript "Release";
-
-        mkBuildScript = type: let
-          typeLower = lib.toLower type;
-        in
-          pkgs.writers.writeFish "cmake-build.fish" ''
-            cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower}
-
-            echo "Running cmake"
-            cmake --build .
-          '';
-
-        buildDebug = mkBuildScript "Debug";
-        buildRelease = mkBuildScript "Release";
-
-        # Add project-local fish abbrs here
-        abbrs = {
-          # Rust Bevy:
-          # build-release-windows = "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc";
-
-          # C/C++:
-          # cmake-debug = "${cmakeDebug}";
-          # cmake-release = "${cmakeRelease}";
-          # build-debug = "${buildDebug}";
-          # build-release = "${buildRelease}";
-
-          # Clojure:
-          # clojure-deps = "deps-lock --lein";
-
-          # Python:
-          # run = "python ./app/main.py";
-          # profile = "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg";
-          # ptop = "py-spy top -- python ./app/main.py";
-        };
-
-        eraseAbbr = name: value: ''abbr --erase ${name} 2>/dev/null'';
-        createAbbr = name: value: ''abbr -a ${name} "${value}"'';
-
-        # This will be sourced by the global fish config if INIT_PROJECT_SHELL gets unset
-        unloadProjectShell = pkgs.writers.writeFish "unload-shell.fish" ''
-          echo "Unloading \"${description}\" environment..."
-
-          ${builtins.concatStringsSep "\n" (lib.mapAttrsToList eraseAbbr abbrs)}
-        '';
-
-        # This will be sourced by the global fish config if INIT_PROJECT_SHELL gets set
-        initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
-          # Unload just in case, to not have redefinition errors
-          source ${unloadProjectShell}
-
-          echo "Sourcing \"${description}\" environment..."
-
-          ${builtins.concatStringsSep "\n" (lib.mapAttrsToList createAbbr abbrs)}
-        '';
-      in
-        builtins.concatStringsSep "\n" [
-          # Launch into pure fish shell
-          ''
-            # Determine the project root, used e.g. in cmake scripts
-            export FLAKE_PROJECT_ROOT="$(git rev-parse --show-toplevel)"
-
-            # Can't do the "exec" with nix-direnv
-            # - The "exec fish" would call direnv again => Infinite loop
-            # - The shellHook is Bash/POSIX, so fish syntax doesn't work
-
-            # Use this for "nix develop" without direnv
-            # exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
-
-            # Use this for direnv without "nix develop"
-            export INIT_PROJECT_SHELL="${initProjectShell}"
-            export UNLOAD_PROJECT_SHELL="${unloadProjectShell}"
-          ''
-
-          # Qt: Launch into wrapped fish shell (direnv incompatible)
-          # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
-          # ''
-          #   fishdir=$(mktemp -d)
-          #   makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
-          #   exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
-          # ''
-        ];
-
       # ===========================================================================================
       # Define custom dependencies
       # ===========================================================================================
@@ -203,7 +68,7 @@ rec {
       #   bintools = pkgs.bintools.bintools; # Unwrapped bintools
       #   libc = pkgs.glibc;
       # };
-      # gcc = lib.hiPrio (pkgs.wrapCCWith {
+      # gcc = pkgs.hiPrio (pkgs.wrapCCWith {
       #   cc = pkgs.gcc.cc; # Unwrapped gcc
       #   libc = pkgs.glibc;
       #   bintools = bintools;
@@ -219,7 +84,7 @@ rec {
       #   bintools = pkgs.bintools.bintools; # Unwrapped bintools
       #   libc = pkgs.glibc_multi;
       # };
-      # gcc_multilib = lib.hiPrio (pkgs.wrapCCWith {
+      # gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith {
       #   cc = pkgs.gcc.cc; # Unwrapped gcc
       #   libc = pkgs.glibc_multi;
       #   bintools = bintools_multilib;
@@ -254,15 +119,11 @@ rec {
         # jdk
 
         # C/C++:
-        # pkg-config
-        # cmake
-        # gnumake
-        # ninja
         # gdb
         # valgrind
-        # kdePackages.kcachegrind
+        # gnumake
-        # perf
+        # cmake
-        # hotspot
+        # pkg-config
 
         # Clojure:
         # leiningen
@@ -286,8 +147,6 @@ rec {
         # C/C++:
         # boost
         # sfml
-        # raylib
-        # backward-cpp
 
         # Qt:
         # qt6.qtbase
@@ -303,38 +162,8 @@ rec {
       #   src = ./.;
       #
       #   installPhase = ''
-      #     runHook preInstall
-      #
       #     mkdir -p $out/bin
-      #     cp -rv ./${pname} $out/bin/
+      #     mv ./BINARY $out/bin
-      #
-      #     runHook postInstall
-      #   '';
-      # };
-      # windowsPackage = windowsPkgs.stdenv.mkDerivation rec {
-      #   pname = "";
-      #   version = "1.0.0";
-      #   src = ./.;
-      #
-      #   # nativeBuildInputs must be from the build-platform (not cross)
-      #   # so we use "pkgs" here, not "windowsPkgs"
-      #   nativeBuildInputs = with pkgs; [
-      #     cmake
-      #   ];
-      #
-      #   buildInputs = with windowsPkgs; [];
-      #
-      #   cmakeFlags = [
-      #     "-DCMAKE_SYSTEM_NAME=Windows"
-      #   ];
-      #
-      #   installPhase = ''
-      #     runHook preInstall
-      #
-      #     mkdir -p $out/bin
-      #     cp ./${pname}.exe $out/bin/
-      #
-      #     runHook postInstall
       #   '';
       # };
       # package = clj-nix.lib.mkCljApp {
@@ -356,76 +185,133 @@ rec {
       # };
     in rec {
       # Provide package for "nix build"
-      # packages = {
+      # defaultPackage = package;
-      #   default = package;
+      # defaultApp = flake-utils.lib.mkApp {
-      #   windows = windowsPackage;
+      #   drv = defaultPackage;
-      # };
-      # apps = {
-      #   default = flake-utils.lib.mkApp {drv = package;};
       # };
 
-      devShells = {
+      # Provide environment for "nix develop"
-        # Provide default environment for "nix develop".
+      devShell = pkgs.mkShell {
-        # Other environments can be added below.
+        inherit nativeBuildInputs buildInputs;
-        default = pkgs.mkShell {
+        name = description;
-          inherit nativeBuildInputs buildInputs shellHook;
-          name = description;
 
-          # =========================================================================================
+        # =========================================================================================
-          # Define environment variables
+        # Define environment variables
-          # =========================================================================================
+        # =========================================================================================
 
-          # Rust stdlib source:
+        # Rust stdlib source:
-          # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
+        # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
 
-          # Custom dynamic libraries:
+        # Custom dynamic libraries:
-          # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
+        # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
-          #   # Rust Bevy GUI app:
+        #   # Rust Bevy GUI app:
-          #   # "${pkgs.libx11}/lib"
+        #   # "${pkgs.xorg.libX11}/lib"
-          #   # "${pkgs.libxcursor}/lib"
+        #   # "${pkgs.xorg.libXcursor}/lib"
-          #   # "${pkgs.libxrandr}/lib"
+        #   # "${pkgs.xorg.libXrandr}/lib"
-          #   # "${pkgs.libxi}/lib"
+        #   # "${pkgs.xorg.libXi}/lib"
-          #   # "${pkgs.libGL}/lib"
+        #   # "${pkgs.libGL}/lib"
-          #
-          #   # JavaFX app:
-          #   # "${pkgs.libGL}/lib"
-          #   # "${pkgs.gtk3}/lib"
-          #   # "${pkgs.glib.out}/lib"
-          #   # "${pkgs.xorg.libXtst}/lib"
-          # ];
-
-          # Dynamic libraries from buildinputs:
-          # LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
-
-          # QT imports to use with "qmlls -E"
-          # QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
-
-          # Set PYTHONPATH
-          # PYTHONPATH = ".";
-
-          # Set matplotlib backend
-          # MPLBACKEND = "TkAgg";
-        };
-
-        # Provide environment with clang stdenv for "nix develop .#clang"
-        # clang =
-        #   pkgs.mkShell.override {
-        #     stdenv = pkgs.clangStdenv;
-        #   } {
-        #     inherit shellHook;
-        #     name = description;
         #
-        #     # If not required, use pkgs instead of clangPkgs for a lighter build
+        #   # JavaFX app:
-        #     nativeBuildInputs = with pkgs; [];
+        #   # "${pkgs.libGL}/lib"
-        #     buildInputs = with pkgs; [];
+        #   # "${pkgs.gtk3}/lib"
-        #
+        #   # "${pkgs.glib.out}/lib"
-        #     # =========================================================================================
+        #   # "${pkgs.xorg.libXtst}/lib"
-        #     # Define environment variables
+        # ];
-        #     # =========================================================================================
+
-        #
+        # Dynamic libraries from buildinputs:
-        #     # Dynamic libraries from buildinputs:
+        # LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
-        #     LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
+
-        #   };
+        # QT imports to use with "qmlls -E"
+        # QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
+
+        # Set PYTHONPATH
+        # PYTHONPATH = ".";
+
+        # Set matplotlib backend
+        # MPLBACKEND = "TkAgg";
+
+        # =========================================================================================
+        # Define shell environment
+        # =========================================================================================
+
+        # Setup the shell when entering the "nix develop" environment (bash script).
+        shellHook = let
+          mkCmakeScript = type: let
+            typeLower = lib.toLower type;
+          in
+            pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
+              cd $FLAKE_PROJECT_ROOT
+
+              echo "Removing build directory ./cmake-build-${typeLower}/"
+              rm -rf ./cmake-build-${typeLower}
+
+              echo "Creating build directory"
+              mkdir cmake-build-${typeLower}
+              cd cmake-build-${typeLower}
+
+              echo "Running cmake"
+              cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
+
+              echo "Linking compile_commands.json"
+              cd ..
+              ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json
+            '';
+
+          cmakeDebug = mkCmakeScript "Debug";
+          cmakeRelease = mkCmakeScript "Release";
+
+          mkBuildScript = type: let
+            typeLower = lib.toLower type;
+          in
+            pkgs.writers.writeFish "cmake-build.fish" ''
+              cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower}
+
+              echo "Running cmake"
+              cmake --build .
+            '';
+
+          buildDebug = mkBuildScript "Debug";
+          buildRelease = mkBuildScript "Release";
+
+          # Use this to specify commands that should be ran after entering fish shell
+          initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
+            echo "Entering \"${description}\" environment..."
+
+            # Determine the project root, used e.g. in cmake scripts
+            set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
+
+            # Rust Bevy:
+            # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
+
+            # C/C++:
+            # abbr -a cmake-debug "${cmakeDebug}"
+            # abbr -a cmake-release "${cmakeRelease}"
+            # abbr -a build-debug "${buildDebug}"
+            # abbr -a build-release "${buildRelease}"
+
+            # Clojure:
+            # abbr -a clojure-deps "deps-lock --lein"
+
+            # Python:
+            # abbr -a run "python ./app/main.py"
+            # abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
+            # abbr -a ptop "py-spy top -- python ./app/main.py"
+          '';
+        in
+          builtins.concatStringsSep "\n" [
+            # Launch into pure fish shell
+            ''
+              exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
+            ''
+
+            # Qt: Launch into wrapped fish shell
+            # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
+            # ''
+            #   fishdir=$(mktemp -d)
+            #   makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
+            #   exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
+            # ''
+          ];
       };
     });
 }

config/navi/christoph.cheat

@@ -210,10 +210,6 @@ Convert line endings to dos format
 unix2dos <file>
 $ file: eza -1
 
-% tiddl
-Download stuff from tidal
-tiddl download --track-quality max --path ~/Downloads/Beet/Albums --videos none url "<url>"
-
 ; ===========================
 ; SECRETS
 ; ===========================
@@ -238,11 +234,11 @@ $ mode: echo -e "--export            \tExport public key\n--export-secret-keys\t
 
 % sops
 # Edit secrets.yaml
-sops ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
+sops ~/NixFlake/system/modules/sops-nix/secrets.yaml
 
 % sops
 # Rekey secrets.yaml
-sops updatekeys ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
+sops updatekeys ~/NixFlake/system/modules/sops-nix/secrets.yaml
 
 % ssh
 # Generate a new SSH key
@@ -308,33 +304,27 @@ mkdir -p "<name>" && cd "<name>" && spotdl --client-id (cat /home/christoph/.sec
 
 % ffmpeg
 # Create a slow motion version of a video with interpolated/blended frames
-ffmpeg -i <input> -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
+ffmpeg -i "<input>" -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
 $ input: eza -f -1
 
 % ffmpeg
 # Detect black bar dimensions automatically by looking at the first 10 frames
-ffmpeg -i <input> -vframes 10 -vf cropdetect -f null -
+ffmpeg -i "<input>" -vframes 10 -vf cropdetect -f null -
 $ input: eza -f -1
 
 % ffmpeg
 # Preview video with applied crop settings
-ffplay -vf crop=<width>:<height>:<x>:<y> <input>
+ffplay -vf crop=<width>:<height>:<x>:<y> "<input>"
 $ input: eza -f -1
 
 % ffmpeg
 # Re-encode the video with applied crop settings
-ffmpeg -i <input> -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
+ffmpeg -i "<input>" -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
 $ input: eza -f -1
 
 % ffmpeg
 # Reencode and compress the video using the h265 codec
-ffmpeg -i <input> -vcodec libx265 -crf <quality> out_<input>
+ffmpeg -i "<input>" -vcodec libx265 -crf <quality> "out_<input>"
-$ input: eza -f -1
-$ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
-
-% ffmpeg
-# Reencode, compress and scale the video using the h265 codec
-ffmpeg -i <input> -vcodec libx265 -crf <quality> -vf scale=<width>:-2,setsar=1:1 out_<input>
 $ input: eza -f -1
 $ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
 

config/neovim/bundle.py

@@ -1,204 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import re
-import shutil
-import subprocess
-from typing import cast
-from urllib.request import urlretrieve
-
-INIT_LUA: str = "/home/christoph/.config/nvim/init.lua"
-
-
-def patch_paths(text: str, mappings: dict[str, str]) -> str:
-    """Patches /nix/store paths in init.lua"""
-
-    patched = text
-
-    for old, new in mappings.items():
-        print(f"Patching init.lua: {old} -> {new}")
-        patched = patched.replace(old, new)
-
-    return patched
-
-
-def patch_various(text: str) -> str:
-    """Patches various incompatibilities with NixVim init.lua"""
-
-    # Install lazy
-    print("Patching init.lua: Bootstrap lazy.nvim")
-    patched = (
-        """-- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\\n", "ErrorMsg" },
-      { out, "WarningMsg" },
-      { "\\nPress any key to exit..." },
-    }, true, {})
-    vim.fn.getchar()
-    os.exit(1)
-  end
-end
-vim.opt.rtp:prepend(lazypath)
-
-"""
-        + text
-    )
-
-    # print("Patching init.lua: Disabling vim.loader")
-    # patched = patched.replace("vim.loader.enable(true)", "vim.loader.enable(false)")
-
-    return patched
-
-
-def copy_plugins(text: str, path: str) -> dict[str, str]:
-    """Copies NeoVim plugins from the Nix Store"""
-
-    os.makedirs(path, exist_ok=True)
-
-    plugins_path: str = re.findall(r"\"(/nix/store/.*-lazy-plugins)\"", text)[0]
-    print(f"Copying: {plugins_path} -> {path}/plugins")
-    _ = shutil.copytree(plugins_path, f"{path}/plugins")
-
-    treesitter_path: str = re.findall(
-        r"\"(/nix/store/.*-vimplugin-nvim-treesitter.*)\"", text
-    )[0]
-    print(f"Copying: {treesitter_path} -> {path}/treesitter")
-    _ = shutil.copytree(treesitter_path, f"{path}/treesitter")
-
-    parsers_path: str = re.findall(r"\"(/nix/store/.*-treesitter-parsers)\"", text)[0]
-    print(f"Copying: {parsers_path} -> {path}/parsers")
-    _ = shutil.copytree(parsers_path, f"{path}/parsers")
-
-    return {
-        plugins_path: "./plugins",
-        treesitter_path: "./treesitter",
-        parsers_path: "./parsers",
-    }
-
-
-def write_file(text: str, path: str) -> None:
-    """Write text to a file"""
-
-    with open(path, "w") as file:
-        _ = file.write(text)
-
-
-# TODO: Could add etc. nvim/lsp/formatter/linter binaries here
-# TODO: Needs "install recipe", as in most cases the download will be an archive
-DOWNLOADS: list[tuple[str, str]] = [
-    # (
-    #     "https://github.com/neovim/neovim/releases/download/v0.11.6/nvim-linux-x86_64.tar.gz",
-    #     "nvim",
-    # ),
-]
-
-
-def download_binaries(path: str, urls: list[tuple[str, str]]) -> None:
-    """Download required binaries"""
-
-    os.makedirs(f"{path}/bin", exist_ok=True)
-
-    def download(url: str, path: str) -> None:
-        """Download from URL"""
-
-        print(f"Downloading: {url}")
-        _ = urlretrieve(url, path)
-
-    for url, name in urls:
-        download(url, f"{path}/bin/{name}")
-
-
-def build_nvim(path: str) -> None:
-    """Builds a static nvim binary against musl"""
-
-    # TODO: Build etc. is working, but on the target system there are
-    #       lua-ffi errors from noice.nvim with the static binary.
-    #       This does not happen with nvim from system package repository.
-
-    def run(command: list[str]) -> None:
-        """Run a subprocess"""
-
-        print(f"Running: {' '.join(command)}")
-        _ = subprocess.run(command)
-
-    os.makedirs(f"{path}/nvim-build", exist_ok=True)
-
-    with open(f"{path}/nvim-build/build-nvim.sh", "w") as file:
-        _ = file.write(
-            "\n".join(
-                [
-                    "#!/bin/sh",
-                    "git clone https://github.com/neovim/neovim",
-                    "cd neovim",
-                    "git checkout stable",
-                    'make -j$(nproc) CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DSTATIC_BUILD=1"',
-                    "make CMAKE_INSTALL_PREFIX=/workdir/install install",
-                ]
-            )
-        )
-
-    run(
-        [
-            "docker",
-            "run",
-            "--rm",
-            "-it",
-            "-v",
-            f"{os.path.abspath(path)}/nvim-build:/workdir",
-            "-w",
-            "/workdir",
-            "alpine:3.23.3",
-            "/bin/sh",
-            "-c",
-            "apk add build-base cmake coreutils curl gettext-tiny-dev git && chmod +x ./build-nvim.sh && ./build-nvim.sh",
-        ]
-    )
-
-    _ = shutil.copytree(f"{path}/nvim-build/install/bin", f"{path}/bin")
-    _ = shutil.copytree(f"{path}/nvim-build/install/lib", f"{path}/lib")
-    _ = shutil.copytree(f"{path}/nvim-build/install/share", f"{path}/share")
-
-    _ = shutil.rmtree(f"{path}/nvim-build")
-
-
-def bundle() -> None:
-    """Creates a standalone NeoVim bundle from the NixVim configuration"""
-
-    parser = argparse.ArgumentParser()
-    _ = parser.add_argument(
-        "--config",
-        type=str,
-        default=INIT_LUA,
-        help="init.lua or other config file",
-    )
-    _ = parser.add_argument(
-        "--out",
-        type=str,
-        default="./nvim_bundle",
-        help="destination folder",
-    )
-
-    args = parser.parse_args()
-    args.config = cast(str, args.config)
-    args.out = cast(str, args.out)
-
-    with open(args.config, "r") as file:
-        patched_init_lua: str = file.read()
-
-    path_mappings = copy_plugins(patched_init_lua, args.out)
-    patched_init_lua = patch_paths(patched_init_lua, path_mappings)
-    patched_init_lua = patch_various(patched_init_lua)
-    write_file(patched_init_lua, f"{args.out}/init.lua")
-
-    # build_nvim(args.out)
-    # download_binaries(args.out, DOWNLOADS)
-
-
-if __name__ == "__main__":
-    bundle()

config/neovim/info.md

@@ -1,6 +0,0 @@
-# NeoVim Portable
-
-## Requirements
-
-- Base packages: `sudo apt install neovim git direnv ripgrep curl fzf`
-- Link or copy the generated `nvim_bundle` to `~/.config/nvim` on the target machine

config/obsidian/css_snippets/bordered_image.css

@@ -1,10 +0,0 @@
-.bordered-images img {
-  border-radius: var(--callout-radius);
-  /* border-style: solid; */
-  /* border-width: var(--callout-border-width); */
-  /* border-color: var(--color-purple-rgb); */
-  /* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); */
-
-  /* Background color so PNGs with transparent backgrounds don't look weird */
-  /* background-color: var(--background-secondary); */
-}

config/obsidian/css_snippets/center_image.css

@@ -1,5 +1,5 @@
-.center-images img {
+img[alt*="center"] {
-  display: block !important;
+  display: block;
-  margin-left: auto !important;
+  margin-left: auto;
-  margin-right: auto !important;
+  margin-right: auto;
 }

config/obsidian/css_snippets/fullwidth_image.css

@@ -1,4 +0,0 @@
-.fullwidth-images img {
-  width: 100% !important;
-  height: auto !important;
-}

config/obsidian/css_snippets/justify_text.css

@@ -1,5 +0,0 @@
-.justify-text.cm-s-obsidian,
-.justify-text.markdown-preview-view {
-  text-align: justify;
-  hyphens: auto;
-}

derivations/1_deprecated/modules-options-doc/default.nix

@@ -7,7 +7,7 @@
   ...
 }: let
   # create a module that only contains the options, type can be home or system
-  toModule = type: name: {options.systemmodules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
+  toModule = type: name: {options.modules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
 
   # evaluate a single module
   evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];});

derivations/default.nix

@@ -9,5 +9,4 @@
   msty = pkgs.callPackage ./msty {};
   unityhub = pkgs.callPackage ./unityhub {};
   tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
-  tiddl = pkgs.callPackage ./tiddl {};
 }

derivations/tidal-dl-ng/default.nix

@@ -10,12 +10,11 @@
   #
   pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
     typer = super.typer.overridePythonAttrs (old: {
-      version = "0.20.1";
+      version = "0.20.0";
       src = super.fetchPypi {
         inherit (old) pname;
-        version = "0.20.1";
+        version = "0.20.0";
-        # sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc="; # v0.20.0
+        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-        sha256 = "sha256-aFhesbASA2icQZm8RA1r5hbwhR6fDrQeSneIRcWg/Vs="; # v0.20.1
       };
     });
 
@@ -49,33 +48,30 @@
   #   doCheck = false;
   # });
 
+  # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
+  #   version = "14.2.0";
+  #   src = pkgs.fetchFromGitHub {
+  #     owner = "Textualize";
+  #     repo = "rich";
+  #     tag = "v14.2.0";
+  #     hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
+  #   };
+  # });
+
   tidalDlNg = pythonPkgs.buildPythonApplication rec {
-    pname = "tidal_dl_ng_for_dj";
+    pname = "tidal-dl-ng";
-    version = "0.33.2";
+    version = "0.31.3";
     format = "pyproject";
 
-    # The official repo was deleted
+    src = pkgs.fetchFromGitHub {
-    # src = pkgs.fetchFromGitHub {
+      owner = "exislow";
-    #   owner = "exislow";
+      repo = "tidal-dl-ng";
-    #   repo = "tidal-dl-ng";
+      rev = "v${version}";
-    #   rev = "v${version}";
+      sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
-    #   sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
-    # };
-
-    # Package now also deleted from PyPi
-    # src = pythonPkgs.fetchPypi {
-    #   inherit pname version;
-    #   sha256 = "sha256-rOMyxnT7uVnMbn678DFtqAu4+Uc5VFGcqGI0jxplnpc=";
-    # };
-
-    # TODO: Borked
-    # "For DJ"-Fork
-    src = pythonPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "sha256-605cgBqZV6L7sxWtEa4Ki+9hBqX4m3Rk+X5oY5bv/FQ=";
     };
 
-    dontCheckRuntimeDeps = true;
+    doCheck = false;
+    catchConflicts = false;
 
     nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
 
@@ -100,6 +96,13 @@
       typer
       rich
     ];
+
+    # pythonOutputDistPhase = ''
+    #   echo "⚠️Skipping pythonOutputDistPhase"
+    # '';
+    # pythonCatchConflictsPhase = ''
+    #   echo "🛑 Skipping pythonCatchConflictsPhase"
+    # '';
   };
 
   #
@@ -128,7 +131,7 @@
 
   tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
     pname = "tdng";
-    version = "0.33.2";
+    version = "0.31.3";
     dontUnpack = true;
 
     nativeBuildInputs = [pkgs.makeWrapper];

derivations/tiddl/default.nix

@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenv,
-  pkgs,
-}: let
-  pythonPkgs = pkgs.python314Packages.overrideScope (self: super: {
-    typer = super.typer.overridePythonAttrs (old: {
-      version = "0.20.1";
-      src = pkgs.fetchPypi {
-        pname = "typer";
-        version = "0.20.0";
-        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-      };
-      propagatedBuildInputs = with pythonPkgs; [
-        typing-extensions
-      ];
-    });
-
-    aiofiles = super.aiofiles.overridePythonAttrs (old: {
-      version = "25.1.0";
-      src = pkgs.fetchFromGitHub {
-        owner = "Tinche";
-        repo = "aiofiles";
-        tag = "v25.1.0";
-        hash = "sha256-NBmzoUb2una3+eWqR1HraVPibaRb9I51aYwskrjxskQ=";
-      };
-      # Build system changed in this version
-      build-system = with pythonPkgs; [
-        hatchling
-        hatch-vcs
-      ];
-    });
-  });
-in
-  pythonPkgs.buildPythonApplication rec {
-    pname = "tiddl";
-    version = "3.4.3";
-    format = "pyproject";
-
-    src = pythonPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "sha256-45KHNS1IP59DsH8i2uQ7sua6T21vW/Yw1PQg55jzLGs=";
-    };
-
-    dontCheckRuntimeDeps = true;
-
-    build-system = with pythonPkgs; [
-      poetry-core
-      setuptools
-    ];
-
-    propagatedBuildInputs = with pythonPkgs; [
-      # Nixpkgs
-      aiofiles
-      aiohttp
-      m3u8
-      mutagen
-      pydantic
-      requests
-      requests-cache
-      typer
-    ];
-  }

derivations/unityhub/default.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       with pkgs;
         [
           # Unity Hub binary dependencies
-          libxrandr
+          xorg.libXrandr
           xdg-utils
 
           # GTK filepicker
@@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
           dbus
           at-spi2-core
           pango
-          libxcomposite
+          xorg.libXcomposite
-          libxext
+          xorg.libXext
-          libxdamage
+          xorg.libXdamage
-          libxfixes
+          xorg.libXfixes
-          libxcb
+          xorg.libxcb
-          libxshmfence
+          xorg.libxshmfence
-          libxScrnSaver
+          xorg.libXScrnSaver
-          libxtst
+          xorg.libXtst
 
           # Unity Hub additional dependencies
           libva
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
 
           # Unity Editor dependencies
           libglvnd # provides ligbl
-          libx11
+          xorg.libX11
-          libxcursor
+          xorg.libXcursor
           glib
           gdk-pixbuf
           libxml2-legacy
@@ -111,8 +111,8 @@ stdenv.mkDerivation rec {
           vulkan-loader
 
           # Unity Bug Reporter specific dependencies
-          libICE
+          xorg.libICE
-          libSM
+          xorg.libSM
 
           # Fonts used by built-in and third party editor tools
           corefonts

flake.nix

@@ -12,12 +12,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
-    # Darwin
-    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-
     # NOTE: Update this after May and November
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
 
     # Home Manager
     home-manager.url = "github:nix-community/home-manager";
@@ -57,14 +53,52 @@
     niri.url = "github:sodiboo/niri-flake";
     niri.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Walker
+    # Quickshell
-    elephant.url = "github:abenz1267/elephant";
+    quickshell.url = "github:quickshell-mirror/quickshell";
-    walker.url = "github:abenz1267/walker";
+    quickshell.inputs.nixpkgs.follows = "nixpkgs";
-    walker.inputs.elephant.follows = "elephant";
+
+    # Noctalia shell
+    noctalia.url = "github:noctalia-dev/noctalia-shell";
+    noctalia.inputs.nixpkgs.follows = "nixpkgs";
+    # noctalia.inputs.quickshell.follows = "quickshell";
+
+    # Lol
+    waifu-cursors.url = "github:kagurazakei/waifu-cursors";
+
+    # Caelestia shell
+    caelestia.url = "github:caelestia-dots/shell";
+    caelestia.inputs.nixpkgs.follows = "nixpkgs";
+    caelestia.inputs.quickshell.follows = "quickshell";
+    # caelestia-cli.url = "github:caelestia-dots/cli";
+    # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
+
+    # DankMaterialShell
+    dgop.url = "github:AvengeMedia/dgop";
+    dgop.inputs.nixpkgs.follows = "nixpkgs";
+    # dms-cli.url = "github:AvengeMedia/danklinux";
+    # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
+    dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
+    dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
+    dank-material-shell.inputs.dgop.follows = "dgop";
+
+    # Hyprland (use flake so plugins are not built from source)
+    hyprland.url = "github:hyprwm/Hyprland";
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+
+    # HyprPlugins
+    hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
+    hyprland-plugins.inputs.nixpkgs.follows = "nixpkgs";
+    hyprland-plugins.inputs.hyprland.follows = "hyprland";
+    hypr-dynamic-cursors.url = "github:VirtCode/hypr-dynamic-cursors";
+    hypr-dynamic-cursors.inputs.nixpkgs.follows = "nixpkgs";
+    hypr-dynamic-cursors.inputs.hyprland.follows = "hyprland";
+    hyprspace.url = "github:KZDKM/Hyprspace";
+    # hyprspace.inputs.nixpkgs.follows = "nixpkgs";
+    hyprspace.inputs.hyprland.follows = "hyprland";
 
     # NeoVim <3
     nixvim.url = "github:nix-community/nixvim";
-    # nixvim.inputs.nixpkgs.follows = "nixpkgs";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
 
     # Emacs nightly
     # emacs-overlay.url = "github:nix-community/emacs-overlay";
@@ -78,19 +112,9 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
     # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
 
-    # Instant Direnv (load environment in background)
-    # direnv-instant.url = "github:Mic92/direnv-instant";
-    # direnv-instant.inputs.nixpkgs.follows = "nixpkgs";
-
     # Realtime audio
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
-
-    # HyTale
-    hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
-
-    masssprings.url = "git+https://gitea.local.chriphost.de/christoph/cpp-masssprings";
-    masssprings.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   # Outputs is a function that takes the inputs as arguments.
@@ -99,14 +123,12 @@
   outputs = {
     self,
     nixpkgs,
-    nix-darwin,
     ...
   } @ inputs: let
     # Our configuration is buildable on the following system/platform.
     # Configs can support more than a single system simultaneously,
     # e.g. NixOS (linux) and MacOS (darwin) or Arm.
     system = "x86_64-linux";
-    darwinSystem = "aarch64-darwin";
 
     # We configure our global packages here.
     # Usually, "nixpkgs.legacyPackages.${system}" is used (and more efficient),
@@ -148,26 +170,6 @@
       ];
     };
 
-    darwinPkgs = import nixpkgs {
-      system = darwinSystem;
-
-      hostPlatform = darwinSystem;
-      config.allowUnfree = true;
-      config.allowUnfreePredicate = pkg: true;
-
-      overlays = let
-        pkgs-stable = import inputs.nixpkgs-stable {
-          system = darwinSystem;
-
-          config.allowUnfree = true;
-          config.allowUnfreePredicate = pkg: true;
-        };
-      in [
-        # All my own overlays (derivations + modifications)
-        (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
-      ];
-    };
-
     # My own library functions are imported here.
     # They are made available to the system and HM configs by inheriting mylib.
     mylib = import ./lib {
@@ -182,15 +184,8 @@
       inherit (nixpkgs) lib;
     };
 
-    darwinMylib = import ./lib {
-      inherit inputs darwinPkgs;
-
-      inherit (nixpkgs) lib;
-
-      pkgs = darwinPkgs;
-    };
-
     # NOTE: Keep public keys here so they're easy to rotate
+
     publicKeys.christoph = {
       # /home/christoph/.ssh/id_ed25519.pub
       ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAoJac+GdGtzblCMA0lBfMdSR6aQ4YyovrNglCFGIny christoph.urlacher@protonmail.com";
@@ -214,22 +209,6 @@
     # Local shell for NixFlake directory
     devShells.${system}.default = import ./shell.nix {inherit pkgs;};
 
-    # Usage: sudo darwin-rebuild switch --flake .#darwinix
-    darwinConfigurations = {
-      darwinix = darwinMylib.nixos.mkDarwinConfigWithHomeManagerModule {
-        inherit publicKeys;
-
-        system = darwinSystem;
-        mylib = darwinMylib;
-        hostname = "darwinix";
-        username = "christoph";
-        headless = false;
-        extraModules = [
-          inputs.sops-nix.darwinModules.sops
-        ];
-      };
-    };
-
     # We give each configuration a (host)name to choose a configuration when rebuilding.
     # This makes it easy to add different configurations (e.g. for a laptop).
     # Usage: sudo nixos-rebuild switch --flake .#nixinator

home/christoph/darwinix/default.nix

@@ -1,54 +0,0 @@
-{
-  pkgs,
-  nixosConfig,
-  config,
-  lib,
-  mylib,
-  username,
-  inputs,
-  ...
-}: {
-  config = {
-    paths = rec {
-      nixflake = "${config.home.homeDirectory}/NixFlake";
-      dotfiles = "${nixflake}/config";
-    };
-
-    homemodules = {
-      color = {
-        scheme = "catppuccin-mocha";
-        accent = "mauve";
-        accentHl = "pink";
-        accentDim = "lavender";
-        accentText = "base";
-
-        font = "MonoLisa Alt Script";
-      };
-
-      packages.enable = true;
-      terminal.enable = true;
-    };
-
-    home = {
-      inherit username;
-
-      homeDirectory = "/Users/${config.home.username}";
-      enableNixpkgsReleaseCheck = true;
-
-      sessionVariables = {
-        LANG = "en_US.UTF-8";
-        EDITOR = "nvim";
-        MANPAGER = "nvim +Man!";
-        TERMINAL = "kitty";
-      };
-
-      # packages = with pkgs; []; # Configured in homemodules/packages
-
-      stateVersion = "25.11";
-    };
-
-    programs = {};
-
-    services = {};
-  };
-}

home/christoph/default.nix

@@ -15,7 +15,7 @@
   headless,
   ...
 }: let
-  inherit (config.homemodules) color;
+  inherit (config.modules) color;
 in
   # This is a HM module.
   # Because no imports/options/config is defined explicitly, everything is treated as config:
@@ -25,6 +25,16 @@ in
     # Every module (/function) is called with the same arguments as this module.
     # Arguments with matching names are "plugged in" into the right slots,
     # the case of different arity is handled by always providing ellipses (...) in module definitions.
+    imports = [
+      # Import the host-specific HM config.
+      # It will be merged with the main config (like all different modules).
+      # Settings regarding a specific host (e.g. desktop or laptop)
+      # should only be made in the host-specific config.
+      ./${hostname}
+
+      # Import all of my custom HM modules.
+      ../modules
+    ];
 
     # Enable and configure my custom HM modules.
     paths = rec {
@@ -32,9 +42,10 @@ in
       dotfiles = "${nixflake}/config";
     };
 
-    homemodules = {
+    modules = {
       beets.enable = !headless;
-      cava.enable = !headless;
+
+      btop.enable = true;
 
       chromium = {
         enable = !headless;
@@ -46,8 +57,7 @@ in
         extraPackages = with pkgs; [
           papirus-icon-theme
           bibata-cursors
-          # Lol
+          inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
-          # inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
         ];
 
         cursor = "Bibata-Modern-Classic";
@@ -77,15 +87,221 @@ in
         disableTabBar = true;
       };
 
+      fish.enable = true;
+
+      git = {
+        enable = true;
+
+        userName = "Christoph Urlacher";
+        userEmail = "christoph.urlacher@protonmail.com";
+        signCommits = true;
+      };
+
+      hyprland = {
+        enable = nixosConfig.programs.hyprland.enable;
+        dunst.enable = !config.modules.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.modules.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.modules.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"
+        ];
+      };
+
+      # hyprpanel.enable = !headless; # Enabled by hyprland module
+
+      kitty.enable = !headless;
+      lazygit.enable = true;
       mpd.enable = !headless;
+
+      neovim = {
+        enable = true;
+        alias = true;
+        neovide = !headless;
+      };
+
       niri.enable = nixosConfig.programs.niri.enable;
       nnn.enable = false; # Use yazi
-      packages.enable = true;
       qutebrowser.enable = !headless;
       rmpc.enable = !headless;
-      rofi.enable = false;
+
-      terminal.enable = true;
+      rofi = {
-      waybar.enable = !headless;
+        enable = !headless;
+      };
+
+      waybar.enable = false; # Use hyprpanel
+      yazi.enable = true;
       zathura.enable = !headless;
     };
 
@@ -102,10 +318,10 @@ in
     # as nixosConfig won't be available otherwise.
     xdg = {
       enable = true; # This only does xdg path management
-      mime.enable = nixosConfig.systemmodules.mime.enable;
+      mime.enable = nixosConfig.modules.mime.enable;
 
       mimeApps = {
-        enable = nixosConfig.systemmodules.mime.enable;
+        enable = nixosConfig.modules.mime.enable;
 
         associations.added = nixosConfig.xdg.mime.addedAssociations;
         associations.removed = nixosConfig.xdg.mime.removedAssociations;
@@ -176,7 +392,7 @@ in
             config.lib.file.mkOutOfStoreSymlink
             nixosConfig.sops.templates."nix.conf".path;
         }
-        (lib.mkIf nixosConfig.systemmodules.desktopportal.termfilechooser.enable {
+        (lib.mkIf nixosConfig.modules.desktopportal.termfilechooser.enable {
           ".config/xdg-desktop-portal-termfilechooser/config".text = ''
             [filechooser]
             cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
@@ -186,7 +402,7 @@ in
             save_mode = last
           '';
         })
-        (lib.mkIf config.homemodules.git.enable {
+        (lib.mkIf config.modules.git.enable {
           ".ssh/allowed_signers".text = "* ${publicKeys.${username}.ssh}";
         })
         (lib.mkIf config.programs.navi.enable {
@@ -224,15 +440,6 @@ in
                 "start_app_minimized": true
             }
           '';
-
-          # KeePassXC
-          ".config/QtProject.conf".text = ''
-            [FileDialog]
-            history=@Invalid()
-            lastVisited=file:///home/christoph/Documents/KeePass
-            qtVersion=5.15.18
-            viewMode=Detail
-          '';
         })
       ];
 
@@ -247,13 +454,366 @@ in
       };
 
       # Add stuff for your user as you see fit:
-      # packages = with pkgs; []; # Configured in homemodules/packages
+      # TODO: Make the headless installations smaller
+      packages = with pkgs;
+        lib.mkMerge [
+          [
+            # Shell utils
+            (ripgrep.override {withPCRE2 = true;}) # fast as fuck
+            gdu # Alternative to du-dust (I like it better)
+            duf # Disk usage analyzer (for all disk overview)
+            sd # Sed alternative
+            fclones # Duplicate file finder
+            tealdeer # Very fast tldr (so readable man)
+            killall
+            atool # Archive preview
+            ouch # Unified compression/decompression
+            ffmpegthumbnailer # Video thumbnails
+            mediainfo # Media meta information
+            file # File meta information
+            unrar # Cooler WinRar
+            p7zip # Zip stuff
+            unzip # Unzip stuff
+            progress # Find coreutils processes and show their progress
+            tokei # Text file statistics in a project
+            playerctl # Media player control
+            pastel # Color tools
+            nvd # Nix rebuild diff
+            nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options
+            nix-tree # Browse the nix store sorted by size (gdu for closures)
+            nurl # Generate nix fetcher sections based on URLs
+            python313 # Nicer scripting than bash
+            binsider # Analyze binaries
+            lazyjournal # Journalctl viewer
+            systemctl-tui
+            restic # Backups
+
+            # Hardware/Software info
+            pciutils # lspci
+            mesa-demos # OpenGL info
+            wayland-utils # wayland-info
+            clinfo # OpenCL info
+            vulkan-tools # vulkaninfo
+            libva-utils # vainfo
+            vdpauinfo # Video-Decode and Presentation API for Unix info
+            hwloc # Generate CPU topology diagram
+            lm_sensors # Readout hardware sensors
+            acpica-tools # Dump ACPI tables etc.
+            smartmontools # Disk health
+            nvme-cli # NVME disk health
+
+            # Video/Image/Audio utils
+            ffmpeg-full # I love ffmpeg (including ffplay)
+            ffmpeg-normalize # Normalize audio
+            imagemagick # Convert image (magic)
+            mp3val # Validate mp3 files
+            flac # Validate flac files
+            spotdl
+
+            # Document utils
+            poppler-utils # pdfunite
+            graphviz # generate graphs from code
+            d2 # generate diagrams from code
+            plantuml # generate diagrams
+            gnuplot # generate function plots
+            pdf2svg # extract vector graphics from pdf
+            pandoc # document converting madness
+
+            # Networking
+            dig # Make DNS requests
+            tcpdump # Listen in on TCP traffic
+            traceroute # "Follow" a packet
+            gping # ping with graph
+            curlie # curl a'la httpie
+            wget # download that shit
+            dogdns # dns client
+            rsync # cp on steroids
+            rclone # Rsync for cloud
+            httpie # Cool http client
+            cifs-utils # Mount samba shares
+            nfs-utils # Mount NFS shares
+            sshfs # Mount remote directories via SSH
+
+            # Run unpatched binaries on NixOS
+            # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
+            # Usage: "nix-alien-ld -- <Executable>".
+            inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
+
+            # Search nixpkgs
+            inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
+
+            # Use NixCommunity binary cache
+            cachix
+          ]
+          (lib.mkIf (!headless) [
+            ripdrag # drag & drop from terminal
+            veracrypt
+
+            # Proton
+            protonvpn-gui
+            protonmail-bridge-gui
+
+            # GUI stuff
+            nautilus # Just in case
+            signal-desktop
+            anki
+            font-manager # Previews fonts, but doesn't set them
+            nextcloud-client
+            keepassxc
+            thunderbird # TODO: Email module
+            obsidian
+            zotero
+            zeal # docs browser
+            helvum
+            vlc
+            audacity
+            ferdium
+            gparted
+            tidal-hifi
+            tidal-dl-ng
+            picard
+            handbrake
+            teamspeak6-client
+
+            # Office
+            kdePackages.wacomtablet # For xournalpp/krita
+            xournalpp # Write with a pen, like old people
+            hunspell # I cna't type
+            hunspellDicts.en_US
+            hunspellDicts.de_DE
+          ])
+        ];
     };
 
     # home.file.".options-doc".source = "${pkgs.modules-options-doc}";
 
     # Packages with extra options managed by HomeManager natively
     programs = {
+      # The home-manager management tool.
+      # Will only be enabled if HM is installed standalone.
+      home-manager.enable = true;
+
+      bat = {
+        enable = true;
+
+        themes = {
+          catppuccin-latte = {
+            src = pkgs.fetchFromGitHub {
+              owner = "catppuccin";
+              repo = "bat";
+              rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+              sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+            };
+            file = "Catppuccin-latte.tmTheme";
+          };
+        };
+
+        config = {
+          theme = "catppuccin-latte";
+        };
+      };
+
+      cava = {
+        enable = !headless;
+
+        settings = {
+          general = {
+            framerate = 60; # default 60
+            autosens = 1; # default 1
+            sensitivity = 100; # default 100
+            lower_cutoff_freq = 50; # not passed to cava if not provided
+            higher_cutoff_freq = 10000; # not passed to cava if not provided
+          };
+
+          smoothing = {
+            noise_reduction = 77; # default 77
+            monstercat = false; # default false
+            waves = false; # default false
+          };
+
+          color = {
+            # https://github.com/catppuccin/cava/blob/main/themes/latte-transparent.cava
+            gradient = 1;
+
+            gradient_color_1 = "'${color.hexS.teal}'";
+            gradient_color_2 = "'${color.hexS.sky}'";
+            gradient_color_3 = "'${color.hexS.sapphire}'";
+            gradient_color_4 = "'${color.hexS.blue}'";
+            gradient_color_5 = "'${color.hexS.mauve}'";
+            gradient_color_6 = "'${color.hexS.pink}'";
+            gradient_color_7 = "'${color.hexS.maroon}'";
+            gradient_color_8 = "'${color.hexS.red}'";
+          };
+        };
+      };
+
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+      };
+
+      eza = {
+        enable = true;
+        enableFishIntegration = config.modules.fish.enable;
+      };
+
+      # TODO: Module
+      fastfetch = {
+        enable = true;
+
+        settings = {
+          logo = {
+            padding = {
+              top = 3;
+              left = 1;
+              right = 2;
+            };
+          };
+
+          display = {
+            separator = "";
+            key.width = 17;
+          };
+
+          # Box Drawing: ╭ ─ ╮ ╰ ╯ │
+          modules = [
+            # Title
+            {
+              type = "title";
+              format = "{#1}╭─── {#}{user-name-colored}";
+            }
+
+            # System Information
+            {
+              type = "custom";
+              format = "{#1}│ {#}System Information";
+            }
+            {
+              type = "os";
+              key = "{#separator}│  {#keys}󰍹 OS";
+            }
+            {
+              type = "kernel";
+              key = "{#separator}│  {#keys}󰒋 Kernel";
+            }
+            {
+              type = "bootmgr";
+              key = "{#separator}│  {#keys}󰒋 BootMGR";
+            }
+            {
+              type = "uptime";
+              key = "{#separator}│  {#keys}󰅐 Uptime";
+            }
+            {
+              type = "packages";
+              key = "{#separator}│  {#keys}󰏖 Packages";
+              # format = "{all}";
+            }
+            {
+              type = "custom";
+              format = "{#1}│";
+            }
+
+            # Desktop Environment
+            {
+              type = "custom";
+              format = "{#1}│ {#}Desktop Environment";
+            }
+            {
+              type = "de";
+              key = "{#separator}│  {#keys}󰧨 DE";
+            }
+            {
+              type = "wm";
+              key = "{#separator}│  {#keys}󱂬 WM";
+            }
+            {
+              type = "wmtheme";
+              key = "{#separator}│  {#keys}󰉼 Theme";
+            }
+            {
+              type = "display";
+              key = "{#separator}│  {#keys}󰹑 Resolution";
+            }
+            {
+              type = "shell";
+              key = "{#separator}│  {#keys}󰞷 Shell";
+            }
+            {
+              type = "terminalfont";
+              key = "{#separator}│  {#keys}󰛖 Font";
+            }
+            {
+              type = "icons";
+              key = "{#separator}│  {#keys} Icons";
+            }
+            {
+              type = "cursor";
+              key = "{#separator}│  {#keys}󰆽 Cursor";
+            }
+            {
+              type = "custom";
+              format = "{#1}│";
+            }
+
+            # Hardware Information
+            {
+              type = "custom";
+              format = "{#1}│ {#}Hardware Information";
+            }
+            {
+              type = "board";
+              key = "{#separator}│  {#keys} Board";
+            }
+            {
+              type = "cpu";
+              key = "{#separator}│  {#keys}󰻠 CPU";
+            }
+            {
+              type = "gpu";
+              key = "{#separator}│  {#keys}󰢮 GPU";
+            }
+            {
+              type = "memory";
+              key = "{#separator}│  {#keys}󰍛 Memory";
+            }
+            # {
+            #   type = "disk";
+            #   key = "{#separator}│  {#keys}󰋊 Disk (/)";
+            #   folders = "/";
+            # }
+            # {
+            #   type = "disk";
+            #   key = "{#separator}│  {#keys}󰋊 Disk (~/Games)";
+            #   folders = "/home/christoph/Games";
+            # }
+            {
+              type = "btrfs";
+              key = "{#separator}│  {#keys}󰋊 BTRFS";
+            }
+            {
+              type = "custom";
+              format = "{#1}│";
+            }
+
+            # Colors Footer
+            {
+              type = "colors";
+              key = "{#separator}╰─── {#1}";
+              keyWidth = 6;
+              symbol = "circle";
+            }
+          ];
+        };
+      };
+
+      fd.enable = true;
+
+      fzf = {
+        enable = true;
+        enableFishIntegration = config.modules.fish.enable;
+      };
+
       imv = {
         enable = !headless;
         settings = {
@@ -269,7 +829,7 @@ in
 
       keychain = {
         enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
+        enableFishIntegration = config.modules.fish.enable;
         enableXsessionIntegration = !headless;
         keys = ["id_ed25519"];
       };
@@ -281,9 +841,14 @@ in
         };
       };
 
+      navi = {
+        enable = true;
+        enableFishIntegration = config.modules.fish.enable;
+      };
+
       nix-index = {
         enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
+        enableFishIntegration = config.modules.fish.enable;
       };
 
       nushell.enable = false;
@@ -310,6 +875,73 @@ in
       #     pointer
       #   ];
       # };
+
+      ssh = {
+        enable = true;
+        enableDefaultConfig = false;
+
+        matchBlocks = {
+          "*" = {
+            forwardAgent = false;
+            addKeysToAgent = "no";
+            compression = true;
+            serverAliveInterval = 0;
+            serverAliveCountMax = 3;
+            hashKnownHosts = false;
+            userKnownHostsFile = "~/.ssh/known_hosts";
+            controlMaster = "no";
+            controlPath = "~/.ssh/master-%r@%n:%p";
+            controlPersist = "no";
+          };
+          "nixinator" = {
+            user = "christoph";
+            hostname = "192.168.86.50";
+          };
+          "servenix" = {
+            user = "christoph";
+            hostname = "local.chriphost.de";
+          };
+          "thinknix" = {
+            user = "christoph";
+            hostname = "think.chriphost.de";
+          };
+          "vps" = {
+            user = "root";
+            hostname = "vps.chriphost.de";
+          };
+        };
+      };
+
+      tmux = {
+        enable = false;
+
+        clock24 = true;
+        escapeTime = 0; # Delay after pressing escape
+        # keyMode = "vi";
+        terminal = "xterm-256color";
+
+        plugins = with pkgs; [
+          {
+            plugin = tmuxPlugins.catppuccin;
+            extraConfig = ''
+              set -g @plugin 'catppuccin/tmux'
+              set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
+            '';
+          }
+        ];
+
+        extraConfig = ''
+          set -g default-terminal "xterm-256color"
+          set-option -ga terminal-overrides ",xterm-256color:Tc"
+        '';
+      };
+
+      yt-dlp.enable = true;
+
+      zoxide = {
+        enable = true;
+        enableFishIntegration = config.modules.fish.enable;
+      };
     };
 
     services = {
@@ -360,18 +992,14 @@ in
             # Force Wayland by default
             # Context.sockets = ["wayland" "!x11" "!fallback-x11"]; # NOTE: Makes discord + steam crash
 
-            Context.filesystems = [
+            Context.filesystems = ["/nix/store:ro"];
-              "/nix/store:ro"
-              "${config.home.homeDirectory}/.themes:ro"
-              "${config.home.homeDirectory}/.config/gtk-4.0:ro"
-            ];
 
             Environment = {
               # Fix un-themed cursor in some Wayland apps
               XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
 
               # Force correct theme for some GTK apps
-              GTK_THEME = config.gtk.theme.name;
+              GTK_THEME = "Adwaita:light";
             };
           };
 

home/christoph/nixinator/default.nix

@@ -3,228 +3,69 @@
   pkgs,
   nixosConfig,
   config,
-  hostname,
   lib,
   mylib,
   username,
-  inputs,
   ...
 }: {
+  imports = [
+    ../../modules
+  ];
+
   config = {
-    homemodules = {
+    modules = {
       btop.cuda = true;
 
       # This has been relocated here from the default config,
       # because it forces en-US keyboard layout.
       fcitx.enable = true;
 
-      waybar.monitors = ["DP-1" "DP-2"];
+      hyprland = {
-      vscode.enable = true;
+        keyboard = {
-      zed.enable = true;
+          layout = "us";
-    };
+          variant = "altgr-intl";
+          option = "nodeadkeys";
+        };
 
-    programs = {
+        monitors = {
-      claude-code = {
+          "DP-1" = {
-        enable = true;
+            width = 3440;
-        enableMcpIntegration = true;
+            height = 1440;
-      };
+            rate = 165;
+            x = 1920;
+            y = 0;
+            scale = 1;
+          };
 
-      mcp = {
+          "DP-2" = {
-        enable = true;
+            width = 1920;
-        servers = {
+            height = 1080;
-          nixos = {
+            rate = 60;
-            command = "uvx";
+            x = 0;
-            args = ["mcp-nixos"];
+            y = 0;
-          };
+            scale = 1;
-          svelte = {
-            # claude mcp add -t stdio -s [scope] svelte -- npx -y @sveltejs/mcp
-            command = "npx";
-            args = ["-y" "@sveltejs/mcp"];
-            type = "stdio";
-          };
-          shadcn = {
-            # npx shadcn@latest mcp init --client claude
-            command = "npx";
-            args = ["-y" "shadcn@latest" "mcp"];
           };
         };
-      };
 
-      opencode = {
+        workspaces = {
-        enable = true;
+          "DP-1" = [1 2 3 4 5 6 7 8 9];
-        enableMcpIntegration = true;
+          "DP-2" = [10];
-        extraPackages = with pkgs; [
+        };
-          # opencode-claude-auth # Installed using npm
+
+        autostart = {
+          delayed = [
+            "fcitx5"
+          ];
+        };
+
+        floating = [
+          {
+            class = "fcitx";
+          }
         ];
-
-        # Writes opencode.json
-        settings = {
-          attachment = {
-            image = {
-              auto_resize = true;
-              max_width = 2000;
-              max_height = 2000;
-              max_base64_bytes = 5242880;
-            };
-          };
-          autoupdate = false;
-          compaction = {
-            auto = true;
-            prune = true;
-            reserved = 10000;
-          };
-          default_agent = "plan";
-          enabled_providers = [
-            "opencode"
-            "opencode-go"
-            "anthropic"
-          ];
-          formatter = {
-            nixfmt = {
-              disabled = true;
-            };
-            alejandra = {
-              command = ["alejandra" "$FILE"];
-              extensions = [".nix"];
-            };
-            perltidy = {
-              command = ["perltidy" "$FILE"];
-              extensions = [".pl"];
-            };
-          };
-          lsp = {
-            nixd = {
-              command = ["nixd"];
-              extensions = [".nix"];
-              initialization = {
-                preferences = {
-                  nixd = {
-                    nixpkgs = {expr = "import <nixpkgs> {}";};
-                    options = {
-                      nixos = {expr = "(builtins.getFlake \"/home/${username}/NixFlake\").nixosConfigurations.${hostname}.options";};
-                      home-manager = {expr = "(builtins.getFlake \"/home/${username}/NixFlake\").nixosConfigurations.\"${hostname}\".options.home-manager.users.type.getSubOptions []";};
-                    };
-                    diagnostic = {
-                      suppress = ["sema-escaping-with" "var-bind-to-this" "escaping-this-with"];
-                    };
-                  };
-                };
-              };
-            };
-            perlnavigator = {
-              command = ["perlnavigator"];
-              extensions = [".pl"];
-              initialization = {
-                preferences = {};
-              };
-            };
-            # perlpls = {
-            #   command = ["pls"];
-            #   extensions = [".pl"];
-            #   initialization = {
-            #     preferences = {
-            #       perl = {
-            #         perlcritic = {enabled = false;};
-            #         syntax = {enabled = true;};
-            #       };
-            #     };
-            #   };
-            # };
-            r-language-server = {
-              command = ["R" "--no-echo" "-e" "languageserver::run()"];
-              extensions = [".r" ".rmd" ".quarto"];
-            };
-          };
-          permission = {
-            "*" = "ask";
-            "bash" = {
-              "*" = "ask";
-              "ls *" = "allow";
-              "find *" = "ask"; # Don't want find -exec
-              "file *" = "allow";
-              "wc *" = "allow";
-              "grep *" = "allow";
-              "rg *" = "allow";
-              "test *" = "allow";
-              "echo *" = "allow";
-              "which *" = "allow";
-              "pwd *" = "allow";
-              "dirname *" = "allow";
-              "basename *" = "allow";
-              "readlink *" = "allow";
-
-              "cat *.env" = "deny";
-              "cat *.env.*" = "deny";
-              "cat *.env.example" = "allow";
-              "printenv *" = "deny";
-              "env *" = "deny";
-
-              "nix eval *" = "allow";
-              "nix flake metadata *" = "allow";
-              "nix flake show *" = "allow";
-              "nix path-info *" = "allow";
-              "nix why-depends *" = "allow";
-              "nix derivation show *" = "allow";
-              "nix store ping *" = "allow";
-              "nix stire diff-closures *" = "allow";
-
-              "git status *" = "allow";
-              "git log *" = "allow";
-              "git diff *" = "allow";
-            };
-            "external_directory" = {
-              "/nix/store/**" = "allow";
-              "/tmp" = "allow";
-              "/tmp/*" = "allow";
-            };
-            "read" = {
-              "*" = "allow";
-              "*.env" = "deny";
-              "*.env.*" = "deny";
-              "*.env.example" = "allow";
-            };
-            "grep" = "allow";
-            "glob" = "allow";
-            "lsp" = "allow";
-            "skill" = "allow";
-            "task" = "ask";
-            "todowrite" = "allow";
-            "webfetch" = "allow";
-            "websearch" = "allow";
-            "question" = "allow";
-          };
-          plugin = [
-            "opencode-claude-auth@latest" # https://github.com/griffinmartin/opencode-claude-auth
-            "@tarquinen/opencode-dcp@latest" # better compacting
-            # "@slkiser/opencode-quota"
-          ];
-          share = "disabled";
-          shell = "fish";
-          snapshot = false;
-          watcher = {
-            ignore = ["node_modules/**" "dist/**" ".git/**"];
-          };
-        };
-
-        # Writes tui.json
-        tui = {
-          theme = "system";
-          diff_style = "auto";
-          mouse = true;
-          attention = {
-            enabled = true;
-            notifications = true;
-            sound = true;
-            volume = "0.3";
-          };
-        };
-
-        agents = {};
-        commands = {};
-        context = '''';
-        skills = {};
-        tools = {};
       };
+
+      waybar.monitor = "DP-1";
     };
 
     home = let
@@ -276,68 +117,52 @@
         # Intel FPGA design software
         # quartus-prime-lite
 
-        jetbrains.clion
+        # jetbrains.clion
         # jetbrains.rust-rover
         # jetbrains.pycharm-professional
         # jetbrains.idea-ultimate
         # jetbrains.webstorm
         # jetbrains.rider
-        # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra)
-        # zed-editor # Using module
-        # vscode # Using module
 
         # Unity Stuff
+        # TODO: Unity module
         # unityhub
         # rider-unity
         # dotnetCore
         # mono
         # steam-run-free # nix-alien doesn't seem to run unity apps, this does...
 
-        inputs.hytale-launcher.packages.${pkgs.stdenv.hostPlatform.system}.default
         (blender.override {cudaSupport = true;})
         godot_4
         (obs-studio.override {cudaSupport = true;})
         kdePackages.kdenlive
-        # davinci-resolve
         krita
         makemkv
         lrcget
-        # msty
+        msty
         # jellyfin-media-player # CVE, can't install
-        jellyfin-desktop
         jellyfin-mpv-shim
-        # tidal-hifi
-        # tidal-dl-ng # TODO: Borked
-        # spotdl
-        tiddl
-        picard
-        handbrake
-        teamspeak6-client
-
-        # virt-manager # use system program option
-        virt-viewer
-        gnome-boxes # doesn't list VMs imported using virsh
 
         steam-devices-udev-rules
       ];
 
       file = lib.mkMerge [
-        {
+        # {
-          # ".local/share/applications/jetbrains-rider.desktop".source = let
+        #   ".local/share/applications/jetbrains-rider.desktop".source = let
-          #   desktopFile = pkgs.makeDesktopItem {
+        #     desktopFile = pkgs.makeDesktopItem {
-          #     name = "jetbrains-rider";
+        #       name = "jetbrains-rider";
-          #     desktopName = "Rider";
+        #       desktopName = "Rider";
-          #     exec = "\"${rider-unity}/bin/rider\"";
+        #       exec = "\"${rider-unity}/bin/rider\"";
-          #     icon = "rider";
+        #       icon = "rider";
-          #     type = "Application";
+        #       type = "Application";
-          #     # Don't show desktop icon in search or run launcher
+        #       # Don't show desktop icon in search or run launcher
-          #     extraConfig.NoDisplay = "true";
+        #       extraConfig.NoDisplay = "true";
-          #   };
+        #     };
-          # in "${desktopFile}/share/applications/jetbrains-rider.desktop";
+        #   in "${desktopFile}/share/applications/jetbrains-rider.desktop";
-
+        #
-          ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
+        #   ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
-            ../../../config/mangohud/MangoHud.conf;
+        #     ../../../config/mangohud/MangoHud.conf;
-        }
+        # }
         (lib.optionalAttrs (mylib.modules.contains config.home.packages pkgs.makemkv) {
           ".MakeMKV/settings.conf".source =
             config.lib.file.mkOutOfStoreSymlink
@@ -351,21 +176,46 @@
     };
 
     services = {
+      ollama = {
+        enable = true;
+        acceleration = "cuda";
+        # home = "/var/lib/ollama";
+
+        # loadModels = [
+        #   "deepseek-r1:8b" # Default
+        #   "deepseek-r1:14b"
+        # ];
+
+        # https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server
+        environmentVariables = {
+          # Flash Attention is a feature of most modern models
+          # that can significantly reduce memory usage as the context size grows.
+          OLLAMA_FLASH_ATTENTION = "1";
+
+          # The K/V context cache can be quantized to significantly
+          # reduce memory usage when Flash Attention is enabled.
+          OLLAMA_KV_CACHE_TYPE = "q8_0"; # f16, q8_0 q4_0
+
+          # To improve Retrieval-Augmented Generation (RAG) performance, you should increase
+          # the context length to 8192+ tokens in your Ollama model settings.
+          OLLAMA_CONTEXT_LENGTH = "8192";
+        };
+
+        host = "127.0.0.1";
+        port = 11434;
+      };
+
       flatpak = {
         packages = [
-          "com.valvesoftware.Steam"
+          # "com.valvesoftware.Steam"
-          "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
+          # "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
-          "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"
           # "net.davidotek.pupgui2"
+          # "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
+          # "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
 
           "org.prismlauncher.PrismLauncher"
           "com.usebottles.bottles"
-          "io.github.lawstorant.boxflat"
+          # "io.github.lawstorant.boxflat"
-
-          "org.onlyoffice.desktopeditors"
 
           # "com.unity.UnityHub"
         ];
@@ -395,13 +245,6 @@
             ];
           };
 
-          "com.vysp3r.ProtonPlus".Context = {
-            filesystems = [
-              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
-              "${config.home.homeDirectory}/Games"
-            ];
-          };
-
           "com.usebottles.bottles".Context = {
             filesystems = [
               "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"

home/christoph/nixtop/default.nix

@@ -1,39 +1,39 @@
 # Here goes the stuff that will only be enabled on the laptop
-{pkgs, ...}: {
+{...}: {
+  imports = [
+    ../../modules
+  ];
+
   config = {
-    homemodules = {
+    modules = {
-      # TODO: Niri config (needs to modularize niri module)
+      hyprland = {
+        keyboard = {
+          layout = "us";
+          variant = "altgr-intl";
+          option = "nodeadkeys";
+        };
 
-      # hyprland = {
+        monitors = {
-      #   keyboard = {
+          "eDP-1" = {
-      #     layout = "us";
+            width = 1920;
-      #     variant = "altgr-intl";
+            height = 1080;
-      #     option = "nodeadkeys";
+            rate = 60;
-      #   };
+            x = 0;
-      #
+            y = 0;
-      #   monitors = {
+            scale = 1;
-      #     "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"];
+        workspaces = {
+          "eDP-1" = [1 2 3 4 5 6 7 8 9];
+        };
+      };
+
+      waybar.monitor = "eDP-1";
     };
 
     home = {
-      packages = with pkgs; [
+      # packages = with pkgs; [];
-        brightnessctl
-      ];
 
       # Do not change.
       # This marks the version when NixOS was installed for backwards-compatibility.

home/christoph/servenix/default.nix

@@ -6,8 +6,12 @@
   username,
   ...
 }: {
+  imports = [
+    ../../modules
+  ];
+
   config = {
-    homemodules = {
+    modules = {
       btop.cuda = true;
     };
 

home/christoph/thinknix/default.nix

@@ -6,6 +6,10 @@
   username,
   ...
 }: {
+  imports = [
+    ../../modules
+  ];
+
   config = {
     home.packages = with pkgs; [
       docker-compose

home/homemodules/0_template/default.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) TEMPLATE color;
-in {
-  options.homemodules.TEMPLATE = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf TEMPLATE.enable {};
-}

home/homemodules/1_deprecated/hyprland/hyprland-nixinator.nix

@@ -1,44 +0,0 @@
-{
-  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";
-    }
-  ];
-}

home/homemodules/1_deprecated/hyprland/hyprland.nix

@@ -1,186 +0,0 @@
-{
-  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"
-  ];
-}

home/homemodules/1_deprecated/niri/catppuccin-mauve.json

@@ -1,555 +0,0 @@
-{
-  "id": "catppuccin",
-  "name": "Catppuccin",
-  "version": "1.0.0",
-  "author": "Avenge Media",
-  "description": "Soothing pastel theme for the high-spirited",
-  "dark": {},
-  "light": {},
-  "variants": {
-    "type": "multi",
-    "defaults": {
-      "dark": {
-        "accent": "mauve",
-        "flavor": "mocha"
-      },
-      "light": {
-        "accent": "mauve",
-        "flavor": "latte"
-      }
-    },
-    "flavors": [
-      {
-        "id": "mocha",
-        "name": "Mocha",
-        "dark": {
-          "surface": "#181825",
-          "surfaceText": "#cdd6f4",
-          "surfaceVariant": "#1e1e2e",
-          "surfaceVariantText": "#a6adc8",
-          "background": "#1e1e2e",
-          "backgroundText": "#cdd6f4",
-          "outline": "#6c7086",
-          "surfaceContainer": "#1e1e2e",
-          "surfaceContainerHigh": "#313244",
-          "surfaceContainerHighest": "#45475a",
-          "error": "#f38ba8",
-          "warning": "#fab387",
-          "info": "#89b4fa"
-        },
-        "light": {}
-      },
-      {
-        "id": "macchiato",
-        "name": "Macchiato",
-        "dark": {
-          "surface": "#1e2030",
-          "surfaceText": "#cad3f5",
-          "surfaceVariant": "#24273a",
-          "surfaceVariantText": "#a5adcb",
-          "background": "#24273a",
-          "backgroundText": "#cad3f5",
-          "outline": "#6e738d",
-          "surfaceContainer": "#24273a",
-          "surfaceContainerHigh": "#363a4f",
-          "surfaceContainerHighest": "#494d64",
-          "error": "#ed8796",
-          "warning": "#f5a97f",
-          "info": "#8aadf4"
-        },
-        "light": {}
-      },
-      {
-        "id": "frappe",
-        "name": "Frappé",
-        "dark": {
-          "surface": "#292c3c",
-          "surfaceText": "#c6d0f5",
-          "surfaceVariant": "#303446",
-          "surfaceVariantText": "#a5adce",
-          "background": "#303446",
-          "backgroundText": "#c6d0f5",
-          "outline": "#737994",
-          "surfaceContainer": "#303446",
-          "surfaceContainerHigh": "#414559",
-          "surfaceContainerHighest": "#51576d",
-          "error": "#e78284",
-          "warning": "#ef9f76",
-          "info": "#8caaee"
-        },
-        "light": {}
-      },
-      {
-        "id": "latte",
-        "name": "Latte",
-        "dark": {},
-        "light": {
-          "surface": "#e6e9ef",
-          "surfaceText": "#4c4f69",
-          "surfaceVariant": "#eff1f5",
-          "surfaceVariantText": "#6c6f85",
-          "background": "#eff1f5",
-          "backgroundText": "#4c4f69",
-          "outline": "#9ca0b0",
-          "surfaceContainer": "#e6e9ef",
-          "surfaceContainerHigh": "#ccd0da",
-          "surfaceContainerHighest": "#bcc0cc",
-          "error": "#d20f39",
-          "warning": "#fe640b",
-          "info": "#1e66f5"
-        }
-      }
-    ],
-    "accents": [
-      {
-        "frappe": {
-          "primary": "#f2d5cf",
-          "primaryText": "#303446",
-          "primaryContainer": "#76534f",
-          "secondary": "#eebebe",
-          "surfaceTint": "#3a2f33"
-        },
-        "id": "rosewater",
-        "latte": {
-          "primary": "#dc8a78",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#f6e7e3",
-          "secondary": "#dd7878",
-          "surfaceTint": "#f6e7e3"
-        },
-        "macchiato": {
-          "primary": "#f4dbd6",
-          "primaryText": "#24273a",
-          "primaryContainer": "#7a5853",
-          "secondary": "#f0c6c6",
-          "surfaceTint": "#3b3035"
-        },
-        "mocha": {
-          "primary": "#f5e0dc",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#7d5d56",
-          "secondary": "#f2cdcd",
-          "surfaceTint": "#3d3237"
-        },
-        "name": "Rosewater"
-      },
-      {
-        "frappe": {
-          "primary": "#eebebe",
-          "primaryText": "#303446",
-          "primaryContainer": "#744f52",
-          "secondary": "#f2d5cf",
-          "surfaceTint": "#392e31"
-        },
-        "id": "flamingo",
-        "latte": {
-          "primary": "#dd7878",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#f6e5e5",
-          "secondary": "#dc8a78",
-          "surfaceTint": "#f6e5e5"
-        },
-        "macchiato": {
-          "primary": "#f0c6c6",
-          "primaryText": "#24273a",
-          "primaryContainer": "#775256",
-          "secondary": "#f4dbd6",
-          "surfaceTint": "#3a3033"
-        },
-        "mocha": {
-          "primary": "#f2cdcd",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#7a555a",
-          "secondary": "#f5e0dc",
-          "surfaceTint": "#3c3134"
-        },
-        "name": "Flamingo"
-      },
-      {
-        "frappe": {
-          "primary": "#f4b8e4",
-          "primaryText": "#303446",
-          "primaryContainer": "#793d65",
-          "secondary": "#ca9ee6",
-          "surfaceTint": "#3c2e37"
-        },
-        "id": "pink",
-        "latte": {
-          "primary": "#ea76cb",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#f7d7ee",
-          "secondary": "#8839ef",
-          "surfaceTint": "#f7d7ee"
-        },
-        "macchiato": {
-          "primary": "#f5bde6",
-          "primaryText": "#24273a",
-          "primaryContainer": "#7a3e67",
-          "secondary": "#c6a0f6",
-          "surfaceTint": "#3d2f38"
-        },
-        "mocha": {
-          "primary": "#f5c2e7",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#7a3f69",
-          "secondary": "#cba6f7",
-          "surfaceTint": "#3d2f39"
-        },
-        "name": "Pink"
-      },
-      {
-        "frappe": {
-          "primary": "#ca9ee6",
-          "primaryText": "#303446",
-          "primaryContainer": "#542f79",
-          "secondary": "#babbf1",
-          "surfaceTint": "#33293c"
-        },
-        "id": "mauve",
-        "latte": {
-          "primary": "#8839ef",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#eadcff",
-          "secondary": "#7287fd",
-          "surfaceTint": "#eadcff"
-        },
-        "macchiato": {
-          "primary": "#c6a0f6",
-          "primaryText": "#24273a",
-          "primaryContainer": "#532f7d",
-          "secondary": "#b7bdf8",
-          "surfaceTint": "#32293e"
-        },
-        "mocha": {
-          "primary": "#cba6f7",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#55307f",
-          "secondary": "#b4befe",
-          "surfaceTint": "#33293f"
-        },
-        "name": "Mauve"
-      },
-      {
-        "frappe": {
-          "primary": "#e78284",
-          "primaryText": "#303446",
-          "primaryContainer": "#692233",
-          "secondary": "#ea999c",
-          "surfaceTint": "#38272e"
-        },
-        "id": "red",
-        "latte": {
-          "primary": "#d20f39",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#f6d0d6",
-          "secondary": "#e64553",
-          "surfaceTint": "#f6d0d6"
-        },
-        "macchiato": {
-          "primary": "#ed8796",
-          "primaryText": "#24273a",
-          "primaryContainer": "#6c2336",
-          "secondary": "#ee99a0",
-          "surfaceTint": "#3a2830"
-        },
-        "mocha": {
-          "primary": "#f38ba8",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#6f2438",
-          "secondary": "#eba0ac",
-          "surfaceTint": "#3c2930"
-        },
-        "name": "Red"
-      },
-      {
-        "frappe": {
-          "primary": "#ea999c",
-          "primaryText": "#303446",
-          "primaryContainer": "#69333d",
-          "secondary": "#e78284",
-          "surfaceTint": "#382a2f"
-        },
-        "id": "maroon",
-        "latte": {
-          "primary": "#e64553",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#f7d8dc",
-          "secondary": "#d20f39",
-          "surfaceTint": "#f7d8dc"
-        },
-        "macchiato": {
-          "primary": "#ee99a0",
-          "primaryText": "#24273a",
-          "primaryContainer": "#6b343f",
-          "secondary": "#ed8796",
-          "surfaceTint": "#392b30"
-        },
-        "mocha": {
-          "primary": "#eba0ac",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#6d3641",
-          "secondary": "#f38ba8",
-          "surfaceTint": "#3a2c31"
-        },
-        "name": "Maroon"
-      },
-      {
-        "frappe": {
-          "primary": "#ef9f76",
-          "primaryText": "#303446",
-          "primaryContainer": "#6d3e24",
-          "secondary": "#e5c890",
-          "surfaceTint": "#382e27"
-        },
-        "id": "peach",
-        "latte": {
-          "primary": "#fe640b",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#ffe4d5",
-          "secondary": "#df8e1d",
-          "surfaceTint": "#ffe4d5"
-        },
-        "macchiato": {
-          "primary": "#f5a97f",
-          "primaryText": "#24273a",
-          "primaryContainer": "#704025",
-          "secondary": "#eed49f",
-          "surfaceTint": "#3a2f28"
-        },
-        "mocha": {
-          "primary": "#fab387",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#734226",
-          "secondary": "#f9e2af",
-          "surfaceTint": "#3b3028"
-        },
-        "name": "Peach"
-      },
-      {
-        "frappe": {
-          "primary": "#e5c890",
-          "primaryText": "#303446",
-          "primaryContainer": "#68542c",
-          "secondary": "#a6d189",
-          "surfaceTint": "#383428"
-        },
-        "id": "yellow",
-        "latte": {
-          "primary": "#df8e1d",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#fff6d6",
-          "secondary": "#40a02b",
-          "surfaceTint": "#fff6d6"
-        },
-        "macchiato": {
-          "primary": "#eed49f",
-          "primaryText": "#24273a",
-          "primaryContainer": "#6b572e",
-          "secondary": "#a6da95",
-          "surfaceTint": "#393529"
-        },
-        "mocha": {
-          "primary": "#f9e2af",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#6e5a2f",
-          "secondary": "#a6e3a1",
-          "surfaceTint": "#3a362a"
-        },
-        "name": "Yellow"
-      },
-      {
-        "frappe": {
-          "primary": "#a6d189",
-          "primaryText": "#303446",
-          "primaryContainer": "#2d5932",
-          "secondary": "#81c8be",
-          "surfaceTint": "#2a362b"
-        },
-        "id": "green",
-        "latte": {
-          "primary": "#40a02b",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#dff4e0",
-          "secondary": "#179299",
-          "surfaceTint": "#dff4e0"
-        },
-        "macchiato": {
-          "primary": "#a6da95",
-          "primaryText": "#24273a",
-          "primaryContainer": "#2e5c34",
-          "secondary": "#8bd5ca",
-          "surfaceTint": "#2b372c"
-        },
-        "mocha": {
-          "primary": "#a6e3a1",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#2f5f36",
-          "secondary": "#94e2d5",
-          "surfaceTint": "#2b382c"
-        },
-        "name": "Green"
-      },
-      {
-        "frappe": {
-          "primary": "#81c8be",
-          "primaryText": "#303446",
-          "primaryContainer": "#2c5853",
-          "secondary": "#99d1db",
-          "surfaceTint": "#2a3634"
-        },
-        "id": "teal",
-        "latte": {
-          "primary": "#179299",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#daf3f1",
-          "secondary": "#04a5e5",
-          "surfaceTint": "#daf3f1"
-        },
-        "macchiato": {
-          "primary": "#8bd5ca",
-          "primaryText": "#24273a",
-          "primaryContainer": "#2d5b56",
-          "secondary": "#91d7e3",
-          "surfaceTint": "#2b3735"
-        },
-        "mocha": {
-          "primary": "#94e2d5",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#2e5e59",
-          "secondary": "#89dceb",
-          "surfaceTint": "#2b3836"
-        },
-        "name": "Teal"
-      },
-      {
-        "frappe": {
-          "primary": "#99d1db",
-          "primaryText": "#303446",
-          "primaryContainer": "#245464",
-          "secondary": "#85c1dc",
-          "surfaceTint": "#283438"
-        },
-        "id": "sky",
-        "latte": {
-          "primary": "#04a5e5",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#dbf1fb",
-          "secondary": "#209fb5",
-          "surfaceTint": "#dbf1fb"
-        },
-        "macchiato": {
-          "primary": "#91d7e3",
-          "primaryText": "#24273a",
-          "primaryContainer": "#245667",
-          "secondary": "#7dc4e4",
-          "surfaceTint": "#293539"
-        },
-        "mocha": {
-          "primary": "#89dceb",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#24586a",
-          "secondary": "#74c7ec",
-          "surfaceTint": "#29363a"
-        },
-        "name": "Sky"
-      },
-      {
-        "frappe": {
-          "primary": "#85c1dc",
-          "primaryText": "#303446",
-          "primaryContainer": "#1f4967",
-          "secondary": "#8caaee",
-          "surfaceTint": "#27323a"
-        },
-        "id": "sapphire",
-        "latte": {
-          "primary": "#209fb5",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#def3f8",
-          "secondary": "#1e66f5",
-          "surfaceTint": "#def3f8"
-        },
-        "macchiato": {
-          "primary": "#7dc4e4",
-          "primaryText": "#24273a",
-          "primaryContainer": "#1f4b6b",
-          "secondary": "#8aadf4",
-          "surfaceTint": "#27333b"
-        },
-        "mocha": {
-          "primary": "#74c7ec",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#1f4d6f",
-          "secondary": "#89b4fa",
-          "surfaceTint": "#27343c"
-        },
-        "name": "Sapphire"
-      },
-      {
-        "frappe": {
-          "primary": "#8caaee",
-          "primaryText": "#303446",
-          "primaryContainer": "#243d6f",
-          "secondary": "#babbf1",
-          "surfaceTint": "#282f3b"
-        },
-        "id": "blue",
-        "latte": {
-          "primary": "#1e66f5",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#e0e9ff",
-          "secondary": "#7287fd",
-          "surfaceTint": "#e0e9ff"
-        },
-        "macchiato": {
-          "primary": "#8aadf4",
-          "primaryText": "#24273a",
-          "primaryContainer": "#243e72",
-          "secondary": "#b7bdf8",
-          "surfaceTint": "#29303c"
-        },
-        "mocha": {
-          "primary": "#89b4fa",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#243f75",
-          "secondary": "#b4befe",
-          "surfaceTint": "#29313d"
-        },
-        "name": "Blue"
-      },
-      {
-        "frappe": {
-          "primary": "#babbf1",
-          "primaryText": "#303446",
-          "primaryContainer": "#3d427b",
-          "secondary": "#ca9ee6",
-          "surfaceTint": "#2e2f3e"
-        },
-        "id": "lavender",
-        "latte": {
-          "primary": "#7287fd",
-          "primaryText": "#eff1f5",
-          "primaryContainer": "#e5e8ff",
-          "secondary": "#8839ef",
-          "surfaceTint": "#e5e8ff"
-        },
-        "macchiato": {
-          "primary": "#b7bdf8",
-          "primaryText": "#24273a",
-          "primaryContainer": "#3e437e",
-          "secondary": "#c6a0f6",
-          "surfaceTint": "#2f303f"
-        },
-        "mocha": {
-          "primary": "#b4befe",
-          "primaryText": "#1e1e2e",
-          "primaryContainer": "#3f4481",
-          "secondary": "#cba6f7",
-          "surfaceTint": "#2f3140"
-        },
-        "name": "Lavender"
-      }
-    ]
-  },
-  "sourceDir": "catppuccin"
-}

home/homemodules/bat/default.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) bat color;
-in {
-  options.homemodules.bat = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf bat.enable {
-    programs.bat = {
-      enable = true;
-
-      themes = {
-        catppuccin-latte = {
-          src = pkgs.fetchFromGitHub {
-            owner = "catppuccin";
-            repo = "bat";
-            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-            sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-          };
-          file = "Catppuccin-latte.tmTheme";
-        };
-      };
-
-      config = {
-        theme = "catppuccin-latte";
-      };
-    };
-  };
-}

home/homemodules/bat/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable bat";
-}

home/homemodules/cava/default.nix

@@ -1,48 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) cava color;
-in {
-  options.homemodules.cava = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf cava.enable {
-    programs.cava = {
-      enable = true;
-
-      settings = {
-        general = {
-          framerate = 60; # default 60
-          autosens = 1; # default 1
-          sensitivity = 100; # default 100
-          lower_cutoff_freq = 50; # not passed to cava if not provided
-          higher_cutoff_freq = 10000; # not passed to cava if not provided
-        };
-
-        smoothing = {
-          noise_reduction = 77; # default 77
-          monstercat = false; # default false
-          waves = false; # default false
-        };
-
-        color = {
-          # https://github.com/catppuccin/cava/blob/main/themes/latte-transparent.cava
-          gradient = 1;
-
-          gradient_color_1 = "'${color.hexS.teal}'";
-          gradient_color_2 = "'${color.hexS.sky}'";
-          gradient_color_3 = "'${color.hexS.sapphire}'";
-          gradient_color_4 = "'${color.hexS.blue}'";
-          gradient_color_5 = "'${color.hexS.mauve}'";
-          gradient_color_6 = "'${color.hexS.pink}'";
-          gradient_color_7 = "'${color.hexS.maroon}'";
-          gradient_color_8 = "'${color.hexS.red}'";
-        };
-      };
-    };
-  };
-}

home/homemodules/cava/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable cava";
-}

home/homemodules/darwin.nix

@@ -1,25 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    # My own HM modules
-    ./bat
-    ./btop
-    ./color
-    ./fastfetch
-    ./fish
-    ./git
-    ./jellyfin-tui
-    ./kitty
-    ./lazygit
-    ./neovim
-    ./packages
-    ./paths
-    ./ssh
-    ./terminal
-    ./tmux
-    ./yazi
-
-    # HM modules imported from the flake inputs
-    inputs.nixvim.homeModules.nixvim
-    inputs.textfox.homeManagerModules.default
-  ];
-}

home/homemodules/fastfetch/default.nix

@@ -1,163 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) fastfetch color;
-in {
-  options.homemodules.fastfetch = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf fastfetch.enable {
-    programs.fastfetch = {
-      enable = true;
-
-      settings = {
-        logo = {
-          padding = {
-            top = 4;
-            left = 1;
-            right = 2;
-          };
-        };
-
-        display = {
-          separator = "";
-          key.width = 17;
-        };
-
-        # Box Drawing: ╭ ─ ╮ ╰ ╯ │
-        modules = [
-          # Title
-          {
-            type = "title";
-            format = "{#1}╭─── {#}{user-name-colored}";
-          }
-
-          # System Information
-          {
-            type = "custom";
-            format = "{#1}│ {#}System Information";
-          }
-          {
-            type = "os";
-            key = "{#separator}│  {#keys}󰍹 OS";
-          }
-          {
-            type = "kernel";
-            key = "{#separator}│  {#keys}󰒋 Kernel";
-          }
-          {
-            type = "bootmgr";
-            key = "{#separator}│  {#keys}󰒋 BootMGR";
-          }
-          {
-            type = "uptime";
-            key = "{#separator}│  {#keys}󰅐 Uptime";
-          }
-          {
-            type = "packages";
-            key = "{#separator}│  {#keys}󰏖 Packages";
-            # format = "{all}";
-          }
-          {
-            type = "custom";
-            format = "{#1}│";
-          }
-
-          # Desktop Environment
-          {
-            type = "custom";
-            format = "{#1}│ {#}Desktop Environment";
-          }
-          {
-            type = "de";
-            key = "{#separator}│  {#keys}󰧨 DE";
-          }
-          {
-            type = "wm";
-            key = "{#separator}│  {#keys}󱂬 WM";
-          }
-          {
-            type = "wmtheme";
-            key = "{#separator}│  {#keys}󰉼 Theme";
-          }
-          {
-            type = "display";
-            key = "{#separator}│  {#keys}󰹑 Resolution";
-          }
-          {
-            type = "shell";
-            key = "{#separator}│  {#keys}󰞷 Shell";
-          }
-          {
-            type = "terminalfont";
-            key = "{#separator}│  {#keys}󰛖 Font";
-          }
-          {
-            type = "icons";
-            key = "{#separator}│  {#keys} Icons";
-          }
-          {
-            type = "cursor";
-            key = "{#separator}│  {#keys}󰆽 Cursor";
-          }
-          {
-            type = "custom";
-            format = "{#1}│";
-          }
-
-          # Hardware Information
-          {
-            type = "custom";
-            format = "{#1}│ {#}Hardware Information";
-          }
-          {
-            type = "board";
-            key = "{#separator}│  {#keys} Board";
-          }
-          {
-            type = "cpu";
-            key = "{#separator}│  {#keys}󰻠 CPU";
-          }
-          {
-            type = "gpu";
-            key = "{#separator}│  {#keys}󰢮 GPU";
-          }
-          {
-            type = "memory";
-            key = "{#separator}│  {#keys}󰍛 Memory";
-          }
-          # {
-          #   type = "disk";
-          #   key = "{#separator}│  {#keys}󰋊 Disk (/)";
-          #   folders = "/";
-          # }
-          # {
-          #   type = "disk";
-          #   key = "{#separator}│  {#keys}󰋊 Disk (~/Games)";
-          #   folders = "/home/christoph/Games";
-          # }
-          {
-            type = "btrfs";
-            key = "{#separator}│  {#keys}󰋊 BTRFS";
-          }
-          {
-            type = "custom";
-            format = "{#1}│";
-          }
-
-          # Colors Footer
-          {
-            type = "colors";
-            key = "{#separator}╰─── {#1}";
-            keyWidth = 6;
-            symbol = "circle";
-          }
-        ];
-      };
-    };
-  };
-}

home/homemodules/fastfetch/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable fastfetch";
-}

home/homemodules/fish/default.nix

@@ -1,318 +0,0 @@
-{
-  config,
-  lib,
-  mylib,
-  pkgs,
-  username,
-  nixosConfig,
-  ...
-}: let
-  inherit (config.homemodules) fish color;
-in {
-  options.homemodules.fish = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf fish.enable {
-    # https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme
-    home.file.".config/fish/themes/system-theme.theme".text = ''
-      fish_color_normal ${color.hex.text}
-      fish_color_command ${color.hex.blue}
-      fish_color_param ${color.hex.flamingo}
-      fish_color_keyword ${color.hex.red}
-      fish_color_quote ${color.hex.green}
-      fish_color_redirection ${color.hex.accentHl}
-      fish_color_end ${color.hex.peach}
-      fish_color_comment ${color.hex.overlay1}
-      fish_color_error ${color.hex.red}
-      fish_color_gray ${color.hex.overlay0}
-      fish_color_selection --background=${color.hex.surface0}
-      fish_color_search_match --background=${color.hex.surface0}
-      fish_color_option ${color.hex.green}
-      fish_color_operator ${color.hex.accentHl}
-      fish_color_escape ${color.hex.maroon}
-      fish_color_autosuggestion ${color.hex.overlay0}
-      fish_color_cancel ${color.hex.red}
-      fish_color_cwd ${color.hex.yellow}
-      fish_color_user ${color.hex.teal}
-      fish_color_host ${color.hex.blue}
-      fish_color_host_remote ${color.hex.green}
-      fish_color_status ${color.hex.red}
-      fish_pager_color_progress ${color.hex.overlay0}
-      fish_pager_color_prefix ${color.hex.accentHl}
-      fish_pager_color_completion ${color.hex.text}
-      fish_pager_color_description ${color.hex.overlay0}
-    '';
-
-    programs.fish = let
-      # Only add " | bat" if bat is installed
-      batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
-
-      # Same as above but with args for bat
-      batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
-
-      # These can be used for my config.homemodules and for HM config.programs,
-      # as both of these add the package to home.packages
-      hasHomePackage = package: (mylib.modules.contains config.home.packages package);
-
-      # Only add fish abbr if package is installed
-      abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
-    in
-      lib.mkMerge [
-        # Darwin exclusive config
-        (lib.mkIf pkgs.stdenv.isDarwin {
-          shellInit = ''
-            set fish_greeting
-            yes | fish_config theme save "system-theme"
-
-            set --global --export HOMEBREW_PREFIX "/opt/homebrew"
-            set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
-            set --global --export HOMEBREW_REPOSITORY "/opt/homebrew"
-            fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin"
-            if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end;
-            if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end;
-          '';
-
-          shellAbbrs = lib.mkMerge [
-            {
-              rebuild = "sudo darwin-rebuild switch --flake .#darwinix";
-            }
-
-            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'darwin,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
-          ];
-        })
-
-        # Linux exclusive config
-        (lib.mkIf pkgs.stdenv.isLinux {
-          generateCompletions = nixosConfig.programs.fish.generateCompletions;
-
-          # TODO: There's a bug with the direnv mechanism:
-          #       - When leaving an env, it unloads (good)
-          #       - When entering another env, it loads (good)
-          #       - When leaving this one, it doesn't unload (bad)
-          #       - When entering leaving it again, it works...
-          #       This only happens sometimes, is there a race condition?
-          shellInit = ''
-            set fish_greeting
-            yes | fish_config theme save "system-theme"
-            fish_vi_key_bindings
-
-            # Because we can't source that in a project flake's shellHook (is POSIX), source it here
-            function __project_shell_reload --on-variable INIT_PROJECT_SHELL
-                # Leaving the environment
-                if not set -q INIT_PROJECT_SHELL; or test -z "$INIT_PROJECT_SHELL"
-                    if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
-                        source "$__last_unload_project_shell"
-                    end
-                    set -e __last_init_project_shell
-                    set -e __last_unload_project_shell
-                    return
-                end
-
-                # Entering or switching environments
-                if test "$INIT_PROJECT_SHELL" != "$__last_init_project_shell"
-                    # Cleanup the previous environment
-                    if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
-                        source "$__last_unload_project_shell"
-                    end
-
-                    # Store into variables to persist until next environment switch in the same shell
-                    set -g __last_init_project_shell "$INIT_PROJECT_SHELL"
-                    if set -q UNLOAD_PROJECT_SHELL; and test -f "$UNLOAD_PROJECT_SHELL"
-                        set -g __last_unload_project_shell "$UNLOAD_PROJECT_SHELL"
-                    else
-                        set -e __last_unload_project_shell
-                    end
-
-                    # Source the new environment
-                    if test -f "$INIT_PROJECT_SHELL"
-                        source "$INIT_PROJECT_SHELL"
-                    end
-                end
-            end
-          '';
-
-          functions = lib.mergeAttrsList [
-            (lib.optionalAttrs config.homemodules.nnn.enable {
-              nnncd = {
-                wraps = "nnn";
-                description = "support nnn quit and change directory";
-                body = ''
-                  # Block nesting of nnn in subshells
-                  if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
-                      echo "nnn is already running"
-                      return
-                  end
-
-                  # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
-                  # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
-                  # see. To cd on quit only on ^G, remove the "-x" from both lines below,
-                  # without changing the paths.
-                  if test -n "$XDG_CONFIG_HOME"
-                      set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
-                  else
-                      set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
-                  end
-
-                  # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
-                  # stty start undef
-                  # stty stop undef
-                  # stty lwrap undef
-                  # stty lnext undef
-
-                  # The command function allows one to alias this function to `nnn` without
-                  # making an infinitely recursive alias
-                  command nnn $argv
-
-                  if test -e $NNN_TMPFILE
-                      source $NNN_TMPFILE
-                      rm $NNN_TMPFILE
-                  end
-                '';
-              };
-            })
-          ];
-
-          shellAbbrs = lib.mkMerge [
-            # Abbrs that are always available are defined here.
-            {
-              # Tools
-              blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MOUNTPOINT";
-              blkids = batify "lsblk -o NAME,LABEL,FSTYPE,SIZE,PARTLABEL,MODEL,ID,UUID";
-
-              ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
-            }
-
-            (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
-
-            # Doesn't work with abbrify because I have nnn.override...
-            (lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
-            (lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
-
-            (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
-
-            (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
-
-            # (abbrify pkgs.sd {sed = "sd";})
-          ];
-        })
-
-        # Common config
-        {
-          enable = true;
-
-          shellAbbrs = lib.mkMerge [
-            {
-              # Shell
-              c = "clear";
-              q = "exit";
-              mkdir = "mkdir -p"; # also create parents (-p)
-              watch = "watch -d -c -n 0.5";
-              sy = "sudo yazi";
-              cd = "z"; # zoxide for quickjump to previously visited locations
-              cdd = "zi";
-              b = "z -"; # jump to previous dir
-
-              # Fish
-              h = batifyWithArgs "history" "-l fish"; # -l fish sets syntax highlighting to fish
-              abbrs = batifyWithArgs "abbr" "-l fish";
-
-              # Nix
-              nd = "nix develop";
-              nb = "nix build -L";
-              ns = "nix shell nixpkgs#";
-              nr = "nix run";
-              nps = "nps -e";
-            }
-
-            # Abbrs only available if package is installed
-            (abbrify pkgs.rsync rec {
-              rsync = "rsync -ahv --inplace --partial --info=progress2";
-              copy = rsync;
-            })
-
-            (abbrify pkgs.duf {
-              disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
-              alldisks = "duf";
-            })
-
-            (abbrify pkgs.ripgrep {
-              rg = "rg --trim --pretty";
-              # grep = rg;
-            })
-
-            (abbrify pkgs.eza {
-              ls = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions";
-              lsl = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l";
-              lsa = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -l -a";
-              tre = "eza --color=always --group-directories-first -F --git --icons=always --octal-permissions -T -L 2";
-            })
-
-            (abbrify pkgs.fd {find = "fd";})
-
-            (abbrify pkgs.fzf {fuzzy = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";})
-
-            (abbrify pkgs.gdu {
-              # du = "gdu";
-              storage = "gdu";
-            })
-
-            (abbrify pkgs.git {
-              gs = "git status";
-              gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";
-              gl = "git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an  %ar%C(auto)  %D%n%s%n'";
-              ga = "git add";
-              gap = "git add --patch";
-              gc = "git commit --verbose";
-              gcm = "git commit -m";
-              gcl = "git clone";
-            })
-
-            (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
-
-            (abbrify pkgs.lazygit {lg = "lazygit";})
-          ];
-
-          plugins = [];
-        }
-      ];
-
-    programs.starship = {
-      enable = true;
-      enableFishIntegration = config.homemodules.fish.enable;
-      settings = {
-        # Other config here
-        format = "$all"; # Remove this line to disable the default prompt format
-        palette = "system-theme";
-
-        # https://github.com/catppuccin/starship/blob/main/themes/mocha.toml
-        palettes."system-theme" = {
-          rosewater = color.hexS.rosewater;
-          flamingo = color.hexS.flamingo;
-          pink = color.hexS.accentHl;
-          mauve = color.hexS.accent;
-          red = color.hexS.red;
-          maroon = color.hexS.maroon;
-          peach = color.hexS.peach;
-          yellow = color.hexS.yellow;
-          green = color.hexS.green;
-          teal = color.hexS.teal;
-          sky = color.hexS.sky;
-          sapphire = color.hexS.sapphire;
-          blue = color.hexS.blue;
-          lavender = color.hexS.lavender;
-          text = color.hexS.text;
-          subtext1 = color.hexS.subtext1;
-          subtext0 = color.hexS.subtext0;
-          overlay2 = color.hexS.overlay2;
-          overlay1 = color.hexS.overlay1;
-          overlay0 = color.hexS.overlay0;
-          surface2 = color.hexS.surface2;
-          surface1 = color.hexS.surface1;
-          surface0 = color.hexS.surface0;
-          base = color.hexS.accentText;
-          mantle = color.hexS.mantle;
-          crust = color.hexS.crust;
-        };
-      };
-    };
-  };
-}

home/homemodules/jellyfin-tui/default.nix

@@ -1,91 +0,0 @@
-{
-  config,
-  nixosConfig,
-  darwinConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) jellyfin-tui color;
-
-  systemConfig =
-    if pkgs.stdenv.isLinux
-    then nixosConfig
-    else darwinConfig;
-in {
-  options.homemodules.jellyfin-tui = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf jellyfin-tui.enable {
-    home = {
-      packages = [
-        pkgs.jellyfin-tui
-      ];
-
-      file = let
-        jellyfinUrl =
-          if pkgs.stdenv.isLinux
-          then "https://jellyfin.local.chriphost.de"
-          else "https://jellyfin.vps.chriphost.de";
-
-        configFile = ''
-          servers:
-          - name: Mafia Dortmund
-            url: ${jellyfinUrl}
-            username: root
-            password_file: ${systemConfig.sops.secrets.jellyfin-password.path}
-            default: true
-
-          # All following settings are OPTIONAL. What you see here are the defaults.
-
-          # Show album cover image
-          art: true
-          # Save and restore the state of the player (queue, volume, etc.)
-          persist: true
-          # Grab the primary color from the cover image (false => uses the current theme's `accent` instead)
-          auto_color: false
-          # Time in milliseconds to fade between colors when the track changes
-          auto_color_fade_ms: 400
-          # Always show the lyrics pane, even if no lyrics are available
-          lyrics: 'always' # options: 'always', 'never', 'auto'
-
-          rounded_corners: true
-
-          transcoding:
-            bitrate: 320
-            # container: mp3
-
-          # Discord Rich Presence. Shows your listening status on your Discord profile if Discord is running.
-          # NOTE: I think we're allowed to leak this to the public (hopefully)?
-          discord: 1466134677537685546 # https://discord.com/developers/applications
-          # Displays album art on your Discord profile if enabled
-          # !!CAUTION!! - Enabling this will expose the URL of your Jellyfin instance to all Discord users!
-          discord_art: false
-
-          # Customize the title of the terminal window
-          window_title: true # default -> {title} – {artist} ({year})
-          # window_title: false # disable
-          # Custom title: choose from current track's {title} {artist} {album} {year}
-          # window_title: "\"{title}\" by {artist} ({year}) – jellyfin-tui"
-
-          # Options specified here will be passed to mpv - https://mpv.io/manual/master/#options
-          mpv:
-            log-file: /tmp/mpv.log
-            no-config: true
-            # af: lavfi=[loudnorm=I=-23:TP=-1]
-            gapless-audio: weak
-            prefetch-playlist: yes
-            replaygain: no
-        '';
-      in
-        lib.mkMerge [
-          (lib.optionalAttrs pkgs.stdenv.isLinux {
-            ".config/jellyfin-tui/config.yaml".text = configFile;
-          })
-          (lib.optionalAttrs pkgs.stdenv.isDarwin {
-            "Library/Application Support/jellyfin-tui/config.yaml".text = configFile;
-          })
-        ];
-    };
-  };
-}

home/homemodules/jellyfin-tui/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable jellyfin-tui";
-}

home/homemodules/kitty/default.nix

@@ -1,130 +0,0 @@
-# TODO: Expose some settings
-{
-  config,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) kitty color;
-in {
-  options.homemodules.kitty = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf kitty.enable {
-    programs.kitty = {
-      enable = true;
-      shellIntegration.enableFishIntegration = true;
-
-      font = {
-        name = "${config.homemodules.color.font}";
-        size = 12;
-      };
-
-      keybindings = {
-        "kitty_mod" = "ctrl+shift";
-        "kitty_mod+enter" = "launch --cwd=current";
-        "kitty_mod+j" = "next_window";
-        "kitty_mod+k" = "previous_window";
-        "kitty_mod+l" = "next_layout";
-      };
-
-      settings = lib.mkMerge [
-        # Linux config
-        (lib.mkIf pkgs.stdenv.isLinux {
-          allow_remote_control = true; # For nnn file preview or nvim scrollback
-          listen_on = lib.mkDefault "unix:@mykitty"; # This conflicts with direnv-instant
-        })
-
-        # Common config
-        {
-          editor = config.home.sessionVariables.EDITOR;
-          scrollback_lines = 10000;
-          window_padding_width = 10; # Looks stupid with editors if bg doesn't match
-          # hide_window_decorations = "yes";
-          enabled_layouts = "grid,vertical,horizontal";
-          cursor_trail = 3;
-
-          tab_bar_min_tabs = 2; # Don't show a single tab
-          tab_bar_edge = "bottom";
-          tab_bar_style = "powerline";
-          tab_powerline_style = "round";
-          tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
-
-          #
-          # Color Theme
-          #
-
-          # The basic colors
-          background = color.hexS.base;
-          foreground = color.hexS.text;
-          selection_foreground = color.hexS.base;
-          selection_background = color.hexS.rosewater;
-
-          # Cursor colors
-          cursor = color.hexS.rosewater;
-          cursor_text_color = color.hexS.base;
-
-          # URL underline color when hovering with mouse
-          url_color = color.hexS.rosewater;
-
-          # Kitty window border colors
-          active_border_color = color.hexS.lavender;
-          inactive_border_color = color.hexS.overlay0;
-          bell_border_color = color.hexS.yellow;
-
-          # OS Window titlebar colors
-          wayland_titlebar_color = "system";
-          macos_titlebar_color = "system";
-
-          # Tab bar colors
-          active_tab_foreground = color.hexS.base;
-          active_tab_background = color.hexS.lavender;
-          inactive_tab_foreground = color.hexS.text;
-          inactive_tab_background = color.hexS.crust;
-          tab_bar_background = color.hexS.base;
-
-          # Color for marks (marked text in the terminal)
-          mark1_foreground = color.hexS.base;
-          mark1_background = color.hexS.lavender;
-          mark2_foreground = color.hexS.base;
-          mark2_background = color.hexS.mauve;
-          mark3_foreground = color.hexS.base;
-          mark3_background = color.hexS.sapphire;
-
-          # The 16 terminal colors
-          # black
-          color0 = color.hexS.subtext1;
-          color8 = color.hexS.subtext0;
-
-          # red
-          color1 = color.hexS.red;
-          color9 = color.hexS.red;
-
-          # green
-          color2 = color.hexS.green;
-          color10 = color.hexS.green;
-
-          # yellow
-          color3 = color.hexS.yellow;
-          color11 = color.hexS.yellow;
-
-          # blue
-          color4 = color.hexS.blue;
-          color12 = color.hexS.blue;
-
-          # magenta
-          color5 = color.hexS.pink;
-          color13 = color.hexS.pink;
-
-          # cyan
-          color6 = color.hexS.teal;
-          color14 = color.hexS.teal;
-
-          # white
-          color7 = color.hexS.surface2;
-          color15 = color.hexS.surface1;
-        }
-      ];
-    };
-  };
-}

home/homemodules/packages/default.nix

@@ -1,250 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  headless,
-  inputs,
-  ...
-}: let
-  inherit (config.homemodules) packages color;
-in {
-  options.homemodules.packages = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf packages.enable {
-    # TODO: Add extra packages option and use that from host-specific configs
-    home.packages = with pkgs;
-      lib.mkMerge [
-        # Common packages
-        [
-          # Shell utils
-          (ripgrep.override {withPCRE2 = true;}) # fast as fuck
-          gdu # Alternative to du-dust (I like it better)
-          duf # Disk usage analyzer (for all disk overview)
-          sd # Sed alternative
-          fclones # Duplicate file finder
-          tealdeer # Very fast tldr (so readable man)
-          killall
-          atool # Archive preview
-          exiftool
-          ouch # Unified compression/decompression
-          ffmpegthumbnailer # Video thumbnails
-          mediainfo # Media meta information
-          file # File meta information
-          unrar # Cooler WinRar
-          p7zip # Zip stuff
-          unzip # Unzip stuff
-          progress # Find coreutils processes and show their progress
-          tokei # Text file statistics in a project
-          ttyper
-          wiki-tui
-
-          # Nix
-          nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options
-          nix-tree # Browse the nix store sorted by size (gdu for closures)
-          inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default # Search nixpkgs
-
-          # Video/Image/Audio utils
-          ffmpeg-full # I love ffmpeg (including ffplay)
-          ffmpeg-normalize # Normalize audio
-
-          # Document utils
-          poppler-utils # pdfunite
-          pdf2svg # extract vector graphics from pdf
-          pandoc # document converting madness
-
-          # Networking
-          dig # Make DNS requests
-          tcpdump # Listen in on TCP traffic
-          gping # ping with graph
-          curlie # curl a'la httpie
-          wget # download that shit
-          doggo # dns client
-          rsync # cp on steroids
-          rclone # Rsync for cloud
-          httpie # Cool http client
-          speedtest-cli
-          bandwhich
-          snitch
-
-          # Use NixCommunity binary cache
-          cachix
-        ]
-
-        # Common !headless packages
-        (lib.optionals (!headless) [
-          ripdrag # drag & drop from terminal
-          # jellyfin-tui # Use module
-
-          inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
-        ])
-
-        # Linux exclusive packages
-        (lib.optionals (pkgs.stdenv.isLinux) [
-          pastel # Color tools
-          nvd # Nix rebuild diff
-          nurl # Generate nix fetcher sections based on URLs
-          # python313 # Nicer scripting than bash
-          lazyjournal # Journalctl viewer
-          systemctl-tui
-          restic # Backups
-          gnumake
-          just # make alternative
-          binsider # .elf analyzer
-          jujutsu # git-like vcs
-          lurk # strace analysis
-          radare2
-          disktui
-          lldb
-
-          # Hardware/Software info
-          pciutils # lspci
-          mesa-demos # OpenGL info
-          wayland-utils # wayland-info
-          clinfo # OpenCL info
-          vulkan-tools # vulkaninfo
-          libva-utils # vainfo
-          vdpauinfo # Video-Decode and Presentation API for Unix info
-          hwloc # Generate CPU topology diagram
-          lm_sensors # Readout hardware sensors
-          acpica-tools # Dump ACPI tables etc.
-          smartmontools # Disk health
-          nvme-cli # NVME disk health
-
-          # Video/Image/Audio utils
-          imagemagick # Convert image (magic)
-          mp3val # Validate mp3 files
-          flac # Validate flac files
-
-          # Document utils
-          graphviz # generate graphs from code
-          d2 # generate diagrams from code
-          plantuml # generate diagrams
-          gnuplot # generate function plots
-
-          # Networking
-          traceroute # "Follow" a packet
-          cifs-utils # Mount samba shares
-          nfs-utils # Mount NFS shares
-          sshfs # Mount remote directories via SSH
-
-          # Run unpatched binaries on NixOS
-          # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
-          # Usage: "nix-alien-ld -- <Executable>".
-          inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
-        ])
-
-        # Linux exclusive packages (!headless)
-        (lib.optionals (pkgs.stdenv.isLinux && (!headless)) [
-          wl-clipboard
-
-          # Proton
-          proton-vpn
-          protonmail-bridge-gui
-
-          # GUI stuff
-          signal-desktop
-          anki
-          nextcloud-client
-          keepassxc
-          thunderbird # TODO: Email module
-          obsidian
-          zotero
-          zeal # docs browser
-          vlc
-          audacity
-          # ferdium
-          # feishin # electron :(
-          playerctl # Media player control
-          czkawka-full # file deduplicator
-          binaryninja-free # reverse engineering
-          tableplus # database explorer
-          # opencode-desktop
-          lmstudio # TODO: Ollama
-
-          # Office
-          kdePackages.wacomtablet # For xournalpp/krita
-          xournalpp # Write with a pen, like old people
-          hunspell # I cna't type
-          hunspellDicts.en_US
-          hunspellDicts.de_DE
-
-          # GTK-Apps
-          # gnome-calculator
-          # gnome-calendar
-          # helvum # unmaintained
-          crosspipe
-          nautilus # Just in case
-          font-manager # Previews fonts, but doesn't set them
-          gparted
-          resources
-          # celluloid
-          # cine
-          eyedropper
-          junction
-        ])
-
-        # Darwin exclusive packages
-        (lib.optionals pkgs.stdenv.isDarwin [
-          # Use homebrew instead
-          # alt-tab-macos
-          # discord
-          # obsidian
-          # nextcloud-client
-          # proton-vpn
-          # iina
-
-          # TODO: Update the docs module to be darwinix compatible
-          #       - The filepaths need to be adapted
-          texliveFull
-          typst
-        ])
-      ];
-
-    programs = {
-      # The home-manager management tool.
-      # Will only be enabled if HM is installed standalone.
-      home-manager.enable = true;
-
-      direnv = {
-        enable = true;
-        enableFishIntegration = true;
-        silent = true;
-        nix-direnv.enable = true;
-      };
-
-      # This replaces the normal direnv.enableFishIntegration.
-      # direnv-instant = {
-      #   enable = true;
-      #   enableFishIntegration = true;
-      #   enableKittyIntegration = true;
-      #   settings.use_cache = true;
-      # };
-
-      eza = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      fd.enable = true;
-
-      fzf = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      navi = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-
-      yt-dlp.enable = true;
-
-      zoxide = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-      };
-    };
-  };
-}

home/homemodules/packages/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable common packages";
-}

home/homemodules/rofi/default.nix

@@ -1,106 +0,0 @@
-# TODO: Need some kind of menu generator API that is integrated with hyprland hotkeys
-#       VPN and Container modules should use this rofi module to enable their menus then
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) rofi color;
-in {
-  options.homemodules.rofi = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf rofi.enable {
-    programs.rofi = {
-      enable = true;
-      package = pkgs.rofi;
-      terminal = "kitty";
-      font = "${color.font} 14";
-      location = "center";
-      cycle = true;
-
-      extraConfig = {
-        modi = "run,drun,ssh,filebrowser";
-        show-icons = true;
-        icon-theme = color.iconTheme;
-        drun-display-format = "{icon} {name}";
-        disable-history = false;
-        hide-scrollbar = true;
-        display-drun = " apps ";
-        display-run = " run ";
-        display-filebrowser = " file ";
-        display-ssh = " ssh ";
-        sidebar-mode = false;
-      };
-
-      theme = let
-        mkLiteral = config.lib.formats.rasi.mkLiteral;
-      in
-        import ./theme.nix {inherit color mkLiteral;};
-    };
-
-    # homemodules.hyprland.keybindings = let
-    #   vpn-menu =
-    #     pkgs.writeScriptBin
-    #     "rofi-menu-vpn"
-    #     (builtins.readFile ./menus/vpn.fish);
-    #
-    #   keybinds-menu =
-    #     pkgs.writeScriptBin
-    #     "rofi-menu-keybinds"
-    #     (builtins.readFile ./menus/keybinds.fish);
-    #
-    #   lectures-menu =
-    #     pkgs.writeScriptBin
-    #     "rofi-menu-lectures"
-    #     (builtins.readFile ./menus/lectures.fish);
-    #
-    #   power-menu =
-    #     mylib.rofi.mkSimpleMenu
-    #     "power"
-    #     {
-    #       "󰤂 Poweroff" = "poweroff";
-    #       "󰜉 Reboot" = "reboot";
-    #       "󰌾 Lock" = "loginctl lock-session";
-    #       " Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
-    #       " Reload Hyprland" = "hyprctl reload";
-    #       " Exit Hyprland" = "hyprctl dispatch exit";
-    #     };
-    #
-    #   wallpaper-menu = let
-    #     setWallpaperOnMonitor = name: monitor:
-    #       "hyprctl hyprpaper wallpaper "
-    #       + "${monitor},${config.paths.nixflake}/wallpapers/${name}.jpg";
-    #
-    #     setWallpaperOnMonitors = monitors: name: {
-    #       ${name} =
-    #         monitors
-    #         |> builtins.map (setWallpaperOnMonitor name)
-    #         |> builtins.concatStringsSep " && ";
-    #     };
-    #
-    #     monitors = builtins.attrNames config.homemodules.hyprland.monitors;
-    #   in
-    #     mylib.rofi.mkSimpleMenu
-    #     "wall"
-    #     (color.wallpapers
-    #       |> builtins.map (setWallpaperOnMonitors monitors)
-    #       |> lib.mergeAttrsList);
-    # in
-    #   lib.mkIf (!config.homemodules.hyprland.caelestia.enable) {
-    #     bindings = lib.mergeAttrsList [
-    #       {
-    #         "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];
-    #         "$mainMod, m" = ["exec, \"${keybinds-menu}/bin/rofi-menu-keybinds\""];
-    #         "$mainMod, w" = ["exec, \"${wallpaper-menu}/bin/rofi-menu-wall\""];
-    #         # "$mainMod, o" = ["exec, \"${lectures-menu}\""];
-    #       }
-    #       (lib.optionalAttrs (!nixosConfig.systemmodules.network.useNetworkManager) {
-    #         "$mainMod, U" = ["exec, \"${vpn-menu}/rofi-menu-vpn\""];
-    #       })
-    #     ];
-    #   };
-  };
-}

home/homemodules/rofi/theme.nix

@@ -1,101 +0,0 @@
-# https://github.com/davatorium/rofi/blob/next/doc/rofi-theme.5.markdown#basic-layout-structure
-# https://github.com/davatorium/rofi/blob/next/doc/rofi-theme.5.markdown#base-widgets
-{
-  color,
-  mkLiteral,
-}: let
-  trans = "rgba(0, 0, 0, 0)";
-in {
-  "element-text,element-icon,mode-switcher" = {
-    background-color = mkLiteral "inherit";
-    text-color = mkLiteral "inherit";
-  };
-
-  "window" = {
-    height = mkLiteral "50%";
-    width = mkLiteral "33%";
-    border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
-    border-radius = 6;
-    border-color = mkLiteral color.hexS.accent;
-
-    # This is not opacity but translucency
-    background-color = mkLiteral "rgba(${color.rgbS.base}, 0.25)";
-  };
-
-  "mainbox" = {
-    background-color = mkLiteral trans;
-  };
-
-  # TOP INPUT BAR START
-
-  "inputbar" = {
-    children = builtins.map mkLiteral ["prompt" "entry"];
-    background-color = mkLiteral trans;
-  };
-
-  "prompt" = {
-    background-color = mkLiteral color.hexS.accentHl;
-    padding = 6;
-    text-color = mkLiteral color.hexS.accentText;
-    border-radius = 3;
-    margin = mkLiteral "10px 0px 0px 10px";
-  };
-
-  "entry" = {
-    padding = 6;
-    margin = mkLiteral "10px 10px 0px 5px";
-    text-color = mkLiteral color.hexS.text;
-    background-color = mkLiteral trans;
-    border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
-    border-radius = 3;
-    border-color = mkLiteral color.hexS.accentHl;
-  };
-
-  # MESSAGEBOX (usually not visible)
-
-  "message" = {
-    background-color = mkLiteral trans;
-  };
-
-  "error-message" = {
-    background-color = mkLiteral trans;
-    margin = mkLiteral "0px 0px 10px 0px";
-  };
-
-  "textbox" = {
-    background-color = mkLiteral trans;
-    padding = 6;
-    margin = mkLiteral "10px 10px 0px 10px";
-    border-radius = 3;
-  };
-
-  # LISTVIEW
-
-  "listview" = {
-    # border = mkLiteral "0px 0px 0px";
-    padding = 0;
-    margin = mkLiteral "5px 10px 10px 10px";
-    columns = 1;
-    background-color = mkLiteral trans;
-    border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
-    border-radius = 3;
-    border-color = mkLiteral color.hexS.accentDim;
-  };
-
-  "element" = {
-    padding = 5;
-    margin = 0;
-    background-color = mkLiteral trans;
-    text-color = mkLiteral color.hexS.text;
-    # border-radius = 3;
-  };
-
-  "element-icon" = {
-    size = 25;
-  };
-
-  "element selected" = {
-    background-color = mkLiteral color.hexS.accentDim;
-    text-color = mkLiteral color.hexS.accentText;
-  };
-}

home/homemodules/ssh/default.nix

@@ -1,73 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) ssh color;
-in {
-  options.homemodules.ssh = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf ssh.enable {
-    programs.ssh = {
-      enable = true;
-      enableDefaultConfig = false;
-
-      settings = {
-        "*" = {
-          ForwardAgent = false;
-          AddKeysToAgent =
-            if pkgs.stdenv.isLinux
-            then "no"
-            else "yes"; # Don't have keychain on darwin
-          Compression = true;
-          ServerAliveInterval = 0;
-          ServerAliveCountMax = 3;
-          HashKnownHosts = false;
-          UserKnownHostsFile = "~/.ssh/known_hosts";
-          ControlMaster = "no";
-          ControlPath = "~/.ssh/master-%r@%n:%p";
-          ControlPersist = "no";
-        };
-        "nixinator" = {
-          Port = 5432;
-          User = "christoph";
-          HostName = "vps.chriphost.de";
-        };
-        "servenix" = {
-          User = "christoph";
-          HostName = "local.chriphost.de";
-        };
-        "thinknix" = {
-          User = "christoph";
-          HostName = "think.chriphost.de";
-        };
-        "vps" = {
-          User = "root";
-          HostName = "vps.chriphost.de";
-        };
-        "mars" = {
-          User = "smchurla";
-          HostName = "mars.cs.tu-dortmund.de";
-          ServerAliveInterval = 60;
-          LocalForward = [
-            {
-              # Resultbrowser
-              bind.port = 22941;
-              host.address = "127.0.0.1";
-              host.port = 22941;
-            }
-            {
-              # Mysql
-              bind.port = 3306;
-              host.address = "127.0.0.1";
-              host.port = 3306;
-            }
-          ];
-        };
-      };
-    };
-  };
-}

home/homemodules/ssh/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable ssh";
-}

home/homemodules/terminal/default.nix

@@ -1,44 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  headless,
-  ...
-}: let
-  inherit (config.homemodules) terminal color;
-in {
-  options.homemodules.terminal = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf terminal.enable {
-    homemodules = {
-      bat.enable = true;
-      btop.enable = true;
-      fastfetch.enable = true;
-      fish.enable = true;
-
-      git = {
-        enable = true;
-
-        userName = "Christoph Urlacher";
-        userEmail = "christoph.urlacher@protonmail.com";
-        signCommits = true;
-      };
-
-      jellyfin-tui.enable = true;
-      kitty.enable = true;
-      lazygit.enable = true;
-
-      neovim = {
-        enable = true;
-        alias = true;
-        neovide = !headless;
-      };
-
-      ssh.enable = true;
-      tmux.enable = true;
-      yazi.enable = true;
-    };
-  };
-}

home/homemodules/terminal/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable terminal tools";
-}

home/homemodules/tmux/default.nix

@@ -1,38 +0,0 @@
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}: let
-  inherit (config.homemodules) tmux color;
-in {
-  options.homemodules.tmux = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf tmux.enable {
-    programs.tmux = {
-      enable = true;
-
-      clock24 = true;
-      escapeTime = 0; # Delay after pressing escape
-      # keyMode = "vi";
-      terminal = "xterm-256color";
-
-      plugins = with pkgs; [
-        {
-          plugin = tmuxPlugins.catppuccin;
-          extraConfig = ''
-            set -g @plugin 'catppuccin/tmux'
-            set -g @catppuccin_flavour 'latte' # or frappe, macchiato, mocha
-          '';
-        }
-      ];
-
-      extraConfig = ''
-        set -g default-terminal "xterm-256color"
-        set-option -ga terminal-overrides ",xterm-256color:Tc"
-      '';
-    };
-  };
-}

home/homemodules/tmux/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable tmux";
-}

home/homemodules/vscode/default.nix

@@ -1,89 +0,0 @@
-# TODO: Expose some settings
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.homemodules.vscode;
-in {
-  options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
-
-  config = mkIf cfg.enable {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscode;
-      mutableExtensionsDir = false;
-
-      profiles.default = {
-        enableUpdateCheck = false;
-        enableExtensionUpdateCheck = false;
-        enableMcpIntegration = true;
-
-        extensions = with pkgs.vscode-extensions; [
-          # Theme
-          catppuccin.catppuccin-vsc
-          catppuccin.catppuccin-vsc-icons
-          vscode-icons-team.vscode-icons
-
-          # General
-          vscodevim.vim
-          christian-kohler.path-intellisense
-          ryu1kn.partial-diff
-          redhat.vscode-yaml
-          ms-vscode-remote.remote-ssh
-          ms-vscode-remote.remote-ssh-edit
-          ms-vscode.remote-explorer
-          anthropic.claude-code
-
-          # Python
-          ms-python.python
-          ms-python.vscode-pylance
-          ms-python.black-formatter
-
-          # C/C++
-          ms-vscode.cpptools
-          # llvm-vs-code-extensions.vscode-clangd
-          ms-vscode.cmake-tools
-          ms-vscode.makefile-tools
-          # llvm-org.lldb-vscode
-          vadimcn.vscode-lldb
-          # "13xforever".language-x86-64-assembly
-
-          # Latex
-          # james-yu.latex-workshop
-          # valentjn.vscode-ltex
-        ];
-
-        keybindings = [];
-        globalSnippets = {};
-        languageSnippets = {};
-        userMcp = {};
-
-        userSettings = {
-          "editor.fontFamily" = config.homemodules.color.font;
-          "editor.fontSize" = 14;
-          "editor.smoothScrolling" = true;
-          "editor.cursorSmoothCaretAnimation" = "on";
-          "workbench.enableExperiments" = false;
-          "workbench.list.smoothScrolling" = true;
-          "workbench.colorTheme" = "Catppuccin Mocha";
-          "workbench.iconTheme" = "catppuccin-mocha";
-          "remote.SSH.configFile" = "~/.ssh/custom-config";
-          "workbench.welcomePage.walkthroughs.openOnInstall" = false;
-          "security.workspace.trust.enabled" = false;
-          "chat.disableAIFeatures" = false;
-
-          # C++
-          # "C_Cpp.intelliSenseEngine" = "disabled"; # IntelliSense conflics with Clangd
-        };
-
-        userTasks = {};
-      };
-    };
-  };
-}

home/homemodules/waybar/default.nix

@@ -1,270 +0,0 @@
-{
-  config,
-  lib,
-  mylib,
-  ...
-}: let
-  inherit (config.homemodules) color waybar;
-in {
-  options.homemodules.waybar = import ./options.nix {inherit lib mylib;};
-
-  config = lib.mkIf waybar.enable {
-    programs.waybar = {
-      enable = true;
-      systemd.enable = true;
-
-      settings = {
-        mainBar = {
-          layer = "top";
-          position = "top";
-          height = 36;
-          spacing = 0;
-          margin = "10px 10px 0px 10px";
-          fixed-center = true;
-          output = waybar.monitors;
-
-          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"];
-
-          "custom/launcher" = {
-            format = "<span></span>";
-            interval = "once";
-            on-click = "walker -m desktopapplications";
-          };
-
-          systemd-failed-units = {
-            hide-on-ok = true;
-            format = " {nr_failed}";
-            format-ok = "✔️";
-            system = true;
-            user = true;
-          };
-
-          "niri/workspaces" = {
-            all-outputs = false;
-            format = "{icon}";
-            format-icons = {
-              default = "";
-              focused = "";
-              active = "";
-            };
-          };
-
-          "niri/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>";
-            dynamic-order = ["artist" "title"];
-            status-icons = {
-              paused = "󰏤";
-            };
-          };
-
-          privacy = {
-            icon-spacing = 4;
-            icon-size = 16;
-            transition-duration = 250;
-            modules = [
-              {
-                type = "screenshare";
-                tooltip = true;
-                tooltip-icon-size = 24;
-              }
-              # {
-              #   type = "audio-out";
-              #   tooltip = true;
-              #   tooltip-icon-size = 24;
-              # }
-              {
-                type = "audio-in";
-                tooltip = true;
-                tooltip-icon-size = 24;
-              }
-            ];
-            ignore-monitor = true;
-          };
-
-          pulseaudio = {
-            format = "<span>󰕾</span> {volume}%";
-            format-muted = "<span>󰝟</span> ";
-            on-click = "kitty --title=WireMix wiremix";
-          };
-
-          network = {
-            format = "<span>󰌀</span> {ipaddr}";
-            format-disconnected = "<span></span> ";
-            interface = "enp8s0";
-            tooltip = false;
-          };
-
-          disk = {
-            interval = 5;
-            format = "<span>󰋊</span> {percentage_used}%";
-            on-click = "kitty --hold --title=Duf duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
-          };
-
-          cpu = {
-            interval = 1;
-            # states = {
-            #   "critical" = 85;
-            # };
-            format = "<span></span> {load}%";
-            # format-critical = "<span color='#${color.hex.red}'><span></span> {load}%</span>";
-            on-click = "kitty --title=Btop btop";
-            tooltip = false;
-          };
-
-          memory = {
-            interval = 1;
-            # states = {
-            #   "critical" = 85;
-            # };
-            format = "<span></span> {percentage}%";
-            # format-critical = "<span color='#${color.hex.red}'><span></span> {percentage}%</span>";
-            on-click = "kitty --title=Btop btop";
-            tooltip = true;
-            tooltip-format = "RAM:  {used}GiB / {total}GiB\nSwap: {swapUsed}GiB / {swapTotal}GiB";
-          };
-
-          clock = {
-            format = "<span>󰥔</span> {:%H:%M}";
-            timezone = "Europe/Berlin";
-            tooltip-format = "<tt><small>{calendar}</small></tt>";
-            calendar = {
-              mode = "month";
-              weeks-pos = "right";
-              mode-mon-col = 3;
-              on-scroll = -1;
-              format = {
-                months = "<span color='#${color.hex.peach}'><b>{}</b></span>";
-                days = "<span color='#${color.hex.flamingo}'><b>{}</b></span>";
-                weeks = "<span color='#${color.hex.teal}'><b>W{}</b></span>";
-                weekdays = "<span color='#${color.hex.lavender}'><b>{}</b></span>";
-                today = "<span color='#${color.hex.accent}'><b><u>{}</u></b></span>";
-              };
-            };
-            actions = {
-              on-click-right = "mode";
-              on-scroll-up = "shift_up";
-              on-scroll-down = "shift_down";
-            };
-          };
-
-          tray = {
-            icon-size = 22;
-            show-passive-items = true;
-            spacing = 5;
-          };
-        };
-      };
-
-      style = let
-        border-width = "2px";
-        border-radius = "10px";
-      in ''
-        /* Order is Top-Right-Bottom-Left for combined properties */
-        * {
-          font-family: ${color.font};
-        }
-
-        window#waybar {
-          border-style: solid;
-          border-width: ${border-width};
-          border-radius: ${border-radius};
-          border-color: #${color.hex.accent};
-          background-color: rgba(${color.rgbS.mantle}, 1.0);
-        }
-
-        tooltip {
-          color: #${color.hex.text};
-          font-weight: normal;
-          border-style: solid;
-          border-width: ${border-width};
-          border-radius: ${border-radius};
-          border-color: #${color.hex.accent};
-          background-color: rgba(${color.rgbS.mantle}, 1.0);
-        }
-
-        /* Background colors */
-        #custom-launcher           {background-color: #${color.hex.accent};}
-        #workspaces button         {background-color: #${color.hex.blue};}
-        #workspaces button.empty   {background-color: #${color.hex.lavender};}
-        #workspaces button.active  {background-color: #${color.hex.green};}
-        #workspaces button.urgent  {background-color: #${color.hex.red};}
-        #window                    {background-color: #${color.hex.maroon};}
-
-        #mpris                     {background-color: #${color.hex.accent};}
-
-        #privacy                   {background-color: #${color.hex.red};}
-        #pulseaudio                {background-color: #${color.hex.maroon};}
-        #network                   {background-color: #${color.hex.peach};}
-        #disk                      {background-color: #${color.hex.yellow};}
-        #cpu                       {background-color: #${color.hex.green};}
-        #memory                    {background-color: #${color.hex.teal};}
-        #clock                     {background-color: #${color.hex.sky};}
-        #tray                      {background-color: #${color.hex.accent};}
-
-        /* Square Widgets */
-        #custom-launcher,
-        #mpris,
-        #tray {
-          color: #${color.hex.mantle};
-          font-weight: bold;
-          padding: 0px 10px 0px 10px;
-          border-radius: ${border-radius};
-        }
-
-        /* Workspaces */
-        #workspaces button {
-          color: #${color.hex.mantle};
-          font-weight: bold;
-          padding: 0px 2px 0px 2px;
-          margin: 8px 2px 8px 2px;
-          border-radius: ${border-radius};
-        }
-
-        /* Rectangle Widgets */
-        #user,
-        #window,
-        #pulseaudio,
-        #privacy,
-        #network,
-        #disk,
-        #cpu,
-        #memory,
-        #clock {
-          color: #${color.hex.mantle};
-          font-weight: bold;
-          padding: 0px 10px 0px 10px;
-          margin: 8px 5px 8px 5px;
-          border-radius: ${border-radius};
-        }
-
-        /* Make window module transparent when no windows present */
-        window#waybar.empty #window {
-            background-color: transparent;
-        }
-
-        /* Alignment of left/right/center elements */
-
-        /* Tux Icon */
-        #custom-launcher {
-          font-size: 26px;
-          padding-right: 13px;
-          margin: 0px 5px 0px 0px;
-        }
-
-        #tray {
-          margin: 0px 0px 0px 5px;
-        }
-      '';
-    };
-  };
-}

home/homemodules/zed/default.nix

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

home/homemodules/zed/options.nix

@@ -1,7 +0,0 @@
-{
-  lib,
-  mylib,
-  ...
-}: {
-  enable = lib.mkEnableOption "Enable zed editor";
-}

home/modules/0_template/default.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules) TEMPLATE color;
+in {
+  options.modules.TEMPLATE = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf TEMPLATE.enable {};
+}

home/modules/1_deprecated/ags/default.nix

@@ -6,9 +6,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.homemodules) ags;
+  inherit (config.modules) ags;
 in {
-  options.homemodules.ags = import ./options.nix {inherit lib mylib;};
+  options.modules.ags = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf ags.enable {
     programs.ags = {
@@ -68,7 +68,7 @@ in {
       # ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config";
 
       # NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir
-      ".config/_colors.scss".text = with config.homemodules.color.hex; ''
+      ".config/_colors.scss".text = with config.modules.color.hex; ''
         $dark-rosewater: #${dark.rosewater};
         $dark-flamingo: #${dark.flamingo};
         $dark-pink: #${dark.pink};

home/modules/1_deprecated/alacritty/default.nix

@@ -5,9 +5,9 @@
   ...
 }:
 with mylib.modules; let
-  cfg = config.homemodules.alacritty;
+  cfg = config.modules.alacritty;
 in {
-  options.homemodules.alacritty = import ./options.nix {inherit lib mylib;};
+  options.modules.alacritty = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     programs.alacritty = {

home/modules/1_deprecated/audio/default.nix

@@ -8,14 +8,14 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.audio;
+  cfg = config.modules.audio;
-  cfgfp = config.homemodules.flatpak;
+  cfgfp = config.modules.flatpak;
 in {
   imports = [
     ../flatpak
   ];
 
-  options.homemodules.audio = import ./options.nix {inherit lib mylib;};
+  options.modules.audio = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/1_deprecated/emacs/default.nix

@@ -12,13 +12,13 @@ with lib;
 with mylib.modules; let
   # This is the current state of the option that this module defines
   # We use it to determine if the config should be changed below
-  cfg = config.homemodules.emacs;
+  cfg = config.modules.emacs;
 in {
   imports = [];
 
   # Options is a vector of options this module defines
   # This module defines only the "emacs" option and suboptions "enable" and "doom"
-  options.homemodules.emacs = import ./options.nix {inherit lib mylib;};
+  options.modules.emacs = import ./options.nix {inherit lib mylib;};
 
   # Config is the merged set of all module configurations
   # Here we define what happens to the config if the module is active (but only if the module is active)

home/modules/1_deprecated/email/default.nix

@@ -13,9 +13,9 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.email;
+  cfg = config.modules.email;
 in {
-  options.homemodules.email = import ./options.nix {inherit lib mylib;};
+  options.modules.email = import ./options.nix {inherit lib mylib;};
 
   # TODO: Add Maildir to nextcloud sync
   config = mkIf cfg.enable {

home/modules/1_deprecated/flatpak/default.nix

@@ -12,9 +12,9 @@ with mylib.modules;
 #       It is important that every flatpak interaction is handled through this module
 #       to prevent that anything is removed by a module although it is required by another one
   let
-    cfg = config.homemodules.flatpak;
+    cfg = config.modules.flatpak;
   in {
-    options.homemodules.flatpak = import ./options.nix {inherit lib mylib;};
+    options.modules.flatpak = import ./options.nix {inherit lib mylib;};
 
     config = mkIf cfg.enable {
       assertions = [

home/modules/1_deprecated/gaming/default.nix

@@ -7,11 +7,11 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.gaming;
+  cfg = config.modules.gaming;
-  cfgfp = config.homemodules.flatpak;
+  cfgfp = config.modules.flatpak;
 in {
   imports = [
-    # NOTE: I don't know if this is the right approach or if I should use config.homemodules.flatpak
+    # NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
     ../flatpak
   ];
 
@@ -19,7 +19,7 @@ in {
   # TODO: SteamTinkerLaunch option
   # TODO: Dolphin + SteamRomManager option
 
-  options.homemodules.gaming = import ./options.nix {inherit lib mylib;};
+  options.modules.gaming = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/1_deprecated/helix/default.nix

@@ -10,9 +10,9 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.helix;
+  cfg = config.modules.helix;
 in {
-  options.homemodules.helix = import ./options.nix {inherit lib mylib;};
+  options.modules.helix = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     home.sessionVariables = {

home/modules/1_deprecated/misc/default.nix

@@ -9,9 +9,9 @@
 # TODO: Remove this module, put protonmail into the email module
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.misc;
+  cfg = config.modules.misc;
 in {
-  options.homemodules.misc = import ./options.nix {inherit lib mylib;};
+  options.modules.misc = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

home/modules/1_deprecated/nextcloud/default.nix

@@ -12,9 +12,9 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.nextcloud;
+  cfg = config.modules.nextcloud;
 in {
-  options.homemodules.nextcloud = import ./options.nix {inherit lib mylib;};
+  options.modules.nextcloud = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     assertions = [

home/modules/1_deprecated/ranger/default.nix

@@ -8,9 +8,9 @@
 }:
 with lib;
 with mylib.modules; let
-  cfg = config.homemodules.ranger;
+  cfg = config.modules.ranger;
 in {
-  options.homemodules.ranger = import ./options.nix {inherit lib mylib;};
+  options.modules.ranger = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

home/modules/1_deprecated/vscode/default.nix

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

home/modules/beets/default.nix

@@ -6,9 +6,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.homemodules) beets;
+  inherit (config.modules) beets;
 in {
-  options.homemodules.beets = import ./options.nix {inherit lib mylib;};
+  options.modules.beets = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf beets.enable {
     programs.beets = {
@@ -57,7 +57,7 @@ in {
 
         fetchart = {
           auto = "yes";
-          sources = "*"; # sources are queried in this order
+          sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
         };
 
         # lyrics = {

home/modules/btop/default.nix

@@ -6,9 +6,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.homemodules) btop color;
+  inherit (config.modules) btop color;
 in {
-  options.homemodules.btop = import ./options.nix {inherit lib mylib;};
+  options.modules.btop = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf btop.enable {
     programs.btop = {

home/modules/chromium/default.nix

@@ -5,9 +5,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.homemodules) chromium;
+  inherit (config.modules) chromium;
 in {
-  options.homemodules.chromium = import ./options.nix {inherit lib mylib;};
+  options.modules.chromium = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf chromium.enable {
     home.packages = with pkgs;