henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Again a full rewrite

Browse Source
This commit is contained in:
Henro Veijer
2026-02-26 19:20:52 +01:00
parent e0972b7cc8
commit 08f82f45c1
3 changed files with 486 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
henrovnix_ok/README.html
+364 -337
View File
File diff suppressed because it is too large Load Diff
henrovnix_ok/README.org
+61 -34
View File
@@ -1712,19 +1712,24 @@ workspace_wallpaper installs wpaperd and deploys your wallpaper files from the r
{ config, pkgs, lib, flakeRoot, ... }:
let
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
userRelRoot = "nixos_conf/wallpaperstuff";
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
# Minimal wpaperd config: force stretch; we don't rely on it for selection,
# but it helps ensure daemon is "properly configured".
wpaperdConfigRel = "wpaperd/config.toml";
picturesDir = "${userAbsRoot}/pictures";
currentDir = "${userAbsRoot}/current";
# where the listener script will live
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
# wpaperd reads this by default (XDG_CONFIG_HOME/wpaperd/config.toml)
wpaperdConfRel = "wpaperd/config.toml";
in
{
home.packages = [
pkgs.wpaperd
pkgs.socat
pkgs.jq
pkgs.coreutils
];
# Copy wallpapers from repo → ~/nixos_conf/wallpaperstuff
@@ -1733,29 +1738,28 @@ in
recursive = true;
};
# Force stretch (and give wpaperd a valid config file)
xdg.configFile."${wpaperdConfigRel}".text = ''
[default]
mode = "stretch"
'';
# Workspace listener script
# Workspace/monitor listener: creates per-monitor symlink and reloads wpaperd
xdg.configFile."${scriptRel}" = {
executable = true;
text = ''
#!/usr/bin/env bash
set -euo pipefail
log() { echo "[wpaperd-ws] $*" >&2; }
ROOT="${userAbsRoot}"
PICTURES="${picturesDir}"
CURRENT="${currentDir}"
CONF="${config.xdg.configHome}/${wpaperdConfRel}"
: "''${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR not set}"
: "''${HYPRLAND_INSTANCE_SIGNATURE:?HYPRLAND_INSTANCE_SIGNATURE not set}"
SOCK="''${XDG_RUNTIME_DIR}/hypr/''${HYPRLAND_INSTANCE_SIGNATURE}/.socket2.sock"
log() { echo "[wpaperd-ws] $*" >&2; }
mkdir -p "$CURRENT" "$(dirname "$CONF")"
# Wait up to ~10s for Hyprland socket (avoid exiting 0 and never restarting)
for i in $(seq 1 100); do
# wait for hyprland socket so the service doesn't exit "successfully" too early
for i in $(seq 1 120); do
[[ -S "$SOCK" ]] && break
sleep 0.1
done
@@ -1770,17 +1774,33 @@ in
img_for_ws() {
local n="$1"
case "$n" in
1|2|3|4|5|6|7|8|9) printf '%s/pictures/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
1|2|3|4|5|6|7|8|9) printf '%s/wallpaper%s.jpg\n' "$PICTURES" "$n" ;;
*) return 1 ;;
esac
}
have_set=0
if ${pkgs.wpaperd}/bin/wpaperctl --help 2>&1 | ${pkgs.gnugrep}/bin/grep -qE '(\bset\b)'; then
have_set=1
fi
# Create/refresh config.toml with one section per output, pointing at CURRENT/<mon>.jpg
write_config_from_monitors() {
local mons
mons="$(${pkgs.hyprland}/bin/hyprctl -j monitors | ${pkgs.jq}/bin/jq -r '.[].name')"
apply_for() {
# Truncate + rebuild
: >"$CONF"
# Each output gets its own section (wpaperd-output(5)); force stretch mode
# (If you want different mode later: "fit", "crop", etc.)
while IFS= read -r mon; do
[[ -n "$mon" ]] || continue
cat >>"$CONF" <<EOF
["$mon"]
path = "$CURRENT/$mon.jpg"
mode = "stretch"
EOF
done <<<"$mons"
}
ensure_symlink_for() {
local mon="$1"
local ws="$2"
@@ -1793,14 +1813,19 @@ in
return 0
fi
if [[ "$have_set" -eq 1 ]]; then
log "Setting $img on $mon (ws=$n)"
${pkgs.wpaperd}/bin/wpaperctl set "$img" "$mon"
else
log "ERROR: your wpaperctl doesn't expose 'set'. Check 'wpaperctl --help' and package version."
log "Upstream supports: wpaperctl set /path/to/image.png [OUTPUT]"
return 0
fi
ln -sf "$img" "$CURRENT/$mon.jpg"
log "Link: $CURRENT/$mon.jpg -> $img"
}
apply_for() {
local mon="$1"
local ws="$2"
ensure_symlink_for "$mon" "$ws"
write_config_from_monitors
# wpaperctl supports reload-wallpaper on 1.2.1
${pkgs.wpaperd}/bin/wpaperctl reload-wallpaper >/dev/null 2>&1 || true
}
apply_initial() {
@@ -1815,25 +1840,26 @@ in
handle_line() {
case "$1" in
focusedmon\>\>*)
# focusedmon>>MONNAME,WORKSPACENAME
local payload="''${1#focusedmon>>}"
local mon="''${payload%%,*}"
local ws="''${payload#*,}"
apply_for "$mon" "$ws" || true
[[ -n "$mon" && -n "$ws" ]] || return 0
apply_for "$mon" "$ws"
;;
esac
}
apply_initial
log "Listening on $SOCK"
exec ${pkgs.socat}/bin/socat -U - "UNIX-CONNECT:$SOCK" \
| while IFS= read -r line; do
handle_line "$line"
handle_line "$line" || true
done
'';
};
# Start wpaperd (with config)
# Start wpaperd (uses ~/.config/wpaperd/config.toml by default)
systemd.user.services.wpaperd = {
Unit = {
Description = "wpaperd wallpaper daemon";
@@ -1843,14 +1869,15 @@ in
Service = {
ExecStart = "${pkgs.wpaperd}/bin/wpaperd";
Restart = "on-failure";
RestartSec = 1;
};
Install.WantedBy = [ "graphical-session.target" ];
};
# Listener
# Listener that updates per-monitor symlink based on workspace and triggers reload
systemd.user.services.wpaperd-workspace-wallpapers = {
Unit = {
Description = "Set wallpaper based on workspace number (1..9)";
Description = "Set wallpaper per monitor based on workspace number (1..9)";
After = [ "graphical-session.target" "wpaperd.service" ];
PartOf = [ "graphical-session.target" ];
};
henrovnix_ok/home/desktop/workspace_wallpaper.nix
+61 -34
View File
@@ -1,19 +1,24 @@
{ config, pkgs, lib, flakeRoot, ... }:
let
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
userRelRoot = "nixos_conf/wallpaperstuff";
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
# Minimal wpaperd config: force stretch; we don't rely on it for selection,
# but it helps ensure daemon is "properly configured".
wpaperdConfigRel = "wpaperd/config.toml";
picturesDir = "${userAbsRoot}/pictures";
currentDir = "${userAbsRoot}/current";
# where the listener script will live
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
# wpaperd reads this by default (XDG_CONFIG_HOME/wpaperd/config.toml)
wpaperdConfRel = "wpaperd/config.toml";
in
{
home.packages = [
pkgs.wpaperd
pkgs.socat
pkgs.jq
pkgs.coreutils
];
# Copy wallpapers from repo → ~/nixos_conf/wallpaperstuff
@@ -22,29 +27,28 @@ in
recursive = true;
};
# Force stretch (and give wpaperd a valid config file)
xdg.configFile."${wpaperdConfigRel}".text = ''
[default]
mode = "stretch"
'';
# Workspace listener script
# Workspace/monitor listener: creates per-monitor symlink and reloads wpaperd
xdg.configFile."${scriptRel}" = {
executable = true;
text = ''
#!/usr/bin/env bash
set -euo pipefail
log() { echo "[wpaperd-ws] $*" >&2; }
ROOT="${userAbsRoot}"
PICTURES="${picturesDir}"
CURRENT="${currentDir}"
CONF="${config.xdg.configHome}/${wpaperdConfRel}"
: "''${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR not set}"
: "''${HYPRLAND_INSTANCE_SIGNATURE:?HYPRLAND_INSTANCE_SIGNATURE not set}"
SOCK="''${XDG_RUNTIME_DIR}/hypr/''${HYPRLAND_INSTANCE_SIGNATURE}/.socket2.sock"
log() { echo "[wpaperd-ws] $*" >&2; }
mkdir -p "$CURRENT" "$(dirname "$CONF")"
# Wait up to ~10s for Hyprland socket (avoid exiting 0 and never restarting)
for i in $(seq 1 100); do
# wait for hyprland socket so the service doesn't exit "successfully" too early
for i in $(seq 1 120); do
[[ -S "$SOCK" ]] && break
sleep 0.1
done
@@ -59,17 +63,33 @@ in
img_for_ws() {
local n="$1"
case "$n" in
1|2|3|4|5|6|7|8|9) printf '%s/pictures/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
1|2|3|4|5|6|7|8|9) printf '%s/wallpaper%s.jpg\n' "$PICTURES" "$n" ;;
*) return 1 ;;
esac
}
have_set=0
if ${pkgs.wpaperd}/bin/wpaperctl --help 2>&1 | ${pkgs.gnugrep}/bin/grep -qE '(\bset\b)'; then
have_set=1
fi
# Create/refresh config.toml with one section per output, pointing at CURRENT/<mon>.jpg
write_config_from_monitors() {
local mons
mons="$(${pkgs.hyprland}/bin/hyprctl -j monitors | ${pkgs.jq}/bin/jq -r '.[].name')"
apply_for() {
# Truncate + rebuild
: >"$CONF"
# Each output gets its own section (wpaperd-output(5)); force stretch mode
# (If you want different mode later: "fit", "crop", etc.)
while IFS= read -r mon; do
[[ -n "$mon" ]] || continue
cat >>"$CONF" <<EOF
["$mon"]
path = "$CURRENT/$mon.jpg"
mode = "stretch"
EOF
done <<<"$mons"
}
ensure_symlink_for() {
local mon="$1"
local ws="$2"
@@ -82,14 +102,19 @@ in
return 0
fi
if [[ "$have_set" -eq 1 ]]; then
log "Setting $img on $mon (ws=$n)"
${pkgs.wpaperd}/bin/wpaperctl set "$img" "$mon"
else
log "ERROR: your wpaperctl doesn't expose 'set'. Check 'wpaperctl --help' and package version."
log "Upstream supports: wpaperctl set /path/to/image.png [OUTPUT]"
return 0
fi
ln -sf "$img" "$CURRENT/$mon.jpg"
log "Link: $CURRENT/$mon.jpg -> $img"
}
apply_for() {
local mon="$1"
local ws="$2"
ensure_symlink_for "$mon" "$ws"
write_config_from_monitors
# wpaperctl supports reload-wallpaper on 1.2.1
${pkgs.wpaperd}/bin/wpaperctl reload-wallpaper >/dev/null 2>&1 || true
}
apply_initial() {
@@ -104,25 +129,26 @@ in
handle_line() {
case "$1" in
focusedmon\>\>*)
# focusedmon>>MONNAME,WORKSPACENAME
local payload="''${1#focusedmon>>}"
local mon="''${payload%%,*}"
local ws="''${payload#*,}"
apply_for "$mon" "$ws" || true
[[ -n "$mon" && -n "$ws" ]] || return 0
apply_for "$mon" "$ws"
;;
esac
}
apply_initial
log "Listening on $SOCK"
exec ${pkgs.socat}/bin/socat -U - "UNIX-CONNECT:$SOCK" \
| while IFS= read -r line; do
handle_line "$line"
handle_line "$line" || true
done
'';
};
# Start wpaperd (with config)
# Start wpaperd (uses ~/.config/wpaperd/config.toml by default)
systemd.user.services.wpaperd = {
Unit = {
Description = "wpaperd wallpaper daemon";
@@ -132,14 +158,15 @@ in
Service = {
ExecStart = "${pkgs.wpaperd}/bin/wpaperd";
Restart = "on-failure";
RestartSec = 1;
};
Install.WantedBy = [ "graphical-session.target" ];
};
# Listener
# Listener that updates per-monitor symlink based on workspace and triggers reload
systemd.user.services.wpaperd-workspace-wallpapers = {
Unit = {
Description = "Set wallpaper based on workspace number (1..9)";
Description = "Set wallpaper per monitor based on workspace number (1..9)";
After = [ "graphical-session.target" "wpaperd.service" ];
PartOf = [ "graphical-session.target" ];
};