Compare commits

...

2 Commits

Author SHA1 Message Date
daniil-berg e4a8b07117 fix(wallpaper): repaint monitors hotplugged after login
awww-daemon paints only the outputs present when `awww img` last ran and does
not repaint a monitor connected later, so it comes up on the daemon's black
fill — which a transparent foot then shows instead of the wallpaper. Add
`wallpaper-hotplug`: it watches Hyprland's event socket and re-runs `setbg`
(which pushes to all outputs) on each `monitoradded`.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 09:33:15 +02:00
daniil-berg f533bbeb05 feat(hyprland): add per-monitor workspace homing and monitor nav binds
New `local.hyprland.workspaceRules` option binds workspaces to monitor
connectors so each has a home screen; a consumer sets it from its own host
config (empty by default). Soft binding — an absent monitor's workspaces fall
back to an active one, so a laptop-only session still works.

`$mod+o` / `$mod SHIFT+o` focus and move the current workspace to the other
monitor. When rules are set, an `exec-once` nudges a single-monitor session to
workspace 1 rather than a support monitor's high default.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-21 09:32:59 +02:00
4 changed files with 79 additions and 1 deletions
+13
View File
@@ -14,4 +14,17 @@
name = "Example User";
email = "user@example.com";
};
# Optional: give workspaces a home monitor (see modules/hyprland-workspaces.nix).
# Bind by connector name (`hyprctl monitors`), not panel identity, so any
# monitor on that port inherits the rules. `default:true` sets what a screen
# shows on connect. Absent monitors fall back, so a single-screen session still
# works. Left unset here — uncomment and adjust to your outputs.
#
# local.hyprland.workspaceRules = [
# "1, monitor:HDMI-A-1, default:true" # external, workspaces 1-5
# "2, monitor:HDMI-A-1"
# "6, monitor:LVDS-1, default:true" # laptop, workspaces 6-9
# "7, monitor:LVDS-1"
# ];
}
+7 -1
View File
@@ -81,7 +81,7 @@ let
'';
in
{
imports = [ ./gpg.nix ./media.nix ./texlive.nix ./librewolf.nix ./mc.nix ./mime.nix ];
imports = [ ./gpg.nix ./media.nix ./texlive.nix ./librewolf.nix ./mc.nix ./mime.nix ./hyprland-workspaces.nix ];
# Put ~/.local/bin (the XDG user-bin dir) on PATH so hand-dropped scripts run
# by name without wiring each through nix.
@@ -578,6 +578,10 @@ in
# master area width. Master layout uses `mfact`, not dwindle's `splitratio`.
"$mod, h, layoutmsg, mfact -0.05"
"$mod, l, layoutmsg, mfact +0.05"
# Move focus / the current workspace to the other monitor ("o" = other).
# With two monitors the relative +1 just toggles between them.
"$mod, o, focusmonitor, +1"
"$mod SHIFT, o, movecurrentworkspacetomonitor, +1"
] ++ (
# Dynamic definitions for viewing workspaces 1 to 9 and moving windows between them.
# References physical key codes for robustness with the SHIFT key, e.g. `code:10` instead of `1`.
@@ -610,6 +614,8 @@ in
# the ~/.local/share/bg symlink if it exists.
"awww-daemon"
"sh -c '[ -e \"$HOME/.local/share/bg\" ] && awww img \"$HOME/.local/share/bg\"'"
# re-push the wallpaper onto monitors connected after login (media.nix)
"wallpaper-hotplug"
];
};
};
+42
View File
@@ -0,0 +1,42 @@
# Per-monitor "home" for workspaces. Each rule pins a workspace to a monitor
# connector, so it opens there and Hyprland moves it back when that monitor
# reappears after an unplug. The connector names are host hardware, so the rule
# list is an option a consumer sets from its own host config (see the example in
# `hosts/example/home.nix`), not baked in here; empty by default, so the example
# host binds nothing.
#
# Soft binding: when a bound monitor is absent the workspace just falls back to
# an active one — every workspace stays reachable, so a laptop-only (no external)
# session works unchanged. The `default` keyword marks the workspace a monitor
# shows on connect.
{ config, lib, pkgs, ... }:
{
options.local.hyprland.workspaceRules = lib.mkOption {
type = with lib.types; listOf str;
default = [ ];
example = [
"1, monitor:HDMI-A-1, default:true"
"6, monitor:LVDS-1, default:true"
];
description = ''
Hyprland `workspace` rules binding workspaces to monitor connectors, so
each workspace has a home screen. Connector names are host-specific set
this from the inventory rather than here.
'';
};
config.wayland.windowManager.hyprland.settings = {
workspace = config.local.hyprland.workspaceRules;
# With a support monitor whose `default` workspace is high (e.g. a laptop
# holding 6-9), a solo session with that monitor as the only screen opens on
# that high workspace instead of 1. When rules are in effect, nudge a
# single-monitor startup back to workspace 1. No-op with no rules (1 is
# already the default). jq is pinned by store path so a consumer needn't
# have it installed; hyprctl is bare (a Hyprland session always has it, like
# the wallpaper exec-once assumes awww).
exec-once = lib.optional (config.local.hyprland.workspaceRules != [ ])
"sh -c '[ \"$(hyprctl monitors -j | ${pkgs.jq}/bin/jq length)\" -eq 1 ] && hyprctl dispatch workspace 1'";
};
}
+17
View File
@@ -17,6 +17,22 @@ let
[ -n "$1" ] && ln -sf "$(readlink -f "$1")" "$bgloc"
${pkgs.awww}/bin/awww img "$bgloc"
'';
# awww-daemon paints only the outputs present when `awww img` last ran and does
# not repaint a monitor hotplugged afterwards — it comes up on the fill color
# (black), and a transparent foot on it then shows that black, not the
# wallpaper. Watch Hyprland's event socket and re-push the wallpaper (setbg
# with no arg → all current outputs) on each monitor-add. Hyprland emits both
# `monitoradded` and `monitoraddedv2`; match only the former so setbg fires
# once. Runs as a Hyprland exec-once (see home.nix).
wallpaperHotplug = pkgs.writeShellScriptBin "wallpaper-hotplug" ''
sock="''${XDG_RUNTIME_DIR}/hypr/''${HYPRLAND_INSTANCE_SIGNATURE}/.socket2.sock"
${pkgs.socat}/bin/socat -u UNIX-CONNECT:"$sock" - | while IFS= read -r line; do
case "$line" in
"monitoradded>>"*) setbg ;;
esac
done
'';
in
{
programs.mpv = {
@@ -50,6 +66,7 @@ in
home.packages = with pkgs; [
setbg
wallpaperHotplug # re-push wallpaper to a hotplugged monitor (see comment above)
awww # wayland wallpaper daemon (setbg backend)
wl-clipboard # wl-copy, for the yank binds
imagemagick # `magick`: rotate/flip binds