diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix index 79c7a563..2cf65925 100644 --- a/homeManagerModules/desktop/hyprland/settings.nix +++ b/homeManagerModules/desktop/hyprland/settings.nix @@ -133,7 +133,7 @@ in { (lib.getExe pkgs.mako) "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1" ] - ++ lib.lists.optional (cfg.desktop.hyprland.redShift) + ++ lib.lists.optional (cfg.desktop.redShift) "${lib.getExe pkgs.gammastep} -l 33.74:-84.38" ++ lib.lists.optional (cfg.desktop.randomWallpaper) helpers.wallpaperD diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix index 08c19e54..9a98572c 100644 --- a/homeManagerModules/desktop/sway/settings.nix +++ b/homeManagerModules/desktop/sway/settings.nix @@ -165,7 +165,7 @@ in { {command = lib.getExe' pkgs.swayosd "swayosd-server";} {command = lib.getExe pkgs.mako;} ] - ++ lib.optional cfg.desktop.sway.redShift + ++ lib.optional cfg.desktop.redShift {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";} ++ lib.optional cfg.desktop.randomWallpaper {command = "${helpers.wallpaperD}";} ++ lib.optional (!cfg.desktop.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";}; diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 6987cd2f..b0caa9c0 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -119,6 +119,12 @@ in { type = lib.types.bool; }; + redShift = lib.mkOption { + description = "Whether to redshift display colors at night."; + default = cfg.desktop.hyprland.enable || cfg.desktop.sway.enable; + type = lib.types.bool; + }; + hyprland = { enable = lib.mkOption { description = "Hyprland with full desktop session components."; @@ -138,12 +144,6 @@ in { type = lib.types.listOf lib.types.str; }; - redShift = lib.mkOption { - description = "Whether to redshift display colors at night."; - default = cfg.desktop.hyprland.enable; - type = lib.types.bool; - }; - windowManagerBinds = lib.mkOption { description = "Default binds for window management."; default = { @@ -195,12 +195,6 @@ in { type = lib.types.bool; }; - redShift = lib.mkOption { - description = "Whether to redshift display colors at night."; - default = cfg.desktop.sway.enable; - type = lib.types.bool; - }; - windowManagerBinds = lib.mkOption { description = "Default binds for window management."; default = {