Modules/Waybar: Update module configurations

.gitignore

@@ -11,3 +11,4 @@ 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

@@ -21,7 +21,7 @@ Contains all the system configurations.
 
 - 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`
+- System modules are located in `NixFlake/system/systemmodules`
 - Hosted services are located in `NixFlake/system/services`
 
 When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
@@ -33,7 +33,7 @@ Contains all the home-manager configurations.
 
 - 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 modules are located in `NixFlake/home/homemodules`
 
 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.

config/flake.nix

@@ -21,6 +21,9 @@ 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;
@@ -28,8 +31,113 @@ 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";
+
+        # 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}"'"
+          # ''
+        ];
+
       # ===========================================================================================
       # Define custom dependencies
       # ===========================================================================================
@@ -68,7 +176,7 @@ rec {
       #   bintools = pkgs.bintools.bintools; # Unwrapped bintools
       #   libc = pkgs.glibc;
       # };
-      # gcc = pkgs.hiPrio (pkgs.wrapCCWith {
+      # gcc = lib.hiPrio (pkgs.wrapCCWith {
       #   cc = pkgs.gcc.cc; # Unwrapped gcc
       #   libc = pkgs.glibc;
       #   bintools = bintools;
@@ -84,7 +192,7 @@ rec {
       #   bintools = pkgs.bintools.bintools; # Unwrapped bintools
       #   libc = pkgs.glibc_multi;
       # };
-      # gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith {
+      # gcc_multilib = lib.hiPrio (pkgs.wrapCCWith {
       #   cc = pkgs.gcc.cc; # Unwrapped gcc
       #   libc = pkgs.glibc_multi;
       #   bintools = bintools_multilib;
@@ -119,11 +227,15 @@ rec {
         # jdk
 
         # C/C++:
+        # pkg-config
+        # cmake
+        # gnumake
+        # ninja
         # gdb
         # valgrind
-        # gnumake
-        # cmake
-        # pkg-config
+        # kdePackages.kcachegrind
+        # perf
+        # hotspot
 
         # Clojure:
         # leiningen
@@ -147,6 +259,8 @@ rec {
         # C/C++:
         # boost
         # sfml
+        # raylib
+        # backward-cpp
 
         # Qt:
         # qt6.qtbase
@@ -162,8 +276,38 @@ rec {
       #   src = ./.;
       #
       #   installPhase = ''
+      #     runHook preInstall
+      #
       #     mkdir -p $out/bin
-      #     mv ./BINARY $out/bin
+      #     cp -rv ./${pname} $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 {
@@ -185,133 +329,76 @@ rec {
       # };
     in rec {
       # Provide package for "nix build"
-      # defaultPackage = package;
-      # defaultApp = flake-utils.lib.mkApp {
-      #   drv = defaultPackage;
+      # packages = {
+      #   default = package;
+      #   windows = windowsPackage;
+      # };
+      # apps = {
+      #   default = flake-utils.lib.mkApp {drv = package;};
       # };
 
-      # Provide environment for "nix develop"
-      devShell = pkgs.mkShell {
-        inherit nativeBuildInputs buildInputs;
-        name = description;
+      devShells = {
+        # Provide default environment for "nix develop".
+        # Other environments can be added below.
+        default = pkgs.mkShell {
+          inherit nativeBuildInputs buildInputs shellHook;
+          name = description;
 
-        # =========================================================================================
-        # Define environment variables
-        # =========================================================================================
+          # =========================================================================================
+          # Define environment variables
+          # =========================================================================================
 
-        # Rust stdlib source:
-        # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
+          # Rust stdlib source:
+          # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
 
-        # Custom dynamic libraries:
-        # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
-        #   # Rust Bevy GUI app:
-        #   # "${pkgs.xorg.libX11}/lib"
-        #   # "${pkgs.xorg.libXcursor}/lib"
-        #   # "${pkgs.xorg.libXrandr}/lib"
-        #   # "${pkgs.xorg.libXi}/lib"
-        #   # "${pkgs.libGL}/lib"
+          # Custom dynamic libraries:
+          # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
+          #   # Rust Bevy GUI app:
+          #   # "${pkgs.libx11}/lib"
+          #   # "${pkgs.libxcursor}/lib"
+          #   # "${pkgs.libxrandr}/lib"
+          #   # "${pkgs.libxi}/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;
         #
-        #   # 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";
-
-        # =========================================================================================
-        # 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}"'"
-            # ''
-          ];
+        #     # If not required, use pkgs instead of clangPkgs for a lighter build
+        #     nativeBuildInputs = with pkgs; [];
+        #     buildInputs = with pkgs; [];
+        #
+        #     # =========================================================================================
+        #     # Define environment variables
+        #     # =========================================================================================
+        #
+        #     # Dynamic libraries from buildinputs:
+        #     LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
+        #   };
       };
     });
 }

config/navi/christoph.cheat

@@ -210,6 +210,10 @@ 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
 ; ===========================

config/neovim/bundle.py

@@ -0,0 +1,204 @@
+#!/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

@@ -0,0 +1,6 @@
+# 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

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.modules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
+  toModule = type: name: {options.systemmodules.${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,4 +9,5 @@
   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,11 +10,12 @@
   #
   pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
     typer = super.typer.overridePythonAttrs (old: {
-      version = "0.20.0";
+      version = "0.20.1";
       src = super.fetchPypi {
         inherit (old) pname;
-        version = "0.20.0";
-        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
+        version = "0.20.1";
+        # sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc="; # v0.20.0
+        sha256 = "sha256-aFhesbASA2icQZm8RA1r5hbwhR6fDrQeSneIRcWg/Vs="; # v0.20.1
       };
     });
 
@@ -48,30 +49,33 @@
   #   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";
-    version = "0.31.3";
+    pname = "tidal_dl_ng_for_dj";
+    version = "0.33.2";
     format = "pyproject";
 
-    src = pkgs.fetchFromGitHub {
-      owner = "exislow";
-      repo = "tidal-dl-ng";
-      rev = "v${version}";
-      sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
+    # The official repo was deleted
+    # src = pkgs.fetchFromGitHub {
+    #   owner = "exislow";
+    #   repo = "tidal-dl-ng";
+    #   rev = "v${version}";
+    #   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=";
     };
 
-    doCheck = false;
-    catchConflicts = false;
+    dontCheckRuntimeDeps = true;
 
     nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
 
@@ -96,13 +100,6 @@
       typer
       rich
     ];
-
-    # pythonOutputDistPhase = ''
-    #   echo "⚠️Skipping pythonOutputDistPhase"
-    # '';
-    # pythonCatchConflictsPhase = ''
-    #   echo "🛑 Skipping pythonCatchConflictsPhase"
-    # '';
   };
 
   #
@@ -131,7 +128,7 @@
 
   tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
     pname = "tdng";
-    version = "0.31.3";
+    version = "0.33.2";
     dontUnpack = true;
 
     nativeBuildInputs = [pkgs.makeWrapper];

derivations/tiddl/default.nix

@@ -0,0 +1,63 @@
+{
+  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.2.0";
+    format = "pyproject";
+
+    src = pythonPkgs.fetchPypi {
+      inherit pname version;
+      sha256 = "sha256-uLkGyIScYPqFgQdPAOYJDJG0jp+nDAwIl2kFkaJZFco=";
+    };
+
+    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
-          xorg.libXrandr
+          libxrandr
           xdg-utils
 
           # GTK filepicker
@@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
           dbus
           at-spi2-core
           pango
-          xorg.libXcomposite
-          xorg.libXext
-          xorg.libXdamage
-          xorg.libXfixes
-          xorg.libxcb
-          xorg.libxshmfence
-          xorg.libXScrnSaver
-          xorg.libXtst
+          libxcomposite
+          libxext
+          libxdamage
+          libxfixes
+          libxcb
+          libxshmfence
+          libxScrnSaver
+          libxtst
 
           # Unity Hub additional dependencies
           libva
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
 
           # Unity Editor dependencies
           libglvnd # provides ligbl
-          xorg.libX11
-          xorg.libXcursor
+          libx11
+          libxcursor
           glib
           gdk-pixbuf
           libxml2-legacy
@@ -111,8 +111,8 @@ stdenv.mkDerivation rec {
           vulkan-loader
 
           # Unity Bug Reporter specific dependencies
-          xorg.libICE
-          xorg.libSM
+          libICE
+          libSM
 
           # Fonts used by built-in and third party editor tools
           corefonts

flake.nix

@@ -53,22 +53,27 @@
     niri.url = "github:sodiboo/niri-flake";
     niri.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Walker
+    elephant.url = "github:abenz1267/elephant";
+    walker.url = "github:abenz1267/walker";
+    walker.inputs.elephant.follows = "elephant";
+
     # Quickshell
-    quickshell.url = "github:quickshell-mirror/quickshell";
-    quickshell.inputs.nixpkgs.follows = "nixpkgs";
+    # quickshell.url = "github:quickshell-mirror/quickshell";
+    # quickshell.inputs.nixpkgs.follows = "nixpkgs";
 
     # Noctalia shell
-    noctalia.url = "github:noctalia-dev/noctalia-shell";
-    noctalia.inputs.nixpkgs.follows = "nixpkgs";
+    # 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";
+    # 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.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";
 
@@ -77,24 +82,26 @@
     # dgop.inputs.nixpkgs.follows = "nixpkgs";
     # dms-cli.url = "github:AvengeMedia/danklinux";
     # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
-    # dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
-    # dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
-    # dankMaterialShell.inputs.dgop.follows = "dgop";
+    # dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
+    # dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
+    # dank-material-shell.inputs.dgop.follows = "dgop";
+    # danksearch.url = "github:AvengeMedia/danksearch";
+    # danksearch.inputs.nixpkgs.follows = "nixpkgs";
 
     # Hyprland (use flake so plugins are not built from source)
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+    # 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";
+    # 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";
+    # hyprspace.inputs.hyprland.follows = "hyprland";
 
     # NeoVim <3
     nixvim.url = "github:nix-community/nixvim";
@@ -115,6 +122,16 @@
     # Realtime audio
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
+
+    # ComfyUI
+    # nixified-ai.url = "github:nixified-ai/flake";
+    # comfyui-nix.url = "github:utensils/comfyui-nix";
+
+    # 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.
@@ -164,6 +181,7 @@
         inputs.nur.overlays.default
         inputs.niri.overlays.niri
         # inputs.emacs-overlay.overlay
+        # inputs.comfyui-nix.overlays.default
 
         # All my own overlays (derivations + modifications)
         (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
@@ -231,6 +249,8 @@
         extraModules =
           [
             inputs.disko.nixosModules.disko
+            # inputs.nixified-ai.nixosModules.comfyui
+            # inputs.comfyui-nix.nixosModules.default
           ]
           ++ commonModules;
       };

home/christoph/default.nix

@@ -15,7 +15,7 @@
   headless,
   ...
 }: let
-  inherit (config.modules) color;
+  inherit (config.homemodules) color;
 in
   # This is a HM module.
   # Because no imports/options/config is defined explicitly, everything is treated as config:
@@ -25,16 +25,6 @@ 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 {
@@ -42,7 +32,7 @@ in
       dotfiles = "${nixflake}/config";
     };
 
-    modules = {
+    homemodules = {
       beets.enable = !headless;
 
       btop.enable = true;
@@ -57,7 +47,8 @@ in
         extraPackages = with pkgs; [
           papirus-icon-theme
           bibata-cursors
-          inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
+          # Lol
+          # inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
         ];
 
         cursor = "Bibata-Modern-Classic";
@@ -97,190 +88,6 @@ in
         signCommits = true;
       };
 
-      hyprland = {
-        enable = !headless;
-        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
-          "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-          "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-        ];
-
-        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;
@@ -291,7 +98,7 @@ in
         neovide = !headless;
       };
 
-      niri.enable = !headless;
+      niri.enable = nixosConfig.programs.niri.enable;
       nnn.enable = false; # Use yazi
       qutebrowser.enable = !headless;
       rmpc.enable = !headless;
@@ -300,7 +107,7 @@ in
         enable = !headless;
       };
 
-      waybar.enable = false; # Use hyprpanel
+      waybar.enable = !headless;
       yazi.enable = true;
       zathura.enable = !headless;
     };
@@ -318,10 +125,10 @@ in
     # as nixosConfig won't be available otherwise.
     xdg = {
       enable = true; # This only does xdg path management
-      mime.enable = nixosConfig.modules.mime.enable;
+      mime.enable = nixosConfig.systemmodules.mime.enable;
 
       mimeApps = {
-        enable = nixosConfig.modules.mime.enable;
+        enable = nixosConfig.systemmodules.mime.enable;
 
         associations.added = nixosConfig.xdg.mime.addedAssociations;
         associations.removed = nixosConfig.xdg.mime.removedAssociations;
@@ -392,7 +199,7 @@ in
             config.lib.file.mkOutOfStoreSymlink
             nixosConfig.sops.templates."nix.conf".path;
         }
-        (lib.mkIf nixosConfig.modules.desktopportal.termfilechooser.enable {
+        (lib.mkIf nixosConfig.systemmodules.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
@@ -402,7 +209,7 @@ in
             save_mode = last
           '';
         })
-        (lib.mkIf config.modules.git.enable {
+        (lib.mkIf config.homemodules.git.enable {
           ".ssh/allowed_signers".text = "* ${publicKeys.${username}.ssh}";
         })
         (lib.mkIf config.programs.navi.enable {
@@ -440,6 +247,15 @@ 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
+          '';
         })
       ];
 
@@ -454,7 +270,7 @@ in
       };
 
       # Add stuff for your user as you see fit:
-      # TODO: Make the headless installations smaller
+      # TODO: Make the headless installations smaller. Don't install stuff here if !headless but in nixinator config.
       packages = with pkgs;
         lib.mkMerge [
           [
@@ -467,6 +283,7 @@ in
             tealdeer # Very fast tldr (so readable man)
             killall
             atool # Archive preview
+            exiftool
             ouch # Unified compression/decompression
             ffmpegthumbnailer # Video thumbnails
             mediainfo # Media meta information
@@ -487,6 +304,12 @@ in
             lazyjournal # Journalctl viewer
             systemctl-tui
             restic # Backups
+            gnumake
+            just # make alternative
+            binsider # .elf analyzer
+            jujutsu # git-like vcs
+            lurk # strace analysis
+            radare2
 
             # Hardware/Software info
             pciutils # lspci
@@ -508,7 +331,7 @@ in
             imagemagick # Convert image (magic)
             mp3val # Validate mp3 files
             flac # Validate flac files
-            spotdl
+            # spotdl
 
             # Document utils
             poppler-utils # pdfunite
@@ -526,7 +349,7 @@ in
             gping # ping with graph
             curlie # curl a'la httpie
             wget # download that shit
-            dogdns # dns client
+            doggo # dns client
             rsync # cp on steroids
             rclone # Rsync for cloud
             httpie # Cool http client
@@ -548,6 +371,7 @@ in
           (lib.mkIf (!headless) [
             ripdrag # drag & drop from terminal
             veracrypt
+            wl-clipboard
 
             # Proton
             protonvpn-gui
@@ -564,16 +388,15 @@ in
             obsidian
             zotero
             zeal # docs browser
-            helvum
+            # helvum # unmaintained
+            crosspipe
             vlc
             audacity
             ferdium
             gparted
-            tidal-hifi
-            tidal-dl-ng
-            picard
-            handbrake
-            teamspeak6-client
+            # feishin # electron :(
+            jellyfin-tui
+            czkawka-full # file deduplicator
 
             # Office
             kdePackages.wacomtablet # For xournalpp/krita
@@ -581,6 +404,8 @@ in
             hunspell # I cna't type
             hunspellDicts.en_US
             hunspellDicts.de_DE
+
+            inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
           ])
         ];
     };
@@ -654,7 +479,7 @@ in
 
       eza = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       # TODO: Module
@@ -811,7 +636,7 @@ in
 
       fzf = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       imv = {
@@ -829,7 +654,7 @@ in
 
       keychain = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
         enableXsessionIntegration = !headless;
         keys = ["id_ed25519"];
       };
@@ -843,12 +668,12 @@ in
 
       navi = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       nix-index = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       nushell.enable = false;
@@ -909,6 +734,25 @@ in
             user = "root";
             hostname = "vps.chriphost.de";
           };
+          "mars" = {
+            user = "smchurla";
+            hostname = "mars.cs.tu-dortmund.de";
+            serverAliveInterval = 60;
+            localForwards = [
+              {
+                # 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;
+              }
+            ];
+          };
         };
       };
 
@@ -940,7 +784,7 @@ in
 
       zoxide = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
     };
 
@@ -992,14 +836,18 @@ in
             # Force Wayland by default
             # Context.sockets = ["wayland" "!x11" "!fallback-x11"]; # NOTE: Makes discord + steam crash
 
-            Context.filesystems = ["/nix/store:ro"];
+            Context.filesystems = [
+              "/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 = "Adwaita:light";
+              GTK_THEME = config.gtk.theme.name;
             };
           };
 

home/christoph/nixinator/default.nix

@@ -6,66 +6,18 @@
   lib,
   mylib,
   username,
+  inputs,
   ...
 }: {
-  imports = [
-    ../../modules
-  ];
-
   config = {
-    modules = {
+    homemodules = {
       btop.cuda = true;
 
       # This has been relocated here from the default config,
       # because it forces en-US keyboard layout.
       fcitx.enable = true;
 
-      hyprland = {
-        keyboard = {
-          layout = "us";
-          variant = "altgr-intl";
-          option = "nodeadkeys";
-        };
-
-        monitors = {
-          "DP-1" = {
-            width = 3440;
-            height = 1440;
-            rate = 165;
-            x = 1920;
-            y = 0;
-            scale = 1;
-          };
-
-          "DP-2" = {
-            width = 1920;
-            height = 1080;
-            rate = 60;
-            x = 0;
-            y = 0;
-            scale = 1;
-          };
-        };
-
-        workspaces = {
-          "DP-1" = [1 2 3 4 5 6 7 8 9];
-          "DP-2" = [10];
-        };
-
-        autostart = {
-          delayed = [
-            "fcitx5"
-          ];
-        };
-
-        floating = [
-          {
-            class = "fcitx";
-          }
-        ];
-      };
-
-      waybar.monitor = "DP-1";
+      waybar.monitors = ["DP-1" "DP-2"];
     };
 
     home = let
@@ -117,52 +69,63 @@
         # Intel FPGA design software
         # quartus-prime-lite
 
-        # jetbrains.clion
+        jetbrains.clion
         # jetbrains.rust-rover
         # jetbrains.pycharm-professional
         # jetbrains.idea-ultimate
         # jetbrains.webstorm
         # jetbrains.rider
+        zed-editor
+        vscode
+        # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra)
 
         # 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
+        tiddl
+        picard
+        handbrake
+        teamspeak6-client
 
         steam-devices-udev-rules
       ];
 
       file = lib.mkMerge [
-        # {
-        #   ".local/share/applications/jetbrains-rider.desktop".source = let
-        #     desktopFile = pkgs.makeDesktopItem {
-        #       name = "jetbrains-rider";
-        #       desktopName = "Rider";
-        #       exec = "\"${rider-unity}/bin/rider\"";
-        #       icon = "rider";
-        #       type = "Application";
-        #       # Don't show desktop icon in search or run launcher
-        #       extraConfig.NoDisplay = "true";
-        #     };
-        #   in "${desktopFile}/share/applications/jetbrains-rider.desktop";
-        #
-        #   ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
-        #     ../../../config/mangohud/MangoHud.conf;
-        # }
+        {
+          # ".local/share/applications/jetbrains-rider.desktop".source = let
+          #   desktopFile = pkgs.makeDesktopItem {
+          #     name = "jetbrains-rider";
+          #     desktopName = "Rider";
+          #     exec = "\"${rider-unity}/bin/rider\"";
+          #     icon = "rider";
+          #     type = "Application";
+          #     # Don't show desktop icon in search or run launcher
+          #     extraConfig.NoDisplay = "true";
+          #   };
+          # in "${desktopFile}/share/applications/jetbrains-rider.desktop";
+
+          ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
+            ../../../config/mangohud/MangoHud.conf;
+        }
         (lib.optionalAttrs (mylib.modules.contains config.home.packages pkgs.makemkv) {
           ".MakeMKV/settings.conf".source =
             config.lib.file.mkOutOfStoreSymlink
@@ -176,46 +139,19 @@
     };
 
     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.Utility.steamtinkerlaunch"
+          "com.valvesoftware.Steam"
+          "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"
 
           # "com.unity.UnityHub"
         ];
@@ -245,6 +181,13 @@
             ];
           };
 
+          "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,11 +1,7 @@
 # Here goes the stuff that will only be enabled on the laptop
-{...}: {
-  imports = [
-    ../../modules
-  ];
-
+{pkgs, ...}: {
   config = {
-    modules = {
+    homemodules = {
       hyprland = {
         keyboard = {
           layout = "us";
@@ -33,7 +29,9 @@
     };
 
     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,12 +6,8 @@
   username,
   ...
 }: {
-  imports = [
-    ../../modules
-  ];
-
   config = {
-    modules = {
+    homemodules = {
       btop.cuda = true;
     };
 

home/christoph/thinknix/default.nix

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

home/homemodules/0_template/default.nix

@@ -0,0 +1,14 @@
+{
+  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/ags/default.nix

@@ -6,9 +6,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules) ags;
+  inherit (config.homemodules) ags;
 in {
-  options.modules.ags = import ./options.nix {inherit lib mylib;};
+  options.homemodules.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.modules.color.hex; ''
+      ".config/_colors.scss".text = with config.homemodules.color.hex; ''
         $dark-rosewater: #${dark.rosewater};
         $dark-flamingo: #${dark.flamingo};
         $dark-pink: #${dark.pink};

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

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

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

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

home/homemodules/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.modules.emacs;
+  cfg = config.homemodules.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.modules.emacs = import ./options.nix {inherit lib mylib;};
+  options.homemodules.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/homemodules/1_deprecated/email/default.nix

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

home/homemodules/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.modules.flatpak;
+    cfg = config.homemodules.flatpak;
   in {
-    options.modules.flatpak = import ./options.nix {inherit lib mylib;};
+    options.homemodules.flatpak = import ./options.nix {inherit lib mylib;};
 
     config = mkIf cfg.enable {
       assertions = [

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

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

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

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

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

@@ -8,7 +8,7 @@
   username,
   ...
 }: let
-  inherit (config.modules) hyprland color;
+  inherit (config.homemodules) hyprland color;
 
   # Autostart programs
   always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
@@ -22,7 +22,7 @@
     "$mainMod, mouse:273" = ["resizewindow"];
   };
 in {
-  options.modules.hyprland = import ./options.nix {inherit lib mylib;};
+  options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf hyprland.enable {
     assertions = [
@@ -46,7 +46,7 @@ in {
       iconTheme.name = color.iconTheme;
     };
 
-    modules = {
+    homemodules = {
       hyprpanel.enable = hyprland.hyprpanel.enable;
     };
 

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

@@ -11,7 +11,7 @@
 
   settings = {
     global = {
-      monitor = config.modules.waybar.monitor;
+      monitor = config.homemodules.waybar.monitor;
       font = "${color.font} 11";
       offset = "10x10";
       background = color.hexS.base;

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

@@ -0,0 +1,44 @@
+{
+  keyboard = {
+    layout = "us";
+    variant = "altgr-intl";
+    option = "nodeadkeys";
+  };
+
+  monitors = {
+    "DP-1" = {
+      width = 3440;
+      height = 1440;
+      rate = 165;
+      x = 1920;
+      y = 0;
+      scale = 1;
+    };
+
+    "DP-2" = {
+      width = 1920;
+      height = 1080;
+      rate = 60;
+      x = 0;
+      y = 0;
+      scale = 1;
+    };
+  };
+
+  workspaces = {
+    "DP-1" = [1 2 3 4 5 6 7 8 9];
+    "DP-2" = [10];
+  };
+
+  autostart = {
+    delayed = [
+      "fcitx5"
+    ];
+  };
+
+  floating = [
+    {
+      class = "fcitx";
+    }
+  ];
+}

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

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

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

@@ -111,19 +111,19 @@
 
   windowrule = let
     mkWorkspaceRule = workspace: class:
-      "workspace ${workspace}, "
-      + "class:^(${class})$";
+      "match:class ^(${class})$, "
+      + "workspace ${workspace}";
     mkWorkspaceRules = workspace: class-list:
       builtins.map (mkWorkspaceRule workspace) class-list;
 
     mkFloatingRule = attrs:
-      "float"
-      + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
-      + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
+      (lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
+      + (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
+      + "float 1";
 
     mkTranslucentRule = class:
-      "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
-      + "class:^(${class})$";
+      "match:class ^(${class})$, "
+      + "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}";
   in
     lib.mkMerge [
       (hyprland.workspacerules
@@ -165,15 +165,15 @@
   # Because those are not windows, but layers,
   # we have to blur them explicitly
   layerrule = [
-    "blur,rofi"
-    "ignorealpha 0.001,rofi" # Fix pixelated corners
-    "xray 0,rofi" # Render on top of other windows
-    "dimaround,rofi"
+    "match:class rofi, blur 1"
+    # "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
+    # "match:class rofi, xray 0" # Render on top of other windows
+    # "match:class rofi, dim_around 1"
 
-    "blur,waybar"
-    "blur,gtk4-layer-shell"
-    "blur,bar-0"
-    "blur,bar-1"
+    "match:class waybar, blur 1"
+    "match:class gtk4-layer-shell, blur 1"
+    "match:class bar-0, blur 1"
+    "match:class bar-1, blur 1"
   ];
 
   decoration = {

home/homemodules/1_deprecated/hyprpanel/default.nix

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

home/homemodules/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.modules.misc;
+  cfg = config.homemodules.misc;
 in {
-  options.modules.misc = import ./options.nix {inherit lib mylib;};
+  options.homemodules.misc = import ./options.nix {inherit lib mylib;};
 
   config = mkIf cfg.enable {
     home.packages = with pkgs;

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

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

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

@@ -0,0 +1,555 @@
+{
+  "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/1_deprecated/niri/dankMaterialShell.nix

@@ -0,0 +1,664 @@
+{
+  config,
+  color,
+}: {
+  enable = true;
+
+  systemd = {
+    enable = false;
+    restartIfChanged = true;
+  };
+
+  # Deprecated
+  # enableClipboard = true;
+  # enableBrightnessControl = false;
+  # enableColorPicker = true;
+  # enableSystemSound = false;
+
+  enableSystemMonitoring = true;
+  enableVPN = true;
+  enableDynamicTheming = false;
+  enableAudioWavelength = true;
+  enableCalendarEvents = false;
+
+  niri = {
+    enableKeybinds = false;
+    enableSpawn = false;
+  };
+
+  # This is generated from the DMS settings dialog.
+  # Run: nix eval --impure --expr 'builtins.fromJSON (builtins.readFile ~/.config/DankMaterialShell/settings.json)'
+  settings = {
+    acLockTimeout = 0;
+    acMonitorTimeout = 0;
+    acProfileName = "";
+    acSuspendBehavior = 0;
+    acSuspendTimeout = 0;
+    activeDisplayProfile = {};
+    animationSpeed = 1;
+    appDrawerSectionViewModes = {};
+    appIdSubstitutions = [
+      {
+        pattern = "Spotify";
+        replacement = "spotify";
+        type = "exact";
+      }
+      {
+        pattern = "beepertexts";
+        replacement = "beeper";
+        type = "exact";
+      }
+      {
+        pattern = "home assistant desktop";
+        replacement = "homeassistant-desktop";
+        type = "exact";
+      }
+      {
+        pattern = "com.transmissionbt.transmission";
+        replacement = "transmission-gtk";
+        type = "contains";
+      }
+      {
+        pattern = "^steam_app_(\\d+)$";
+        replacement = "steam_icon_$1";
+        type = "regex";
+      }
+    ];
+    appLauncherGridColumns = 4;
+    appLauncherViewMode = "list";
+    appPickerViewMode = "grid";
+    appsDockActiveColorMode = "primary";
+    appsDockColorizeActive = false;
+    appsDockEnlargeOnHover = false;
+    appsDockEnlargePercentage = 125;
+    appsDockHideIndicators = false;
+    appsDockIconSizePercentage = 100;
+    audioInputDevicePins = {};
+    audioOutputDevicePins = {};
+    audioScrollMode = "volume";
+    audioVisualizerEnabled = true;
+    audioWheelScrollAmount = 5;
+    barConfigs = [
+      {
+        autoHide = false;
+        autoHideDelay = 250;
+        borderColor = "surfaceText";
+        borderEnabled = false;
+        borderOpacity = 1;
+        borderThickness = 2;
+        bottomGap = 0;
+        centerWidgets = [
+          {
+            enabled = true;
+            id = "music";
+            mediaSize = 1;
+          }
+        ];
+        enabled = true;
+        fontScale = 1.1;
+        gothCornerRadiusOverride = false;
+        gothCornerRadiusValue = 12;
+        gothCornersEnabled = false;
+        id = "default";
+        innerPadding = 4;
+        leftWidgets = [
+          {
+            enabled = true;
+            id = "launcherButton";
+          }
+          {
+            enabled = true;
+            id = "workspaceSwitcher";
+          }
+          {
+            enabled = true;
+            focusedWindowCompactMode = true;
+            id = "focusedWindow";
+          }
+        ];
+        maximizeDetection = true;
+        name = "Main Bar";
+        noBackground = false;
+        openOnOverview = true;
+        popupGapsAuto = true;
+        popupGapsManual = 4;
+        position = 0;
+        rightWidgets = [
+          {
+            enabled = true;
+            id = "privacyIndicator";
+          }
+          {
+            enabled = true;
+            id = "cpuUsage";
+            minimumWidth = true;
+          }
+          {
+            enabled = true;
+            id = "memUsage";
+            minimumWidth = true;
+          }
+          {
+            enabled = true;
+            id = "diskUsage";
+          }
+          {
+            enabled = true;
+            id = "colorPicker";
+          }
+          {
+            enabled = true;
+            id = "clipboard";
+          }
+          {
+            enabled = true;
+            id = "vpn";
+          }
+          {
+            enabled = true;
+            id = "controlCenterButton";
+          }
+          {
+            enabled = true;
+            id = "systemTray";
+          }
+          {
+            clockCompactMode = true;
+            enabled = true;
+            id = "clock";
+          }
+          {
+            enabled = true;
+            id = "notificationButton";
+          }
+        ];
+        screenPreferences = ["all"];
+        showOnLastDisplay = true;
+        spacing = 0;
+        squareCorners = true;
+        transparency = 1;
+        visible = true;
+        widgetOutlineColor = "primary";
+        widgetOutlineEnabled = false;
+        widgetOutlineOpacity = 1;
+        widgetOutlineThickness = 2;
+        widgetTransparency = 1;
+      }
+    ];
+    barMaxVisibleApps = 0;
+    barMaxVisibleRunningApps = 0;
+    barShowOverflowBadge = true;
+    batteryChargeLimit = 100;
+    batteryLockTimeout = 0;
+    batteryMonitorTimeout = 0;
+    batteryProfileName = "";
+    batterySuspendBehavior = 0;
+    batterySuspendTimeout = 0;
+    bluetoothDevicePins = {};
+    blurWallpaperOnOverview = true;
+    blurredWallpaperLayer = true;
+    brightnessDevicePins = {};
+    browserPickerViewMode = "grid";
+    browserUsageHistory = {};
+    builtInPluginSettings = {dms_settings_search = {trigger = "?";};};
+    buttonColorMode = "primary";
+    centeringMode = "index";
+    clipboardEnterToPaste = false;
+    clockCompactMode = false;
+    clockDateFormat = "yyyy-MM-dd";
+    configVersion = 5;
+    controlCenterShowAudioIcon = true;
+    controlCenterShowAudioPercent = false;
+    controlCenterShowBatteryIcon = false;
+    controlCenterShowBluetoothIcon = true;
+    controlCenterShowBrightnessIcon = false;
+    controlCenterShowBrightnessPercent = false;
+    controlCenterShowMicIcon = true;
+    controlCenterShowMicPercent = false;
+    controlCenterShowNetworkIcon = true;
+    controlCenterShowPrinterIcon = false;
+    controlCenterShowScreenSharingIcon = true;
+    controlCenterShowVpnIcon = true;
+    controlCenterTileColorMode = "primary";
+    controlCenterWidgets = [
+      {
+        enabled = true;
+        id = "volumeSlider";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "brightnessSlider";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "wifi";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "bluetooth";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "audioOutput";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "audioInput";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "nightMode";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "darkMode";
+        width = 50;
+      }
+    ];
+    cornerRadius = 10;
+    currentThemeCategory = "registry";
+    currentThemeName = "custom";
+    cursorSettings = {
+      dwl = {cursorHideTimeout = 0;};
+      hyprland = {
+        hideOnKeyPress = false;
+        hideOnTouch = false;
+        inactiveTimeout = 0;
+      };
+      niri = {
+        hideAfterInactiveMs = 0;
+        hideWhenTyping = false;
+      };
+      size = 24;
+      theme = "System Default";
+    };
+    customAnimationDuration = 500;
+    customPowerActionHibernate = "";
+    customPowerActionLock = "";
+    customPowerActionLogout = "";
+    customPowerActionPowerOff = "";
+    customPowerActionReboot = "";
+    customPowerActionSuspend = "";
+    customThemeFile = "/home/christoph/NixFlake/config/dankmaterialshell/catppuccin-mauve.json";
+    dankLauncherV2BorderColor = "primary";
+    dankLauncherV2BorderEnabled = false;
+    dankLauncherV2BorderThickness = 2;
+    dankLauncherV2ShowFooter = true;
+    dankLauncherV2Size = "compact";
+    dankLauncherV2UnloadOnClose = false;
+    desktopClockColorMode = "primary";
+    desktopClockCustomColor = {
+      a = 1;
+      b = 1;
+      g = 1;
+      hslHue = -1;
+      hslLightness = 1;
+      hslSaturation = 0;
+      hsvHue = -1;
+      hsvSaturation = 0;
+      hsvValue = 1;
+      r = 1;
+      valid = true;
+    };
+    desktopClockDisplayPreferences = ["all"];
+    desktopClockEnabled = false;
+    desktopClockHeight = 180;
+    desktopClockShowAnalogNumbers = false;
+    desktopClockShowAnalogSeconds = true;
+    desktopClockShowDate = true;
+    desktopClockStyle = "analog";
+    desktopClockTransparency = 0.8;
+    desktopClockWidth = 280;
+    desktopClockX = -1;
+    desktopClockY = -1;
+    desktopWidgetGridSettings = {};
+    desktopWidgetGroups = [];
+    desktopWidgetInstances = [];
+    desktopWidgetPositions = {};
+    displayNameMode = "system";
+    displayProfileAutoSelect = false;
+    displayProfiles = {};
+    displayShowDisconnected = false;
+    displaySnapToEdge = true;
+    dockAutoHide = false;
+    dockBorderColor = "surfaceText";
+    dockBorderEnabled = false;
+    dockBorderOpacity = 1;
+    dockBorderThickness = 1;
+    dockBottomGap = 0;
+    dockGroupByApp = false;
+    dockIconSize = 40;
+    dockIndicatorStyle = "circle";
+    dockIsolateDisplays = false;
+    dockLauncherEnabled = false;
+    dockLauncherLogoBrightness = 0.5;
+    dockLauncherLogoColorOverride = "";
+    dockLauncherLogoContrast = 1;
+    dockLauncherLogoCustomPath = "";
+    dockLauncherLogoMode = "apps";
+    dockLauncherLogoSizeOffset = 0;
+    dockMargin = 0;
+    dockMaxVisibleApps = 0;
+    dockMaxVisibleRunningApps = 0;
+    dockOpenOnOverview = false;
+    dockPosition = 1;
+    dockShowOverflowBadge = true;
+    dockSmartAutoHide = false;
+    dockSpacing = 4;
+    dockTransparency = 1;
+    dwlShowAllTags = false;
+    enableFprint = false;
+    enableRippleEffects = true;
+    enabledGpuPciIds = [];
+    fadeToDpmsEnabled = true;
+    fadeToDpmsGracePeriod = 5;
+    fadeToLockEnabled = true;
+    fadeToLockGracePeriod = 5;
+    filePickerUsageHistory = {};
+    focusedWindowCompactMode = false;
+    fontFamily = "MonoLisa Normal";
+    fontScale = 1;
+    fontWeight = 500;
+    groupWorkspaceApps = true;
+    gtkThemingEnabled = false;
+    hideBrightnessSlider = false;
+    hyprlandLayoutBorderSize = -1;
+    hyprlandLayoutGapsOverride = -1;
+    hyprlandLayoutRadiusOverride = -1;
+    hyprlandOutputSettings = {};
+    iconTheme = "System Default";
+    keyboardLayoutNameCompactMode = false;
+    launchPrefix = "";
+    launcherLogoBrightness = 0.5;
+    launcherLogoColorInvertOnMode = false;
+    launcherLogoColorOverride = "";
+    launcherLogoContrast = 1;
+    launcherLogoCustomPath = "";
+    launcherLogoMode = "os";
+    launcherLogoSizeOffset = 0;
+    launcherPluginOrder = [];
+    launcherPluginVisibility = {};
+    lockAtStartup = false;
+    lockBeforeSuspend = false;
+    lockDateFormat = "yyyy-MM-dd";
+    lockScreenActiveMonitor = "all";
+    lockScreenInactiveColor = "#000000";
+    lockScreenNotificationMode = 0;
+    lockScreenPowerOffMonitorsOnLock = false;
+    lockScreenShowDate = true;
+    lockScreenShowMediaPlayer = true;
+    lockScreenShowPasswordField = true;
+    lockScreenShowPowerActions = true;
+    lockScreenShowProfileImage = true;
+    lockScreenShowSystemIcons = true;
+    lockScreenShowTime = true;
+    loginctlLockIntegration = true;
+    mangoLayoutBorderSize = -1;
+    mangoLayoutGapsOverride = -1;
+    mangoLayoutRadiusOverride = -1;
+    matugenScheme = "scheme-tonal-spot";
+    matugenTargetMonitor = "";
+    matugenTemplateAlacritty = true;
+    matugenTemplateDgop = true;
+    matugenTemplateEmacs = true;
+    matugenTemplateEquibop = true;
+    matugenTemplateFirefox = true;
+    matugenTemplateFoot = true;
+    matugenTemplateGhostty = true;
+    matugenTemplateGtk = true;
+    matugenTemplateHyprland = true;
+    matugenTemplateKcolorscheme = true;
+    matugenTemplateKitty = true;
+    matugenTemplateMangowc = true;
+    matugenTemplateNeovim = true;
+    matugenTemplateNiri = true;
+    matugenTemplatePywalfox = true;
+    matugenTemplateQt5ct = true;
+    matugenTemplateQt6ct = true;
+    matugenTemplateVesktop = true;
+    matugenTemplateVscode = true;
+    matugenTemplateWezterm = true;
+    matugenTemplateZenBrowser = true;
+    maxFprintTries = 15;
+    maxWorkspaceIcons = 3;
+    mediaSize = 1;
+    modalAnimationSpeed = 1;
+    modalCustomAnimationDuration = 150;
+    modalDarkenBackground = true;
+    monoFontFamily = "MonoLisa Normal";
+    networkPreference = "auto";
+    nightModeEnabled = false;
+    niriLayoutBorderSize = -1;
+    niriLayoutGapsOverride = -1;
+    niriLayoutRadiusOverride = -1;
+    niriOutputSettings = {};
+    niriOverviewOverlayEnabled = true;
+    notepadFontFamily = "";
+    notepadFontSize = 14;
+    notepadLastCustomTransparency = 0.7;
+    notepadShowLineNumbers = false;
+    notepadTransparencyOverride = -1;
+    notepadUseMonospace = true;
+    notificationAnimationSpeed = 1;
+    notificationCompactMode = false;
+    notificationCustomAnimationDuration = 400;
+    notificationHistoryEnabled = true;
+    notificationHistoryMaxAgeDays = 7;
+    notificationHistoryMaxCount = 50;
+    notificationHistorySaveCritical = true;
+    notificationHistorySaveLow = true;
+    notificationHistorySaveNormal = true;
+    notificationOverlayEnabled = false;
+    notificationPopupPosition = 0;
+    notificationPopupPrivacyMode = false;
+    notificationPopupShadowEnabled = true;
+    notificationRules = [];
+    notificationTimeoutCritical = 0;
+    notificationTimeoutLow = 5000;
+    notificationTimeoutNormal = 5000;
+    osdAlwaysShowValue = true;
+    osdAudioOutputEnabled = true;
+    osdBrightnessEnabled = true;
+    osdCapsLockEnabled = true;
+    osdIdleInhibitorEnabled = true;
+    osdMediaPlaybackEnabled = true;
+    osdMediaVolumeEnabled = true;
+    osdMicMuteEnabled = true;
+    osdPosition = 7;
+    osdPowerProfileEnabled = false;
+    osdVolumeEnabled = true;
+    padHours12Hour = false;
+    popoutAnimationSpeed = 1;
+    popoutCustomAnimationDuration = 150;
+    popupTransparency = 1;
+    powerActionConfirm = true;
+    powerActionHoldDuration = 0.5;
+    powerMenuActions = ["reboot" "logout" "poweroff" "lock" "restart"];
+    powerMenuDefaultAction = "poweroff";
+    powerMenuGridLayout = false;
+    privacyShowCameraIcon = false;
+    privacyShowMicIcon = false;
+    privacyShowScreenShareIcon = false;
+    qtThemingEnabled = false;
+    registryThemeVariants = {};
+    reverseScrolling = false;
+    runDmsMatugenTemplates = false;
+    runUserMatugenTemplates = false;
+    runningAppsCompactMode = true;
+    runningAppsCurrentMonitor = false;
+    runningAppsCurrentWorkspace = false;
+    runningAppsGroupByApp = false;
+    screenPreferences = {};
+    scrollTitleEnabled = true;
+    selectedGpuIndex = 0;
+    showBattery = false;
+    showCapsLockIndicator = false;
+    showClipboard = true;
+    showClock = true;
+    showControlCenterButton = true;
+    showCpuTemp = true;
+    showCpuUsage = true;
+    showDock = false;
+    showFocusedWindow = true;
+    showGpuTemp = false;
+    showLauncherButton = true;
+    showMemUsage = true;
+    showMusic = true;
+    showNotificationButton = true;
+    showOccupiedWorkspacesOnly = false;
+    showOnLastDisplay = {};
+    showPrivacyButton = false;
+    showSeconds = true;
+    showSystemTray = true;
+    showWeather = true;
+    showWorkspaceApps = false;
+    showWorkspaceIndex = false;
+    showWorkspaceName = false;
+    showWorkspacePadding = false;
+    showWorkspaceSwitcher = true;
+    sortAppsAlphabetically = false;
+    soundNewNotification = true;
+    soundPluggedIn = true;
+    soundVolumeChanged = true;
+    soundsEnabled = false;
+    spotlightCloseNiriOverview = true;
+    spotlightModalViewMode = "list";
+    spotlightSectionViewModes = {};
+    syncComponentAnimationSpeeds = true;
+    syncModeWithPortal = true;
+    systemMonitorColorMode = "primary";
+    systemMonitorCustomColor = {
+      a = 1;
+      b = 1;
+      g = 1;
+      hslHue = -1;
+      hslLightness = 1;
+      hslSaturation = 0;
+      hsvHue = -1;
+      hsvSaturation = 0;
+      hsvValue = 1;
+      r = 1;
+      valid = true;
+    };
+    systemMonitorDisplayPreferences = ["all"];
+    systemMonitorEnabled = false;
+    systemMonitorGpuPciId = "";
+    systemMonitorGraphInterval = 60;
+    systemMonitorHeight = 480;
+    systemMonitorLayoutMode = "auto";
+    systemMonitorShowCpu = true;
+    systemMonitorShowCpuGraph = true;
+    systemMonitorShowCpuTemp = true;
+    systemMonitorShowDisk = true;
+    systemMonitorShowGpuTemp = false;
+    systemMonitorShowHeader = true;
+    systemMonitorShowMemory = true;
+    systemMonitorShowMemoryGraph = true;
+    systemMonitorShowNetwork = true;
+    systemMonitorShowNetworkGraph = true;
+    systemMonitorShowTopProcesses = false;
+    systemMonitorTopProcessCount = 3;
+    systemMonitorTopProcessSortBy = "cpu";
+    systemMonitorTransparency = 0.8;
+    systemMonitorVariants = [];
+    systemMonitorWidth = 320;
+    systemMonitorX = -1;
+    systemMonitorY = -1;
+    terminalsAlwaysDark = false;
+    updaterCustomCommand = "";
+    updaterHideWidget = false;
+    updaterTerminalAdditionalParams = "";
+    updaterUseCustomCommand = false;
+    use24HourClock = true;
+    useAutoLocation = false;
+    useFahrenheit = false;
+    useSystemSoundTheme = false;
+    wallpaperFillMode = "Fill";
+    waveProgressEnabled = true;
+    weatherEnabled = true;
+    widgetBackgroundColor = "sc";
+    widgetColorMode = "default";
+    wifiNetworkPins = {};
+    windSpeedUnit = "kmh";
+    workspaceAppIconSizeOffset = 0;
+    workspaceColorMode = "default";
+    workspaceDragReorder = true;
+    workspaceFocusedBorderColor = "primary";
+    workspaceFocusedBorderEnabled = false;
+    workspaceFocusedBorderThickness = 2;
+    workspaceFollowFocus = false;
+    workspaceNameIcons = {};
+    workspaceOccupiedColorMode = "none";
+    workspaceScrolling = false;
+    workspaceUnfocusedColorMode = "default";
+    workspaceUrgentColorMode = "default";
+  };
+
+  session = {
+    # Settings
+    doNotDisturb = false;
+    isLightMode = false;
+    weatherHourlyDetailed = true;
+
+    # Night
+    nightModeAutoEnabled = true;
+    nightModeAutoMode = "time";
+    nightModeEnabled = true;
+    nightModeEndHour = 6;
+    nightModeEndMinute = 0;
+    nightModeHighTemperature = 6500;
+    nightModeLocationProvider = "";
+    nightModeStartHour = 22;
+    nightModeStartMinute = 0;
+    nightModeTemperature = 5500;
+    nightModeUseIPLocation = false;
+
+    # Hardware
+    nonNvidiaGpuTempEnabled = false;
+    nvidiaGpuTempEnabled = false;
+    selectedGpuIndex = 0;
+    wifiDeviceOverride = "";
+    enabledGpuPciIds = [];
+    lastBrightnessDevice = "";
+
+    # Wallpapers
+    perModeWallpaper = false;
+    perMonitorWallpaper = false;
+    wallpaperCyclingEnabled = false;
+    wallpaperCyclingInterval = 300;
+    wallpaperCyclingMode = "interval";
+    wallpaperCyclingTime = "06:00";
+    wallpaperPath = "/home/christoph/NixFlake/wallpapers/Windows.jpg";
+    wallpaperPathDark = "";
+    wallpaperPathLight = "";
+    wallpaperTransition = "iris bloom";
+
+    # Random shit
+    includedTransitions = ["fade" "wipe" "disc" "stripes" "iris bloom" "pixelate" "portal"];
+    launchPrefix = "";
+    latitude = 0;
+    longitude = 0;
+    pinnedApps = [];
+    hiddenTrayIds = [];
+    recentColors = [];
+    showThirdPartyPlugins = true;
+
+    # Ultra random shit
+    monitorCyclingSettings = {};
+    monitorWallpapers = {};
+    monitorWallpapersDark = {};
+    monitorWallpapersLight = {};
+    brightnessExponentValues = {};
+    brightnessExponentialDevices = {};
+    brightnessUserSetValues = {};
+
+    configVersion = 1;
+  };
+}

home/homemodules/1_deprecated/niri/noctalia.nix

@@ -1,5 +1,6 @@
 {color}: {
-  enable = true;
+  enable = false;
+
   settings = {
     # configure noctalia here; defaults will
     # be deep merged with these attributes.

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

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

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

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

home/homemodules/beets/default.nix

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

home/homemodules/btop/default.nix

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

home/homemodules/chromium/default.nix

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

home/homemodules/color/default.nix

@@ -5,9 +5,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules) color;
+  inherit (config.homemodules) color;
 in {
-  options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
+  options.homemodules.color = import ./options.nix {inherit lib mylib pkgs;};
 
   config = {
     home.packages = let
@@ -59,7 +59,7 @@ in {
       ++ (lib.optionals color.installPackages color.extraPackages);
 
     # This module sets its own options to the values specified in a colorscheme file.
-    modules.color = let
+    homemodules.color = let
       scheme = import ./schemes/${color.scheme}.nix;
 
       # Add the aliases

home/homemodules/default.nix

@@ -12,8 +12,6 @@
     ./firefox
     ./fish
     ./git
-    ./hyprland
-    ./hyprpanel
     ./kitty
     ./lazygit
     ./mpd
@@ -32,11 +30,13 @@
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.nixvim.homeModules.nixvim
     inputs.textfox.homeManagerModules.default
+    inputs.walker.homeManagerModules.default
     # inputs.niri.homeModules.niri # Imported by system module
-    inputs.noctalia.homeModules.default
-    inputs.caelestia.homeManagerModules.default
-    # inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-    # inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
+    # inputs.noctalia.homeModules.default
+    # inputs.caelestia.homeManagerModules.default
+    # inputs.dank-material-shell.homeModules.dank-material-shell
+    # inputs.dank-material-shell.homeModules.niri
+    # inputs.danksearch.homeModules.default
 
     # NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
     # inputs.impermanence.homeManagerModules.impermanence

home/homemodules/docs/default.nix

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

home/homemodules/fcitx/default.nix

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

home/homemodules/firefox/bookmarks.nix

@@ -15,7 +15,7 @@ in [
           (mkBm "Package Search" "https://search.nixos.org/packages")
           (mkBm "Option Search" "https://search.nixos.org/options?")
           (mkBm "Function Search" "https://noogle.dev/")
-          (mkBm "HM Search" "https://mipmip.github.io/home-manager-option-search/")
+          (mkBm "HM Search" "https://home-manager-options.extranix.com/")
           (mkBm "NUR Search" "https://nur.nix-community.org/")
           (mkBm "Nixpkgs Version Search" "https://lazamar.co.uk/nix-versions/")
           (mkBm "Nixpkgs PR Tracker" "https://nixpk.gs/pr-tracker.html")
@@ -69,6 +69,7 @@ in [
           (mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
           (mkBm "RustOS" "https://os.phil-opp.com/")
           (mkBm "Interpreters" "https://craftinginterpreters.com/contents.html")
+          (mkBm "Godbolt" "https://godbolt.org")
         ];
       }
       {

home/homemodules/firefox/default.nix

@@ -6,15 +6,15 @@
   hostname,
   ...
 }: let
-  inherit (config.modules) firefox color;
+  inherit (config.homemodules) firefox color;
 in {
-  options.modules.firefox = import ./options.nix {inherit lib mylib;};
+  options.homemodules.firefox = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf firefox.enable {
     textfox = {
       enable = firefox.textfox;
-      useLegacyExtensions = false;
-      profile = "default";
+      # useLegacyExtensions = false;
+      profiles = ["default"];
 
       config = {
         background = {
@@ -54,7 +54,9 @@ in {
       };
     };
 
-    home.packages = with pkgs; [vdhcoapp];
+    home.packages = with pkgs; [
+      # vdhcoapp # No longer required since VDH >= 10
+    ];
 
     home.sessionVariables = lib.mkMerge [
       {
@@ -161,12 +163,19 @@ in {
               "google"
             ];
 
-            engines = {
+            engines = let
+              mkMan = section: page: p: {
+                name = "Man Pages - ${section}";
+                urls = [{template = "https://man7.org/linux/man-pages/man${page}/{searchTerms}.${page}${p}.html";}];
+                iconMapObj."16" = "https://man7.org/favicon.ico";
+                definedAliases = ["@man${page}"];
+              };
+            in {
               kagi = {
                 name = "Kagi";
                 urls = [{template = "https://kagi.com/search?q={searchTerms}";}];
                 iconMapObj."16" = "https://kagi.com/favicon.ico";
-                definedAliases = ["@k"];
+                definedAliases = ["@kg"];
               };
 
               wiki = {
@@ -176,13 +185,34 @@ in {
                 definedAliases = ["@w"];
               };
 
-              nixos-packages = {
-                name = "NixOS Packages";
+              searchix = {
+                name = "Searchix";
                 urls = [{template = "https://searchix.ovh/?query={searchTerms}";}];
                 iconMapObj."16" = "https://nixos.org/favicon.ico";
+                definedAliases = ["@ns"];
+              };
+
+              nixos-packages = {
+                name = "Nix Packages";
+                urls = [{template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";}];
+                iconMapObj."16" = "https://nixos.org/favicon.ico";
                 definedAliases = ["@np"];
               };
 
+              nixos-options = {
+                name = "NixOS Options";
+                urls = [{template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";}];
+                iconMapObj."16" = "https://nixos.org/favicon.ico";
+                definedAliases = ["@no"];
+              };
+
+              home-manager-options = {
+                name = "Home Manager Options";
+                urls = [{template = "https://home-manager-options.extranix.com/?query={searchTerms}";}];
+                iconMapObj."16" = "https://nixos.org/favicon.ico";
+                definedAliases = ["@hm"];
+              };
+
               nixos-functions = {
                 name = "NixOS Functions";
                 urls = [{template = "https://noogle.dev/q?term={searchTerms}";}];
@@ -190,6 +220,13 @@ in {
                 definedAliases = ["@nf"];
               };
 
+              nixpkgs-issues = {
+                name = "Nixpkgs Issues";
+                urls = [{template = "https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue%20{searchTerms}";}];
+                iconMapObj."16" = "https://github.com/favicon.ico";
+                definedAliases = ["@ni"];
+              };
+
               nixos-wiki = {
                 name = "NixOS Wiki";
                 urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
@@ -204,13 +241,6 @@ in {
                 definedAliases = ["@aw"];
               };
 
-              nixpkgs-issues = {
-                name = "Nixpkgs Issues";
-                urls = [{template = "https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue%20{searchTerms}";}];
-                iconMapObj."16" = "https://github.com/favicon.ico";
-                definedAliases = ["@i"];
-              };
-
               github = {
                 name = "GitHub";
                 urls = [{template = "https://github.com/search?q={searchTerms}&type=repositories";}];
@@ -218,6 +248,32 @@ in {
                 definedAliases = ["@gh"];
               };
 
+              man0 = mkMan "POSIX" "0" "p";
+              man1 = mkMan "Commands" "1" "";
+              man2 = mkMan "Syscalls" "2" "";
+              man3 = mkMan "C Functions" "3" "";
+
+              stackoverflow = {
+                name = "Stack Overflow";
+                urls = [{template = "https://stackoverflow.com/search?q={searchTerms}";}];
+                iconMapObj."16" = "https://stackoverflow.com/favicon.ico";
+                definedAliases = ["@so"];
+              };
+
+              x86 = {
+                name = "x86 Ref";
+                urls = [{template = "https://www.felixcloutier.com/x86/{searchTerms}";}];
+                iconMapObj."16" = "https://www.felixcloutier.com/favicon.ico";
+                definedAliases = ["@x86"];
+              };
+
+              youtube = {
+                name = "YouTube";
+                urls = [{template = "https://www.youtube.com/results?search_query={searchTerms}";}];
+                iconMapObj."16" = "https://www.youtube.com/favicon.ico";
+                definedAliases = ["@yt"];
+              };
+
               google.metaData.alias = "@g";
 
               # Hide bullshit
@@ -243,7 +299,7 @@ in {
               # catppuccin-web-file-icons
               clearurls
               # cookie-autodelete
-              dark-background-light-text
+              # dark-background-light-text
               display-_anchors # Easier linking to specific website parts
               don-t-fuck-with-paste
               # enhancer-for-youtube # Discontinued, use tweaks-for-youtube

home/homemodules/fish/default.nix

@@ -7,9 +7,9 @@
   nixosConfig,
   ...
 }: let
-  inherit (config.modules) fish color;
+  inherit (config.homemodules) fish color;
 in {
-  options.modules.fish = import ./options.nix {inherit lib mylib;};
+  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
@@ -47,7 +47,7 @@ in {
       generateCompletions = nixosConfig.programs.fish.generateCompletions;
 
       functions = lib.mergeAttrsList [
-        (lib.optionalAttrs config.modules.nnn.enable {
+        (lib.optionalAttrs config.homemodules.nnn.enable {
           nnncd = {
             wraps = "nnn";
             description = "support nnn quit and change directory";
@@ -101,7 +101,7 @@ in {
         # 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.modules and for HM config.programs,
+        # 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);
 
@@ -131,12 +131,16 @@ in {
             nd = "nix develop";
             nb = "nix build -L";
             ns = "nix shell nixpkgs#";
+            nr = "nix run";
+
+            ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra"; # env var for wayland
+            sy = "sudo -E -u ${username} yazi";
           }
 
           # Abbrs only available if package is installed
 
           (abbrify pkgs.duf {
-            disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*'";
+            disks = "duf --hide-mp '/var/*,/etc/*,/usr/*,/home/christoph/.*' -width 120";
             alldisks = "duf";
           })
 
@@ -167,15 +171,15 @@ in {
             gcl = "git clone";
           })
 
-          (lib.optionalAttrs config.modules.kitty.enable {ssh = "kitty +kitten ssh";})
+          (lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
 
           (abbrify pkgs.lazygit {lg = "lazygit";})
 
           (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.modules.nnn.enable {n = "nnncd -a";})
-          (lib.optionalAttrs config.modules.nnn.enable {np = "nnncd -a -P p";})
+          (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";})
 
@@ -184,7 +188,7 @@ in {
             # grep = rg;
           })
 
-          (lib.optionalAttrs config.modules.rmpc.enable {r = "rcmp";})
+          (lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
 
           (abbrify pkgs.rsync rec {
             rsync = "rsync -ahv --inplace --partial --info=progress2";
@@ -197,7 +201,7 @@ in {
 
     programs.starship = {
       enable = true;
-      enableFishIntegration = config.modules.fish.enable;
+      enableFishIntegration = config.homemodules.fish.enable;
       settings = {
         # Other config here
         format = "$all"; # Remove this line to disable the default prompt format

home/homemodules/git/default.nix

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

home/homemodules/kitty/default.nix

@@ -5,9 +5,9 @@
   mylib,
   ...
 }: let
-  inherit (config.modules) kitty color;
+  inherit (config.homemodules) kitty color;
 in {
-  options.modules.kitty = import ./options.nix {inherit lib mylib;};
+  options.homemodules.kitty = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf kitty.enable {
     programs.kitty = {
@@ -15,7 +15,7 @@ in {
       shellIntegration.enableFishIntegration = true;
 
       font = {
-        name = "${config.modules.color.font}";
+        name = "${config.homemodules.color.font}";
         size = 12;
       };
 

home/homemodules/lazygit/default.nix

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

home/homemodules/mpd/default.nix

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