From 787008fdb7cb1fe560109f896a2528ed8de8f443 Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Wed, 29 Mar 2023 12:32:50 +0000
Subject: [PATCH] polybar: Normalise some module configs

Remove host-specific options from the wifi/ethernet modules, because
polybar is able to work it out for itself.

Signed-off-by: Joe Groocock <me@frebib.net>
---
 polybar/config.ini | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/polybar/config.ini b/polybar/config.ini
index b68dbb1..4e7d97b 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -44,8 +44,7 @@ line-colour = #f00
 
 modules-left = i3
 modules-center =
-# modules-right = volume updates weather xkeyboard wlan gateway eth memory cpu xbacklight battery cputemp gputemp date
-modules-right = volume updates weather wlan eth memory cpu xbacklight battery cputemp gputemp date
+modules-right = volume updates weather wifi ethernet memory cpu cputemp backlight battery date
 
 tray-position = right
 tray-detached = false
@@ -132,8 +131,9 @@ label-urgent-foreground = ${colours.urgent}
 label-urgent-padding = ${self.label-focused-padding}
 
 
-[module/xbacklight]
-type = internal/xbacklight
+[module/backlight]
+type = internal/backlight
+card = intel_backlight
 
 label = %percentage%
 format = <label>
@@ -141,12 +141,6 @@ format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
 
 
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-
 [module/cpu]
 type = internal/cpu
 interval = 2
@@ -164,9 +158,9 @@ format-prefix-foreground = ${colours.icon}
 label = %percentage_used%%
 
 
-[module/wlan]
+[module/wifi]
 type = internal/network
-interface = wlp1s0
+interface-type = wireless
 interval = 3.0
 
 format-connected = <ramp-signal>  <label-connected>
@@ -185,9 +179,9 @@ ramp-signal-2 = 
 ramp-signal-foreground = ${colours.icon}
 
 
-[module/eth]
+[module/ethernet]
 type = internal/network
-interface = lan
+interface-type = wired
 interval = 10.0
 
 label-connected = %local_ip% & %local_ip6%