Merge pull request 'Lock file maintenance' (#317) from renovate/lock-file-maintenance into main

.gitea/workflows/update.yml

@@ -15,13 +15,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install nix
-        uses: DeterminateSystems/nix-installer-action@v22
+        uses: DeterminateSystems/nix-installer-action@v23
         with:
           github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
           extra_nix_config: |
             experimental-features = nix-command flakes            
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v28
+        uses: DeterminateSystems/update-flake-lock@v29
         with:
           token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
           pr-title: "[chore] Update flake.lock"

flake.lock

@@ -76,11 +76,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1788335262,
+        "lastModified": 1789127271,
-        "narHash": "sha256-3jBEq8avfzlrsY4UpW4d5TOmm7ocseZfnitEJhqauyc=",
+        "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "44d95795ee2d475b3d687325e26dcf4ca9104557",
+        "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787377438,
+        "lastModified": 1789182507,
-        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
+        "narHash": "sha256-9nt4W0HNNP84B+b37yRs9Zxat1ZR5guJxEZDEjAgex4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
+        "rev": "b1d1b60084970f9d1e2b72662639dab6d039be71",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     },
     "nixUnstable": {
       "locked": {
-        "lastModified": 1788372231,
+        "lastModified": 1789073787,
-        "narHash": "sha256-7aqErvrAEz/5OcPA5p3M+tVOqeYc4oJXkNIPXfCqxAw=",
+        "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9387b3fcc0c23c86661636da63faabad4235a0a6",
+        "rev": "aff8a0b28396750446e5537a96461bc4facdb287",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784642409,
+        "lastModified": 1789164534,
-        "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=",
+        "narHash": "sha256-DoYGPM6QpnYBLWj9gGw6ZwAzIX+HrAVov1BoT+8Jixo=",
         "owner": "nix-community",
         "repo": "nixos-wsl",
-        "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e",
+        "rev": "72c92b11bb8289e6651c7fef29cc0a885fd6a255",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1788297115,
+        "lastModified": 1789114715,
-        "narHash": "sha256-Z+vUNbfd2FIKkWOTkcT7RYlh3oFCnig/d2eXD1SWf2E=",
+        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a3116115851d68b8952a2a4221cc25a84e56b532",
+        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
         "type": "github"
       },
       "original": {
@@ -245,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788337237,
+        "lastModified": 1788914643,
-        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
+        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
+        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
         "type": "github"
       },
       "original": {

modules/home/base/default.nix

@@ -1,4 +1,5 @@
 { lib, config, pkgs, ... }: {
+  imports = [ ./network-watchdog.nix ];
 
   #environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
   systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";

modules/home/base/network-watchdog.nix

@@ -0,0 +1,52 @@
+{ lib, config, pkgs, ... }:
+let
+  cfg = config.services.network-watchdog;
+  watchdog = "${pkgs.custom.network-watchdog}/bin/network-watchdog";
+  units = map (name: "${name}.service") cfg.units;
+in {
+  # User services that only make sense while online: GUI clients that hold a
+  # socket to a server (jellyfin-mpv-shim, nextcloud-client). Their upstream
+  # units have no network ordering (network-online.target is a system target,
+  # out of reach for user units), so they happily start while offline —
+  # silently dead — and nothing notices a connection dropped by a network
+  # blip. Gate each start on the network being up, restart on failure, and let
+  # a watchdog catch the "up but not connected" state that systemd can't see.
+  # See pkgs.custom.network-watchdog.
+  options.services.network-watchdog.units = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = [ ];
+    example = [ "jellyfin-mpv-shim" ];
+    description = "User services (no .service suffix) to gate on the network and keep connected.";
+  };
+
+  config = lib.mkIf (cfg.units != [ ]) {
+    systemd.user.services = lib.genAttrs cfg.units (name: {
+      Service = {
+        ExecStartPre = "${watchdog} wait-online ${name}.service";
+        TimeoutStartSec = "infinity";  # stay in start-pre until the network is back
+        Restart = lib.mkDefault "on-failure";
+        RestartSec = lib.mkDefault 5;
+      };
+    }) // {
+      network-watchdog = {
+        Unit = {
+          Description = "Restart network services that are up but not connected";
+          After = units;
+        };
+        Service = {
+          Type = "oneshot";
+          ExecStart = "${watchdog} check ${lib.concatStringsSep " " units}";
+        };
+      };
+    };
+
+    systemd.user.timers.network-watchdog = {
+      Unit.Description = "Periodic health check for network services";
+      Timer = {
+        OnActiveSec = "60s";
+        OnUnitActiveSec = "60s";
+      };
+      Install.WantedBy = [ "timers.target" ];
+    };
+  };
+}

modules/home/gui/apps/mpv/default.nix

@@ -1,7 +1,6 @@
 { lib, config, pkgs, ... }:
 let
   configuredMpv = config.programs.mpv.finalPackage;
-  shimWatchdog = pkgs.custom.jellyfin-mpv-shim-watchdog;
 in{
 
   config = lib.mkIf (config.syscfg.make.gui) {
@@ -83,36 +82,6 @@ in{
 
     programs.yt-dlp.enable = true;
 
-    # The upstream jellyfin-mpv-shim service has no Restart and no network
+    services.network-watchdog.units = [ "jellyfin-mpv-shim" ];
-    # ordering: it happily starts while offline (silently dead) and never
-    # recovers a connection dropped by a network blip. Gate its start on the
-    # network being up, and let a watchdog notice the "up but not connected"
-    # state that systemd can't see. See pkgs.custom.jellyfin-mpv-shim-watchdog.
-    systemd.user.services.jellyfin-mpv-shim.Service = {
-      ExecStartPre = "${shimWatchdog}/bin/jellyfin-mpv-shim-watchdog wait-online";
-      TimeoutStartSec = "infinity";  # stay in start-pre until the network is back
-      Restart = "on-failure";
-      RestartSec = 5;
-    };
-
-    systemd.user.services.jellyfin-mpv-shim-watchdog = {
-      Unit = {
-        Description = "Restart jellyfin-mpv-shim when it is up but not connected";
-        After = [ "jellyfin-mpv-shim.service" ];
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${shimWatchdog}/bin/jellyfin-mpv-shim-watchdog check";
-      };
-    };
-
-    systemd.user.timers.jellyfin-mpv-shim-watchdog = {
-      Unit.Description = "Periodic health check for jellyfin-mpv-shim";
-      Timer = {
-        OnActiveSec = "60s";
-        OnUnitActiveSec = "60s";
-      };
-      Install.WantedBy = [ "timers.target" ];
-    };
   };
 }

modules/home/gui/apps/pipewire/default.nix

@@ -1,6 +1,8 @@
 { lib, config, ... }: {
 
   config = lib.mkIf (config.syscfg.make.gui) {
+    services.easyeffects.enable = true;
+
     xdg.configFile."pipewire/pipewire-pulse.conf.d/desktop.conf".text = ''
       context.modules = [
         {   name = libpipewire-module-loopback

modules/home/gui/base/default.nix

@@ -1,7 +1,25 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.syscfg.make.gui) {
-    services.nextcloud-client.enable = true;
+    services.nextcloud-client = {
+      enable = true;
+      startInBackground = true;
+    };
+    services.network-watchdog.units = [ "nextcloud-client" ];
+
+    systemd.user.services.keepassxc = lib.mkIf (config.usercfg.wm != "X11") {
+      Unit = {
+        Description = "KeePassXC";
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = "${pkgs.keepassxc}/bin/keepassxc";
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+      Install.WantedBy = [ "graphical-session.target" ];
+    };
 
     home.packages = with pkgs; [
       thunar

modules/home/wayland/apps/eww/bar/css/_sys.scss

@@ -3,7 +3,7 @@
 .cpubar { color: $base0C; }
 .gpubar { color: $base0E; }
 .membar { color: $base08; }
-.batbar { color: $base0B; } // overridden by .bat-<state> below
+.batbar { color: $base0A; } // overridden by .bat-<state> below
 .cpubar, .gpubar, .membar, .batbar { @include background-base2; margin: $gaps-window 0; }
 
 // Window chrome
@@ -66,7 +66,9 @@
 .gpu-ring-label, .vram-usage-label, .swap-section-label { margin-top: 2pt; }
 
 .cpu-core-label  { font-size: 0.7em; @include color-active; }
-.bat-ring-label  { font-size: 0.7em; @include color-body; }
+.bat-ring-label  { font-size: 0.85em; font-weight: bold; @include color-body; }
+.bat-stat-value  { font-size: 1.05em; font-weight: bold; @include color-body; }
+.bat-stat-label  { font-size: 0.62em; margin-top: 2pt; @include color-active; }
 .ram-total-label { font-size: 0.72em; @include color-active; }
 
 // GPU stats row
@@ -92,7 +94,18 @@
   margin: $popup-scale * 4pt;
 }
 
-// Battery colour by state (scripts/sys/battery → .bat-<state>)
+// Battery colour by state (scripts/sys/battery → .bat-<state>):
-.batbar, .bat-ring        { color: $base0B; }
+// light blue on mains (charging / full / idle), on battery green, orange below
-.bat-charging             { color: $base0C; }
+// 25 %, red at ≤15 %
+.batbar, .bat-ring        { color: $base0A; }
+.bat-charging, .bat-full, .bat-idle { color: $base0B; }
 .bat-low                  { color: $base08; }
+.bat-critical             { color: $base0F; }
+
+// Battery history plot: one vertical bar per bucket, same colours as the ring
+.bat-hist { min-height: 44px; margin-top: $popup-scale * 8pt; }
+.bat-hist-bar { @include background-base2; margin: 0 2px; }
+.bat-hist-bar trough *   { background-color: $base0A; }
+.hist-charging trough *, .hist-idle trough * { background-color: $base0B; }
+.hist-low trough *       { background-color: $base08; }
+.hist-critical trough *  { background-color: $base0F; }

modules/home/wayland/apps/eww/bar/modules/sys.yuck

@@ -1,8 +1,9 @@
 (deflisten gpu :initial '{"gfx_pct":0,"mem_pct":0,"media_pct":0,"sclk":0,"mclk":0,"sclk_pct":0,"mclk_pct":0,"vclk":0,"vclk_pct":0,"temp":0,"power":0,"vram_used":0,"vram_total":1}' "scripts/sys/gpu")
 (deflisten memory :initial '{"total":1,"used":0,"cached":0,"human":{"total":"0G","used":"0G","cached":"0G"},"swap":{"total":0,"used":0,"human":{"total":"0G","used":"0G"}}}' "scripts/sys/memory")
 
-; state: charging | discharging | low | full | idle | none — styled via .bat-<state>
+; state: charging | discharging | low (<25%) | critical (≤15%) | full | idle | none — styled via .bat-<state>
-(deflisten battery :initial '{"visible":false,"percentage":0,"wattage":"","status":"","state":"none"}' "scripts/sys/battery")
+; history: 6 h of {t, p, s} buckets (p = -1 when empty)
+(deflisten battery :initial '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}' "scripts/sys/battery")
 
 (defwidget sys-mod []
   (module

modules/home/wayland/apps/eww/bar/scripts/_lib.sh

@@ -39,6 +39,18 @@ detach() {
   systemd-run --user --collect --quiet "${unit[@]}" -- "$cmd" "$@"
 }
 
+# eww kills a click handler that has not returned within the widget's
+# :timeout (200 ms) — less than the eww client calls most handlers make
+# (~50 ms each), let alone bluetoothctl or a station list fetch.  Re-run
+# this script detached and return at once.  Call it with the original
+# arguments, before anything with side effects.
+#   detach_self "$@"
+detach_self() {
+  [[ -n ${EWW_DETACHED-} ]] && return 0
+  EWW_DETACHED=1 setsid -f "$0" "$@"
+  exit 0
+}
+
 # Event multiplexer for listener scripts.  Producers run in the background
 # and write one line per event into a fifo; the main loop re-evaluates the
 # state on every event, coalescing bursts into a single refresh.

modules/home/wayland/apps/eww/bar/scripts/airplane-mode

@@ -5,6 +5,7 @@ active() { rfkill list wifi 2>/dev/null | grep -q "Soft blocked: yes"; }
 case ${1:-} in
   status) active && echo true || echo false ;;
   *)
+    detach_self "$@"
     if active; then
       rfkill unblock all
       state=false

modules/home/wayland/apps/eww/bar/scripts/do-not-disturb

@@ -3,6 +3,7 @@
 case ${1:-} in
   status) dunstctl is-paused ;;
   *)
+    detach_self "$@"
     dunstctl set-paused toggle
     state=$(dunstctl is-paused)
     eww update do-not-disturb="$state" 2>/dev/null

modules/home/wayland/apps/eww/bar/scripts/net/bt-toggle

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # Connect or disconnect the bluetooth device with MAC $1.
 mac=$1
+[[ -n $mac ]] || exit 64
+detach_self "$@"
 if bluetoothctl info "$mac" 2>/dev/null | grep -q "Connected: yes"; then
   bluetoothctl disconnect "$mac"
 else

modules/home/wayland/apps/eww/bar/scripts/net/wg-toggle

@@ -4,6 +4,7 @@
 # Needs the polkit rule from modules/nixos/system/network/wireguard.
 name=$1
 [[ -n $name ]] || exit 64
+detach_self "$@"
 if [[ -d /sys/class/net/$name ]]; then
   systemctl stop "wireguard-$name.service"
 else

modules/home/wayland/apps/eww/bar/scripts/nightlight

@@ -8,6 +8,7 @@ active() { systemctl --user is-active --quiet "$unit" || pgrep -x wlsunset >/dev
 case ${1:-} in
   status) active && echo true || echo false ;;
   *)
+    detach_self "$@"
     if active; then
       systemctl --user stop "$unit" 2>/dev/null
       pkill -x wlsunset

modules/home/wayland/apps/eww/bar/scripts/panel-toggle

@@ -11,6 +11,7 @@
 # reply can never spawn a second daemon).
 panel=$1
 [[ -n $panel ]] || exit 64
+detach_self "$@"
 
 # One toggle at a time; the lock dies with this process.  fd 9 is closed for
 # every eww call so nothing can inherit it.

modules/home/wayland/apps/eww/bar/scripts/power-save

@@ -5,6 +5,7 @@ active() { [[ $(powerprofilesctl get 2>/dev/null) == power-saver ]]; }
 case ${1:-} in
   status) active && echo true || echo false ;;
   *)
+    detach_self "$@"
     if active; then
       powerprofilesctl set balanced 2>/dev/null
       state=false

modules/home/wayland/apps/eww/bar/scripts/powermenu-toggle

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # Toggle the full-screen power menu on the focused monitor.  The open's exit
 # status is ignored: it exceeds the client's 100 ms reply deadline.
+detach_self "$@"
 eww close popup 2>/dev/null
 eww update active-panel= 2>/dev/null
 screen=$(eww-bar focused)

modules/home/wayland/apps/eww/bar/scripts/radio

@@ -216,10 +216,10 @@ status_loop() {
 }
 
 case ${1:-} in
-  start) start "$2" ;;
+  start) detach_self "$@"; start "$2" ;;
-  stop) stop ;;
+  stop) detach_self "$@"; stop ;;
-  toggle) if playing; then stop; else start "$(current_id)"; fi ;;
+  toggle) detach_self "$@"; if playing; then stop; else start "$(current_id)"; fi ;;
-  vol) set_volume "$2" ;;
+  vol) detach_self "$@"; set_volume "$2" ;;
-  mute) toggle_mute ;;
+  mute) detach_self "$@"; toggle_mute ;;
   *) status_loop ;;
 esac

