refactor!: import modules recursively

flake.nix

@@ -121,16 +121,8 @@
          ║                         Modules                          ║
          ╚══════════════════════════════════════════════════════════╝
       */
-      nixosModules = utils.lib.exportModules [
-        ./modules/profiles/base.nix
-        ./modules/profiles/gaming.nix
-        ./modules/profiles/desktop.nix
-        ./modules/profiles/personal.nix
-      ];
-
       hostDefaults.modules = [
         ./modules/default.nix
-        self.nixosModules.base
         inputs.home-manager.nixosModule
         {
           home-manager = {
@@ -145,16 +137,11 @@
 
       hosts.nixos-laptop.modules = [
         ./hosts/nixos-laptop
-        self.nixosModules.desktop
-        self.nixosModules.personal
       ];
 
 
       hosts.nixos-desktop.modules = [
         ./hosts/nixos-desktop
-        self.nixosModules.desktop
-        self.nixosModules.gaming
-        self.nixosModules.personal
       ];
 
       /*

hosts/nixos-desktop/default.nix

@@ -10,7 +10,13 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
+
   my = {
+    profiles = {
+      desktop.enable = true;
+      gaming.enable = true;
+      personal.enable = true;
+    };
     programs.hyprland.nvidiaSupport = true;
     services.mullvad.enable = true;
     programs.ledger.enable = true;

hosts/nixos-laptop/default.nix

@@ -10,6 +10,11 @@
     ./hardware-configuration.nix
   ];
 
+  my.profiles = {
+    desktop.enable = true;
+    personal.enable = true;
+  };
+
   # BOOT
   boot = {
     supportedFilesystems = [ "btrfs" ];

lib/default.nix

@@ -47,4 +47,34 @@ lib.makeExtensible (_: rec {
   mapModules' = f: dir: lib.attrValues (mapModules f dir);
 
   listModules = mapModules' (path: path);
+
+  mapModulesRec = f: dir:
+    let
+      filterDirs = name: type:
+        let
+          isPublic = !(lib.hasPrefix "_" name);
+          isSomething = type != null;
+          isDir = type == "directory";
+          isDefault = isDir && builtins.pathExists "${toString dir}/${name}/default.nix";
+        in
+        isPublic && isSomething && isDir && !isDefault;
+
+      subDirs = lib.filterAttrs filterDirs (builtins.readDir dir);
+
+      mkSubModule = name: _:
+        let
+          path = "${toString dir}/${name}";
+        in
+        lib.nameValuePair name (mapModulesRec f path);
+    in
+    mapModules f dir //
+    (lib.mapAttrs' mkSubModule subDirs);
+
+  mapModulesRec' = f: dir:
+    let
+      attrValuesRec = attrs: map (values: if lib.isAttrs values then attrValuesRec values else values) (lib.attrValues attrs);
+    in
+    lib.flatten (attrValuesRec (mapModulesRec f dir));
+
+  listModulesRec = mapModulesRec' (path: path);
 })

modules/config/bin/default.nix

@@ -7,10 +7,10 @@
 with lib;
 let
   cfg = config.my.bin;
-  cycleSinks = import ./cycleSinks.nix { inherit pkgs; };
+  cycleSinks = import ./_cycleSinks.nix { inherit pkgs; };
-  protonge = import ./protonge.nix { inherit pkgs; };
+  protonge = import ./_protonge.nix { inherit pkgs; };
-  share = import ./share.nix { inherit pkgs; };
+  share = import ./_share.nix { inherit pkgs; };
-  sxhkdHelp = import ./sxhkdHelp.nix { inherit pkgs; };
+  sxhkdHelp = import ./_sxhkdHelp.nix { inherit pkgs; };
 in
 {
   options.my.bin.enable = mkEnableOption "bin";

modules/config/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/config/theming/catppuccin-frappe.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-latte.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-macchiato.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/config/theming/catppuccin-mocha.nix

@@ -6,7 +6,7 @@ let
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha")
-    (import ./catppuccin.nix
+    (import ./_catppuccin.nix
       {
         inherit config lib pkgs;
         flavor = "mocha";

modules/default.nix

@@ -1,9 +1,4 @@
+{ lib, ... }:
 {
-  imports = [
+  imports = lib.my.listModulesRec ./.;
-    ./config
-    ./programs
-    ./security
-    ./services
-    ./virtualisation
-  ];
 }

modules/profiles/desktop.nix

@@ -1,8 +1,17 @@
 { lib
+, config
 , pkgs
 , ...
 }:
-with lib; {
+
+with lib;
+let
+  cfg = config.my.profiles.desktop;
+in
+{
+  options.my.profiles.desktop.enable = mkEnableOption "desktop profile";
+
+  config = mkIf cfg.enable {
     my = {
       yubikey = {
         enable = mkDefault true;
@@ -70,4 +79,5 @@ with lib; {
         pulse.enable = true;
       };
     };
+  };
 }

modules/profiles/gaming.nix

@@ -1,6 +1,17 @@
-{ pkgs
+{ lib
+, config
+, pkgs
 , ...
-}: {
+}:
+
+with lib;
+let
+  cfg = config.my.profiles.gaming;
+in
+{
+  options.my.profiles.gaming.enable = mkEnableOption "Enable gaming profile";
+
+  config = mkIf cfg.enable {
     programs.steam.enable = true;
     environment.systemPackages = with pkgs; [
       lutris
@@ -8,4 +19,5 @@
       heroic
       mangohud
     ];
+  };
 }

modules/profiles/personal.nix

@@ -1,7 +1,17 @@
-{ lib, ... }:
+{ lib
+, config
+, ...
+}:
 
 with lib;
+let
+  cfg = config.my.profiles.personal;
+in
 {
+  options.my.profiles.personal.enable = mkEnableOption "personal profile";
+
+  config = mkIf cfg.enable
+    {
       my = {
         services = {
           openconnect.enable = true;
@@ -60,4 +70,5 @@ with lib;
           };
         };
       };
+    };
 }

modules/profiles/ripping.nix

@@ -1,10 +1,23 @@
-{ pkgs }:
+{ lib
+, config
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.profiles.ripping;
+in
 
 {
+  options.my.profiles.ripping.enable = mkEnableOption "ripping profile";
+
+  config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       # ripping
       abcde
       handbrake
       picard
     ];
+  };
 }

modules/programs/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/programs/hyprland/default.nix

@@ -48,7 +48,7 @@ in
         enable = true;
         package = hyprland;
         recommendedEnvironment = true;
-        extraConfig = import ./config.nix args;
+        extraConfig = import ./_config.nix args;
       };
     };
 

modules/services/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/virtualisation/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}