Move programs to modules

flake.nix

@@ -9,20 +9,38 @@
     };
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, ... }: {
-    nixosConfigurations = {
-      atlas = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+  outputs = inputs @ { nixpkgs, home-manager, ... }:
+    let
+      inherit (lib) attrValues;
+      inherit (lib.my) mapModules mapModulesRec;
 
-        modules = [
-          ./hosts/atlas/configuration.nix
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-	          home-manager.useUserPackages = true;
-            home-manager.users.jordan = import ./users/jordan/home.nix;
-	        }
-	      ];
+      mkPkgs = pkgs:
+        import pkgs {
+          config.allowUnfree = true;
+        };
+      pkgs = mkPkgs nixpkgs;
+
+      lib = nixpkgs.lib.extend (self: super: {
+        my = import ./lib {
+          inherit pkgs inputs;
+          lib = self;
+        };
+      });
+    in {
+      lib = lib.my;
+
+      nixosModules = mapModulesRec ./modules import;
+
+      nixosConfigurations = {
+        atlas = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            inputs.home-manager.nixosModules.home-manager
+            (import ./modules)
+            ./hosts/atlas
+          ];
+          specialArgs = { inherit lib inputs; };
+        };
       };
-    };
   };
 }