flake: expose overlays

flake.nix

@@ -177,6 +177,7 @@
   in {
     formatter = eachDefaultSystemMap (system: inputs.nixpkgs.legacyPackages.${system}.alejandra);
     packages = eachDefaultSystemMap (system: import ./pkgs inputs.nixpkgs.legacyPackages.${system});
+    overlays = import ./overlays;
     nixosModules.default = ./nixos/modules;
     darwinModules.default = ./darwin/modules;
 

nixos/profiles/common/core/default.nix

@@ -9,7 +9,7 @@
     ./hardening
     ./networking
     ./nix
-    ./packages
+    ./anti-feature.nix
 
     # Flake modules
     inputs.self.nixosModules.default
@@ -21,6 +21,12 @@
     inputs.nix-gaming.nixosModules.pipewireLowLatency
   ];
 
+  nixpkgs.overlays = [
+    inputs.self.overlays.sway
+    inputs.self.overlays.prismlauncher
+    inputs.self.overlays.nautilus
+  ];
+
   ### home-manager
   home-manager.users.guanranwang = import ./home;
 

nixos/profiles/common/core/packages/default.nix

@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./overlays
-    ./anti-feature.nix
-  ];
-}

nixos/profiles/common/core/packages/overlays/default.nix

@@ -1,12 +0,0 @@
-let
-  addPatches = pkg: patches:
-    pkg.overrideAttrs (old: {
-      patches = (old.patches or []) ++ patches;
-    });
-in {
-  nixpkgs.overlays = [
-    (import ./nautilus.nix {inherit addPatches;})
-    (import ./prismlauncher.nix {inherit addPatches;})
-    (import ./sway.nix {inherit addPatches;})
-  ];
-}

overlays/default.nix

@@ -0,0 +1,10 @@
+let
+  addPatches = pkg: patches:
+    pkg.overrideAttrs (old: {
+      patches = (old.patches or []) ++ patches;
+    });
+in {
+  nautilus = import ./nautilus.nix {inherit addPatches;};
+  prismlauncher = import ./prismlauncher.nix {inherit addPatches;};
+  sway = import ./sway.nix {inherit addPatches;};
+}