2 files changed, 15 insertions, 14 deletions
diff --git a/config/polybar/colorblocks/config.ini b/config/polybar/colorblocks/config.ini
index 15ef2c4..9257eba 100644
--- a/config/polybar/colorblocks/config.ini
+++ b/config/polybar/colorblocks/config.ini
@@ -140,7 +140,7 @@ font-1 = "Iosevka Nerd Font:pixelsize=13;4"
 
 modules-left = workspaces 
 modules-center = 
-modules-right = cpu memory alsa network date
+modules-right = cpu memory alsa eth date
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -356,7 +356,7 @@ font-1 = "Iosevka Nerd Font:pixelsize=13;4"
 
 modules-left = workspaces 
 modules-center = 
-modules-right = cpu memory alsa network date
+modules-right = cpu memory alsa date
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
diff --git a/config/polybar/colorblocks/modules.ini b/config/polybar/colorblocks/modules.ini
index f05347b..d1c9ade 100644
--- a/config/polybar/colorblocks/modules.ini
+++ b/config/polybar/colorblocks/modules.ini
@@ -789,18 +789,21 @@ toggle-off-foreground = ${color.background}
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
+[network-base]
 type = internal/network
-interface = eth0
+interval = 5
+format-connected = <label-connected>
+format-disconnected = <label-disconnected>
+label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
 
-[module/wireless-network]
-type = internal/network
-interface = enp7s0 
+[module/wlan]
+inherit = network-base
+interface-type = wireless
+label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
 
-; Normal Module
-[module/network]
-type = internal/network
-interface = wlan0
+[module/eth]
+inherit = network-base
+interface-type = wired
 
 ; Seconds to sleep between updates
 ; Default: 1
@@ -831,7 +834,6 @@ unknown-as-up = true
 ;   <label-connected> (default)
 ;   <ramp-signal>
 format-connected = <label-connected>
-format-connected-prefix = 直
 format-connected-prefix-font = 2
 format-connected-background = ${color.shade4}
 format-connected-padding = 2
@@ -839,7 +841,6 @@ format-connected-padding = 2
 ; Available tags:
 ;   <label-disconnected> (default)
 format-disconnected = <label-disconnected>
-format-disconnected-prefix = 睊
 format-disconnected-prefix-font = 2
 format-disconnected-background = ${color.shade4}
 format-disconnected-padding = 2
@@ -860,7 +861,7 @@ format-disconnected-padding = 2
 ;   %downspeed% [wireless+wired]
 ;   %linkspeed% [wired]
 ; Default: %ifname% %local_ip%
-label-connected = "%{A1:networkmanager_dmenu &:} %essid%%{A}"
+label-connected = "%downspeed% - %upspeed% | %local_ip%"
 
 ; Available tokens:
 ;   %ifname%    [wireless+wired]