fix(modules): fix adding module

Author: misumisumi

flake.nix

@@ -62,40 +62,53 @@
   };
 
   outputs =
-    inputs@{ self, flake-parts, ... }:
+    inputs@{
+      self,
+      flake-parts,
+      nixpkgs,
+      ...
+    }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [ inputs.devshell.flakeModule ];
-      flake = {
-        overlay = self.overlays.default;
-        overlays.default =
-          let
-            nixpkgs-stable = import inputs.nixpkgs-stable {
-              system = "x86_64-linux";
-              config = {
-                allowUnfree = true;
+      flake =
+        let
+          inherit (nixpkgs) lib;
+        in
+        {
+          overlay = self.overlays.default;
+          overlays.default =
+            let
+              nixpkgs-stable = import inputs.nixpkgs-stable {
+                system = "x86_64-linux";
+                config = {
+                  allowUnfree = true;
+                };
               };
-            };
-          in
-          import ./patches { inherit nixpkgs-stable; };
-        homeManagerModules = {
-          dotfiles = import ./modules/home-manager/dotfiles.nix;
-          zinit = import ./modules/home-manager/zinit.nix;
-          zotero = import ./modules/home-manager/zotero.nix;
-        };
-        nixosModules = {
-          vfio = import ./modules/nixos/vfio.nix;
-          virtualisation = import ./modules/nixos/virtualisation.nix;
-          xp-pentablet = import ./modules/nixos/xp-pentablet.nix;
-        };
-        homeConfigurations = import ./machines/home-manager.nix {
-          inherit (inputs.nixpkgs) lib;
-          inherit inputs self;
-        };
-        nixosConfigurations = import ./machines {
-          inherit (inputs.nixpkgs) lib;
-          inherit inputs self;
+            in
+            import ./patches { inherit nixpkgs-stable; };
+          homeManagerModules =
+            let
+              modulePath = ./modules/home-manager;
+            in
+            lib.mapAttrs' (
+              f: _: lib.nameValuePair (lib.removeSuffix ".nix" f) (import (modulePath + "/${f}"))
+            ) (builtins.readDir modulePath);
+          nixosModules =
+            let
+              modulePath = ./modules/nixos;
+            in
+            lib.mapAttrs' (
+              f: _: lib.nameValuePair (lib.removeSuffix ".nix" f) (import (modulePath + "/${f}"))
+            ) (builtins.readDir modulePath);
+          homeConfigurations = import ./machines/home-manager.nix {
+            inherit (inputs.nixpkgs) lib;
+            inherit inputs self;
+          };
+          nixosConfigurations = import ./machines {
+            inherit (inputs.nixpkgs) lib;
+            inherit inputs self;
+          };
         };
-      };
       systems = [ "x86_64-linux" ];
       perSystem =
         { pkgs, system, ... }:

machines/default.nix

@@ -63,9 +63,7 @@ let
                 inputs.nvimdots.homeManagerModules.nvimdots
                 inputs.sops-nix.homeManagerModules.sops
                 inputs.spicetify-nix.homeManagerModules.default
-                self.homeManagerModules.dotfiles
-                self.homeManagerModules.zinit
-                self.homeManagerModules.zotero
+                self.homeManagerModules.default
               ];
               users."${user}" = {
                 imports =

modules/home-manager/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./dotfiles.nix
+    ./qtile.nix
+    ./zinit.nix
+    ./zotero.nix
+  ];
+}