From 65a8232156262404ca4788e3a63fb7e7c4cf8688 Mon Sep 17 00:00:00 2001
From: Matthew Reschke <mail@mreschke.com>
Date: Mon, 20 Jan 2025 16:27:19 -0700
Subject: [PATCH] Network module use apps.networkeditor

---
 qpanels/panel/gnome.ini         |  4 ++++
 shared/bars.ini                 |  2 +-
 shared/modules.d/network.j2.ini |  4 ++--
 shared/modules.ini              | 26 +++++++++++++-------------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/qpanels/panel/gnome.ini b/qpanels/panel/gnome.ini
index 0328d8f..69a6ec5 100644
--- a/qpanels/panel/gnome.ini
+++ b/qpanels/panel/gnome.ini
@@ -32,6 +32,10 @@ include-file = ~/.config/polybar/shared/bars.ini
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; Bar Settings
+[bar/primary]
+; This is for the primary monitor, the launch.sh script uses this bar for primary monitor only
+; the modules-right includes the tray for primary monitor only!
+inherit = bar/main
 
 [bar/main]
 ; Use either of the following command to list available outputs:
diff --git a/shared/bars.ini b/shared/bars.ini
index 97b5ef8..b151f9c 100644
--- a/shared/bars.ini
+++ b/shared/bars.ini
@@ -187,7 +187,7 @@ type = internal/backlight
 ; $ ls -1 /sys/class/backlight/
 ;card = intel_backlight
 ;card = amdgpu_bl0
-card = intel_backlight
+card = None
 
 ; Available tags:
 ;   <label> (default)
diff --git a/shared/modules.d/network.j2.ini b/shared/modules.d/network.j2.ini
index ad8a033..92d94e5 100644
--- a/shared/modules.d/network.j2.ini
+++ b/shared/modules.d/network.j2.ini
@@ -41,7 +41,7 @@ format-disconnected = <label-disconnected>
 ; Default: %ifname% %local_ip%
 ;label-connected = "%{A1:networkmanager_dmenu &:}%{A}"
 ;label-connected = "%{A1:networkmanager_dmenu &:}直%{A}"
-label-connected = "%{A1:networkmanager_dmenu &:}說%{A}"
+label-connected = "%{A1:{{ apps.networkeditor }} &:}說%{A}"
 label-connected-font = 3
 
 
@@ -49,7 +49,7 @@ label-connected-font = 3
 ;   %ifname%    [wireless+wired]
 ; Default: (none)
 ;label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
-label-disconnected = "%{A1:networkmanager_dmenu &:}睊%{A}"
+label-disconnected = "%{A1:{{ apps.networkeditor }} &:}睊%{A}"
 label-disconnected-foreground = ${color.fg-alt}
 label-disconnected-font = 3
 
diff --git a/shared/modules.ini b/shared/modules.ini
index 9fe45fc..7cc29a7 100644
--- a/shared/modules.ini
+++ b/shared/modules.ini
@@ -27,7 +27,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.blue-gray}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = konsole &
+click-left  = kitty &
 
 [module/web]
 type = custom/text
@@ -51,7 +51,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.cyan}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = dolphin &
+click-left  = pcmanfm-qt &
 
 [module/settings]
 type = custom/text
@@ -59,7 +59,7 @@ type = custom/text
 content = "%{T3}%{T-}"
 content-foreground = ${color.fg-alt}
 content-padding = 2
-click-left  = systemsettings &
+click-left  = lxqt-config &
 
 [module/htop]
 type = custom/text
@@ -67,7 +67,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.orange}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = konsole -e htop &
+click-left  = kitty -e htop &
 
 [module/bashtop]
 type = custom/text
@@ -75,7 +75,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.orange}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = konsole -e bashtop &
+click-left  = kitty -e bashtop &
 
 [module/taskmanager]
 type = custom/text
@@ -83,7 +83,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.green}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = ksysguard &
+click-left  = qps &
 
 [module/editor]
 type = custom/text
@@ -99,7 +99,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.light-blue}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = kate &
+click-left  = mousepad -o window &
 
 [module/calc]
 type = custom/text
@@ -107,7 +107,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.amber}
 content-background = ${color.bg}
 content-padding = 1
-click-left  = kcalc &
+click-left  = galculator &
 
 [module/colorpicker]
 type = custom/text
@@ -117,7 +117,7 @@ content-foreground = ${color.light-green}
 content-background = ${color.bg}
 content-padding = 1
 
-click-left  = kcolorchooser &
+click-left  = xcolor &
 
 
 [module/spotify]
@@ -157,7 +157,7 @@ click-left  = spotify &
 type = internal/battery
 
 ; $ ls -1 /sys/class/power_supply/
-battery = BAT0
+battery = None
 adapter = ACAD
 
 poll-interval = 2
@@ -463,7 +463,7 @@ label = " %mb_used%"
 [module/network]
 type = internal/network
 
-interface = wlp0s20f3
+interface = enp6s18
 interval = 1.0
 
 ;ping-interval = 3
@@ -498,7 +498,7 @@ format-disconnected = <label-disconnected>
 ; Default: %ifname% %local_ip%
 ;label-connected = "%{A1:networkmanager_dmenu &:}%{A}"
 ;label-connected = "%{A1:networkmanager_dmenu &:}直%{A}"
-label-connected = "%{A1:networkmanager_dmenu &:}說%{A}"
+label-connected = "%{A1:nm-connection-editor &:}說%{A}"
 label-connected-font = 3
 
 
@@ -506,7 +506,7 @@ label-connected-font = 3
 ;   %ifname%    [wireless+wired]
 ; Default: (none)
 ;label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
-label-disconnected = "%{A1:networkmanager_dmenu &:}睊%{A}"
+label-disconnected = "%{A1:nm-connection-editor &:}睊%{A}"
 label-disconnected-foreground = ${color.fg-alt}
 label-disconnected-font = 3