Home: Add masssprings

.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/dankmaterialshell/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"
+}

config/flake.nix

@@ -30,6 +30,15 @@ rec {
       };
       inherit (pkgs) lib stdenv;
 
+      # Package set for cross-compilation
+      # windowsPkgs = import nixpkgs {
+      #   inherit system;
+      #   crossSystem = {
+      #     config = "x86_64-w64-mingw32";
+      #   };
+      #   config.allowUnfree = true;
+      # };
+
       # ===========================================================================================
       # Define custom dependencies
       # ===========================================================================================
@@ -68,7 +77,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 +93,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;
@@ -163,7 +172,29 @@ rec {
       #
       #   installPhase = ''
       #     mkdir -p $out/bin
-      #     mv ./BINARY $out/bin
+      #     cp ./${pname} $out/bin/
+      #   '';
+      # };
+      # 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 = ''
+      #     mkdir -p $out/bin
+      #     cp ./${pname}.exe $out/bin/
       #   '';
       # };
       # package = clj-nix.lib.mkCljApp {
@@ -185,133 +216,137 @@ rec {
       # };
     in rec {
       # Provide package for "nix build"
-      # defaultPackage = package;
+      # packages = {
-      # defaultApp = flake-utils.lib.mkApp {
+      #   default = package;
-      #   drv = defaultPackage;
+      #   windows = windowsPackage;
       # };
+      # apps.default = flake-utils.lib.mkApp {drv = package;};
 
-      # Provide environment for "nix develop"
+      devShells = {
-      devShell = pkgs.mkShell {
+        # Provide default environment for "nix develop".
-        inherit nativeBuildInputs buildInputs;
+        # Other environments can be added below.
-        name = description;
+        default = pkgs.mkShell {
+          inherit nativeBuildInputs buildInputs;
+          name = description;
 
-        # =========================================================================================
+          # =========================================================================================
-        # Define environment variables
+          # Define environment variables
-        # =========================================================================================
+          # =========================================================================================
 
-        # Rust stdlib source:
+          # Rust stdlib source:
-        # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
+          # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
 
-        # Custom dynamic libraries:
+          # Custom dynamic libraries:
-        # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
+          # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
-        #   # Rust Bevy GUI app:
+          #   # Rust Bevy GUI app:
-        #   # "${pkgs.xorg.libX11}/lib"
+          #   # "${pkgs.libx11}/lib"
-        #   # "${pkgs.xorg.libXcursor}/lib"
+          #   # "${pkgs.libxcursor}/lib"
-        #   # "${pkgs.xorg.libXrandr}/lib"
+          #   # "${pkgs.libxrandr}/lib"
-        #   # "${pkgs.xorg.libXi}/lib"
+          #   # "${pkgs.libxi}/lib"
-        #   # "${pkgs.libGL}/lib"
+          #   # "${pkgs.libGL}/lib"
-        #
+          #
-        #   # JavaFX app:
+          #   # JavaFX app:
-        #   # "${pkgs.libGL}/lib"
+          #   # "${pkgs.libGL}/lib"
-        #   # "${pkgs.gtk3}/lib"
+          #   # "${pkgs.gtk3}/lib"
-        #   # "${pkgs.glib.out}/lib"
+          #   # "${pkgs.glib.out}/lib"
-        #   # "${pkgs.xorg.libXtst}/lib"
+          #   # "${pkgs.xorg.libXtst}/lib"
-        # ];
+          # ];
 
-        # Dynamic libraries from buildinputs:
+          # Dynamic libraries from buildinputs:
-        # LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
+          # LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
 
-        # QT imports to use with "qmlls -E"
+          # QT imports to use with "qmlls -E"
-        # QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
+          # QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
 
-        # Set PYTHONPATH
+          # Set PYTHONPATH
-        # PYTHONPATH = ".";
+          # PYTHONPATH = ".";
 
-        # Set matplotlib backend
+          # Set matplotlib backend
-        # MPLBACKEND = "TkAgg";
+          # MPLBACKEND = "TkAgg";
 
-        # =========================================================================================
+          # =========================================================================================
-        # Define shell environment
+          # Define shell environment
-        # =========================================================================================
+          # =========================================================================================
 
-        # Setup the shell when entering the "nix develop" environment (bash script).
+          # Setup the shell when entering the "nix develop" environment (bash script).
-        shellHook = let
+          shellHook = let
-          mkCmakeScript = type: let
+            mkCmakeScript = type: let
-            typeLower = lib.toLower type;
+              typeLower = lib.toLower type;
-          in
+            in
-            pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
+              pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
-              cd $FLAKE_PROJECT_ROOT
+                cd $FLAKE_PROJECT_ROOT
 
-              echo "Removing build directory ./cmake-build-${typeLower}/"
+                echo "Removing build directory ./cmake-build-${typeLower}/"
-              rm -rf ./cmake-build-${typeLower}
+                rm -rf ./cmake-build-${typeLower}
 
-              echo "Creating build directory"
+                echo "Creating build directory"
-              mkdir cmake-build-${typeLower}
+                mkdir cmake-build-${typeLower}
-              cd cmake-build-${typeLower}
+                cd cmake-build-${typeLower}
 
-              echo "Running cmake"
+                echo "Running cmake"
-              cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
+                cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
 
-              echo "Linking compile_commands.json"
+                echo "Linking compile_commands.json"
-              cd ..
+                cd ..
-              ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json
+                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"
             '';
-
-          cmakeDebug = mkCmakeScript "Debug";
-          cmakeRelease = mkCmakeScript "Release";
-
-          mkBuildScript = type: let
-            typeLower = lib.toLower type;
           in
-            pkgs.writers.writeFish "cmake-build.fish" ''
+            builtins.concatStringsSep "\n" [
-              cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower}
+              # Launch into pure fish shell
+              ''
+                exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
+              ''
 
-              echo "Running cmake"
+              # Qt: Launch into wrapped fish shell
-              cmake --build .
+              # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
-            '';
+              # ''
-
+              #   fishdir=$(mktemp -d)
-          buildDebug = mkBuildScript "Debug";
+              #   makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
-          buildRelease = mkBuildScript "Release";
+              #   exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
-
+              # ''
-          # Use this to specify commands that should be ran after entering fish shell
+            ];
-          initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
+        };
-            echo "Entering \"${description}\" environment..."
-
-            # Determine the project root, used e.g. in cmake scripts
-            set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
-
-            # Rust Bevy:
-            # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
-
-            # C/C++:
-            # abbr -a cmake-debug "${cmakeDebug}"
-            # abbr -a cmake-release "${cmakeRelease}"
-            # abbr -a build-debug "${buildDebug}"
-            # abbr -a build-release "${buildRelease}"
-
-            # Clojure:
-            # abbr -a clojure-deps "deps-lock --lein"
-
-            # Python:
-            # abbr -a run "python ./app/main.py"
-            # abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
-            # abbr -a ptop "py-spy top -- python ./app/main.py"
-          '';
-        in
-          builtins.concatStringsSep "\n" [
-            # Launch into pure fish shell
-            ''
-              exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
-            ''
-
-            # Qt: Launch into wrapped fish shell
-            # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
-            # ''
-            #   fishdir=$(mktemp -d)
-            #   makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
-            #   exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
-            # ''
-          ];
       };
     });
 }

