diff --git a/modules/services/greetd/module.nix b/modules/services/greetd/module.nix
index ffec7f4..fad5c66 100644
--- a/modules/services/greetd/module.nix
+++ b/modules/services/greetd/module.nix
@@ -4,11 +4,14 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.services.greetd;
-  uwsmEnabled = config.modules.services.uwsm.enable;
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) str listOf;
-  inherit (lib.modules) mkIf;
+
+  inherit (config.meta.mainUser) username;
+  cfg = config.modules.services.greetd;
+  uwsmEnabled = config.modules.services.uwsm.enable;
 in {
   options.modules.services.greetd = {
     enable = mkEnableOption "greetd";
@@ -25,24 +28,31 @@ in {
       type = str;
       default =
         if uwsmEnabled
-        then "uwsm start Hyprland"
+        then "${getExe config.programs.uwsm.package} start Hyprland"
         else "Hyprland";
     };
   };
 
   config = mkIf cfg.enable {
-    services.greetd = {
+    services.greetd = let
+      session = {
+        # command = ''
+        # ${pkgs.greetd.tuigreet}/bin/tuigreet \
+        #   -c \"${cfg.session}\" \
+        #   -r
+        #   -t --time-format "DD.MM.YYYY"
+        #   --asteriks'';
+        command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
+        user = username;
+      };
+    in {
       enable = true;
       package = pkgs.greetd;
-      settings.default_session = {
-        command = ''
-          ${pkgs.greetd.tuigreet}/bin/tuigreet \
-            -c \"${cfg.session}\" \
-            -r 
-            -t --time-format "DD.MM.YYYY"
-            --asteriks'';
-      };
       vt = 7;
+      settings = {
+        default_session = session;
+        initial_session = session;
+      };
     };
   };
 }