From b7a259bf3982cdcad37b241868b6b826dbe6ce6a Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 7 Aug 2024 11:46:42 +0200 Subject: [PATCH] fix falsely installing wayland everywhere with no x --- components/gui/wayland.nix | 6 +++--- components/gui/xorg/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/gui/wayland.nix b/components/gui/wayland.nix index 1aeed23..9b7b871 100644 --- a/components/gui/wayland.nix +++ b/components/gui/wayland.nix @@ -4,10 +4,10 @@ with lib; options.components.gui.wayland.enable = mkOption { type = lib.types.bool; - default = ! config.components.gui.xorg.enable; + default = !config.components.gui.xorg.enable; }; - config = mkIf config.components.gui.wayland.enable { - programs.hyprland.enable = true; + config = mkIf (config.components.gui.wayland.enable && config.components.gui.enable) { + programs.sway.enable = false; }; } diff --git a/components/gui/xorg/default.nix b/components/gui/xorg/default.nix index 2da2dd3..27f04f3 100644 --- a/components/gui/xorg/default.nix +++ b/components/gui/xorg/default.nix @@ -9,7 +9,7 @@ with lib; default = config.components.gui.enable; }; - config = mkIf config.components.gui.xorg.enable { + config = mkIf (config.components.gui.xorg.enable && config.components.gui.enable) { # system.custom.fonts.enable = true; services.displayManager = {