From 6e2f86f587d14c7c60892809b0d38bb595e415b7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 13 Jan 2024 17:16:32 +0100
Subject: [PATCH] remove overlays module

---
 modules/default.nix          |  1 -
 modules/nix/default.nix      |  8 ++++++++
 modules/overlays/default.nix | 23 -----------------------
 systems/kami/default.nix     |  1 -
 systems/yokai/default.nix    |  1 -
 5 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 modules/overlays/default.nix

diff --git a/modules/default.nix b/modules/default.nix
index ee07f27..2127bdb 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -13,7 +13,6 @@
     ./minecraft-server
     ./moodle-dl
     ./nix
-    ./overlays
     ./plasma
     ./plasma/6.nix
     ./printing
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index a4d2a41..0b16498 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -34,6 +34,14 @@ in {
 
     nixpkgs = {
       config.allowUnfree = true;
+      overlays = [
+        self.inputs.prismlauncher.overlays.default
+
+        (_self: super: rec {
+          firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system};
+          localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system};
+        })
+      ];
     };
 
     environment.etc = lib.mapAttrs' (name: value: { name = "nix/path/${name}"; value.source = value.flake; }) config.nix.registry;
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
deleted file mode 100644
index 582a8ab..0000000
--- a/modules/overlays/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ 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: super: rec {
-          firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system};
-          localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system};
-        })
-      ];
-    };
-  };
-}
-
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index 5621473..8f50af3 100644
--- a/systems/kami/default.nix
+++ b/systems/kami/default.nix
@@ -21,7 +21,6 @@
     nix.enable = true;
     plasma6.enable = true;
     printing.enable = true;
-    overlays.enable = true;
     steam.enable = true;
     ssh.enable = true;
     asf.enable = true;
diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix
index 8b5498f..6f93053 100644
--- a/systems/yokai/default.nix
+++ b/systems/yokai/default.nix
@@ -10,7 +10,6 @@
     audio = { enable = true; };
     bluetooth.enable = true;
     local.enable = true;
-    overlays.enable = true;
     nix.enable = true;
     plasma.enable = true;
     sway.enable = true;