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.

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

@@ -38,7 +38,7 @@
   #     sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
   #   };
   # });
-
+  #
   # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
   #   version = "14.2.0";
   #   src = pkgs.python313Packages.fetchPypi {
@@ -49,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";
@@ -72,14 +62,22 @@
     #   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;
 

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 # TODO: Borked
+        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
           ]
         ];
     };
@@ -886,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 = {

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 = [