config/navi/christoph.cheat

@@ -210,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";
+        version = "0.20.1";
-        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
+        # 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";
+    pname = "tidal_dl_ng_for_dj";
-    version = "0.31.3";
+    version = "0.33.2";
     format = "pyproject";
 
-    src = pkgs.fetchFromGitHub {
+    # The official repo was deleted
-      owner = "exislow";
+    # src = pkgs.fetchFromGitHub {
-      repo = "tidal-dl-ng";
+    #   owner = "exislow";
-      rev = "v${version}";
+    #   repo = "tidal-dl-ng";
-      sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
+    #   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;
+    dontCheckRuntimeDeps = true;
-    catchConflicts = false;
 
     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,60 @@
+{
+  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=";
+      };
+    });
+
+    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
+          libxcomposite
-          xorg.libXext
+          libxext
-          xorg.libXdamage
+          libxdamage
-          xorg.libXfixes
+          libxfixes
-          xorg.libxcb
+          libxcb
-          xorg.libxshmfence
+          libxshmfence
-          xorg.libXScrnSaver
+          libxScrnSaver
-          xorg.libXtst
+          libxtst
 
           # Unity Hub additional dependencies
           libva
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
 
           # Unity Editor dependencies
           libglvnd # provides ligbl
-          xorg.libX11
+          libx11
-          xorg.libXcursor
+          libxcursor
           glib
           gdk-pixbuf
           libxml2-legacy
