migrate randomWallpaper

This commit is contained in:
Aly Raffauf 2024-07-30 16:13:01 -04:00
parent 94daf84fbf
commit d1e491c2ba
3 changed files with 13 additions and 15 deletions

View file

@ -125,7 +125,6 @@ in {
exec-once = exec-once =
[ [
helpers.wallpaperD
(lib.getExe pkgs.waybar) (lib.getExe pkgs.waybar)
scripts.idleD scripts.idleD
(lib.getExe pkgs.wayland-pipewire-idle-inhibit) (lib.getExe pkgs.wayland-pipewire-idle-inhibit)
@ -135,7 +134,11 @@ in {
"${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1" "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
] ]
++ lib.lists.optional (cfg.desktop.hyprland.redShift) ++ lib.lists.optional (cfg.desktop.hyprland.redShift)
"${lib.getExe pkgs.gammastep} -l 33.74:-84.38"; "${lib.getExe pkgs.gammastep} -l 33.74:-84.38"
++ lib.lists.optional (cfg.desktop.randomWallpaper)
helpers.wallpaperD
++ lib.lists.optional (!cfg.desktop.randomWallpaper)
"${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";
input = { input = {
follow_mouse = 1; follow_mouse = 1;

View file

@ -167,8 +167,8 @@ in {
] ]
++ lib.optional cfg.desktop.sway.redShift ++ lib.optional cfg.desktop.sway.redShift
{command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";} {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";}
++ lib.optional cfg.desktop.sway.randomWallpaper {command = "${helpers.wallpaperD}";} ++ lib.optional cfg.desktop.randomWallpaper {command = "${helpers.wallpaperD}";}
++ lib.optional (!cfg.desktop.sway.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";}; ++ lib.optional (!cfg.desktop.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
floating.criteria = [ floating.criteria = [
{app_id = ".blueman-manager-wrapped";} {app_id = ".blueman-manager-wrapped";}

View file

@ -46,17 +46,12 @@ self: {
defaultApps.enable = true; defaultApps.enable = true;
desktop = { desktop = {
hyprland = { hyprland.monitors = [
monitors = [ "desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2400x0,1.6"
"desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2400x0,1.6" "desc:HP Inc. HP 24mh 3CM037248S,preferred,-1920x0,auto"
"desc:HP Inc. HP 24mh 3CM037248S,preferred,-1920x0,auto" "desc:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto"
"desc:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto" ];
]; randomWallpaper = false;
randomWallpaper = false;
};
sway.randomWallpaper = false;
}; };
theme = { theme = {