From 43cb3eeb5aabd0f0c8185c4c93185ea0dd710cfc Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Thu, 12 Mar 2026 16:50:14 +0100
Subject: [PATCH] fix: nb waybar charge limit

---
 hosts/nb/modules/charge-control.nix | 7 +++++--
 hosts/nb/modules/sway/waybar.conf   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hosts/nb/modules/charge-control.nix b/hosts/nb/modules/charge-control.nix
index 0fd60fe..8499035 100644
--- a/hosts/nb/modules/charge-control.nix
+++ b/hosts/nb/modules/charge-control.nix
@@ -1,13 +1,15 @@
 { pkgs, ... }:
 let
   charge-limit-apply = pkgs.writeShellScriptBin "charge-limit-apply" ''
+    set -e
     if [ "$1" != "80" ] && [ "$1" != "100" ]; then
       echo "Usage: charge-limit-apply <80|100>" >&2
       exit 1
     fi
-    ${pkgs.fw-ectool}/bin/ectool fwchargelimit "$1"
+    ${pkgs.fw-ectool}/bin/ectool --interface=lpc fwchargelimit "$1"
     echo "$1" > /run/fw-charge-limit
     chmod 644 /run/fw-charge-limit
+    echo "Charge limit set to $1%"
   '';
 
   charge-limit-menu = pkgs.writeShellScriptBin "charge-limit-menu" ''
@@ -16,6 +18,7 @@ let
       "80%") /run/wrappers/bin/sudo ${charge-limit-apply}/bin/charge-limit-apply 80 ;;
       "100%") /run/wrappers/bin/sudo ${charge-limit-apply}/bin/charge-limit-apply 100 ;;
     esac
+    sleep 1
   '';
 
   waybar-battery = pkgs.writeShellScriptBin "waybar-battery" ''
@@ -82,7 +85,7 @@ in
     serviceConfig = {
       Type = "oneshot";
       ExecStart = "${pkgs.writeShellScript "fw-charge-limit-init" ''
-        ${pkgs.fw-ectool}/bin/ectool fwchargelimit 80
+        ${pkgs.fw-ectool}/bin/ectool --interface=lpc fwchargelimit 80
         echo 80 > /run/fw-charge-limit
         chmod 644 /run/fw-charge-limit
       ''}";
diff --git a/hosts/nb/modules/sway/waybar.conf b/hosts/nb/modules/sway/waybar.conf
index eff3d4e..4cbe653 100644
--- a/hosts/nb/modules/sway/waybar.conf
+++ b/hosts/nb/modules/sway/waybar.conf
@@ -123,7 +123,7 @@
     "exec": "waybar-battery",
     "return-type": "json",
     "interval": 10,
-    "on-click": "foot -a launcher -e charge-limit-menu"
+    "on-click-right": "foot -a launcher -e charge-limit-menu"
   },
   "disk": {
     "interval": 5,