@@ -111,8 +111,8 @@ stdenv.mkDerivation rec {
           vulkan-loader
 
           # Unity Bug Reporter specific dependencies
-          xorg.libICE
+          libICE
-          xorg.libSM
+          libSM
 
           # Fonts used by built-in and third party editor tools
           corefonts

flake.nix

@@ -77,9 +77,11 @@
     # dgop.inputs.nixpkgs.follows = "nixpkgs";
     # dms-cli.url = "github:AvengeMedia/danklinux";
     # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
-    # dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
+    dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
-    # dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
+    dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
-    # dankMaterialShell.inputs.dgop.follows = "dgop";
+    # 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";
@@ -115,6 +117,9 @@
     # Realtime audio
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
+
+    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.

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;
@@ -98,8 +88,8 @@ in
       };
 
       hyprland = {
-        enable = !headless;
+        enable = nixosConfig.programs.hyprland.enable;
-        dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
+        dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
         bars.enable = false;
         dynamicCursor.enable = false;
         trails.enable = true;
@@ -112,14 +102,14 @@ in
 
           bindings = lib.mergeAttrsList [
             # Use Rofi if we don't have caelestia
-            (lib.optionalAttrs (!config.modules.hyprland.caelestia.enable) {
+            (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.modules.hyprland.caelestia.enable) {
+            (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"];
@@ -225,8 +215,8 @@ in
 
         windowrules = [
           # Fix jetbrains tooltip flicker
-          "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
+          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
-          "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
+          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
         ];
 
         workspacerules = {
@@ -291,7 +281,7 @@ in
         neovide = !headless;
       };
 
-      niri.enable = !headless;
+      niri.enable = nixosConfig.programs.niri.enable;
       nnn.enable = false; # Use yazi
       qutebrowser.enable = !headless;
       rmpc.enable = !headless;
@@ -318,10 +308,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 +382,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 +392,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 +430,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
+          '';
         })
       ];
 
@@ -487,6 +486,8 @@ in
             lazyjournal # Journalctl viewer
             systemctl-tui
             restic # Backups
+            gnumake
+            just
 
             # Hardware/Software info
             pciutils # lspci
@@ -508,7 +509,7 @@ in
             imagemagick # Convert image (magic)
             mp3val # Validate mp3 files
             flac # Validate flac files
-            spotdl
+            # spotdl
 
             # Document utils
             poppler-utils # pdfunite
@@ -526,7 +527,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
@@ -569,11 +570,9 @@ in
             audacity
             ferdium
             gparted
-            tidal-hifi
+            # feishin # electron :(
-            tidal-dl-ng
+            jellyfin-tui
-            picard
+            czkawka-full # file deduplicator
-            handbrake
-            teamspeak6-client
 
             # Office
             kdePackages.wacomtablet # For xournalpp/krita
@@ -581,6 +580,8 @@ in
             hunspell # I cna't type
             hunspellDicts.en_US
             hunspellDicts.de_DE
+
+            inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
           ])
         ];
     };
@@ -654,7 +655,7 @@ in
 
       eza = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       # TODO: Module
@@ -811,7 +812,7 @@ in
 
       fzf = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       imv = {
@@ -829,7 +830,7 @@ in
 
       keychain = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
         enableXsessionIntegration = !headless;
         keys = ["id_ed25519"];
       };
@@ -843,12 +844,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;
@@ -940,7 +941,7 @@ in
 
       zoxide = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
     };
 

home/christoph/nixinator/default.nix

