configured new systray module and monitor's bar

4 files changed, 50 insertions, 49 deletions

diff --git a/.config/polybar/bars.ini b/.config/polybar/bars.ini
index d2e4cfa..e945e9a 100644
--- a/.config/polybar/bars.ini
+++ b/.config/polybar/bars.ini
@@ -1,15 +1,11 @@
 [bar/mybar2]
-tray-position = right
-tray-padding = 2
-tray-background = ${colors.systray-bg}
-
 monitor = ${env:MONITOR:HDMI-0}
 enable-ipc = true
 width = 1906
-height = 22
+height = 28
 offset-x = 7
 offset-y = 6
-radius = 2
+radius = 4
 fixed-center = true
 bottom = 0
 
@@ -24,23 +20,21 @@ padding-right = 0
 module-margin-left = 0
 module-margin-right = 0
 
-font-0 = "Roboto:style=Regular:size=12;2"
-font-1 = "Source Han Sans JP:style=Regular:size=11;2"
-
-modules-left = arrow0 date arrow1 uptime wlan eth storage-root storage-home cpu temperature memory mpd
-modules-center = xwindow
-modules-right = battery pulseaudio ewmh
-
 override-redirect = false
 
 cursor-click = pointer
 cursor-scroll = ns-resize
 
-[bar/mybar]
-tray-position = right
-tray-padding = 2
-tray-background = ${colors.systray-bg}
+font-0 = "Roboto:style=Regular:size=12;2"
+font-1 = "Source Han Sans JP:style=Regular:size=11;2"
+font-2 = "Hack Nerd Font:style=Regular:size=11;3"
+font-3 = "Hack Nerd Font:style=Regular:size=20;5"
+font-4 = "Source Han Sans JP:style=Heavy:size=11;2" # font-1 but bold, make sure to edit accordingly
 
+modules-left = powerline0 date powerline1 wlan eth powerline2 storage-root powerline1 storage-home powerline2 cpu powerline1 temperature powerline2 memory powerline4 xwindow
+modules-right = ewmh pulseaudio battery systray
+
+[bar/mybar]
 monitor = ${env:MONITOR:eDP-1}
 monitor-fallback = ${env:MONITOR:eDP-1-1}
 enable-ipc = true
@@ -63,6 +57,11 @@ padding-right = 0
 module-margin-left = 0
 module-margin-right = 0
 
+override-redirect = true
+
+cursor-click = pointer
+cursor-scroll = ns-resize
+
 font-0 = "Roboto:style=Regular:size=12;2"
 font-1 = "Source Han Sans JP:style=Regular:size=11;2"
 font-2 = "Hack Nerd Font:style=Regular:size=11;3"
@@ -70,9 +69,4 @@ font-3 = "Hack Nerd Font:style=Regular:size=20;5"
 font-4 = "Source Han Sans JP:style=Heavy:size=11;2" # font-1 but bold, make sure to edit accordingly
 
 modules-left = powerline0 date powerline1 wlan eth powerline2 storage-root powerline1 storage-home powerline2 cpu powerline1 temperature powerline2 memory powerline1 backlight powerline3 xwindow
-modules-right = ewmh pulseaudio battery
-
-override-redirect = true
-
-cursor-click = pointer
-cursor-scroll = ns-resize
+modules-right = ewmh pulseaudio battery systray
diff --git a/.config/polybar/colors.ini b/.config/polybar/colors.ini
index f5410b3..7a27d76 100644
--- a/.config/polybar/colors.ini
+++ b/.config/polybar/colors.ini
@@ -5,11 +5,13 @@ mantle = #181825
 peach = #fab387
 
 background = #E611111b
+background-solid = #11111b
 foreground = ${colors.mauve}
 foreground-alt = #11111b
 foreground-dull = #6c7086
 
-systray-bg = ${colors.background}
+systray-bg = ${colors.background-solid}
+systray-fg = ${colors.foreground}
 
 module-color-0 = ${colors.mantle}
 module-color-1 = ${colors.mauve}
@@ -32,9 +34,6 @@ ws-urgent-bg = ${colors.red}
 time-fg = ${colors.foreground-alt}
 time-bg = ${colors.module-color-1}
 
-uptime-fg = ${colors.module-color-1}
-uptime-bg = ${colors.module-bg}
-
 ethernet-fg = ${colors.foreground}
 ethernet-bg = ${colors.module-color-0}
 
@@ -70,7 +69,7 @@ batt-charging-fg = ${colors.foreground-alt}
 batt-discharging-bg = ${colors.peach}
 batt-discharging-fg = ${colors.foreground-alt}
 
-batt-full-bg = ${colors.module-bg}
+batt-full-bg = ${colors.background}
 batt-full-fg = ${colors.module-color-0}
 
 backlight-bg = ${colors.module-color-0}
diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini
index be2c735..ede850e 100644
--- a/.config/polybar/modules.ini
+++ b/.config/polybar/modules.ini
@@ -181,7 +181,7 @@ label-urgent-padding = 3
 [module/backlight]
 type = internal/backlight
 
-card = amdgpu_bl2
+#card = amdgpu_bl2
 use-actual-brightness = true
 poll-interval = 0
 
@@ -201,3 +201,11 @@ format-background = ${colors.backlight-bg}
 ; Default: false
 enable-scroll = true
 scroll-interval = 1
+
+[module/systray]
+type = "internal/tray"
+
+tray-background = ${colors.systray-bg}
+tray-foreground = ${colors.systray-fg}
+
+tray-spacing = 8px
diff --git a/.config/polybar/powerline.ini b/.config/polybar/powerline.ini
index 85ace58..eff57da 100644
--- a/.config/polybar/powerline.ini
+++ b/.config/polybar/powerline.ini
@@ -1,34 +1,34 @@
 [module/powerline0]
 type = custom/text
-content = ""
-content-font = 4
-content-foreground = ${colors.module-color-1}
-content-background = ${colors.background}
+format = ""
+format-font = 4
+format-foreground = ${colors.module-color-1}
+format-background = ${colors.background}
 
 [module/powerline1]
 type = custom/text
-content = ""
-content-font = 4
-content-foreground = ${colors.module-color-1}
-content-background = ${colors.module-color-0}
+format = ""
+format-font = 4
+format-foreground = ${colors.module-color-1}
+format-background = ${colors.module-color-0}
 
 [module/powerline2]
 type = custom/text
-content = ""
-content-font = 4
-content-foreground = ${colors.module-color-0}
-content-background = ${colors.module-color-1}
+format = ""
+format-font = 4
+format-foreground = ${colors.module-color-0}
+format-background = ${colors.module-color-1}
 
 [module/powerline3]
 type = custom/text
-content = ""
-content-font = 4
-content-foreground = ${colors.module-color-0}
-content-background = ${colors.background}
+format = ""
+format-font = 4
+format-foreground = ${colors.module-color-0}
+format-background = ${colors.background}
 
 [module/powerline4]
 type = custom/text
-content = ""
-content-font = 4
-content-foreground = ${colors.module-color-1}
-content-background = ${colors.background}
+format = ""
+format-font = 4
+format-foreground = ${colors.module-color-1}
+format-background = ${colors.background}