diff --git a/home-manager/modules/elvish.nix b/home-manager/modules/elvish.nix
index a8f242c..60042c7 100644
--- a/home-manager/modules/elvish.nix
+++ b/home-manager/modules/elvish.nix
@@ -12,7 +12,7 @@ in {
 
     defaultFromBash = mkOption {
       type = types.bool;
-      default = cfg.enable;
+      default = false;
       description = ''
         Launch automatically when an interactive Bash shell is started
       '';
diff --git a/modules/ezpc.nix b/modules/ezpc.nix
index 46e0a44..ffaefb6 100644
--- a/modules/ezpc.nix
+++ b/modules/ezpc.nix
@@ -39,11 +39,15 @@ in {
       NIXOS_OZONE_WL = "1";
     };
 
-    environment.loginShellInit = lib.mkAfter ''
-      if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
-        exec sway
-      fi
-    '';
+    services.greetd = {
+      enable = true;
+      vt = 1;
+      settings = {
+        default_session = {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd sway";
+        };
+      };
+    };
 
     i18n.inputMethod = {
       enabled = "ibus";