Adds a `nomarchy.system.power.*` surface (modules/nixos/power.nix), replacing the bare `services.upower` (Waybar reporting only) baseline: - power-profiles-daemon ships by default; switched through polkit (no root prompt). TLP is the opt-in `backend = "tlp"` for deeper battery tuning — the two are mutually exclusive (asserted). - thermald behind `power.thermal.enable` (Intel-only). - `power.batteryChargeLimit` (e.g. 80): a backend-independent sysfs oneshot writes charge_control_end_threshold; gated on `power.laptop`. Switcher + indicator live home-side and self-gate on a battery being present + powerprofilesctl running, so they hide on desktops and under TLP — no system->home wiring (like the Waybar battery widget): - rofi.nix: `nomarchy-menu power-profile` module + a picker entry shown only on laptops with PPD. - waybar.nix: first `custom/*` module — click cycles the profile. Installer writes `power.laptop = true` (battery probe) and `power.thermal.enable` (GenuineIntel) into the generated system.nix, and scaffolds the charge limit commented-out. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
201 lines
6.1 KiB
Nix
201 lines
6.1 KiB
Nix
# Waybar — two-tier theming:
|
|
#
|
|
# 1. Default: structure, fonts, geometry AND palette baked from
|
|
# theme-state.json (colors as GTK named colors, @define-color).
|
|
#
|
|
# 2. Whole-swap: themes with their own visual identity ship
|
|
# <themesDir>/<slug>/waybar.css (and optionally waybar.jsonc) which
|
|
# replace the generated style/layout entirely. Probed at eval time —
|
|
# pure, it's flake source.
|
|
{ config, lib, pkgs, ... }:
|
|
|
|
let
|
|
t = config.nomarchy.theme;
|
|
|
|
# Power-profile indicator (power-profiles-daemon). Both scripts self-
|
|
# gate: they exit silently unless this is a laptop (a battery is
|
|
# present) running PPD, so the module hides itself on desktops and
|
|
# under the TLP backend — no system→home coupling. Speedometer glyphs
|
|
# (slow/medium/fast) map to power-saver/balanced/performance.
|
|
powerProfileStatus = pkgs.writeShellScript "nomarchy-powerprofile-status" ''
|
|
case "$(ls /sys/class/power_supply/ 2>/dev/null)" in *BAT*) ;; *) exit 0 ;; esac
|
|
command -v powerprofilesctl >/dev/null 2>&1 || exit 0
|
|
prof=$(powerprofilesctl get 2>/dev/null) || exit 0
|
|
case "$prof" in
|
|
power-saver) icon="" ;;
|
|
performance) icon="" ;;
|
|
*) icon="" ;;
|
|
esac
|
|
printf '{"text":"%s","tooltip":"Power profile: %s","class":"%s"}\n' "$icon" "$prof" "$prof"
|
|
'';
|
|
# Cycle to the next profile this machine actually offers (wraps around).
|
|
powerProfileCycle = pkgs.writeShellScript "nomarchy-powerprofile-cycle" ''
|
|
command -v powerprofilesctl >/dev/null 2>&1 || exit 0
|
|
cur=$(powerprofilesctl get 2>/dev/null) || exit 0
|
|
avail=$(powerprofilesctl list 2>/dev/null | sed -nE 's/^[* ] ([a-z-]+):$/\1/p')
|
|
next=$(printf '%s\n' "$avail" | awk -v cur="$cur" '
|
|
{ a[NR] = $0 }
|
|
END { for (i = 1; i <= NR; i++) if (a[i] == cur) { print a[i % NR + 1]; f = 1 }
|
|
if (!f && NR) print a[1] }')
|
|
[ -n "$next" ] && powerprofilesctl set "$next"
|
|
'';
|
|
|
|
# Per-theme override probe.
|
|
assetDir = config.nomarchy.themesDir + "/${t.slug}";
|
|
styleOverride = assetDir + "/waybar.css";
|
|
configOverride = assetDir + "/waybar.jsonc";
|
|
hasStyleOverride = builtins.pathExists styleOverride;
|
|
hasConfigOverride = builtins.pathExists configOverride;
|
|
|
|
# The palette as GTK named colors, straight from the JSON.
|
|
colorDefs = lib.concatStringsSep "\n"
|
|
(lib.mapAttrsToList (name: value: "@define-color ${name} ${value};") t.colors);
|
|
|
|
generatedSettings = {
|
|
layer = "top";
|
|
position = "top";
|
|
height = 34;
|
|
margin-top = t.ui.gapsOut;
|
|
margin-left = t.ui.gapsOut;
|
|
margin-right = t.ui.gapsOut;
|
|
spacing = 8;
|
|
|
|
# waybar re-reads style.css when it changes on disk, so a
|
|
# home-manager switch restyles the running bar without a restart.
|
|
reload_style_on_change = true;
|
|
|
|
modules-left = [ "hyprland/workspaces" "hyprland/window" ];
|
|
modules-center = [ "clock" ];
|
|
modules-right = [ "tray" "pulseaudio" "network" "cpu" "memory" "custom/powerprofile" "battery" ];
|
|
|
|
"hyprland/workspaces" = {
|
|
format = "{icon}";
|
|
on-click = "activate";
|
|
};
|
|
|
|
"hyprland/window" = {
|
|
max-length = 48;
|
|
separate-outputs = true;
|
|
};
|
|
|
|
clock = {
|
|
format = "{:%H:%M}";
|
|
format-alt = "{:%A %d %B %Y}";
|
|
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
|
};
|
|
|
|
pulseaudio = {
|
|
format = "{icon} {volume}%";
|
|
format-muted = "";
|
|
format-icons.default = [ "" "" "" ];
|
|
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
|
};
|
|
|
|
network = {
|
|
format-wifi = " {essid}";
|
|
format-ethernet = "";
|
|
format-disconnected = "";
|
|
tooltip-format = "{ipaddr} via {gwaddr}";
|
|
# nm-applet sits in the tray for the GUI path; this is the
|
|
# keyboard-friendly one.
|
|
on-click = "${config.nomarchy.terminal} -e nmtui";
|
|
};
|
|
|
|
cpu.format = " {usage}%";
|
|
memory.format = " {percentage}%";
|
|
|
|
battery = {
|
|
states = { warning = 25; critical = 10; };
|
|
format = "{icon} {capacity}%";
|
|
format-charging = " {capacity}%";
|
|
format-icons = [ "" "" "" "" "" ];
|
|
};
|
|
|
|
"custom/powerprofile" = {
|
|
exec = "${powerProfileStatus}";
|
|
return-type = "json";
|
|
interval = 5;
|
|
on-click = "${powerProfileCycle}";
|
|
};
|
|
|
|
tray.spacing = 8;
|
|
};
|
|
|
|
generatedStyle = ''
|
|
/* Palette baked from theme-state.json */
|
|
${colorDefs}
|
|
|
|
* {
|
|
font-family: "${t.fonts.ui}", "${t.fonts.mono}";
|
|
font-size: ${toString t.fonts.size}pt;
|
|
min-height: 0;
|
|
}
|
|
|
|
window#waybar {
|
|
background: alpha(@base, 0.85);
|
|
color: @text;
|
|
border: ${toString t.ui.borderSize}px solid alpha(@accent, 0.4);
|
|
border-radius: ${toString t.ui.rounding}px;
|
|
}
|
|
|
|
#workspaces button {
|
|
padding: 0 8px;
|
|
color: @muted;
|
|
border-radius: ${toString t.ui.rounding}px;
|
|
}
|
|
|
|
#workspaces button.active {
|
|
color: @base;
|
|
background: @accent;
|
|
}
|
|
|
|
#workspaces button.urgent {
|
|
color: @base;
|
|
background: @bad;
|
|
}
|
|
|
|
#window {
|
|
color: @subtext;
|
|
padding: 0 12px;
|
|
}
|
|
|
|
#clock {
|
|
color: @text;
|
|
font-weight: bold;
|
|
}
|
|
|
|
#tray, #pulseaudio, #network, #cpu, #memory, #custom-powerprofile, #battery {
|
|
color: @subtext;
|
|
padding: 0 10px;
|
|
}
|
|
|
|
#pulseaudio.muted { color: @muted; }
|
|
#battery.warning { color: @warn; }
|
|
#battery.critical { color: @bad; }
|
|
#battery.charging { color: @good; }
|
|
'';
|
|
in
|
|
{
|
|
programs.waybar = lib.mkIf config.nomarchy.waybar.enable {
|
|
enable = true;
|
|
systemd.enable = true; # started/stopped with graphical-session.target
|
|
|
|
# mkDefault so downstream can replace the whole bar config/style with
|
|
# a plain home.nix assignment. For per-theme identity, prefer the
|
|
# whole-swap assets (themes/<slug>/waybar.{jsonc,css}); for one-off
|
|
# tweaks of the generated bar, lib.mkForce a sub-key. See
|
|
# docs/OVERRIDES.md.
|
|
settings.mainBar = lib.mkDefault (
|
|
if hasConfigOverride
|
|
then builtins.fromJSON (builtins.readFile configOverride)
|
|
else generatedSettings
|
|
);
|
|
|
|
style = lib.mkDefault (
|
|
if hasStyleOverride
|
|
then builtins.readFile styleOverride
|
|
else generatedStyle
|
|
);
|
|
};
|
|
}
|