Services/Kiwix: Init kiwix at v3.8.1

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"
+}

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/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,22 +49,12 @@
   #   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";
+    version = "0.33.0";
     format = "pyproject";
 
-    # TODO: The official repo was deleted, find the new one once it pops up
+    # The official repo was deleted
     # src = pkgs.fetchFromGitHub {
     #   owner = "exislow";
     #   repo = "tidal-dl-ng";
@@ -71,15 +62,24 @@
     #   sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
     # };
 
-    src = pkgs.fetchFromGitHub {
-      owner = "rodvicj";
-      repo = "tidal_dl_ng-Project";
-      rev = "4573142c76ef045ebf8e80c34657dd2bec96f17d";
-      sha256 = "sha256-3sO2qj8V4KXOWK7vQsFAOYeTZo2rsc/M36SwRnC0oVg=";
+    # Alternative repo
+    # src = pkgs.fetchFromGitHub {
+    #   owner = "rodvicj";
+    #   repo = "tidal_dl_ng-Project";
+    #   rev = "4573142c76ef045ebf8e80c34657dd2bec96f17d";
+    #   sha256 = "sha256-3sO2qj8V4KXOWK7vQsFAOYeTZo2rsc/M36SwRnC0oVg=";
+    # };
+
+    # Package is still on PyPi
+    src = pythonPkgs.fetchPypi {
+      inherit pname version;
+      sha256 = "sha256-rOMyxnT7uVnMbn678DFtqAu4+Uc5VFGcqGI0jxplnpc=";
     };
 
     doCheck = false;
+    dontCheckRuntimeDeps = true;
     catchConflicts = false;
+    strictDeps = false;
 
     nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
 

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;
@@ -99,7 +89,7 @@ in
 
       hyprland = {
         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"];
@@ -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 {
@@ -487,6 +477,7 @@ in
             lazyjournal # Journalctl viewer
             systemctl-tui
             restic # Backups
+            gnumake
 
             # Hardware/Software info
             pciutils # lspci
@@ -569,6 +560,8 @@ in
             audacity
             ferdium
             gparted
+            # feishin # electron :(
+            jellyfin-tui
 
             # Office
             kdePackages.wacomtablet # For xournalpp/krita
@@ -649,7 +642,7 @@ in
 
       eza = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       # TODO: Module
@@ -806,7 +799,7 @@ in
 
       fzf = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
       };
 
       imv = {
@@ -824,7 +817,7 @@ in
 
       keychain = {
         enable = true;
-        enableFishIntegration = config.modules.fish.enable;
+        enableFishIntegration = config.homemodules.fish.enable;
         enableXsessionIntegration = !headless;
         keys = ["id_ed25519"];
       };
@@ -838,12 +831,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;
@@ -935,7 +928,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,
@@ -123,6 +119,8 @@
         # jetbrains.idea-ultimate
         # jetbrains.webstorm
         # jetbrains.rider
+        zed-editor
+        vscode
 
         # Unity Stuff
         # unityhub
@@ -143,7 +141,7 @@
         jellyfin-desktop
         jellyfin-mpv-shim
         # tidal-hifi
-        tidal-dl-ng
+        tidal-dl-ng # TODO: Borked
         picard
         handbrake
         teamspeak6-client

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;
-  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/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/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/default.nix

@@ -6,9 +6,9 @@
   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 = {
@@ -243,7 +243,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);
 
@@ -167,15 +167,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 +184,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 +197,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/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,7 @@ in {
             tinymist
             typescript
             vscode-langservers-extracted # includes nodejs
+            autotools-language-server
 
             # Linters
             checkstyle # java
@@ -64,7 +64,6 @@ in {
             # statix # nix (doesn't recognize pipe operator)
 
             # Formatters
-            alejandra # nix
             cljfmt
             python313Packages.black
             google-java-format
@@ -83,6 +82,9 @@ in {
             # Dependencies
             lua54Packages.jsregexp # For tree-sitter
             # nodejs_latest
+
+            nixd
+            alejandra # nix
           ]
         ];
     };
@@ -842,15 +844,14 @@ in {
                 {
                   name = "clangd";
                   extraOptions = {
-                    root_markers = [
-                      "Makefile"
-                      "CMakeLists.txt"
-                      ".clang-format"
-                      ".clang-tidy"
-                      "compile_commands.json"
-                    ];
-
-                    workspace_required = true;
+                    # root_markers = [
+                    #   "Makefile"
+                    #   "CMakeLists.txt"
+                    #   ".clang-format"
+                    #   ".clang-tidy"
+                    #   "compile_commands.json"
+                    # ];
+                    # workspace_required = true;
 
                     cmd = [
                       "clangd"
@@ -887,12 +888,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 = {
@@ -1836,9 +1838,7 @@ in {
               # _treesitter-context # Ugly
               # _treesitter-refactor # Ugly
             ];
-            lazy = true;
-            cmd = ["TSModuleInfo"];
-            event = ["BufReadPost" "BufNewFile"];
+            lazy = false;
             init = ''
               function()
                 -- Fix treesitter grammars/parsers on nix
@@ -1848,7 +1848,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 {
@@ -1866,7 +1869,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;

home/homemodules/niri/dankMaterialShell.nix

@@ -1,4 +1,7 @@
-{color}: {
+{
+  config,
+  color,
+}: {
   enable = true;
 
   systemd = {
@@ -221,9 +224,13 @@
       }
     ];
 
+    # Theme
+    currentThemeName = "custom";
+    currentThemeCategory = "registry";
+    customThemeFile = "${config.paths.dotfiles}/dankmaterialshell/catppuccin-mauve.json";
+
     # Styling
     cornerRadius = 10;
-    currentThemeName = "cat-mauve";
     customAnimationDuration = 500;
     fontFamily = "MonoLisa Normal";
     monoFontFamily = "MonoLisa Normal";
@@ -374,7 +381,6 @@
     customPowerActionPowerOff = "";
     customPowerActionReboot = "";
     customPowerActionSuspend = "";
-    customThemeFile = "";
     displayNameMode = "system";
     matugenScheme = "scheme-tonal-spot";
     matugenTargetMonitor = "";

home/homemodules/niri/default.nix

@@ -7,9 +7,9 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules) niri color;
+  inherit (config.homemodules) niri color;
 in {
-  options.modules.niri = import ./options.nix {inherit lib mylib;};
+  options.homemodules.niri = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf niri.enable rec {
     assertions = [
@@ -61,7 +61,7 @@ in {
     programs = {
       # TODO: Those should be modules with their own options
       noctalia-shell = import ./noctalia.nix {inherit color;};
-      dank-material-shell = import ./dankMaterialShell.nix {inherit color;};
+      dank-material-shell = import ./dankMaterialShell.nix {inherit config color;};
 
       # TODO: Extract options
       niri = {
@@ -71,7 +71,7 @@ in {
           input = {
             focus-follows-mouse = {
               enable = true;
-              # max-scroll-amount = "0%"; # Skip partial windows that would scroll the viewport on focus
+              max-scroll-amount = "0%"; # Skip partial windows that would scroll the viewport on focus
             };
 
             keyboard = {