diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix
index 290dd195..c6f33414 100644
--- a/modules/home/programs/hyprland/default.nix
+++ b/modules/home/programs/hyprland/default.nix
@@ -44,7 +44,5 @@ in {
         ];
       };
     };
-
-    systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
   };
 }
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
index e55c12c9..335a2143 100644
--- a/modules/home/programs/waybar/default.nix
+++ b/modules/home/programs/waybar/default.nix
@@ -11,13 +11,16 @@ in {
     home.programs.waybar.enable = mkEnableOption "Enables waybar";
   };
   config = mkIf cfg.enable {
-    systemd.user.services.waybar = {
-      Unit.StartLimitBurst = 30;
-    };
     programs.waybar = {
       enable = true;
       package = pkgs.waybar;
       systemd.enable = true;
     };
+
+    systemd.user.services.waybar = {
+      Unit.After = ["graphical-session.target"];
+      Service.Slice = ["app-graphical.slice"];
+      Unit.StartLimitBurst = 30;
+    };
   };
 }
diff --git a/modules/nixos/programs/hyprland/default.nix b/modules/nixos/programs/hyprland/default.nix
index fc25c9bd..708cce78 100644
--- a/modules/nixos/programs/hyprland/default.nix
+++ b/modules/nixos/programs/hyprland/default.nix
@@ -16,7 +16,7 @@ in {
   };
   config = mkIf cfg.enable {
     security.pam.services.hyprlock.text = "auth include login";
-    programs.hyprland.withUWSM = {
+    programs.hyprland = {
       enable = true;
       package = inputs.hyprland.packages.${pkgs.system}.default;
       portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
diff --git a/modules/nixos/services/greetd/default.nix b/modules/nixos/services/greetd/default.nix
index 010d9001..9f74592c 100644
--- a/modules/nixos/services/greetd/default.nix
+++ b/modules/nixos/services/greetd/default.nix
@@ -23,45 +23,53 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      services.greetd = let
-        session = {
-          command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
-          user = cfg.user;
-        };
-      in {
-        enable = true;
-        settings = {
-          terminal.vt = 1;
-          default_session = session;
-          initial_session = session;
-        };
+  config = mkIf cfg.enable {
+    services.greetd = let
+      session = {
+        command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
+        user = cfg.user;
       };
-    }
+    in {
+      enable = true;
+      settings = {
+        terminal.vt = 1;
+        default_session = session;
+        initial_session = session;
+      };
+    };
 
-    (mkIf (host == "cnix" || host == "cnixpad") {
-      programs.uwsm = {
-        enable = true;
-        waylandCompositors.hyprland = {
-          binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
-          prettyName = "Hyprland";
-          comment = "Hyprland managed by UWSM";
-        };
+    programs.uwsm = {
+      enable = true;
+      waylandCompositors.hyprland = {
+        binPath = "/run/current-system/sw/bin/Hyprland";
+        prettyName = "Hyprland";
+        comment = "Hyprland managed by UWSM";
       };
-    })
+    };
 
-    (mkIf (host == "toothpc") {
-      programs.uwsm = {
-        enable = true;
-        waylandCompositors.hyprland = {
-          binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
-          prettyName = "Hyprland";
-          comment = "Hyprland managed by UWSM";
-        };
-      };
-    })
-    # Apply GnomeKeyring PAM Service based on user configuration
-    # security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
-  ]);
+    #   (mkIf (host == "cnix" || host == "cnixpad") {
+    #     programs.uwsm = {
+    #       enable = true;
+    #       waylandCompositors.hyprland = {
+    #         binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
+    #         prettyName = "Hyprland";
+    #         comment = "Hyprland managed by UWSM";
+    #       };
+    #     };
+    #   })
+
+    #   (mkIf (host == "toothpc") {
+    #     programs.uwsm = {
+    #       enable = true;
+    #       waylandCompositors.hyprland = {
+    #         binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
+    #         prettyName = "Hyprland";
+    #         comment = "Hyprland managed by UWSM";
+    #       };
+    #     };
+    #   })
+    #   # Apply GnomeKeyring PAM Service based on user configuration
+    #   # security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
+    # ]);
+  };
 }