diff --git a/hosts/nb/modules/charge-control.nix b/hosts/nb/modules/charge-control.nix
index 8499035..0fd60fe 100644
--- a/hosts/nb/modules/charge-control.nix
+++ b/hosts/nb/modules/charge-control.nix
@@ -1,15 +1,13 @@
 { 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 --interface=lpc fwchargelimit "$1"
+    ${pkgs.fw-ectool}/bin/ectool 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" ''
@@ -18,7 +16,6 @@ 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" ''
@@ -85,7 +82,7 @@ in
     serviceConfig = {
       Type = "oneshot";
       ExecStart = "${pkgs.writeShellScript "fw-charge-limit-init" ''
-        ${pkgs.fw-ectool}/bin/ectool --interface=lpc fwchargelimit 80
+        ${pkgs.fw-ectool}/bin/ectool fwchargelimit 80
         echo 80 > /run/fw-charge-limit
         chmod 644 /run/fw-charge-limit
       ''}";
diff --git a/hosts/nb/modules/desktop/default.nix b/hosts/nb/modules/desktop/default.nix
index 13857fe..5ac08db 100644
--- a/hosts/nb/modules/desktop/default.nix
+++ b/hosts/nb/modules/desktop/default.nix
@@ -55,16 +55,7 @@ in
     libreoffice
     libsForQt5.qtgraphicaleffects
     mako
-    (pkgs.symlinkJoin {
-      name = "moonlight-qt-wrapped";
-      paths = [ pkgs.moonlight-qt ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        wrapProgram $out/bin/moonlight \
-          --set SDL_VIDEODRIVER x11 \
-          --set QT_QPA_PLATFORM xcb
-      '';
-    })
+    moonlight-qt
     nautilus
     netflix
     networkmanagerapplet
diff --git a/hosts/nb/modules/sway/waybar.conf b/hosts/nb/modules/sway/waybar.conf
index 4cbe653..eff3d4e 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-right": "foot -a launcher -e charge-limit-menu"
+    "on-click": "foot -a launcher -e charge-limit-menu"
   },
   "disk": {
     "interval": 5,