lyrathorpe/home/desktop.nix

@@ -1,7 +1,8 @@
-# Graphical desktop layer: GUI apps, Wayland session env, cursor theme, and the
-# tty1 Sway autostart. Imported only on hosts that run Sway (MBP, X1); never
-# pulled onto the headless WSL host.
-{ pkgs, lib, ... }:
+# Graphical desktop layer: GUI apps, Wayland session env, and cursor theme.
+# Imported only on hosts that run Sway (MBP, T400, Mac Pro); never pulled onto
+# the headless WSL host. Login (and the Sway session launch) is handled by the
+# greetd/ReGreet greeter -- see ../swaywm.nix -- so there is no tty1 autostart.
+{ pkgs, ... }:
 {
   imports = [
     ./sway.nix
@@ -29,11 +30,4 @@
     name = "Adwaita";
     size = 24;
   };
-
-  # Start Sway automatically on the first virtual terminal.
-  programs.zsh.initContent = lib.mkOrder 1500 ''
-    if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-      exec sway
-    fi
-  '';
 }