zaphyra's git: tgcNUR

flake: refactor outputs

diff --git a/flake.nix b/flake.nix
@@ -20,6 +20,14 @@
 
         homeManagerModules = lib.collectModules { path = ./homeManagerModules; };
         nixosModules = lib.collectModules { path = ./nixosModules; };
+        modulesTemplate =
+          modules:
+          modules
+          // {
+            default = {
+              imports = builtins.attrValues modules;
+            };
+          };
 
         lib = import ./lib nixpkgsLib inputs;
 

@@ -42,29 +50,21 @@
         };
 
         overlays = {
-          emacs-overlay = inputs.emacs-overlay.overlays.package;
           lib = final: prev: {
             lib = prev.lib.extend (_: _: { tgc = lib; });
           };
-          default = final: prev: {
+          packages = final: prev: {
             tgc = inputs.self.packages.${prev.system};
           };
+          emacs-overlay = inputs.emacs-overlay.overlays.package;
+          default = inputs.self.overlays.packages;
         };
 
-        homeManagerModules = homeManagerModules // {
-          default = {
-            imports = builtins.attrValues homeManagerModules;
-          };
-        };
-
-        nixosModules = nixosModules // {
-          allModules = {
-            imports = builtins.attrValues nixosModules;
-          };
-          allPackages = {
+        homeManagerModules = modulesTemplate homeManagerModules;
+        nixosModules = (modulesTemplate nixosModules) // {
+          packages = {
             nixpkgs.overlays = [ inputs.self.overlays.default ];
           };
-          default = inputs.self.nixosModules.allPackages;
         };
 
       }