move overkays to modules

flake.nix

@@ -86,7 +86,6 @@
         modules = [
           ./systems/kami
           self.outputs.nixosModules.default
-          ./overlays
         ];
       };
       yokai = nixpkgs.lib.nixosSystem {
@@ -95,7 +94,6 @@
         modules = [
           ./systems/yokai
           self.outputs.nixosModules.default
-          ./overlays
         ];
       };
       inugami = nixpkgs.lib.nixosSystem {
@@ -104,7 +102,6 @@
         modules = [
           ./systems/inugami
           self.outputs.nixosModules.default
-          ./overlays
         ];
       };
       tuny = nixpkgs.lib.nixosSystem {
@@ -118,7 +115,7 @@
       steamdeck = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = inputs;
-        modules = [ ./systems/steamdeck self.outputs.nixosModules.default ./overlays ];
+        modules = [ ./systems/steamdeck self.outputs.nixosModules.default ];
       };
     };
   };

modules/default.nix

@@ -12,6 +12,7 @@
     ./minecraft-server
     ./moodle-dl
     ./nix
+    ./overlays
     ./plasma
     ./plasma/6.nix
     ./printing

modules/nix/default.nix

@@ -41,6 +41,10 @@ in {
       ];
     };
 
+    nixpkgs = {
+      config.allowUnfree = true;
+    };
+
     environment.systemPackages = with pkgs; [
       deploy-rs
       nixfmt

modules/overlays/default.nix

@@ -0,0 +1,52 @@
+{ config, lib, self, ... }:
+
+let cfg = config.jopejoe1.overlays;
+in {
+  options.jopejoe1.overlays = {
+    enable = lib.mkEnableOption "Enable Overlays";
+  };
+
+  config = lib.mkIf cfg.enable {
+    nixpkgs = {
+
+      overlays = [
+        self.inputs.prismlauncher.overlays.default
+        self.inputs.nur.overlay
+
+        (_self: super: rec {
+
+          tela-icon-theme = super.tela-icon-theme.overrideAttrs
+            (_old: { src = self.inputs.tela-icon-theme; });
+
+          prismlauncher = super.prismlauncher.overrideAttrs (old: {
+            patches = (old.patches or [ ]) ++ [
+              self.inputs.prism-game-options-patch
+              ./prism-ftb.patch
+            ];
+          });
+
+          #noto-fonts-color-emoji = pkgs.noto-fonts-color-emoji_withExtraFlags;
+
+          libadwaita = super.libadwaita.overrideAttrs (old: {
+            patches = (old.patches or [ ])
+              ++ [ ./adwaita-theming-support.patch ];
+            doCheck = false;
+          });
+
+          discord = (super.discord.overrideAttrs (old: {
+            desktopItem = old.desktopItem.override
+              (old: { exec = old.exec + " --disable-gpu-sandbox"; });
+          })).override {
+            withOpenASAR = true;
+            withVencord = true;
+            withTTS = true;
+          };
+
+          catppuccin-plymouth =
+            super.catppuccin-plymouth.override { variant = "frappe"; };
+        })
+      ];
+    };
+  };
+}
+

overlays/default.nix

@@ -1,45 +0,0 @@
-{ prismlauncher, nur, self, config, ... }:
-
-{
-  nixpkgs = {
-    config.allowUnfree = true;
-
-    overlays = [
-      prismlauncher.overlays.default
-      nur.overlay
-
-      (_self: super: rec {
-
-        tela-icon-theme = super.tela-icon-theme.overrideAttrs
-          (_old: { src = self.inputs.tela-icon-theme; });
-
-        prismlauncher = super.prismlauncher.overrideAttrs (old: {
-          patches = (old.patches or [ ]) ++ [
-            self.inputs.prism-game-options-patch
-            ../patches/prism-ftb.patch
-          ];
-        });
-
-        #noto-fonts-color-emoji = pkgs.noto-fonts-color-emoji_withExtraFlags;
-
-        libadwaita = super.libadwaita.overrideAttrs (old: {
-          patches = (old.patches or [ ])
-            ++ [ ../patches/adwaita-theming-support.patch ];
-          doCheck = false;
-        });
-
-        discord = (super.discord.overrideAttrs (old: {
-          desktopItem = old.desktopItem.override
-            (old: { exec = old.exec + " --disable-gpu-sandbox"; });
-        })).override {
-          withOpenASAR = true;
-          withVencord = true;
-          withTTS = true;
-        };
-
-        catppuccin-plymouth =
-          super.catppuccin-plymouth.override { variant = "frappe"; };
-      })
-    ];
-  };
-}

systems/kami/default.nix

@@ -21,6 +21,7 @@
     nix.enable = true;
     plasma6.enable = true;
     printing.enable = true;
+    overlays.enable = true;
     steam.enable = true;
     asf.enable = true;
     minecraft-server.enable = true;