diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index fa7af50..fcf2dfd 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -73,9 +73,6 @@
       };
 
       initExtra = ''
-        if [ -z "''${WAYLAND_DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then
-          dbus-run-session Hyprland
-        fi
         eval "$(zoxide init zsh)"
         eval "$(nh completions --shell zsh)"
         source "$(fzf-share)/key-bindings.zsh"
diff --git a/nixos/modules/users/chest.nix b/nixos/modules/users/chest.nix
index 7fb750a..801da61 100644
--- a/nixos/modules/users/chest.nix
+++ b/nixos/modules/users/chest.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   programs.zsh.enable = true;
 
   users = {
@@ -12,5 +12,21 @@
     };
   };
 
-  services.getty.autologinUser = "chest";
+  services.greetd = let
+    tuigreet = pkgs.lib.getExe pkgs.greetd.tuigreet;
+    session = lib.getExe pkgs.hyprland;
+    username = "chest";
+  in {
+    enable = true;
+    settings = {
+      initial_session = {
+        command = "${session}";
+        user = "${username}";
+      };
+      default_session = {
+        command = "${tuigreet} --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time -cmd ${session}";
+        user = "greeter";
+      };
+    };
+  };
 }
diff --git a/nixos/modules/users/sweetbread.nix b/nixos/modules/users/sweetbread.nix
index db73224..50c776d 100644
--- a/nixos/modules/users/sweetbread.nix
+++ b/nixos/modules/users/sweetbread.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   programs.zsh.enable = true;
 
   users = {
@@ -12,5 +12,21 @@
     };
   };
 
-  services.getty.autologinUser = "sweetbread";
+  services.greetd = let
+    tuigreet = pkgs.lib.getExe pkgs.greetd.tuigreet;
+    session = lib.getExe pkgs.hyprland;
+    username = "sweetbread";
+  in {
+    enable = true;
+    settings = {
+      initial_session = {
+        command = "${session}";
+        user = "${username}";
+      };
+      default_session = {
+        command = "${tuigreet} --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time -cmd ${session}";
+        user = "greeter";
+      };
+    };
+  };
 }