sync

flake.nix

@@ -62,9 +62,19 @@
       packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; });
       devShells = forEachPkgs (pkgs: import ./shell.nix { inherit pkgs; });
       overlays = import ./overlays { inherit inputs; };
-      nixosModules = import ./modules/nixos;
-      homeManagerModules = import ./modules/home-manager;
-
+      nixosModules = builtins.listToAttrs (map
+        (x: {
+          name = x;
+          value = import (./modules/nixos + "/${x}");
+        })
+        (builtins.attrNames (builtins.readDir ../modules/nixos)));
+        
+      homeManagerModules = builtins.listToAttrs (map
+        (name: {
+          inherit name;
+          value = import (./modules/home-manager + "/${name}");
+        })
+        (builtins.attrNames (builtins.readDir ./modules/home-manager)));
 
       # NixOS configuration entrypoint
       # Available through 'nixos-rebuild --flake .#your-hostname'
@@ -73,12 +83,14 @@
           specialArgs = { inherit inputs outputs; };
           modules = [
             ./hosts/WSL/Go3
+            { imports = builtins.attrValues self.nixosModules; }
           ];
         };
         StuPC = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs outputs; };
           modules = [
             ./hosts/WSL/StuPC
+            { imports = builtins.attrValues self.nixosModules; }
           ];
         };
       
@@ -95,7 +107,7 @@
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent
             inputs.sops-nix.homeManagerModules.sops         
-          ];
+          ]++ (builtins.attrValues self.homeManagerModules);
         };
         "sstent@StuPC" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
@@ -104,7 +116,7 @@
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent
             inputs.sops-nix.homeManagerModules.sops         
-          ];
+          ]++ (builtins.attrValues self.homeManagerModules);
         };
       };
 

home-manager/users/sstent/default.nix

@@ -53,7 +53,6 @@
         # beets
         # qemu_kvm
         # nixos-generators
-        nixfmt
         nixpkgs-fmt
         # deploy-rs
       ];

modules/home-manager/default.nix

@@ -1,7 +0,0 @@
-# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module).
-# These should be stuff you would like to share with others, not your personal configurations.
-
-{
-  # List your module files here
-  ssh-proxy = import ./ssh-proxy.nix;
-}

modules/nixos/default.nix

@@ -1,7 +0,0 @@
-# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module).
-# These should be stuff you would like to share with others, not your personal configurations.
-
-{
-  # List your module files here
-  # my-module = import ./my-module.nix;
-}