@@ -8,12 +8,8 @@
   username,
   ...
 }: {
-  imports = [
-    ../../modules
-  ];
-
   config = {
-    modules = {
+    homemodules = {
       btop.cuda = true;
 
       # This has been relocated here from the default config,
@@ -117,15 +113,16 @@
         # 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
 
         # Unity Stuff
-        # TODO: Unity module
         # unityhub
         # rider-unity
         # dotnetCore
@@ -136,12 +133,20 @@
         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
       ];
@@ -177,7 +182,7 @@
 
     services = {
       ollama = {
-        enable = true;
+        enable = false;
         acceleration = "cuda";
         # home = "/var/lib/ollama";
 

home/christoph/nixtop/default.nix

@@ -1,11 +1,7 @@
 # Here goes the stuff that will only be enabled on the laptop
 {...}: {
-  imports = [
-    ../../modules
-  ];
-
   config = {
-    modules = {
+    homemodules = {
       hyprland = {
         keyboard = {
           layout = "us";

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;
+  cfg = config.homemodules.audio;
-  cfgfp = config.modules.flatpak;
+  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;
+  cfg = config.homemodules.gaming;
-  cfgfp = config.modules.flatpak;
+  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/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/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

@@ -35,8 +35,9 @@
     # inputs.niri.homeModules.niri # Imported by system module
     inputs.noctalia.homeModules.default
     inputs.caelestia.homeManagerModules.default
-    # inputs.dankMaterialShell.homeModules.dankMaterialShell.default
+    inputs.dank-material-shell.homeModules.dank-material-shell
-    # inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
+    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

@@ -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;
+      # useLegacyExtensions = false;
-      profile = "default";
+      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 [
       {
@@ -243,7 +245,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,6 +131,7 @@ in {
             nd = "nix develop";
             nb = "nix build -L";
             ns = "nix shell nixpkgs#";
+            nr = "nix run";
           }
 
           # Abbrs only available if package is installed
@@ -167,15 +168,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.homemodules.nnn.enable {n = "nnncd -a";})
-          (lib.optionalAttrs config.modules.nnn.enable {np = "nnncd -a -P p";})
+          (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 +185,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 +198,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/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/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/hyprland/settings.nix

@@ -111,19 +111,19 @@
 
   windowrule = let
     mkWorkspaceRule = workspace: class:
-      "workspace ${workspace}, "
+      "match:class ^(${class})$, "
-      + "class:^(${class})$";
+      + "workspace ${workspace}";
     mkWorkspaceRules = workspace: class-list:
       builtins.map (mkWorkspaceRule workspace) class-list;
 
     mkFloatingRule = attrs:
-      "float"
+      (lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
-      + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+      + (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
-      + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
+      + "float 1";
 
     mkTranslucentRule = class:
-      "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
+      "match:class ^(${class})$, "
-      + "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"
+    "match:class rofi, blur 1"
-    "ignorealpha 0.001,rofi" # Fix pixelated corners
+    # "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
-    "xray 0,rofi" # Render on top of other windows
+    # "match:class rofi, xray 0" # Render on top of other windows
-    "dimaround,rofi"
+    # "match:class rofi, dim_around 1"
 
-    "blur,waybar"
+    "match:class waybar, blur 1"
-    "blur,gtk4-layer-shell"
+    "match:class gtk4-layer-shell, blur 1"
-    "blur,bar-0"
+    "match:class bar-0, blur 1"
-    "blur,bar-1"
+    "match:class bar-1, blur 1"
   ];
 
   decoration = {

home/homemodules/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/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 = {

home/homemodules/neovim/default.nix

@@ -10,9 +10,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules) neovim color;
+  inherit (config.homemodules) neovim color;
 in {
-  options.modules.neovim = import ./options.nix {inherit lib mylib;};
+  options.homemodules.neovim = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf neovim.enable {
     home = {
@@ -38,7 +38,6 @@ in {
             ltex-ls # TODO: Only enable on-demand
             lua-language-server
             # nil
-            nixd
             basedpyright
             pyrefly
             ty
@@ -50,6 +49,8 @@ in {
             tinymist
             typescript
             vscode-langservers-extracted # includes nodejs
+            autotools-language-server
+            just-lsp
 
             # Linters
             checkstyle # java
@@ -64,7 +65,6 @@ in {
             # statix # nix (doesn't recognize pipe operator)
 
             # Formatters
-            alejandra # nix
             cljfmt
             python313Packages.black
             google-java-format
@@ -75,6 +75,8 @@ in {
             rustfmt
             stylua
             typstyle
+            mbake
+            just-formatter
           ])
 
           [
@@ -83,6 +85,9 @@ in {
             # Dependencies
             lua54Packages.jsregexp # For tree-sitter
             # nodejs_latest
+
+            nixd
+            alejandra # nix
           ]
         ];
     };
@@ -349,7 +354,7 @@ in {
           clangd-extensions = rec {
             name = "clangd_extensions";
             pkg = pkgs.vimPlugins.clangd_extensions-nvim;
-            lazy = true;
+            lazy = false;
             config = mkDefaultConfig name;
             opts = {
               inlay_hints = {
@@ -511,8 +516,10 @@ in {
                 html = ["prettierd" "prettier"];
                 java = ["google-java-format"];
                 javascript = ["prettierd" "prettier"];
+                just = ["just"];
                 latex = ["tex-fmt"];
                 lua = ["stylua"];
+                make = ["bake"];
                 markdown = ["prettierd" "prettier"];
                 nix = ["alejandra"];
                 python = ["black"];
@@ -842,30 +849,26 @@ in {
                 {
                   name = "clangd";
                   extraOptions = {
-                    root_dir.__raw = ''
+                    # root_markers = [
-                      function(fname)
+                    #   "Makefile"
-                        -- return require("lspconfig.util").root_pattern(
+                    #   "CMakeLists.txt"
-                        return vim.lsp.config.util.root_pattern(
+                    #   ".clang-format"
-                          "Makefile",
+                    #   ".clang-tidy"
-                          "CMakeLists.txt",
+                    #   "compile_commands.json"
-                          ".clang-format",
+                    # ];
-                          ".clang-tidy"
+                    # workspace_required = true;
-                        -- )(fname) or require("lspconfig.util").root_pattern(
-                        )(fname) or vim.lsp.config.util.root_pattern(
-                          "compile_commands.json"
-                        -- )(fname) or require("lspconfig.util").find_git_ancestor(fname)
-                        )(fname) or vim.lsp.config.util.find_git_ancestor(fname)
-                      end
-                    '';
 
                     cmd = [
                       "clangd"
+                      "--all-scopes-completion"
                       "--background-index"
                       "--clang-tidy"
-                      "--header-insertion=iwyu"
                       "--completion-style=detailed"
-                      "--function-arg-placeholders"
                       "--fallback-style=llvm"
+                      "--function-arg-placeholders=0"
+                      "--header-insertion=iwyu"
+                      "--header-insertion-decorators"
+                      "--pch-storage=memory"
                     ];
 
                     capabilities = {
@@ -883,6 +886,7 @@ in {
                 {name = "cmake";}
                 {name = "cssls";}
                 {name = "html";} # vscode-langservers-extracted
+                {name = "just-lsp";} # TODO: Doesn't autostart?
                 {name = "lua_ls";}
                 {
                   name = "ltex";
@@ -893,12 +897,13 @@ in {
                     };
                   };
                 }
+                {name = "autotools-language-server";}
                 # {name = "nil_ls";}
                 {
                   name = "nixd";
                   extraOptions.cmd = [
                     "nixd"
-                    "--inlay-hints=false"
+                    "--inlay-hints=true"
                     "--semantic-tokens=true"
                   ];
                   extraOptions.settings = {
@@ -1842,9 +1847,7 @@ in {
               # _treesitter-context # Ugly
               # _treesitter-refactor # Ugly
             ];
-            lazy = true;
+            lazy = false;
-            cmd = ["TSModuleInfo"];
-            event = ["BufReadPost" "BufNewFile"];
             init = ''
               function()
                 -- Fix treesitter grammars/parsers on nix
@@ -1854,7 +1857,10 @@ in {
             '';
             config = ''
               function(_, opts)
-                require("nvim-treesitter.configs").setup(opts)
+                -- require("nvim-treesitter.configs").setup(opts)
+                require("nvim-treesitter").setup(opts)
+
+                -- TODO: Why is GLSL filetype in the treesitter setup???
 
                 -- GLSL filetypes
                 vim.filetype.add {
@@ -1872,7 +1878,8 @@ in {
             opts = {
               auto_install = false;
               ensure_installed = [];
-              parser_install_dir = "${treesitter-parsers}";
+              # parser_install_dir = "${treesitter-parsers}";
+              install_dir = "${treesitter-parsers}";
 
               indent = {
                 enable = true;
@@ -1989,6 +1996,39 @@ in {
             '';
           };
 
+          visual-whitespace = rec {
+            name = "visual-whitespace";
+            pkg = pkgs.vimPlugins.visual-whitespace-nvim;
+            event = ["ModeChanged *:[vV\22]"];
+            config = mkDefaultConfig name;
+            opts = {
+              enabled = true;
+              highlight = {
+                link = "Visual";
+                default = true;
+              };
+              match_types = {
+                space = true;
+                tab = true;
+                nbsp = true;
+                lead = false;
+                trail = false;
+              };
+              list_chars = {
+                space = "·";
+                tab = "↦";
+                nbsp = "␣";
+                lead = "‹";
+                trail = "›";
+              };
+              fileformat_chars = {
+                unix = "↲";
+                mac = "←";
+                dos = "↙";
+              };
+            };
+          };
+
           # wakatime = {
           #   name = "wakatime";
           #   pkg = pkgs.vimPlugins.vim-wakatime;
@@ -2170,6 +2210,7 @@ in {
           typst-preview # Typst support
           ufo # Code folding
           vimtex # LaTeX support
+          visual-whitespace
           # wakatime # Time tracking
           web-devicons # Icons for many plugins
           which-key # Live keybinding help