diff --git a/waybar/bars/main.jsonc b/waybar/bars/main.jsonc
index e608a1a..bd36332 100644
--- a/waybar/bars/main.jsonc
+++ b/waybar/bars/main.jsonc
@@ -7,7 +7,7 @@
     "~/.config/waybar/modules/pulseaudio.jsonc",
     "~/.config/waybar/modules/cpu.jsonc",
     "~/.config/waybar/modules/memory.jsonc",
-    "~/.config/waybar/modules/temperature.cpu.jsonc",
+    "~/.config/waybar/modules/temperature-cpu.jsonc",
     "~/.config/waybar/modules/battery.jsonc",
     "~/.config/waybar/modules/network.jsonc",
     "~/.config/waybar/modules/wireguard.jsonc",
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index eb8cd64..d59df89 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -3,7 +3,10 @@
     "include": "~/.config/waybar/bars/main.jsonc",
     "height": 50,
     "layer": "top",
-    "output": "eDP-1",
+    // Primary output of each machine profile (see hypr/configs/profiles):
+    // eDP-1 on the laptop, DP-1 on the PC. Waybar skips names that are
+    // not connected, so one list works on both.
+    "output": ["eDP-1", "DP-1"],
     "mode": "dock",
     "exclusive": true,
     "passtrough": false,
diff --git a/waybar/scripts/get_wg_status.sh b/waybar/scripts/get_wg_status.sh
index 5de62f7..1ab264b 100755
--- a/waybar/scripts/get_wg_status.sh
+++ b/waybar/scripts/get_wg_status.sh
@@ -44,7 +44,9 @@ function format {
 }
 
 # Read wg show output and format
-wg_show_output=$(sudo wg show)
+# -n so a missing NOPASSWD sudoers rule fails instantly instead of blocking
+# the module on a password prompt it has no terminal to ask on.
+wg_show_output=$(sudo -n wg show 2>/dev/null)
 
 if [[ -z $wg_show_output ]]; then
    echo "{ \"text\": \"---\", \"tooltip\": \"disconnected\", \"class\": \"\", \"percentage\": 0 }"