diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix
index 395e2eb6..9a4f9a6f 100644
--- a/homeManagerModules/apps/default.nix
+++ b/homeManagerModules/apps/default.nix
@@ -12,14 +12,12 @@
     ./kitty
     ./keepassxc
     ./librewolf
-    ./mako
     ./nemo
     ./rofi
     ./swaylock
     ./thunar
     ./tmux
     ./vsCodium
-    ./waybar
     ./wlogout
     ./yazi
     ./zed
diff --git a/homeManagerModules/apps/mako/default.nix b/homeManagerModules/apps/mako/default.nix
deleted file mode 100644
index bc4d0113..00000000
--- a/homeManagerModules/apps/mako/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  config = lib.mkIf config.ar.home.apps.mako.enable {
-    services.mako = {
-      enable = true;
-      anchor = "top-center";
-      backgroundColor = "${config.ar.home.theme.colors.background}CC";
-      borderColor = "${config.ar.home.theme.colors.primary}EE";
-      borderSize = 2;
-      borderRadius = 10;
-      defaultTimeout = 10000;
-      font = "${config.gtk.font.name} Regular ${toString config.gtk.font.size}";
-      height = 300;
-      layer = "top";
-      padding = "15";
-      textColor = "${config.ar.home.theme.colors.text}";
-      width = 400;
-      margin = "20,0";
-      extraConfig = ''
-        [mode=do-not-disturb]
-        invisible=1
-      '';
-    };
-  };
-}
diff --git a/homeManagerModules/desktop/hyprland/scripts.nix b/homeManagerModules/desktop/hyprland/scripts.nix
index 2430e0f7..4e3e4df1 100644
--- a/homeManagerModules/desktop/hyprland/scripts.nix
+++ b/homeManagerModules/desktop/hyprland/scripts.nix
@@ -26,28 +26,6 @@ in {
     fi
   '';
 
-  idleD = let
-    timeouts =
-      ["timeout 120 '${lib.getExe pkgs.brightnessctl} -s set 10' resume '${lib.getExe pkgs.brightnessctl} -r'"]
-      ++ (
-        if cfg.desktop.autoSuspend
-        then ["timeout 600 'sleep 2 && ${lib.getExe' pkgs.systemd "systemctl"} suspend'"]
-        else [
-          "timeout 600 '${lib.getExe pkgs.swaylock}'"
-          "timeout 630 '${hyprctl} dispatch dpms off' resume '${hyprctl} dispatch dpms on'"
-        ]
-      );
-
-    beforeSleeps =
-      lib.optionals cfg.desktop.autoSuspend
-      [
-        "before-sleep '${lib.getExe pkgs.playerctl} pause'"
-        "before-sleep '${lib.getExe pkgs.swaylock}'"
-      ];
-  in
-    pkgs.writeShellScript "hyprland-idled"
-    "${lib.getExe pkgs.swayidle} -w lock '${lib.getExe pkgs.swaylock}' ${lib.strings.concatStringsSep " " (timeouts ++ beforeSleeps)}";
-
   tablet = pkgs.writeShellScript "hyprland-tablet" ''
     STATE=`${lib.getExe pkgs.dconf} read /org/gnome/desktop/a11y/applications/screen-keyboard-enabled`
 
diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix
index ec7a722f..64716dc5 100644
--- a/homeManagerModules/desktop/hyprland/settings.nix
+++ b/homeManagerModules/desktop/hyprland/settings.nix
@@ -126,18 +126,8 @@ in {
   exec-once =
     [
       "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
-      (lib.getExe pkgs.mako)
-      (lib.getExe pkgs.waybar)
-      (lib.getExe pkgs.wayland-pipewire-idle-inhibit)
-      (lib.getExe' pkgs.playerctl "playerctld")
-      (lib.getExe' pkgs.swayosd "swayosd-server")
-      scripts.idleD
     ]
-    ++ lib.lists.optional (cfg.desktop.redShift)
-    "${lib.getExe pkgs.gammastep} -l 33.74:-84.38"
-    ++ lib.lists.optional (cfg.desktop.randomWallpaper)
-    helpers.wallpaperD
-    ++ lib.lists.optional (!cfg.desktop.randomWallpaper)
+    ++ lib.lists.optional (!cfg.services.randomWallpaper.enable)
     "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";
 
   input = {
diff --git a/homeManagerModules/desktop/sway/scripts.nix b/homeManagerModules/desktop/sway/scripts.nix
deleted file mode 100644
index 6e3d68db..00000000
--- a/homeManagerModules/desktop/sway/scripts.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.ar.home;
-  swaymsg = lib.getExe' config.wayland.windowManager.sway.package "swaymsg";
-in {
-  idleD = let
-    timeouts =
-      ["timeout 120 '${lib.getExe pkgs.brightnessctl} -s set 10' resume '${lib.getExe pkgs.brightnessctl} -r'"]
-      ++ (
-        if cfg.desktop.autoSuspend
-        then ["timeout 600 'sleep 2 && ${lib.getExe' pkgs.systemd "systemctl"} suspend'"]
-        else [
-          "timeout 600 '${lib.getExe pkgs.swaylock}'"
-          "timeout 630 '${swaymsg} \"output * dpms off\"' resume '${swaymsg} \"output * dpms on\"'"
-        ]
-      );
-
-    beforeSleeps =
-      lib.optionals cfg.desktop.autoSuspend
-      [
-        "before-sleep '${lib.getExe pkgs.playerctl} pause'"
-        "before-sleep '${lib.getExe pkgs.swaylock}'"
-      ];
-  in
-    pkgs.writeShellScript "sway-idled"
-    "${lib.getExe pkgs.swayidle} -w lock '${lib.getExe pkgs.swaylock}' ${lib.strings.concatStringsSep " " (timeouts ++ beforeSleeps)}";
-}
diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index 888c9655..ca281ba8 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -5,7 +5,6 @@
   ...
 }: let
   cfg = config.ar.home;
-  scripts = import ./scripts.nix {inherit config lib pkgs;};
   helpers = import ../wayland/helpers.nix {inherit config lib pkgs;};
   modifier = "Mod4";
 in {
@@ -15,7 +14,7 @@ in {
   wrapperFeatures.gtk = true;
 
   config = {
-    bars = [{command = lib.getExe pkgs.waybar;}];
+    bars = [];
     modifier = modifier;
 
     colors = {
@@ -159,17 +158,9 @@ in {
     startup =
       [
         {command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";}
-        {command = "${scripts.idleD}";}
         {command = lib.getExe pkgs.autotiling;}
-        {command = lib.getExe pkgs.mako;}
-        {command = lib.getExe pkgs.wayland-pipewire-idle-inhibit;}
-        {command = lib.getExe' pkgs.playerctl "playerctld";}
-        {command = lib.getExe' pkgs.swayosd "swayosd-server";}
       ]
-      ++ 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}";};
+      ++ lib.optional (!cfg.services.randomWallpaper.enable) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
 
     floating.criteria = [
       {app_id = ".blueman-manager-wrapped";}
diff --git a/homeManagerModules/desktop/wayland/default.nix b/homeManagerModules/desktop/wayland/default.nix
index a2c40223..01e29657 100644
--- a/homeManagerModules/desktop/wayland/default.nix
+++ b/homeManagerModules/desktop/wayland/default.nix
@@ -5,12 +5,19 @@
   ...
 }: {
   config = lib.mkIf (config.ar.home.desktop.hyprland.enable || config.ar.home.desktop.sway.enable) {
-    ar.home.apps = {
-      kitty.enable = lib.mkDefault true;
-      mako.enable = lib.mkDefault true;
-      rofi.enable = lib.mkDefault true;
-      swaylock.enable = lib.mkDefault true;
-      waybar.enable = lib.mkDefault true;
+    ar.home = {
+      apps = {
+        kitty.enable = lib.mkDefault true;
+        rofi.enable = lib.mkDefault true;
+        swaylock.enable = lib.mkDefault true;
+      };
+
+      services = {
+        mako.enable = lib.mkDefault true;
+        pipewire-inhibit.enable = lib.mkDefault true;
+        swayidle.enable = lib.mkDefault true;
+        waybar.enable = lib.mkDefault true;
+      };
     };
 
     dconf = {
@@ -28,6 +35,19 @@
       swayosd
     ];
 
+    services = {
+      playerctld.enable = lib.mkDefault true;
+      swayosd.enable = lib.mkDefault true;
+    };
+
+    systemd.user.services.swayosd = {
+      Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
+      Service = {
+        Restart = lib.mkForce "on-failure";
+        RestartSec = 5;
+      };
+    };
+
     xdg.portal = {
       enable = true;
       configPackages =
diff --git a/homeManagerModules/desktop/wayland/helpers.nix b/homeManagerModules/desktop/wayland/helpers.nix
index ec140b57..1e99663d 100644
--- a/homeManagerModules/desktop/wayland/helpers.nix
+++ b/homeManagerModules/desktop/wayland/helpers.nix
@@ -48,72 +48,4 @@
     mute = "${bin} --output-volume=mute-toggle";
     micMute = "${bin} --input-volume=mute-toggle";
   };
-
-  wallpaperD = pkgs.writers.writeRuby "randomWallpaperD" {} ''
-    require 'fileutils'
-
-    directory = "${config.xdg.dataHome}/backgrounds/"
-    current_pids = {}
-    known_monitors = {}
-    last_update_time = {}
-
-    update_interval = 900 # 15 minutes in seconds
-
-    def process_running?(process_name)
-      system("pidof #{process_name} > /dev/null 2>&1")
-    end
-
-    def get_outputs
-      if process_running?("sway")
-        outputs = IO.popen(["${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"}", '-t', 'get_outputs', '-p']).readlines
-        outputs.select { |line| line.include?('Output') }.map { |line| line.split[1] }
-      elsif process_running?("Hyprland")
-        outputs = IO.popen(["${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}", 'monitors']).read
-        outputs.each_line.map { |line| line.split[1] if line.include?('Monitor') }.compact
-      end
-    end
-
-    sleep 1
-
-    if Dir.exist?(directory)
-      loop do
-        active_monitors = get_outputs
-
-        added_monitors = active_monitors - known_monitors.keys
-        removed_monitors = known_monitors.keys - active_monitors
-
-        # Handle newly added monitors
-        added_monitors.each do |monitor|
-          random_background = Dir.glob(File.join(directory, '*.{png,jpg}')).sample
-          pid = spawn("${lib.getExe pkgs.swaybg}", '-o', monitor, '-i', random_background, '-m', 'fill')
-          current_pids[monitor] = pid
-          last_update_time[monitor] = Time.now
-          known_monitors[monitor] = random_background
-        end
-
-        # Remove wallpapers from removed monitors
-        removed_monitors.each do |monitor|
-          Process.kill('TERM', current_pids[monitor]) if current_pids[monitor]
-          current_pids.delete(monitor)
-          last_update_time.delete(monitor)
-          known_monitors.delete(monitor)
-        end
-
-        # Update wallpapers after the set interval
-        active_monitors.each do |monitor|
-          if Time.now - last_update_time[monitor] >= update_interval
-            random_background = Dir.glob(File.join(directory, '*.{png,jpg}')).sample
-            pid = spawn("${lib.getExe pkgs.swaybg}", '-o', monitor, '-i', random_background, '-m', 'fill')
-            sleep 1
-            Process.kill('TERM', current_pids[monitor]) if current_pids[monitor]
-            current_pids[monitor] = pid
-            last_update_time[monitor] = Time.now
-            known_monitors[monitor] = random_background
-          end
-        end
-
-        sleep 5 # Check for monitor changes and update intervals every 5 seconds
-      end
-    end
-  '';
 }
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index a6dbb8fe..3c3a9bdd 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -53,7 +53,6 @@ in {
 
       kitty.enable = lib.mkEnableOption "Kitty terminal.";
       librewolf.enable = lib.mkEnableOption "Librewolf web browser.";
-      mako.enable = lib.mkEnableOption "Mako notification daemon.";
 
       nemo.enable = lib.mkOption {
         description = "Cinnamon Nemo file manager.";
@@ -72,7 +71,6 @@ in {
 
       tmux.enable = lib.mkEnableOption "Tmux shell session manager.";
       vsCodium.enable = lib.mkEnableOption "VSCodium text editor.";
-      waybar.enable = lib.mkEnableOption "Waybar wayland panel.";
       wlogout.enable = lib.mkEnableOption "Wlogout session prompt.";
       yazi.enable = lib.mkEnableOption "Yazi terminal file manager.";
 
@@ -114,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.";
@@ -196,6 +182,19 @@ in {
     };
 
     services = {
+      easyeffects = {
+        enable = lib.mkEnableOption "EasyEffects user service.";
+
+        preset = lib.mkOption {
+          description = "Name of preset to start with.";
+          default = "";
+          type = lib.types.str;
+        };
+      };
+
+      gammastep.enable = lib.mkEnableOption "Gammastep redshift daemon.";
+      mako.enable = lib.mkEnableOption "Mako notification daemon.";
+
       mpd = {
         enable = lib.mkEnableOption "MPD user service.";
 
@@ -206,15 +205,10 @@ in {
         };
       };
 
-      easyeffects = {
-        enable = lib.mkEnableOption "EasyEffects user service.";
-
-        preset = lib.mkOption {
-          description = "Name of preset to start with.";
-          default = "";
-          type = lib.types.str;
-        };
-      };
+      pipewire-inhibit.enable = lib.mkEnableOption "Inhibit idle when audio is playing with Pipewire.";
+      randomWallpaper.enable = lib.mkEnableOption "Lightweight swaybg-based random wallpaper daemon.";
+      swayidle.enable = lib.mkEnableOption "Swayidle idle daemon.";
+      waybar.enable = lib.mkEnableOption "Waybar wayland panel.";
     };
 
     theme = {
diff --git a/homeManagerModules/services/default.nix b/homeManagerModules/services/default.nix
index 8ab0c7dc..37ad9050 100644
--- a/homeManagerModules/services/default.nix
+++ b/homeManagerModules/services/default.nix
@@ -1,6 +1,12 @@
 {
   imports = [
     ./easyeffects
+    ./gammastep
+    ./mako
     ./mpd
+    ./pipewire-inhibit
+    ./randomWallpaper
+    ./swayidle
+    ./waybar
   ];
 }
diff --git a/homeManagerModules/services/gammastep/default.nix b/homeManagerModules/services/gammastep/default.nix
new file mode 100644
index 00000000..cd3c3193
--- /dev/null
+++ b/homeManagerModules/services/gammastep/default.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.ar.home;
+in {
+  config = lib.mkIf cfg.services.gammastep.enable {
+    services.gammastep = {
+      enable = true;
+      latitude = lib.mkDefault "33.74";
+      longitude = lib.mkDefault "-84.38";
+    };
+  };
+}
diff --git a/homeManagerModules/services/mako/default.nix b/homeManagerModules/services/mako/default.nix
new file mode 100644
index 00000000..a22d787e
--- /dev/null
+++ b/homeManagerModules/services/mako/default.nix
@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  config = lib.mkIf config.ar.home.services.mako.enable {
+    services.mako = {
+      enable = true;
+      anchor = "top-center";
+      backgroundColor = "${config.ar.home.theme.colors.background}CC";
+      borderColor = "${config.ar.home.theme.colors.primary}EE";
+      borderSize = 2;
+      borderRadius = 10;
+      defaultTimeout = 10000;
+      font = "${config.gtk.font.name} Regular ${toString config.gtk.font.size}";
+      height = 300;
+      layer = "top";
+      padding = "15";
+      textColor = "${config.ar.home.theme.colors.text}";
+      width = 400;
+      margin = "20,0";
+      extraConfig = ''
+        [mode=do-not-disturb]
+        invisible=1
+      '';
+    };
+
+    systemd.user.services.mako = {
+      Unit = {
+        After = "graphical-session.target";
+        Description = "Lightweight Wayland notification daemon";
+        Documentation = "man:mako(1)";
+        PartOf = "graphical-session.target";
+      };
+
+      Service = {
+        BusName = "org.freedesktop.Notifications";
+        ExecReload = ''${lib.getExe' pkgs.mako "makoctl"} reload'';
+        ExecStart = "${lib.getExe pkgs.mako}";
+        Restart = "on-failure";
+        RestartSec = 5;
+        Type = "dbus";
+      };
+
+      Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
+    };
+  };
+}
diff --git a/homeManagerModules/services/pipewire-inhibit/default.nix b/homeManagerModules/services/pipewire-inhibit/default.nix
new file mode 100644
index 00000000..ca913b98
--- /dev/null
+++ b/homeManagerModules/services/pipewire-inhibit/default.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.ar.home;
+in {
+  config = lib.mkIf cfg.services.pipewire-inhibit.enable {
+    systemd.user.services.pipewire-inhibit-idle = {
+      Unit = {
+        After = "graphical-session.target";
+        Description = "inhibit idle when audio is playing with Pipewire.";
+        PartOf = "graphical-session.target";
+      };
+
+      Service = {
+        ExecStart = lib.getExe pkgs.wayland-pipewire-idle-inhibit;
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+
+      Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
+    };
+  };
+}
diff --git a/homeManagerModules/services/randomWallpaper/default.nix b/homeManagerModules/services/randomWallpaper/default.nix
new file mode 100644
index 00000000..25d63ee3
--- /dev/null
+++ b/homeManagerModules/services/randomWallpaper/default.nix
@@ -0,0 +1,92 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  wallpaperD = pkgs.writers.writeRuby "randomWallpaperD" {} ''
+    require 'fileutils'
+
+    directory = "${config.xdg.dataHome}/backgrounds/"
+    current_pids = {}
+    known_monitors = {}
+    last_update_time = {}
+
+    update_interval = 900 # 15 minutes in seconds
+
+    def process_running?(process_name)
+      system("pidof #{process_name} > /dev/null 2>&1")
+    end
+
+    def get_outputs
+      if process_running?("sway")
+        outputs = IO.popen(["${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"}", '-t', 'get_outputs', '-p']).readlines
+        outputs.select { |line| line.include?('Output') }.map { |line| line.split[1] }
+      elsif process_running?("Hyprland")
+        outputs = IO.popen(["${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}", 'monitors']).read
+        outputs.each_line.map { |line| line.split[1] if line.include?('Monitor') }.compact
+      end
+    end
+
+    sleep 1
+
+    if Dir.exist?(directory)
+      loop do
+        active_monitors = get_outputs
+
+        added_monitors = active_monitors - known_monitors.keys
+        removed_monitors = known_monitors.keys - active_monitors
+
+        # Handle newly added monitors
+        added_monitors.each do |monitor|
+          random_background = Dir.glob(File.join(directory, '*.{png,jpg}')).sample
+          pid = spawn("${lib.getExe pkgs.swaybg}", '-o', monitor, '-i', random_background, '-m', 'fill')
+          current_pids[monitor] = pid
+          last_update_time[monitor] = Time.now
+          known_monitors[monitor] = random_background
+        end
+
+        # Remove wallpapers from removed monitors
+        removed_monitors.each do |monitor|
+          Process.kill('TERM', current_pids[monitor]) if current_pids[monitor]
+          current_pids.delete(monitor)
+          last_update_time.delete(monitor)
+          known_monitors.delete(monitor)
+        end
+
+        # Update wallpapers after the set interval
+        active_monitors.each do |monitor|
+          if Time.now - last_update_time[monitor] >= update_interval
+            random_background = Dir.glob(File.join(directory, '*.{png,jpg}')).sample
+            pid = spawn("${lib.getExe pkgs.swaybg}", '-o', monitor, '-i', random_background, '-m', 'fill')
+            sleep 1
+            Process.kill('TERM', current_pids[monitor]) if current_pids[monitor]
+            current_pids[monitor] = pid
+            last_update_time[monitor] = Time.now
+            known_monitors[monitor] = random_background
+          end
+        end
+
+        sleep 5 # Check for monitor changes and update intervals every 5 seconds
+      end
+    end
+  '';
+in {
+  config = lib.mkIf config.ar.home.services.randomWallpaper.enable {
+    systemd.user.services.randomWallpaper = {
+      Unit = {
+        After = "graphical-session.target";
+        Description = "Lightweight swaybg-based random wallpaper daemon.";
+        PartOf = "graphical-session.target";
+      };
+
+      Service = {
+        ExecStart = "${wallpaperD}";
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+
+      Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
+    };
+  };
+}
diff --git a/homeManagerModules/services/swayidle/default.nix b/homeManagerModules/services/swayidle/default.nix
new file mode 100644
index 00000000..cedc1e03
--- /dev/null
+++ b/homeManagerModules/services/swayidle/default.nix
@@ -0,0 +1,73 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.ar.home;
+  hyprctl = lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl";
+  swaymsg = lib.getExe' config.wayland.windowManager.sway.package "swaymsg";
+in {
+  config = lib.mkIf cfg.services.swayidle.enable {
+    services.swayidle = {
+      enable = true;
+
+      events = [
+        {
+          event = "before-sleep";
+          command = "${lib.getExe pkgs.playerctl} pause";
+        }
+        {
+          event = "before-sleep";
+          command = "${pkgs.swaylock}/bin/swaylock";
+        }
+        {
+          event = "lock";
+          command = "${pkgs.swaylock}/bin/swaylock";
+        }
+      ];
+
+      timeouts =
+        [
+          {
+            timeout = 120;
+            command = "${lib.getExe pkgs.brightnessctl} -s set 10";
+            resumeCommand = "${lib.getExe pkgs.brightnessctl} -r";
+          }
+          {
+            timeout = 600;
+            command = "${pkgs.swaylock}/bin/swaylock";
+          }
+        ]
+        ++ lib.optional cfg.desktop.autoSuspend {
+          timeout = 600;
+          command = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
+        }
+        ++ lib.optional (!cfg.desktop.autoSuspend)
+        {
+          timeout = 600;
+          command = "${pkgs.swaylock}/bin/swaylock";
+        }
+        ++ lib.optional (!cfg.desktop.autoSuspend && cfg.desktop.hyprland.enable)
+        {
+          timeout = 630;
+          command = "${hyprctl} dispatch dpms off";
+          resumeCommand = "${hyprctl} dispatch dpms on";
+        }
+        ++ lib.optional (!cfg.desktop.autoSuspend && cfg.desktop.sway.enable)
+        {
+          timeout = 630;
+          command = "${swaymsg} \"output * dpms off\"";
+          resumeCommand = "${swaymsg} \"output * dpms on\"";
+        };
+    };
+
+    systemd.user.services.swayidle = {
+      Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
+      Service = {
+        Restart = lib.mkForce "on-failure";
+        RestartSec = 5;
+      };
+    };
+  };
+}
diff --git a/homeManagerModules/apps/waybar/default.nix b/homeManagerModules/services/waybar/default.nix
similarity index 96%
rename from homeManagerModules/apps/waybar/default.nix
rename to homeManagerModules/services/waybar/default.nix
index 9c2a3a3f..eae2e229 100644
--- a/homeManagerModules/apps/waybar/default.nix
+++ b/homeManagerModules/services/waybar/default.nix
@@ -4,9 +4,10 @@
   pkgs,
   ...
 }: {
-  config = lib.mkIf config.ar.home.apps.waybar.enable {
+  config = lib.mkIf config.ar.home.services.waybar.enable {
     programs.waybar = {
       enable = true;
+
       settings = {
         mainBar = {
           height = 32;
@@ -225,6 +226,16 @@
           };
         };
       };
+
+      systemd.enable = true;
+    };
+
+    systemd.user.services.waybar = {
+      Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
+      Service = {
+        Restart = lib.mkForce "on-failure";
+        RestartSec = 5;
+      };
     };
 
     xdg.configFile."waybar/style.css".text = ''
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 99bab16f..896009fe 100644
--- a/homes/aly/default.nix
+++ b/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";
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
index db09e01d..62bb1432 100644
--- a/homes/dustin/default.nix
+++ b/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 = {