From d1e491c2ba074864f1b141c5c195ff5cf9eae26d Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Tue, 30 Jul 2024 16:13:01 -0400
Subject: [PATCH] migrate randomWallpaper

---
 .../desktop/hyprland/settings.nix               |  7 +++++--
 homeManagerModules/desktop/sway/settings.nix    |  4 ++--
 homes/dustin/default.nix                        | 17 ++++++-----------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix
index 7628b83b..79c7a563 100644
--- a/homeManagerModules/desktop/hyprland/settings.nix
+++ b/homeManagerModules/desktop/hyprland/settings.nix
@@ -125,7 +125,6 @@ in {
 
   exec-once =
     [
-      helpers.wallpaperD
       (lib.getExe pkgs.waybar)
       scripts.idleD
       (lib.getExe pkgs.wayland-pipewire-idle-inhibit)
@@ -135,7 +134,11 @@ in {
       "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
     ]
     ++ 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 = {
     follow_mouse = 1;
diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index 91459a5e..08c19e54 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -167,8 +167,8 @@ in {
       ]
       ++ lib.optional cfg.desktop.sway.redShift
       {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";}
-      ++ lib.optional cfg.desktop.sway.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 = "${helpers.wallpaperD}";}
+      ++ lib.optional (!cfg.desktop.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
 
     floating.criteria = [
       {app_id = ".blueman-manager-wrapped";}
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
index 4eb19904..0c2169f2 100644
--- a/homes/dustin/default.nix
+++ b/homes/dustin/default.nix
@@ -46,17 +46,12 @@ self: {
     defaultApps.enable = true;
 
     desktop = {
-      hyprland = {
-        monitors = [
-          "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:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto"
-        ];
-
-        randomWallpaper = false;
-      };
-
-      sway.randomWallpaper = false;
+      hyprland.monitors = [
+        "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:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto"
+      ];
+      randomWallpaper = false;
     };
 
     theme = {