remove waylandComp, enable based on enabled window managers

This commit is contained in:
Aly Raffauf 2024-06-21 19:32:40 -04:00
parent 131aa76f9f
commit 17880c1460
4 changed files with 2 additions and 15 deletions

View file

@ -4,7 +4,7 @@
config, config,
... ...
}: { }: {
config = lib.mkIf config.alyraffauf.desktop.waylandComp { config = lib.mkIf (config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable) {
alyraffauf = { alyraffauf = {
apps = { apps = {
fuzzel.enable = lib.mkDefault true; fuzzel.enable = lib.mkDefault true;

View file

@ -261,12 +261,6 @@
default = []; default = [];
type = lib.types.listOf (lib.types.str); 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 = { scripts = {
pp-adjuster.enable = lib.mkEnableOption "pp-adjuster script."; pp-adjuster.enable = lib.mkEnableOption "pp-adjuster script.";

View file

@ -5,7 +5,7 @@
config, config,
... ...
}: { }: {
config = lib.mkIf config.alyraffauf.desktop.waylandComp { config = lib.mkIf (config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable) {
programs = { programs = {
gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
}; };

View file

@ -186,13 +186,6 @@
lib.mkEnableOption "Steam + Gamescope session."; lib.mkEnableOption "Steam + Gamescope session.";
sway.enable = sway.enable =
lib.mkEnableOption "Sway wayland session."; 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 = scripts.hoenn.enable =
lib.mkEnableOption "Hoenn system configuration script"; lib.mkEnableOption "Hoenn system configuration script";