From 17880c1460d122070c15b9a0eab077d72af4aa40 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 21 Jun 2024 19:32:40 -0400
Subject: [PATCH] remove waylandComp, enable based on enabled window managers

---
 homeManagerModules/desktop/waylandComp.nix | 2 +-
 homeManagerModules/options.nix             | 6 ------
 nixosModules/desktop/waylandComp.nix       | 2 +-
 nixosModules/options.nix                   | 7 -------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/homeManagerModules/desktop/waylandComp.nix b/homeManagerModules/desktop/waylandComp.nix
index 145686dd..84c589db 100644
--- a/homeManagerModules/desktop/waylandComp.nix
+++ b/homeManagerModules/desktop/waylandComp.nix
@@ -4,7 +4,7 @@
   config,
   ...
 }: {
-  config = lib.mkIf config.alyraffauf.desktop.waylandComp {
+  config = lib.mkIf (config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable) {
     alyraffauf = {
       apps = {
         fuzzel.enable = lib.mkDefault true;
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index 17c529f8..b8e8539f 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -261,12 +261,6 @@
           default = [];
           type = lib.types.listOf (lib.types.str);
         };
-        waylandComp = lib.mkOption {
-          description = "Shared defaults for wayland compositors.";
-          default =
-            config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable;
-          type = lib.types.bool;
-        };
       };
       scripts = {
         pp-adjuster.enable = lib.mkEnableOption "pp-adjuster script.";
diff --git a/nixosModules/desktop/waylandComp.nix b/nixosModules/desktop/waylandComp.nix
index deda65da..f3ba37b1 100644
--- a/nixosModules/desktop/waylandComp.nix
+++ b/nixosModules/desktop/waylandComp.nix
@@ -5,7 +5,7 @@
   config,
   ...
 }: {
-  config = lib.mkIf config.alyraffauf.desktop.waylandComp {
+  config = lib.mkIf (config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable) {
     programs = {
       gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
     };
diff --git a/nixosModules/options.nix b/nixosModules/options.nix
index 87c0e183..194d5952 100644
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@@ -186,13 +186,6 @@
           lib.mkEnableOption "Steam + Gamescope session.";
         sway.enable =
           lib.mkEnableOption "Sway wayland session.";
-        waylandComp = lib.mkOption {
-          description = "Shared defaults for wayland compositors.";
-          default =
-            config.alyraffauf.desktop.hyprland.enable
-            || config.alyraffauf.desktop.sway.enable;
-          type = lib.types.bool;
-        };
       };
       scripts.hoenn.enable =
         lib.mkEnableOption "Hoenn system configuration script";