modules/home/wayland/apps/eww/bar/scripts/read-mode

@@ -8,6 +8,7 @@ active() { hyprctl getoption decoration:screen_shader 2>/dev/null | grep -qF "$s
 case ${1:-} in
   status) active && echo true || echo false ;;
   *)
+    detach_self "$@"
     if active; then
       hyprctl eval 'hl.config({ decoration = { screen_shader = "" } })' >/dev/null
       hyprctl eval 'hl.config({ render = { use_fp16 = 2 } })' >/dev/null

modules/home/wayland/apps/eww/bar/scripts/sys/battery

@@ -1,17 +1,24 @@
 #!/usr/bin/env bash
 # Battery state from sysfs; refreshes on power_supply udev events and every
-# 30 s.  Emits a `state` (charging / discharging / low / full / idle) that the
+# 30 s.  Emits a `state` (charging / discharging / low / critical / full /
-# CSS maps to a colour, instead of hard-coding one here.
+# idle) that the CSS maps to a colour, instead of hard-coding one here.
+#
+# Every refresh also appends a sample to $XDG_STATE_HOME/eww/battery.log,
+# which feeds the drain rate (%/h) and the history plot.
 
 bat=""
 for d in /sys/class/power_supply/*; do
   [[ -r $d/type && $(<"$d/type") == Battery ]] && { bat=$d; break; }
 done
 if [[ -z $bat ]]; then
-  echo '{"visible":false,"percentage":0,"wattage":"","status":"","state":"none"}'
+  echo '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}'
   exit 0
 fi
 
+log=${XDG_STATE_HOME:-$HOME/.local/state}/eww/battery.log
+hist_hours=6 buckets=24
+mkdir -p "${log%/*}" && touch "$log"
+
 attr() { # first readable, non-empty attribute of the list, else 0
   local a v
   for a in "$@"; do
@@ -22,39 +29,83 @@ attr() { # first readable, non-empty attribute of the list, else 0
 
 hours_to_clock() { awk -v h="$1" 'BEGIN { printf "%d:%02d", int(h), int((h - int(h)) * 60 + 0.5) }'; }
 
+# Append "epoch pct state" and, once the head is an hour past the plot window,
+# drop everything older than the window.
+log_sample() {
+  local now=$1 first
+  printf '%s %s %s\n' "$now" "$2" "$3" >> "$log"
+  read -r first _ < "$log"
+  ((first < now - (hist_hours + 1) * 3600)) || return 0
+  awk -v min=$((now - hist_hours * 3600)) '$1 >= min' "$log" > "$log.tmp" && mv "$log.tmp" "$log"
+}
+
+# %/h over the last 30 min of samples in the current state, signed; empty
+# until there are 5 min of them.
+drain_rate() {
+  awk -v now="$1" -v st="$2" '
+    $1 >= now - 1800 && $3 == st { if (!n++) { t0 = $1; p0 = $2 } t1 = $1; p1 = $2 }
+    END { if (n > 1 && t1 - t0 >= 300) printf "%.1f", (p1 - p0) * 3600 / (t1 - t0) }' "$log"
+}
+
+# The plot window split into buckets: mean % of the bucket's samples (-1 when
+# it has none), the state of its last sample, and its start time as label.
+plot() {
+  awk -v now="$1" -v hours="$hist_hours" -v n="$buckets" '
+    BEGIN { w = hours * 3600 / n; t0 = now - hours * 3600 }
+    $1 >= t0 { b = int(($1 - t0) / w); if (b >= n) b = n - 1; sum[b] += $2; cnt[b]++; st[b] = $3 }
+    END {
+      printf "["
+      for (b = 0; b < n; b++) {
+        p = -1; s = "none"
+        if (cnt[b]) {
+          p = sprintf("%.1f", sum[b] / cnt[b])
+          s = st[b] == "c" ? "charging" : st[b] == "d" ? "discharging" : "idle"
+          if (st[b] == "d" && p < 25) s = "low"
+          if (st[b] == "d" && p <= 15) s = "critical"
+        }
+        printf "%s{\"t\":\"%s\",\"p\":%s,\"s\":\"%s\"}", (b ? "," : ""), strftime("%H:%M", t0 + b * w), p, s
+      }
+      printf "]"
+    }' "$log"
+}
+
 state() {
-  local cap status rate now full power time="" wattage state
+  local now cap status rate now_e full power pct st time="" wattage state
+  now=$(printf '%(%s)T' -1)
   cap=$(attr capacity)
   status=$(attr status)
   rate=$(attr power_now current_now) # µW or µA
-  now=$(attr energy_now charge_now)  # µWh or µAh — same unit as rate, so now/rate = hours
+  now_e=$(attr energy_now charge_now) # µWh or µAh — same unit as rate, so now_e/rate = hours
   full=$(attr energy_full charge_full)
   if [[ -r $bat/power_now ]]; then power=$rate; else power=$((rate * $(attr voltage_now) / 1000000)); fi
   wattage=$(awk -v p="$power" 'BEGIN { printf "%.1f W", p / 1000000 }')
+  pct=$(awk -v n="$now_e" -v f="$full" -v c="$cap" 'BEGIN { printf "%.1f", (f > 0 ? 100 * n / f : c) }')
   if ((rate > 0)); then
     case $status in
-      Discharging) time=$(hours_to_clock "$(awk -v n="$now" -v r="$rate" 'BEGIN { print n / r }')") ;;
+      Discharging) time=$(hours_to_clock "$(awk -v n="$now_e" -v r="$rate" 'BEGIN { print n / r }')") ;;
-      Charging) time=$(hours_to_clock "$(awk -v n="$now" -v f="$full" -v r="$rate" 'BEGIN { print (f - n) / r }')") ;;
+      Charging) time=$(hours_to_clock "$(awk -v n="$now_e" -v f="$full" -v r="$rate" 'BEGIN { print (f - n) / r }')") ;;
     esac
   fi
   case $status in
     Charging)
-      state=charging
+      state=charging st=c
       status="Charging${time:+, $time left}"
       ;;
     Discharging)
-      state=discharging
+      state=discharging st=d
-      ((cap <= 20)) && state=low
+      ((cap < 25)) && state=low
+      ((cap <= 15)) && state=critical
       status=${time:+$time left}
       ;;
     Full)
-      state=full
+      state=full st=i
       status="Fully charged"
       ;;
-    *) state=idle ;;
+    *) state=idle st=i ;;
   esac
-  printf '{"visible":true,"percentage":%s,"wattage":"%s","status":"%s","state":"%s"}' \
+  log_sample "$now" "$pct" "$st"
-    "$cap" "$wattage" "$(jstr "$status")" "$state"
+  printf '{"visible":true,"percentage":%s,"wattage":"%s","status":"%s","time":"%s","state":"%s","rate":"%s","history":%s}' \
+    "$cap" "$wattage" "$(jstr "$status")" "$time" "$state" "$(drain_rate "$now" "$st")" "$(plot "$now")"
 }
 
 refresh() { emit "$(state)"; }

modules/home/wayland/apps/eww/bar/windows/sys.yuck

@@ -173,20 +173,46 @@
 
 ; --- Battery ---
 
+(defwidget bat-stat [value label]
+  (box :orientation "v" :halign "center" :valign "center" :space-evenly false
+    (label :class "bat-stat-value" :text value)
+    (label :class "bat-stat-label" :text label)))
+
+; left: draw while on battery, charge rate while charging; right: time left / to full
 (defwidget bat-sys-win []
   (box :orientation "v" :space-evenly false :class "sys-section" :visible {battery.visible}
     (section-header :title "Battery" :accent "bat-accent")
+    (box :orientation "h" :space-evenly true :valign "center"
+      (bat-stat
+        :value {battery.state == "charging"
+                  ? (battery.rate == "" ? "—" : "${battery.rate} %/h")
+                  : (battery.state == "discharging" || battery.state == "low" || battery.state == "critical"
+                      ? battery.wattage : "—")}
+        :label {battery.state == "charging" ? "charging" : "draw"})
       (overlay
         (circular-progress
-        :width 60 :height 60
+          :width 72 :height 72
           :value {battery.percentage}
           :start-at 0
           :clockwise true
-        :thickness 6
+          :thickness 7
           :class "bat-ring bat-${battery.state}"
           :tooltip "Battery  ${round(battery.percentage, 0)}%\n${battery.status} @ ${battery.wattage}")
         (label :class "bat-ring-label"
           :text "${round(battery.percentage, 0)}%"))
+      (bat-stat
+        :value {battery.time == "" ? "—" : battery.time}
+        :label {battery.state == "charging" ? "to full" : "left"}))
+    ; 6 h history, one bar per 15 min bucket, coloured like the ring
+    (box :orientation "h" :space-evenly true :class "bat-hist"
+      (for b in {battery.history}
+        (progress :orientation "v" :flipped true
+          :value {b.p < 0 ? 0 : b.p}
+          :class "bat-hist-bar hist-${b.s}"
+          :tooltip {b.p < 0 ? b.t : "${b.t}  ${round(b.p, 0)}%"})))
+    (box :orientation "h" :space-evenly false
+      (label :class "gpu-stat-label" :halign "start" :hexpand true :text "-6h")
+      (label :class "gpu-stat-label" :halign "end" :text "now"))
   )
 )
 

modules/home/wayland/apps/kanshi/default.nix

@@ -20,6 +20,8 @@ let
 in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    systemd.user.services.kanshi.Unit.After = lib.mkForce [ config.services.kanshi.systemdTarget "awww.service" ];
+
     services.kanshi = {
       enable = true;
       systemdTarget = "graphical-session.target";

modules/home/wayland/hyprland/config.nix

@@ -24,23 +24,15 @@
   
 
   startupScript = pkgs.writeShellScriptBin "hyprland-start" ''
-    # The eww bar is not started here: eww.service opens it with the
-    # graphical session and kanshi places it per profile (see apps/eww).
-    ${pkgs.awww}/bin/awww-daemon &
-    ${pkgs.awww}/bin/awww restore &
-
     sleep 2
-    keepassxc &
     firefox &
-    easyeffects --gapplication-service &
-
-    sleep 2
-    nextcloud &
     # telegram-desktop &
     # discord &
   '';
 in {
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
+    services.awww.enable = true;
+
     wayland.windowManager.hyprland = {
       enable = true;
       xwayland.enable = true;

modules/home/xorg/bspwm/config.nix

@@ -108,7 +108,6 @@
       bspc desktop -f 0
 
       telegram-desktop &
-      nextcloud &
       #flameshot &
 
       sleep 2
@@ -117,7 +116,6 @@
 
       ibus-daemon -drx
 
-      easyeffects --gapplication-service &
       bspc desktop -f 0
     '';
 

modules/nixos/gui/audio/default.nix

@@ -13,6 +13,7 @@ in {
       # wireplumber.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [ easyeffects alsa-utils ];
+    programs.dconf.enable = true;
+    environment.systemPackages = with pkgs; [ alsa-utils ];
   };
 }

packages/default.nix

@@ -8,5 +8,5 @@
 
   eww-bar = pkgs.callPackage ./eww-bar { };
 
-  jellyfin-mpv-shim-watchdog = pkgs.callPackage ./jellyfin-mpv-shim-watchdog { };
+  network-watchdog = pkgs.callPackage ./network-watchdog { };
 }

packages/eww-bar/eww-bar.sh

@@ -56,6 +56,9 @@ log() { printf 'eww-bar: %s\n' "$*" >&2; }
 ewwc() { timeout 5 eww --no-daemonize "$@" 9>&-; }
 
 ping_daemon() { ewwc ping >/dev/null 2>&1; }
+# Empty when the daemon did not answer within the client's 100 ms deadline —
+# its main thread is busy (a popup takes seconds to build) — as well as when
+# nothing is open.  Only a non-empty listing is authoritative.
 list_windows() { ewwc active-windows 2>/dev/null || true; }
 bar_open() { list_windows | grep -qx 'bar: bar'; }
 
@@ -69,6 +72,28 @@ wait_for_window() {
   return 1
 }
 
+# window_state NAME [SECONDS] → open | closed (listed without NAME) |
+# busy (nothing listed within SECONDS: main thread stuck, or nothing open)
+window_state() {
+  local i n=$((${2:-5} * 5)) out
+  for ((i = 0; i < n; i++)); do
+    out=$(list_windows)
+    if [[ -n $out ]]; then
+      if grep -qx "$1: $1" <<<"$out"; then echo open; else echo closed; fi
+      return 0
+    fi
+    sleep 0.2
+  done
+  echo busy
+}
+
+# The compositor's view: does the daemon own any layer surface?  Tells a
+# daemon that is merely not answering from one with nothing on screen.
+daemon_has_layer() {
+  hyprctl -j layers 2>/dev/null \
+    | jq -e --argjson pid "$(main_pid)" '[.. | objects | select(.pid? == $pid)] | length > 0' >/dev/null 2>&1
+}
+
 # ---------------------------------------------------------------- daemon ---
 
 # nixpkgs wraps eww (wrapGAppsHook), so the running process is `.eww-wrapped`;
@@ -126,13 +151,13 @@ wait_for_daemon() {
 
 start_unit() {
   systemctl --user reset-failed "$unit" >/dev/null 2>&1 || true
-  systemctl --user start "$unit"
+  systemctl --user start --no-block "$unit"
 }
 
 restart_unit() {
   log "restarting $unit"
   systemctl --user reset-failed "$unit" >/dev/null 2>&1 || true
-  systemctl --user restart "$unit"
+  systemctl --user restart --no-block "$unit"
 }
 
 ensure() {
@@ -194,7 +219,7 @@ close_popups() {
 
 # open_bar [--force] [SPEC]
 open_bar() {
-  local force=0 spec screen
+  local force=0 spec screen state
   if [[ ${1:-} == --force ]]; then force=1; shift; fi
   spec=${1:-$(saved_screen)}
   spec=${spec:-$default_screen}
@@ -210,18 +235,19 @@ open_bar() {
     # client deadline), so the result is verified instead.
     close_popups
     ewwc open bar --screen "$screen" >/dev/null 2>&1 || true
-    if ! wait_for_window bar 5; then
+    state=$(window_state bar 10)
-      if [[ $screen != "$default_screen" ]]; then
+    # Only an answered "no bar" means the screen was refused; busy just needs time.
+    if [[ $state == closed && $screen != "$default_screen" ]]; then
       log "cannot open the bar on '$screen', using screen $default_screen"
       screen=$default_screen
       ewwc open bar --screen "$screen" >/dev/null 2>&1 || true
+      state=$(window_state bar 10)
     fi
-      if ! wait_for_window bar 5; then
+    if [[ $state != open ]]; then
-        log "the bar does not come up, restarting $unit"
+      log "the bar does not come up ($state), restarting $unit"
       restart_unit
       exit 1
     fi
-    fi
     printf '%s\n' "$spec" >"$screen_file"
     printf '%s\n' "$screen" >"$current_file"
     log "bar opened on screen $screen"
@@ -301,14 +327,16 @@ check() {
     strike "daemon does not answer"
     return 0
   fi
-  if wait_for_window bar 3; then
+  case $(window_state bar 10) in
-    rm -f "$fail_file"
+    open) rm -f "$fail_file"; return 0 ;;
-    return 0
+    # Nothing listed for 10 s while something is on screen: the main loop is
-  fi
+    # frozen or still building a popup.  Leave the windows alone; a second
-  # Either nothing is open or the main loop is frozen (empty reply).  Try to
+    # miss restarts the unit.
-  # open the bar: a frozen daemon still won't list it afterwards.
+    busy) if daemon_has_layer; then strike "UI unresponsive"; return 0; fi ;;
+  esac
+  # Listed without the bar, or nothing on screen at all: it really is gone.
   open_bar || true
-  if wait_for_window bar 3; then
+  if wait_for_window bar 5; then
     rm -f "$fail_file"
     log "bar was missing, reopened"
   else

packages/jellyfin-mpv-shim-watchdog/default.nix

@@ -1,51 +0,0 @@
-{ writeShellScriptBin
-, coreutils
-, findutils
-, gnugrep
-, iproute2
-, systemd
-}:
-
-# jellyfin-mpv-shim keeps a persistent socket to the Jellyfin server. When the
-# machine drops off the network that socket dies, but the process stays alive
-# and the unit stays "active" — running yet deaf to cast requests, the "up but
-# not working, restart it by hand" case. systemd can't see this: nothing
-# crashes and the shim speaks no health protocol, so we probe the real thing —
-# is its MainPID still holding a live (established, non-loopback) connection?
-#
-#   check       (default) one tick, run by a 60s timer: restart if online but
-#               not connected, rate-limited to one restart per 5 min
-#   wait-online block until a real address exists; used as ExecStartPre so the
-#               unit only starts once online
-
-writeShellScriptBin "jellyfin-mpv-shim-watchdog" ''
-  set -u
-  service="jellyfin-mpv-shim.service"
-  stamp="''${XDG_RUNTIME_DIR:-/run/user/$(${coreutils}/bin/id -u)}/jellyfin-mpv-shim-watchdog.stamp"
-
-  # A global-scope address on a non-loopback interface — true for a LAN IP too,
-  # so this needs no server URL and works whether Jellyfin is local or remote.
-  network_up() { ${iproute2}/bin/ip -o addr show scope global up 2>/dev/null | ${gnugrep}/bin/grep -q .; }
-
-  if [ "''${1:-check}" = wait-online ]; then
-    while ! network_up; do ${coreutils}/bin/sleep 5; done
-    exit 0
-  fi
-
-  # Healthy: MainPID owns an established socket to something other than loopback.
-  pid="$(${systemd}/bin/systemctl --user show -p MainPID --value "$service" 2>/dev/null)"
-  if [ "''${pid:-0}" != 0 ] && ${iproute2}/bin/ss -tnpH state established 2>/dev/null \
-      | ${gnugrep}/bin/grep "pid=$pid," \
-      | ${gnugrep}/bin/grep -qv -e '127\.0\.0\.1' -e '\[::1\]'; then
-    exit 0
-  fi
-
-  # Not connected: only worth restarting once the network is actually back...
-  network_up || exit 0
-  # ...and not if we already restarted within the last 5 minutes.
-  [ -e "$stamp" ] && [ -n "$(${findutils}/bin/find "$stamp" -mmin -5 2>/dev/null)" ] && exit 0
-
-  : > "$stamp"
-  echo "jellyfin-mpv-shim-watchdog: online but no live connection -> restarting $service"
-  ${systemd}/bin/systemctl --user restart "$service"
-''

packages/network-watchdog/default.nix

@@ -0,0 +1,69 @@
+{ writeShellScriptBin
+, coreutils
+, findutils
+, gnugrep
+, iproute2
+, systemd
+}:
+
+# For user services that only make sense while online (jellyfin-mpv-shim,
+# nextcloud-client, ...). They keep a persistent socket to their server; when
+# the machine drops off the network that socket dies, but the process stays
+# alive and the unit stays "active" — running yet deaf, the "up but not
+# working, restart it by hand" case. systemd can't see this: nothing crashes
+# and the programs speak no health protocol, so we probe the real thing — is
+# the MainPID still holding a live (established, non-loopback) connection?
+#
+#   wait-online UNIT  block until a default route exists; used as ExecStartPre
+#                     so UNIT only starts once online. Also stamps the start
+#                     time so `check` leaves a freshly (re)started UNIT alone.
+#   check UNIT...     one tick, run by a 60s timer: restart every UNIT that is
+#                     active but not connected, at most once per 2 minutes.
+#
+# Wired up by the services.network-watchdog home-manager module.
+
+writeShellScriptBin "network-watchdog" ''
+  set -u
+  stampdir="''${XDG_RUNTIME_DIR:-/run/user/$(${coreutils}/bin/id -u)}/network-watchdog"
+  ${coreutils}/bin/mkdir -p "$stampdir"
+
+  usage() { echo "usage: network-watchdog wait-online UNIT | check UNIT..." >&2; exit 64; }
+
+  # Online = a default route.  An address alone is not enough: wg0 and virtual
+  # bridges carry global-scope addresses whether or not there is a way out.
+  network_up() { { ${iproute2}/bin/ip -4 route show default; ${iproute2}/bin/ip -6 route show default; } 2>/dev/null | ${gnugrep}/bin/grep -q .; }
+
+  # Healthy: MainPID owns an established socket to something other than loopback.
+  connected() {
+    pid="$(${systemd}/bin/systemctl --user show -p MainPID --value "$1" 2>/dev/null)"
+    [ "''${pid:-0}" != 0 ] && ${iproute2}/bin/ss -tnpH state established 2>/dev/null \
+      | ${gnugrep}/bin/grep "pid=$pid," \
+      | ${gnugrep}/bin/grep -qv -e '127\.0\.0\.1' -e '\[::1\]'
+  }
+
+  # Stamped within the last 2 minutes: still connecting, or already restarted.
+  recently_started() { [ -n "$(${findutils}/bin/find "$stampdir/$1" -mmin -2 2>/dev/null)" ]; }
+
+  [ $# -ge 1 ] || usage
+  cmd="$1"; shift
+  case "$cmd" in
+    wait-online)
+      [ $# -eq 1 ] || usage
+      while ! network_up; do ${coreutils}/bin/sleep 5; done
+      : > "$stampdir/$1"
+      ;;
+    check)
+      # Nothing can be connected while offline, and restarting wouldn't help.
+      network_up || exit 0
+      for unit; do
+        # Not "active" (inactive, failed, or still in wait-online): systemd's job, not ours.
+        ${systemd}/bin/systemctl --user is-active --quiet "$unit" || continue
+        recently_started "$unit" && continue
+        connected "$unit" && continue
+        echo "network-watchdog: $unit is online but has no live connection -> restarting"
+        ${systemd}/bin/systemctl --user restart "$unit"  # its wait-online refreshes the stamp
+      done
+      ;;
+    *) usage ;;
+  esac
+''

systems/valinor/hardware.nix

@@ -5,7 +5,7 @@
     [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "v4l2loopback" "kvm-amd" ];
-  #boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.extraModulePackages = with config.boot.kernelPackages;
     [ v4l2loopback ];
   boot.extraModprobeConfig = ''