jochen
f2ab795926
The bar left the battery out because it belongs to whoever knows the hardware, and had no way to take it back in. i3status-rust now renders bar-neutral blocks through its template; the power module contributes the battery where the machine reports one and the power draw where something measures it, sampling the root-only energy counter as root and publishing only a rate. The memory block shows what programs hold, the figure memory-pressure judges by, instead of counting the cache as used.
301 lines
12 KiB
JSON
301 lines
12 KiB
JSON
{
|
|
"module": "power",
|
|
"version": "1",
|
|
"capabilities": [
|
|
"package-manager",
|
|
"service-manager"
|
|
],
|
|
"claims": [
|
|
{
|
|
"name": "node-power",
|
|
"scope": "node"
|
|
}
|
|
],
|
|
"emits": [
|
|
"booted",
|
|
"sleeping",
|
|
"woke",
|
|
"shutting-down",
|
|
"on-mains",
|
|
"on-battery",
|
|
"battery-low"
|
|
],
|
|
"tools": [
|
|
"power_state",
|
|
"power_hooks",
|
|
"power_history",
|
|
"power_run",
|
|
"power_check"
|
|
],
|
|
"resources": [
|
|
{
|
|
"id": "polkit",
|
|
"type": "package",
|
|
"package": "polkit"
|
|
},
|
|
{
|
|
"id": "scripts",
|
|
"type": "archive",
|
|
"path": "/usr/local/lib/mesh-power",
|
|
"artifact": "scripts"
|
|
},
|
|
{
|
|
"id": "config-dir",
|
|
"type": "directory",
|
|
"path": "/etc/mesh-power",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "moments-dir",
|
|
"type": "directory",
|
|
"path": "/etc/mesh-power/moments",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "moment-after-boot",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/after-boot",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment after-boot, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:after-boot:first}${shell:after-boot:normal}${shell:after-boot:last}"
|
|
},
|
|
{
|
|
"id": "moment-before-sleep",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/before-sleep",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment before-sleep, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:before-sleep:first}${shell:before-sleep:normal}${shell:before-sleep:last}"
|
|
},
|
|
{
|
|
"id": "moment-after-wake",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/after-wake",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment after-wake, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:after-wake:first}${shell:after-wake:normal}${shell:after-wake:last}"
|
|
},
|
|
{
|
|
"id": "moment-before-shutdown",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/before-shutdown",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment before-shutdown, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:before-shutdown:first}${shell:before-shutdown:normal}${shell:before-shutdown:last}"
|
|
},
|
|
{
|
|
"id": "moment-on-mains",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/on-mains",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment on-mains, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:on-mains:first}${shell:on-mains:normal}${shell:on-mains:last}"
|
|
},
|
|
{
|
|
"id": "moment-on-battery",
|
|
"type": "file",
|
|
"path": "/etc/mesh-power/moments/on-battery",
|
|
"mode": "0644",
|
|
"content": "# What every module on this machine runs at the moment on-battery, as the mesh placed it (module power,\n# novox/hq ADR 0211). Replaced on every push: code is added by the module it belongs to, as a\n# contribution for this moment. Each module's piece runs on its own, as root, bounded in time.\n${shell:on-battery:first}${shell:on-battery:normal}${shell:on-battery:last}"
|
|
},
|
|
{
|
|
"id": "logind-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/logind.conf.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "logind-power",
|
|
"type": "file",
|
|
"path": "/etc/systemd/logind.conf.d/power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n#\n# The power key and the lid, from this module's settings: the mesh's, then this machine's.\n[Login]\nHandlePowerKey=${setting:handle-power-key}\nHandleLidSwitch=${setting:handle-lid-switch}\nHandleLidSwitchExternalPower=${setting:handle-lid-switch-external-power}\nHandleLidSwitchDocked=${setting:handle-lid-switch-docked}\n"
|
|
},
|
|
{
|
|
"id": "logind",
|
|
"type": "service",
|
|
"unit": "systemd-logind.service",
|
|
"reload-on": [
|
|
"logind-power"
|
|
]
|
|
},
|
|
{
|
|
"id": "after-boot-unit",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/mesh-power-after-boot.service",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nDescription=Every module's code after boot (mesh power)\nWants=network-online.target\nAfter=network-online.target\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/local/lib/mesh-power/bin/power-moment after-boot\n\n[Install]\nWantedBy=multi-user.target\n"
|
|
},
|
|
{
|
|
"id": "before-shutdown-unit",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/mesh-power-before-shutdown.service",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n#\n# Started at boot and left active; stopping it is the shutdown. Ordered after the network, so at\n# shutdown it stops, and runs every module's code, while the network is still up.\n[Unit]\nDescription=Every module's code before shutdown (mesh power)\nWants=network-online.target\nAfter=network-online.target\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/bin/true\nExecStop=/usr/local/lib/mesh-power/bin/power-moment before-shutdown\nTimeoutStopSec=120\n\n[Install]\nWantedBy=multi-user.target\n"
|
|
},
|
|
{
|
|
"id": "before-sleep-unit",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/mesh-power-before-sleep.service",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n#\n# Pulled in by sleep.target through this module's drop-in on it, never enabled: a one-shot waiting\n# for a sleep is not a service whose state the mesh can declare.\n[Unit]\nDescription=Every module's code before sleep (mesh power)\nBefore=sleep.target\n\n[Service]\nType=oneshot\nExecStart=/usr/local/lib/mesh-power/bin/power-moment before-sleep\n"
|
|
},
|
|
{
|
|
"id": "after-wake-unit",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/mesh-power-after-wake.service",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n#\n# Pulled in by the four sleep targets through this module's drop-ins on them, and ordered after\n# them, so it runs once the machine is awake again. Never enabled.\n[Unit]\nDescription=Every module's code after waking (mesh power)\nAfter=suspend.target hibernate.target hybrid-sleep.target suspend-then-hibernate.target\n\n[Service]\nType=oneshot\nExecStart=/usr/local/lib/mesh-power/bin/power-moment after-wake\n"
|
|
},
|
|
{
|
|
"id": "supply-unit",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/mesh-power-supply.service",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n#\n# Started by the module's udev rule when a power supply changes; runs on-mains or on-battery once per\n# change of source.\n[Unit]\nDescription=Every module's code for the power source (mesh power)\n\n[Service]\nType=oneshot\nExecStart=/usr/local/lib/mesh-power/bin/power-moment supply\n"
|
|
},
|
|
{
|
|
"id": "sleep-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/system/sleep.target.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "sleep-wants",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/sleep.target.d/mesh-power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nWants=mesh-power-before-sleep.service\n"
|
|
},
|
|
{
|
|
"id": "suspend-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/system/suspend.target.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "suspend-wants",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/suspend.target.d/mesh-power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nWants=mesh-power-after-wake.service\n"
|
|
},
|
|
{
|
|
"id": "hibernate-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/system/hibernate.target.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "hibernate-wants",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/hibernate.target.d/mesh-power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nWants=mesh-power-after-wake.service\n"
|
|
},
|
|
{
|
|
"id": "hybrid-sleep-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/system/hybrid-sleep.target.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "hybrid-sleep-wants",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/hybrid-sleep.target.d/mesh-power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nWants=mesh-power-after-wake.service\n"
|
|
},
|
|
{
|
|
"id": "suspend-then-hibernate-drop-ins",
|
|
"type": "directory",
|
|
"path": "/etc/systemd/system/suspend-then-hibernate.target.d",
|
|
"mode": "0755"
|
|
},
|
|
{
|
|
"id": "suspend-then-hibernate-wants",
|
|
"type": "file",
|
|
"path": "/etc/systemd/system/suspend-then-hibernate.target.d/mesh-power.conf",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n[Unit]\nWants=mesh-power-after-wake.service\n"
|
|
},
|
|
{
|
|
"id": "udev-rule",
|
|
"type": "file",
|
|
"path": "/etc/udev/rules.d/90-mesh-power.rules",
|
|
"mode": "0644",
|
|
"content": "# Written by the mesh (module power, novox/hq ADR 0211). Replaced on every push.\n# Only the charger's change can switch the machine between mains and battery. A battery reports its\n# level many times a minute, and USB-C supplies come and go; matching them started the supply unit\n# every second or two on the laptop.\nSUBSYSTEM==\"power_supply\", ACTION==\"change\", ATTR{type}==\"Mains\", RUN+=\"/usr/bin/systemctl --no-block start mesh-power-supply.service\"\n"
|
|
},
|
|
{
|
|
"id": "after-boot",
|
|
"type": "service",
|
|
"unit": "mesh-power-after-boot.service",
|
|
"state": "running",
|
|
"boot": "enabled"
|
|
},
|
|
{
|
|
"id": "before-shutdown",
|
|
"type": "service",
|
|
"unit": "mesh-power-before-shutdown.service",
|
|
"state": "running",
|
|
"boot": "enabled"
|
|
},
|
|
{
|
|
"id": "draw",
|
|
"type": "process",
|
|
"name": "mesh-power-draw",
|
|
"artifact": "tools-go",
|
|
"run": [
|
|
"./power",
|
|
"draw"
|
|
],
|
|
"health": {
|
|
"kind": "unit"
|
|
}
|
|
}
|
|
],
|
|
"build": {
|
|
"artifacts": [
|
|
{
|
|
"name": "tools-go",
|
|
"kind": "bundle",
|
|
"language": "go",
|
|
"system": "arch",
|
|
"from": "cmd/power",
|
|
"binary": "power",
|
|
"loads": [
|
|
"power"
|
|
]
|
|
},
|
|
{
|
|
"name": "scripts",
|
|
"kind": "archive",
|
|
"from": "files"
|
|
}
|
|
]
|
|
},
|
|
"contributions": [
|
|
{
|
|
"seat": "node-bar",
|
|
"kind": "block",
|
|
"if-capability": "battery",
|
|
"data": {
|
|
"bar": "bottom",
|
|
"place": "status",
|
|
"order": 40,
|
|
"shows": "battery"
|
|
}
|
|
},
|
|
{
|
|
"seat": "node-bar",
|
|
"kind": "block",
|
|
"if-capability": "power-meter",
|
|
"data": {
|
|
"bar": "bottom",
|
|
"place": "status",
|
|
"order": 45,
|
|
"shows": "command",
|
|
"options": {
|
|
"command": "/usr/local/lib/mesh-power/bin/power-draw",
|
|
"interval": 5
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|