migrate home options

homeManagerModules/desktop/hyprland/settings.nix

@@ -127,7 +127,7 @@ in {
     [
       "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
     ]
-    ++ lib.lists.optional (!cfg.desktop.randomWallpaper)
+    ++ lib.lists.optional (!cfg.services.randomWallpaper.enable)
     "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";
 
   input = {

homeManagerModules/desktop/sway/settings.nix

@@ -160,7 +160,7 @@ in {
         {command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";}
         {command = lib.getExe pkgs.autotiling;}
       ]
-      ++ lib.optional (!cfg.desktop.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
+      ++ lib.optional (!cfg.services.randomWallpaper.enable) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
 
     floating.criteria = [
       {app_id = ".blueman-manager-wrapped";}

homeManagerModules/options.nix

@@ -112,18 +112,6 @@ in {
         type = lib.types.bool;
       };
 
-      randomWallpaper = lib.mkOption {
-        description = "Whether to enable random wallpaper script.";
-        default = cfg.desktop.hyprland.enable || cfg.desktop.sway.enable;
-        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.";

homeManagerModules/services/gammastep/default.nix

@@ -5,7 +5,7 @@
 }: let
   cfg = config.ar.home;
 in {
-  config = lib.mkIf (cfg.services.gammastep.enable || cfg.desktop.redShift) {
+  config = lib.mkIf cfg.services.gammastep.enable {
     services.gammastep = {
       enable = true;
       latitude = lib.mkDefault "33.74";

homeManagerModules/services/randomWallpaper/default.nix

@@ -72,7 +72,7 @@
     end
   '';
 in {
-  config = lib.mkIf (config.ar.home.services.randomWallpaper.enable || config.ar.home.desktop.randomWallpaper) {
+  config = lib.mkIf config.ar.home.services.randomWallpaper.enable {
     systemd.user.services.randomWallpaper = {
       Unit = {
         After = "graphical-session.target";

homes/aly/default.nix

@@ -106,6 +106,11 @@ in {
       editor = config.ar.home.apps.zed.package;
     };
 
+    services = {
+      gammastep.enable = true;
+      randomWallpaper.enable = true;
+    };
+
     theme = {
       enable = true;
       wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-5g6g33.jpg";

homes/dustin/default.nix

@@ -50,7 +50,11 @@ self: {
         "desc:HP Inc. HP 24mh 3CM037248S,preferred,-1920x0,auto"
         "desc:LG Electronics LG IPS QHD 109NTWG4Y865,preferred,-2560x0,auto"
       ];
-      randomWallpaper = false;
+    };
+
+    services = {
+      gammastep.enable = true;
+      randomWallpaper.enable = false;
     };
 
     theme = {