implementing home.file instead of xdg.config

2026-03-01 18:32:41 +01:00
parent 15607aca9b
commit 0906a319c1
3 changed files with 395 additions and 330 deletions
@@ -1,4 +1,5 @@
 { config, lib, pkgs, flakeRoot, ... }:
+
 let
  userRelRoot = "nixos_conf/wallpaperstuff";
  userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
@@ -21,11 +22,13 @@ in
    pkgs.gnused
    pkgs.gawk
  ];
+
  # Sync wallpapers into a writable directory
  home.file."${userRelRoot}" = {
    source = repoWallpapersOnly;
    recursive = true;
  };
+
  # Hyprpaper config
  home.file.".config/hypr/hyprpaper.conf" = {
    text = ''
@@ -33,34 +36,39 @@ in
      splash = false
    '';
  };
+
  # Workspace wallpaper daemon
  home.file."${daemonRel}" = {
    executable = true;
    text = ''
      #!/usr/bin/env bash
      set -euo pipefail
-      : "${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR not set}"
-      : "${HYPRLAND_INSTANCE_SIGNATURE:?HYPRLAND_INSTANCE_SIGNATURE not set}"
+      : "${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"
      [[ -S "$SOCK" ]] || { echo "Hyprland socket not found: $SOCK" >&2; exit 1; }
+
      PICTURES_DIR="${1:-${picturesDir}}"
-      FIT_MODE="fill" # hyprpaper fit_mode: contain|cover|tile|fill
+      FIT_MODE="fill"
      HYPR_DIR="${config.xdg.configHome}/hypr"
      MAP_ROOT="${HYPR_DIR}/hyprpaper/config"
+
      focused_monitor() {
        hyprctl -j monitors | jq -r '.[] | select(.focused==true) | .name' | head -n 1
      }
+
      map_file_for_monitor() {
        local mon="$1"
        echo "${MAP_ROOT}/${mon}/defaults.conf"
      }
+
      ensure_map_file() {
        local mon="$1"
        local f
        f="$(map_file_for_monitor "$mon")"
        mkdir -p "$(dirname "$f")"
        if [[ ! -f "$f" ]]; then
-          # Seed with 1..9 from picturesDir if present, else empty entries
          {
            for i in 1 2 3 4 5 6 7 8 9; do
              seed="$(ls -1 "${PICTURES_DIR}/${i}."* 2>/dev/null | head -n 1 || true)"
@@ -70,6 +78,7 @@ in
        fi
        echo "$f"
      }
+
      get_wall_for_ws() {
        local mon="$1"
        local wsid="$2"
@@ -79,6 +88,7 @@ in
        val="$(awk -F= -v k="$key" '$1==k {sub(/^[[:space:]]+/, "", $2); print $2; exit}' "$f" || true)"
        echo "$val"
      }
+
      apply_wallpaper() {
        local mon="$1"
        local wsid="$2"
@@ -88,68 +98,78 @@ in
        [[ -f "$file" ]] || return 0
        hyprctl hyprpaper wallpaper "$mon, $file, $FIT_MODE" >/dev/null
      }
-      # Initial apply on startup
+
      mon="$(focused_monitor || true)"
      wsid="$(hyprctl -j activeworkspace | jq -r '.id' | head -n 1 || true)"
      [[ -n "$mon" && -n "$wsid" ]] && apply_wallpaper "$mon" "$wsid"
+
      handle() {
        local line="$1"
        case "$line" in
          workspacev2* )
-            # workspacev2>>ID,NAME
-            local payload wsid
            payload="${line#*>>}"
            wsid="${payload%%,*}"
            mon="$(focused_monitor || true)"
            [[ -n "$mon" && -n "$wsid" ]] && apply_wallpaper "$mon" "$wsid"
            ;;
          focusedmon* )
-            # focusedmon>>MON,WORKSPACENAME
            mon="$(focused_monitor || true)"
            wsid="$(hyprctl -j activeworkspace | jq -r '.id' | head -n 1 || true)"
            [[ -n "$mon" && -n "$wsid" ]] && apply_wallpaper "$mon" "$wsid"
            ;;
        esac
      }
+
      socat -U - UNIX-CONNECT:"$SOCK" | while read -r line; do
        handle "$line" || true
      done
    '';
  };
+
  # CLI setter
  home.file."${setRel}" = {
    executable = true;
    text = ''
      #!/usr/bin/env bash
      set -euo pipefail
+
      HYPR_DIR="${config.xdg.configHome}/hypr"
      MAP_ROOT="${HYPR_DIR}/hyprpaper/config"
+
      usage() {
        echo "Usage: $0 <workspace_id> <monitor> [wallpaper_path]"
      }
+
      wsid="${1:-}"
      mon="${2:-}"
      wp="${3:-}"
+
      [[ -n "$wsid" ]] || { usage; exit 1; }
      [[ -n "$mon"  ]] || { usage; exit 1; }
+
      cfg="${MAP_ROOT}/${mon}/defaults.conf"
      mkdir -p "$(dirname "$cfg")"
      [[ -f "$cfg" ]] || touch "$cfg"
+
      if [[ -z "$wp" ]]; then
        wp="$(find "${config.home.homeDirectory}/.config/wallpapers/defaults" -type f 2>/dev/null | shuf -n 1 || true)"
        [[ -n "$wp" ]] || { echo "No wallpaper found (random). Provide a path as arg 3."; exit 1; }
      fi
+
      key="w-${wsid}"
      if ! grep -q "^${key}=" "$cfg"; then
        echo "${key}=" >> "$cfg"
      fi
+
      ${pkgs.gnused}/bin/sed -i "s|^${key}=.*|${key}= ${wp}|g" "$cfg"
+
      curws="$(hyprctl -j monitors | jq -r --arg m "$mon" '.[] | select(.name==$m) | .activeWorkspace.id' | head -n 1 || true)"
      if [[ "$curws" == "$wsid" ]]; then
        hyprctl hyprpaper wallpaper "$mon, $wp, fill" >/dev/null
      fi
    '';
  };
+
  # Services
  systemd.user.services.hyprpaper = {
    Unit = {
@@ -164,6 +184,7 @@ in
    };
    Install = { WantedBy = [ "graphical-session.target" ]; };
  };
+
  systemd.user.services.hyprpaper-ws-daemon = {
    Unit = {
      Description = "Workspace->wallpaper mapping daemon (hyprpaper + socket2)";
@@ -171,7 +192,7 @@ in
      After = [ "graphical-session.target" "hyprpaper.service" ];
    };
    Service = {
-      ExecStart = "${pkgs.bash}/bin/bash ${daemonRel} ${picturesDir}";
+      ExecStart = "${pkgs.bash}/bin/bash ${config.home.homeDirectory}/${daemonRel} ${picturesDir}";
      Restart = "on-failure";
      RestartSec = 1;
    };