From 50a558615c3d90ecec6f470a34bf4d36988aac77 Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Sat, 11 Jul 2026 17:43:02 +0100 Subject: [PATCH] =?UTF-8?q?feat(hyprland):=20SUPER+0=20=E2=86=92=20workspa?= =?UTF-8?q?ce=2010;=20migration=20doc=20gains=20autoLogin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Workspace binds were generated for 1-9 only, leaving SUPER+0 dead. Generate 10, with the 0 key mapping to workspace 10 (and SHIFT+0 to move); cheatsheet updated to match. MIGRATION.md's example system.nix now includes nomarchy.system.greeter.autoLogin — the migration path missed what nomarchy-install sets on every LUKS machine, so migrated boxes stopped at tuigreet asking for a password behind the LUKS prompt. Verified: nix flake check --no-build passes; generated homeConfigurations.nomarchy hyprland binds eval'd and contain '$mod, 0, workspace, 10' + SHIFT variant. V3 next: rebuild on the migrated T14s (TuringMachine) and press SUPER+0. Co-Authored-By: Claude Fable 5 --- docs/MIGRATION.md | 5 +++++ modules/home/hyprland.nix | 13 ++++++++----- modules/home/keybinds.nix | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 398af6c..86cb378 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -169,6 +169,11 @@ ryzenadj)**, **no Secure Boot**, and the **stateVersion override**. nomarchy.hardware.amd.enable = true; # amd-pstate + radeonsi VA-API # nomarchy.hardware.amd.rocm.enable = true; # opt-in GPU compute (multi-GB) + # LUKS machines: the disk passphrase already gates access, so boot + # straight into the session — this is what nomarchy-install sets on + # encrypted installs. Omit it on unencrypted machines. + nomarchy.system.greeter.autoLogin = username; + # CRITICAL: keep your ORIGINAL install's value — never Nomarchy's 26.05. system.stateVersion = "24.11"; } diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix index b1cb7d4..216276d 100644 --- a/modules/home/hyprland.nix +++ b/modules/home/hyprland.nix @@ -74,15 +74,18 @@ let (e: "${e.mods}, ${e.key}, exec, ${focusOrLaunch}/bin/nomarchy-focus-or-launch ${e.class} ${e.command}") lofEntries; - # SUPER+1..9 / SUPER+SHIFT+1..9 workspace binds, generated. + # SUPER+1..9,0 / SUPER+SHIFT+1..9,0 workspace binds, generated + # (the 0 key is workspace 10). workspaceBinds = builtins.concatLists (builtins.genList (i: - let ws = toString (i + 1); + let + ws = toString (i + 1); + key = if i == 9 then "0" else ws; in [ - "$mod, ${ws}, workspace, ${ws}" - "$mod SHIFT, ${ws}, movetoworkspace, ${ws}" + "$mod, ${key}, workspace, ${ws}" + "$mod SHIFT, ${key}, movetoworkspace, ${ws}" ]) - 9); + 10); # The keyboard binds — single source shared with the SUPER+? cheatsheet # (rofi.nix renders the same list). Edit them in ./keybinds.nix. diff --git a/modules/home/keybinds.nix b/modules/home/keybinds.nix index 60e5a3e..ef1fadf 100644 --- a/modules/home/keybinds.nix +++ b/modules/home/keybinds.nix @@ -87,8 +87,8 @@ ]; extra = [ - { keys = "SUPER + 1-9"; desc = "Switch to workspace 1-9"; } - { keys = "SUPER + SHIFT + 1-9"; desc = "Move window to workspace 1-9"; } + { keys = "SUPER + 1-9, 0"; desc = "Switch to workspace 1-10 (0 = 10)"; } + { keys = "SUPER + SHIFT + 1-9, 0"; desc = "Move window to workspace 1-10 (0 = 10)"; } { keys = "SUPER + drag"; desc = "Move (LMB) / resize (RMB) window"; } { keys = "Volume / Brightness"; desc = "Hardware keys, shown via the OSD"; } { keys = "Bar: 󰾪 click"; desc = "Caffeine — hold the screen awake (idle inhibitor)"; }