New script with writable toml
This commit is contained in:
@@ -1,189 +1,98 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
{ config, lib, pkgs, flakeRoot, ... }:
|
||||
|
||||
let
|
||||
# Repo folder that gets copied to ~/nixos_conf/wallpaperstuff
|
||||
# Repo inputs
|
||||
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
|
||||
|
||||
# Where we sync assets to (writable)
|
||||
userRelRoot = "nixos_conf/wallpaperstuff";
|
||||
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
|
||||
|
||||
# Your actual layout:
|
||||
# ~/nixos_conf/wallpaperstuff/pictures/wallpaper{1..9}.jpg
|
||||
picturesDir = "${userAbsRoot}/pictures";
|
||||
stateDir = "${userAbsRoot}/current";
|
||||
symlinkPath = "${stateDir}/workspace.jpg";
|
||||
|
||||
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
|
||||
wpaperdConfRel = "wpaperd/config.toml";
|
||||
# Writable runtime TOML (NOT under ~/.config)
|
||||
runtimeConf = "${userAbsRoot}/wpaperd-runtime.toml";
|
||||
|
||||
# Your generator script (synced from repo into userAbsRoot)
|
||||
wsScript = "${userAbsRoot}/wpaperd-workspace-1to9.sh";
|
||||
|
||||
# Sync everything in repoWallpaperDir to ~/nixos_conf/wallpaperstuff,
|
||||
# but keep it simple: we exclude no files here unless you want to.
|
||||
repoWallpapersOnly = lib.cleanSourceWith {
|
||||
src = repoWallpaperDir;
|
||||
filter = path: type: true;
|
||||
};
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.wpaperd
|
||||
pkgs.socat
|
||||
pkgs.jq
|
||||
];
|
||||
|
||||
# Copy wallpapers from repo → ~/nixos_conf/wallpaperstuff (includes pictures/)
|
||||
# 1) Sync your wallpaper assets + scripts into a writable location
|
||||
home.file."${userRelRoot}" = {
|
||||
source = repoWallpaperDir;
|
||||
source = repoWallpapersOnly;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
# Ensure wpaperd config points to the global symlink (not per-monitor, not rotating)
|
||||
xdg.configFile."${wpaperdConfRel}".text = ''
|
||||
[default]
|
||||
mode = "stretch"
|
||||
# 2) Ensure we have a writable runtime config (created if missing)
|
||||
#
|
||||
# NOTE: We intentionally do NOT create ~/.config/wpaperd/config.toml via HM,
|
||||
# because HM places managed files in /nix/store and symlinks them (read-only),
|
||||
# which breaks apps/scripts that want to write there.
|
||||
home.activation.ensureWpaperdRuntimeConf =
|
||||
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
mkdir -p "${userAbsRoot}"
|
||||
mkdir -p "${picturesDir}"
|
||||
|
||||
[any]
|
||||
path = "${symlinkPath}"
|
||||
'';
|
||||
if [ ! -f "${runtimeConf}" ]; then
|
||||
cat > "${runtimeConf}" <<'EOF'
|
||||
[default]
|
||||
mode = "stretch"
|
||||
|
||||
# Script: global wallpaper per workspace (focused workspace), via symlink + reload-wallpaper
|
||||
xdg.configFile."${scriptRel}" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
log() { echo "[wpaperd-ws] $*" >&2; }
|
||||
|
||||
PICTURES_DIR="${picturesDir}"
|
||||
STATE_DIR="${stateDir}"
|
||||
SYMLINK="${symlinkPath}"
|
||||
|
||||
XDG_CONFIG_HOME="''${XDG_CONFIG_HOME:-$HOME/.config}"
|
||||
WPAPERD_DIR="$XDG_CONFIG_HOME/wpaperd"
|
||||
CONF="$WPAPERD_DIR/config.toml"
|
||||
|
||||
: "''${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"
|
||||
|
||||
mkdir -p "$STATE_DIR" "$WPAPERD_DIR"
|
||||
|
||||
# Wait for Hyprland socket so we don't exit too early
|
||||
for i in $(seq 1 120); do
|
||||
[[ -S "$SOCK" ]] && break
|
||||
sleep 0.1
|
||||
done
|
||||
[[ -S "$SOCK" ]] || { log "Hyprland socket not found: $SOCK"; exit 1; }
|
||||
|
||||
ws_num() {
|
||||
local w="''${1%%:*}"
|
||||
[[ "$w" =~ ^[0-9]+$ ]] || return 1
|
||||
printf '%s\n' "$w"
|
||||
}
|
||||
|
||||
img_for_ws() {
|
||||
local n="$1"
|
||||
case "$n" in
|
||||
1|2|3|4|5|6|7|8|9) printf '%s/wallpaper%s.jpg\n' "$PICTURES_DIR" "$n" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
ensure_config() {
|
||||
# keep config stable and always pointing to the symlink
|
||||
cat >"$CONF" <<EOF
|
||||
[default]
|
||||
mode = "stretch"
|
||||
|
||||
[any]
|
||||
path = "$SYMLINK"
|
||||
EOF
|
||||
}
|
||||
|
||||
reload_wallpaper() {
|
||||
${pkgs.wpaperd}/bin/wpaperctl reload-wallpaper >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
apply_workspace() {
|
||||
local ws_raw="$1"
|
||||
local n img
|
||||
|
||||
n="$(ws_num "$ws_raw")" || { log "Ignoring non-numeric workspace: $ws_raw"; return 0; }
|
||||
img="$(img_for_ws "$n")" || return 0
|
||||
|
||||
if [[ ! -f "$img" ]]; then
|
||||
log "Missing image for ws=$n: $img"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# If already set, skip
|
||||
if [[ -L "$SYMLINK" ]] && [[ "$(readlink -f "$SYMLINK")" == "$(readlink -f "$img")" ]]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
ln -sf "$img" "$SYMLINK"
|
||||
log "Workspace $n -> $img"
|
||||
ensure_config
|
||||
reload_wallpaper
|
||||
}
|
||||
|
||||
apply_initial() {
|
||||
local ws
|
||||
ws="$(${pkgs.hyprland}/bin/hyprctl -j monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused==true) | .activeWorkspace.name' | head -n1)"
|
||||
if [[ -n "$ws" && "$ws" != "null" ]]; then
|
||||
apply_workspace "$ws"
|
||||
else
|
||||
log "Could not determine initial focused workspace"
|
||||
fi
|
||||
}
|
||||
|
||||
handle_line() {
|
||||
case "$1" in
|
||||
workspace\>\>*)
|
||||
apply_workspace "''${1#workspace>>}"
|
||||
;;
|
||||
workspacev2\>\>*)
|
||||
local payload="''${1#workspacev2>>}"
|
||||
apply_workspace "''${payload#*,}"
|
||||
;;
|
||||
focusedmon\>\>*)
|
||||
local payload="''${1#focusedmon>>}"
|
||||
local ws="''${payload#*,}"
|
||||
apply_workspace "$ws"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
ensure_config
|
||||
apply_initial
|
||||
|
||||
log "Listening on $SOCK"
|
||||
exec ${pkgs.socat}/bin/socat -U - "UNIX-CONNECT:$SOCK" \
|
||||
| while IFS= read -r line; do
|
||||
handle_line "$line" || true
|
||||
done
|
||||
# Fallback for outputs not explicitly listed:
|
||||
[any]
|
||||
path = "__WALLPAPER_DIR__"
|
||||
EOF
|
||||
# default: point [any].path at your pictures dir
|
||||
${pkgs.gnused}/bin/sed -i "s|__WALLPAPER_DIR__|${picturesDir}|g" "${runtimeConf}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# wpaperd daemon
|
||||
# 3) wpaperd user service: always use the writable runtime config
|
||||
systemd.user.services.wpaperd = {
|
||||
Unit = {
|
||||
Description = "wpaperd wallpaper daemon";
|
||||
After = [ "graphical-session.target" ];
|
||||
Description = "wpaperd wallpaper daemon (runtime config)";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
Service = {
|
||||
ExecStart = "${pkgs.wpaperd}/bin/wpaperd";
|
||||
ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${runtimeConf}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
|
||||
Install = {
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
# listener
|
||||
systemd.user.services.wpaperd-workspace-wallpaper = {
|
||||
# 4) Optional: run your workspace generator once per login, then restart wpaperd
|
||||
systemd.user.services.wpaperd-workspaces-init = {
|
||||
Unit = {
|
||||
Description = "Global wallpaper per workspace (1..9)";
|
||||
After = [ "graphical-session.target" "wpaperd.service" ];
|
||||
Description = "Generate workspace wallpapers (wpaperd runtime config)";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
Service = {
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${config.xdg.configHome}/${scriptRel}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${wsScript} ${picturesDir}";
|
||||
ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wpaperd";
|
||||
};
|
||||
|
||||
Install = {
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user