18b854563b
Recovers the crashed iteration #7 (items 21+23, Latitude QA findings): - nomarchy-waybar supervisor (waybar.nix, exec-once'd from hyprland.nix): any waybar exit respawns the bar; crash-loop guard (5 fast exits -> critical notify + stop); TERM trapped for a real stop. Fixes the bar-less session after a theme-switch crash. - nomarchy-theme-sync prefers a clean `pkill -x waybar` (supervisor restart with fresh config+style) over the crash-prone in-place SIGUSR2 reload when the supervisor is running; SIGUSR2 stays as the unsupervised fallback. - sys-rebuild: snapshot-first system rebuild against the CURRENT lock (no `nix flake update`) — the no-update twin of sys-update; README §3/§5 + motd list it. Verified: V0 re-run green after crash recovery (flake check --no-build + py_compile); V1/V2 per the crashed session's journal entry (HM renders exec-once=nomarchy-waybar; headless software-GL VM: SIGKILL -> new pid, clean kill -> respawn, SIGUSR2 -> alive). V3 pending on the Latitude (queued in HARDWARE-QUEUE.md). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
364 lines
17 KiB
Nix
364 lines
17 KiB
Nix
# Hyprland — fully driven by config.nomarchy.theme (theme-state.json).
|
|
# Gaps, borders and colors are baked from the JSON at eval time; theme
|
|
# changes arrive via `home-manager switch`.
|
|
{ config, lib, pkgs, ... }:
|
|
|
|
let
|
|
t = config.nomarchy.theme;
|
|
c = t.colors;
|
|
inherit (config.nomarchy.lib) rgb rgba;
|
|
|
|
# nomarchy-theme-sync — the in-flake state writer the keyboard watcher uses
|
|
# to remember per-device layouts (same path night-light's toggle takes).
|
|
sync = lib.getExe config.nomarchy.package;
|
|
|
|
# swayosd's `--input-volume mute-toggle` draws the OSD but never flips the
|
|
# source mute (verified on hardware: wpctl toggles the state, swayosd's
|
|
# input-mute path is a no-op — unlike its working output-mute path). Do the
|
|
# real toggle with wpctl, then re-render the same icon + volume-bar OSD the
|
|
# native input path would, reading the resulting state back from wpctl:
|
|
# --custom-progress is the mic level (0.0-1.0), --custom-icon the
|
|
# muted/active glyph. Pure bash builtins for parsing so the script needs no
|
|
# PATH beyond the two pinned tools.
|
|
micMute = pkgs.writeShellScript "nomarchy-mic-mute" ''
|
|
${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SOURCE@ toggle
|
|
out=$(${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SOURCE@)
|
|
set -- $out # "Volume: 0.85 [MUTED]" -> $2 is the level
|
|
case "$out" in
|
|
*MUTED*) icon=microphone-sensitivity-muted-symbolic ;;
|
|
*) icon=microphone-sensitivity-high-symbolic ;;
|
|
esac
|
|
${pkgs.swayosd}/bin/swayosd-client --custom-icon "$icon" --custom-progress "$2"
|
|
'';
|
|
|
|
# SUPER+1..9 / SUPER+SHIFT+1..9 workspace binds, generated.
|
|
workspaceBinds = builtins.concatLists (builtins.genList
|
|
(i:
|
|
let ws = toString (i + 1);
|
|
in [
|
|
"$mod, ${ws}, workspace, ${ws}"
|
|
"$mod SHIFT, ${ws}, movetoworkspace, ${ws}"
|
|
])
|
|
9);
|
|
|
|
# The keyboard binds — single source shared with the SUPER+? cheatsheet
|
|
# (rofi.nix renders the same list). Edit them in ./keybinds.nix.
|
|
keybinds = import ./keybinds.nix;
|
|
mkBind = b: "${b.mods}, ${b.key}, ${b.action}";
|
|
|
|
# A nomarchy.monitors entry -> a Hyprland `monitor` rule. Unset optional
|
|
# fields are omitted; `resolution = "disable"` collapses to the short form.
|
|
monitorRule = m:
|
|
if m.resolution == "disable" then "${m.name}, disable"
|
|
else lib.concatStringsSep ", " (
|
|
[ m.name m.resolution (toString m.position) (toString m.scale) ]
|
|
++ lib.optionals (m.transform != null) [ "transform" (toString m.transform) ]
|
|
++ lib.optionals (m.mirror != null) [ "mirror" m.mirror ]
|
|
++ lib.optionals (m.bitdepth != null) [ "bitdepth" (toString m.bitdepth) ]
|
|
++ lib.optionals (m.vrr != null) [ "vrr" (toString m.vrr) ]
|
|
++ lib.optional (m.extra != "") m.extra
|
|
);
|
|
|
|
# Menu-remembered per-output resolutions (settings.monitors: output-name ->
|
|
# "WxH@R", written instantly by the Display menu — see rofi.nix) overlaid onto
|
|
# the declarative nomarchy.monitors by name: a declared output keeps its
|
|
# position/scale/etc and only its resolution changes; an output covered solely
|
|
# by the `,preferred,auto,1` wildcard (e.g. the laptop's built-in panel)
|
|
# becomes a new rule with default position/scale. The menu writes the in-flake
|
|
# state with --no-switch (no rebuild) and applies the mode live via hyprctl;
|
|
# this bakes the same choice on the next rebuild — the monitor twin of the
|
|
# keyboard graduation. The menu pick wins over a hand-set resolution (it's the
|
|
# explicit live action); other declared fields are untouched.
|
|
resOverrides = config.nomarchy.settings.monitors;
|
|
# Skeleton for an output that's only menu-set (mirrors the monitorType defaults).
|
|
monitorDefaults = {
|
|
resolution = "preferred"; position = "auto"; scale = 1;
|
|
transform = null; mirror = null; bitdepth = null; vrr = null; extra = "";
|
|
};
|
|
declaredNames = map (m: m.name) config.nomarchy.monitors;
|
|
resolvedMonitors =
|
|
map (m: if resOverrides ? ${m.name}
|
|
then m // { resolution = resOverrides.${m.name}; }
|
|
else m)
|
|
config.nomarchy.monitors
|
|
++ lib.mapAttrsToList
|
|
(name: res: monitorDefaults // { inherit name; resolution = res; })
|
|
(lib.filterAttrs (name: _: ! lib.elem name declaredNames) resOverrides);
|
|
|
|
# Candidate layouts offered by the new-keyboard picker: the session
|
|
# layout(s) (nomarchy.keyboard.layout, comma-split for a multi-layout
|
|
# session) plus the extra nomarchy.keyboard.layouts pool. The pool is
|
|
# deliberately NOT merged into input.kb_layout — those candidates are for
|
|
# *external* keyboards and get applied per-device by the watcher's apply().
|
|
# Loading them onto the session keyboard is what let a global switch flip
|
|
# the built-in board to the wrong layout.
|
|
pickerLayouts = lib.unique (
|
|
(lib.splitString "," config.nomarchy.keyboard.layout)
|
|
++ config.nomarchy.keyboard.layouts
|
|
);
|
|
kbAutoSwitch = config.nomarchy.keyboard.layouts != [ ];
|
|
|
|
# On a keyboard that connects after login (not declared in
|
|
# keyboard.devices, not already remembered), ask for a layout and persist it
|
|
# per-device, re-applying silently on later reconnects. Stateful runtime
|
|
# piece — the complement to the declarative keyboard.devices. Reliable
|
|
# primitives only: poll hyprctl devices, apply with a per-device
|
|
# `device[<name>]:kb_layout` keyword — the runtime twin of the declarative
|
|
# device blocks, so it isolates that one keyboard and never disturbs the
|
|
# built-in board (switchxkblayout flipped the *shared* layout, which leaked
|
|
# onto the laptop and stuck after unplug).
|
|
#
|
|
# The remembered choices live in the git-tracked in-flake state
|
|
# (settings.keyboard.devices), NOT ~/.local/state — read live from the
|
|
# working tree (so a pick this session is honoured at once) and written
|
|
# instantly with `--no-switch` (no rebuild). A later rebuild graduates them
|
|
# into nomarchy.keyboard.devices (generated device{} blocks), after which the
|
|
# watcher treats them as declared and steps back. NOTE: needs an on-hardware
|
|
# test (hotplug isn't verifiable in CI).
|
|
keyboardWatch = pkgs.writeShellScriptBin "nomarchy-keyboard-watch" ''
|
|
set -u
|
|
layouts="${lib.concatStringsSep " " pickerLayouts}"
|
|
declared="${lib.concatStringsSep " " (builtins.attrNames config.nomarchy.keyboard.devices)}"
|
|
sync=${sync}
|
|
|
|
apply() { hyprctl keyword "device[$1]:kb_layout" "$2" >/dev/null 2>&1; }
|
|
keyboards() { hyprctl devices -j | jq -r '.keyboards[].name'; }
|
|
is_declared() { case " $declared " in *" $1 "*) return 0 ;; *) return 1 ;; esac; }
|
|
|
|
# The remembered map (device-name -> layout) from the LIVE in-flake state;
|
|
# an absent key (sparse state) reads as an empty object.
|
|
saved_map() { "$sync" get settings.keyboard.devices 2>/dev/null || echo '{}'; }
|
|
saved_for() { saved_map | jq -r --arg k "$1" '.[$k] // empty'; }
|
|
|
|
# Persist a pick INSTANTLY: merge it into the map and write the whole object
|
|
# back at the dot-free parent path, so a device name containing a dot can't
|
|
# corrupt the dotted set-path. --no-switch = write only, no rebuild.
|
|
remember() {
|
|
map=$(saved_map | jq -c --arg k "$1" --arg v "$2" '. + {($k): $v}') || return
|
|
"$sync" --quiet set settings.keyboard.devices "$map" --no-switch
|
|
}
|
|
|
|
# Startup: re-apply remembered layouts, never prompt — so the built-in
|
|
# keyboard just stays on the session default.
|
|
prev=" "
|
|
for kb in $(keyboards); do
|
|
prev="$prev$kb "
|
|
is_declared "$kb" && continue
|
|
s=$(saved_for "$kb"); [ -n "$s" ] && apply "$kb" "$s"
|
|
done
|
|
|
|
# Watch for keyboards that connect later.
|
|
while :; do
|
|
sleep 3
|
|
cur=" "
|
|
for kb in $(keyboards); do
|
|
cur="$cur$kb "
|
|
case "$prev" in *" $kb "*) continue ;; esac
|
|
is_declared "$kb" && continue
|
|
s=$(saved_for "$kb")
|
|
if [ -n "$s" ]; then
|
|
apply "$kb" "$s"
|
|
else
|
|
choice=$(printf '%s\n' $layouts | rofi -dmenu -p "Layout · $kb")
|
|
[ -n "$choice" ] && { remember "$kb" "$choice"; apply "$kb" "$choice"; }
|
|
fi
|
|
done
|
|
prev="$cur"
|
|
done
|
|
'';
|
|
in
|
|
{
|
|
wayland.windowManager.hyprland = lib.mkIf config.nomarchy.hyprland.enable {
|
|
enable = true;
|
|
# The binary and portal come from the NixOS module
|
|
# (programs.hyprland.enable); HM only manages configuration.
|
|
package = null;
|
|
portalPackage = null;
|
|
|
|
# HM defaults stateVersion >= 26.05 to the new Lua config and would
|
|
# render these hyprlang-style settings as broken `hl.$mod(...)` Lua
|
|
# (Hyprland then boots into emergency mode with no binds).
|
|
configType = "hyprlang";
|
|
|
|
settings = {
|
|
"$mod" = "SUPER";
|
|
"$terminal" = config.nomarchy.terminal;
|
|
|
|
# `,preferred,auto,1` is the wildcard fallback for any output not in
|
|
# nomarchy.monitors; the generated rules are appended and win by name,
|
|
# and Hyprland applies them on hotplug. mkDefault so a downstream
|
|
# `monitor = [...]` replaces the lot (the live ISO uses mkForce too).
|
|
monitor = lib.mkDefault
|
|
([ ",preferred,auto,1" ] ++ map monitorRule resolvedMonitors);
|
|
|
|
# exec-once is a list at normal priority, so downstream additions
|
|
# CONCATENATE (your autostart runs alongside ours) rather than
|
|
# replace. Same for the bind* lists below.
|
|
exec-once = [
|
|
# nixpkgs' swww is awww (renamed fork); the binary is awww-daemon.
|
|
"awww-daemon"
|
|
# Paint the wallpaper as soon as the session is up (waits for
|
|
# the daemon internally).
|
|
"nomarchy-theme-sync wallpaper"
|
|
# Polkit authentication agent — without one, EVERY pkexec/polkit
|
|
# prompt in the session fails silently (btrfs-assistant-launcher
|
|
# was the discovery case). hyprpolkitagent is Hyprland's own Qt
|
|
# agent, so the prompt is Stylix-themed like every other Qt
|
|
# surface. Its binary lives in libexec (not bin), hence the path.
|
|
"${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"
|
|
# Waybar is launched here rather than as a systemd user service: bound
|
|
# to graphical-session.target the unit raced Hyprland's IPC on relogin
|
|
# and landed in `failed`; exec-once only fires once the compositor is
|
|
# up. Via the nomarchy-waybar supervisor (waybar.nix): a crash — or
|
|
# the clean pkill a theme switch now does — respawns the bar instead
|
|
# of orphaning the session bar-less.
|
|
] ++ lib.optional config.nomarchy.waybar.enable "nomarchy-waybar"
|
|
++ lib.optional kbAutoSwitch "${keyboardWatch}/bin/nomarchy-keyboard-watch";
|
|
|
|
# ── Theme-driven look ──────────────────────────────────────────
|
|
# These flow from theme-state.json and stay at NORMAL priority:
|
|
# change them with `nomarchy-theme-sync set ui.<key>` (the intended
|
|
# path), or lib.mkForce in home.nix to hardcode against the theme.
|
|
# The non-theme knobs around them are lib.mkDefault — override
|
|
# those with a plain home.nix assignment. See docs/OVERRIDES.md.
|
|
general = {
|
|
gaps_in = t.ui.gapsIn;
|
|
gaps_out = t.ui.gapsOut;
|
|
border_size = t.ui.borderSize;
|
|
# Solid borders from theme.border (per-theme, palette-resolved) —
|
|
# matches the legacy identity themes, which never used a gradient.
|
|
"col.active_border" = rgb t.border.active;
|
|
"col.inactive_border" = rgb t.border.inactive;
|
|
layout = lib.mkDefault "dwindle";
|
|
resize_on_border = lib.mkDefault true;
|
|
};
|
|
|
|
decoration = {
|
|
rounding = t.ui.rounding;
|
|
active_opacity = t.ui.activeOpacity;
|
|
inactive_opacity = t.ui.inactiveOpacity;
|
|
blur = {
|
|
enabled = t.ui.blur;
|
|
size = lib.mkDefault 8;
|
|
passes = lib.mkDefault 2;
|
|
popups = lib.mkDefault true;
|
|
};
|
|
shadow = {
|
|
enabled = t.ui.shadow;
|
|
range = lib.mkDefault 20;
|
|
render_power = lib.mkDefault 3;
|
|
color = rgba c.mantle "aa";
|
|
};
|
|
};
|
|
|
|
# ── Behaviour (mkDefault → plain home.nix assignment overrides) ──
|
|
animations = {
|
|
enabled = lib.mkDefault true;
|
|
bezier = lib.mkDefault [
|
|
"smooth, 0.25, 0.1, 0.25, 1.0"
|
|
"snappy, 0.6, 0.0, 0.1, 1.0"
|
|
];
|
|
animation = lib.mkDefault [
|
|
"windows, 1, 4, snappy, popin 85%"
|
|
"border, 1, 8, smooth"
|
|
"fade, 1, 5, smooth"
|
|
"workspaces, 1, 4, snappy, slidefade 15%"
|
|
];
|
|
};
|
|
|
|
input = {
|
|
# kb_layout/variant come from nomarchy.keyboard.* — set that
|
|
# option (the installer writes it; it also drives tty/LUKS). Only the
|
|
# session layout(s) land here; the keyboard.layouts pool is applied
|
|
# per-device to external boards, never onto the session keyboard.
|
|
kb_layout = config.nomarchy.keyboard.layout;
|
|
kb_variant = config.nomarchy.keyboard.variant;
|
|
follow_mouse = lib.mkDefault 1;
|
|
touchpad.natural_scroll = lib.mkDefault true;
|
|
};
|
|
|
|
# Per-device keyboard layouts (nomarchy.keyboard.devices): each
|
|
# overrides the session kb_layout for one named keyboard — e.g. an
|
|
# external board that's physically a different layout than the laptop's
|
|
# built-in one. Hyprland applies them whenever the device connects.
|
|
device = lib.mapAttrsToList
|
|
(name: d: { inherit name; kb_layout = d.layout; kb_variant = d.variant; })
|
|
config.nomarchy.keyboard.devices;
|
|
|
|
# dwindle:pseudotile was removed in Hyprland 0.55 (the `pseudo`
|
|
# dispatcher still exists); setting it aborts config parsing.
|
|
dwindle.preserve_split = lib.mkDefault true;
|
|
|
|
# Hyprland 0.51+ replaced gestures:workspace_swipe with the
|
|
# gesture keyword — without this, touchpads have NO gestures.
|
|
gesture = lib.mkDefault [
|
|
"3, horizontal, workspace"
|
|
"4, pinch, fullscreen"
|
|
];
|
|
|
|
misc = {
|
|
disable_hyprland_logo = lib.mkDefault true;
|
|
disable_splash_rendering = lib.mkDefault true;
|
|
force_default_wallpaper = lib.mkDefault 0;
|
|
};
|
|
|
|
# Rendered from ./keybinds.nix (the cheatsheet reads the same list),
|
|
# plus the generated per-workspace binds. Like exec-once above this
|
|
# stays a normal-priority list, so a downstream `bind = [...]`
|
|
# concatenates rather than replaces. The layout-cycle bind only
|
|
# exists when there is something to cycle (same comma condition
|
|
# the Waybar language indicator gates on).
|
|
bind = map mkBind (keybinds.binds
|
|
++ lib.optionals (lib.hasInfix "," config.nomarchy.keyboard.layout)
|
|
keybinds.multiLayoutBinds)
|
|
++ workspaceBinds;
|
|
|
|
# Media keys via swayosd-client: it performs the action AND shows
|
|
# the on-screen display (the nomarchy.osd module). e = repeat,
|
|
# l = also on a locked screen — the standard flags for hardware keys.
|
|
bindel = [
|
|
", XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise"
|
|
", XF86AudioLowerVolume, exec, swayosd-client --output-volume lower"
|
|
", XF86MonBrightnessUp, exec, swayosd-client --brightness raise"
|
|
", XF86MonBrightnessDown, exec, swayosd-client --brightness lower"
|
|
];
|
|
|
|
bindl = [
|
|
", XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
|
|
# swayosd's input mute-toggle is broken on 0.2.1 (see micMute above).
|
|
", XF86AudioMicMute, exec, ${micMute}"
|
|
", XF86AudioPlay, exec, playerctl play-pause"
|
|
", XF86AudioPause, exec, playerctl play-pause"
|
|
", XF86AudioNext, exec, playerctl next"
|
|
", XF86AudioPrev, exec, playerctl previous"
|
|
];
|
|
|
|
bindm = [
|
|
"$mod, mouse:272, movewindow"
|
|
"$mod, mouse:273, resizewindow"
|
|
];
|
|
};
|
|
};
|
|
|
|
# Runtime-remembered per-device layouts (settings.keyboard.devices, written
|
|
# by the watcher into the in-flake state) graduate into the declarative
|
|
# keyboard.devices: each becomes a generated Hyprland device{} block —
|
|
# reproducible and applied natively on hotplug — after which the watcher sees
|
|
# it as declared and steps back. mkDefault so a hand-written
|
|
# keyboard.devices.<name> in home.nix still wins for the same keyboard.
|
|
nomarchy.keyboard.devices = lib.mapAttrs
|
|
(_name: layout: { layout = lib.mkDefault layout; })
|
|
config.nomarchy.settings.keyboard.devices;
|
|
|
|
# nwg-displays: interactive monitor arranger (applies live via hyprctl and
|
|
# writes a config file). A helper to find values for nomarchy.monitors —
|
|
# the declarative config stays the source of truth (we don't source its
|
|
# output). Gated on its toggle; pointless without the Hyprland session.
|
|
home.packages =
|
|
lib.optionals (config.nomarchy.hyprland.enable && config.nomarchy.displays.enable)
|
|
[ pkgs.nwg-displays ]
|
|
# The new-keyboard watcher on PATH (when enabled) so it's discoverable and
|
|
# runnable by name for debugging — Hyprland still exec-once's it by store path.
|
|
++ lib.optional (config.nomarchy.hyprland.enable && kbAutoSwitch) keyboardWatch;
|
|
}
|