From 536fc32216b5f728f7bcea033070474e64b4f6e5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 2 Jan 2024 19:32:20 +0100
Subject: [PATCH] move overkays to modules

---
 flake.nix                                     |  5 +-
 modules/default.nix                           |  1 +
 modules/nix/default.nix                       |  4 ++
 .../overlays}/adwaita-theming-support.patch   |  0
 modules/overlays/default.nix                  | 52 +++++++++++++++++++
 {patches => modules/overlays}/prism-ftb.patch |  0
 overlays/default.nix                          | 45 ----------------
 systems/kami/default.nix                      |  1 +
 8 files changed, 59 insertions(+), 49 deletions(-)
 rename {patches => modules/overlays}/adwaita-theming-support.patch (100%)
 create mode 100644 modules/overlays/default.nix
 rename {patches => modules/overlays}/prism-ftb.patch (100%)
 delete mode 100644 overlays/default.nix

diff --git a/flake.nix b/flake.nix
index e694946..fd99205 100644
--- a/flake.nix
+++ b/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 ];
       };
     };
   };
diff --git a/modules/default.nix b/modules/default.nix
index 22cd946..9b2bc2b 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -12,6 +12,7 @@
     ./minecraft-server
     ./moodle-dl
     ./nix
+    ./overlays
     ./plasma
     ./plasma/6.nix
     ./printing
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index ddde64b..9b3db55 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -41,6 +41,10 @@ in {
       ];
     };
 
+    nixpkgs = {
+      config.allowUnfree = true;
+    };
+
     environment.systemPackages = with pkgs; [
       deploy-rs
       nixfmt
diff --git a/patches/adwaita-theming-support.patch b/modules/overlays/adwaita-theming-support.patch
similarity index 100%
rename from patches/adwaita-theming-support.patch
rename to modules/overlays/adwaita-theming-support.patch
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
new file mode 100644
index 0000000..4b8912b
--- /dev/null
+++ b/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"; };
+        })
+      ];
+    };
+  };
+}
+
diff --git a/patches/prism-ftb.patch b/modules/overlays/prism-ftb.patch
similarity index 100%
rename from patches/prism-ftb.patch
rename to modules/overlays/prism-ftb.patch
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index 6c301a6..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -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"; };
-      })
-    ];
-  };
-}
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index 456b29a..1f0bafa 100644
--- a/systems/kami/default.nix
+++ b/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;