From 00d314411da5fe33bad30cc7df32188cc8a87477 Mon Sep 17 00:00:00 2001 From: Emma Thorpe Date: Tue, 9 Jun 2026 19:41:17 +0100 Subject: [PATCH] refactor(sway): drop the dead tty1 Sway autostart greetd now owns tty1 and launches the Sway session, so the zsh initContent that exec'd sway on tty1 login can never fire. Remove it (and the now-unused lib arg), and refresh the module header (login is via the greeter; host list MBP/T400/Mac Pro, no longer "X1"). Co-Authored-By: Claude Opus 4.8 (1M context) --- lyrathorpe/home/desktop.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lyrathorpe/home/desktop.nix b/lyrathorpe/home/desktop.nix index f77ee2c..a2329a3 100644 --- a/lyrathorpe/home/desktop.nix +++ b/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 - ''; }