From 99dc13136ef08e6848ef8f8faacfc10294a62fea Mon Sep 17 00:00:00 2001
From: nnduc <contact@ducnn.com>
Date: Thu, 25 Jun 2026 16:15:58 +0700
Subject: [PATCH] refine

---
 i3/config                   |  8 ++++----
 i3/scripts/lock             |  2 +-
 i3/scripts/lock-now         |  3 ++-
 i3/scripts/wallpaper-rotate |  4 ++--
 polybar/config.ini          | 15 ++++++++-------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/i3/config b/i3/config
index dad74e7..f73b5dd 100755
--- a/i3/config
+++ b/i3/config
@@ -10,7 +10,7 @@
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
 set $mod Mod1
-set $wallpaper '/sync/images/wallpapers/pexels-lumn.jpg'
+set $wallpaper_dir /sync/images/wallpapers
 set $terminal 'wezterm'
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
@@ -34,9 +34,9 @@ exec --no-startup-id xrandr --output HDMI-0 --mode 1920x1080 --rate 120
 # burn-in prevention: blank after 5min, DPMS off after 10min, skip lock if fullscreen
 exec --no-startup-id xset s 300 300
 exec --no-startup-id xset dpms 300 600 900
-exec --no-startup-id xss-lock -- ~/.config/i3/scripts/lock
+exec --no-startup-id xss-lock -- ~/.config/i3/scripts/lock $wallpaper_dir
 
-bindsym $mod+l exec ~/.config/i3/scripts/lock-now
+bindsym $mod+l exec ~/.config/i3/scripts/lock-now $wallpaper_dir
 bindsym $mod+Shift+o exec systemctl suspend
 bindsym $mod+Shift+p exec systemctl poweroff
 
@@ -50,7 +50,7 @@ exec --no-startup-id fcitx5 -d
 exec --no-startup-id nm-applet
 exec --no-startup-id blueman-applet
 exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=ssh,pkcs11
-exec --no-startup-id ~/.config/i3/scripts/wallpaper-rotate
+exec --no-startup-id ~/.config/i3/scripts/wallpaper-rotate $wallpaper_dir
 #exec --no-startup-id pasystray
 exec --no-startup-id polybar
 
diff --git a/i3/scripts/lock b/i3/scripts/lock
index 611f9a6..3b43364 100755
--- a/i3/scripts/lock
+++ b/i3/scripts/lock
@@ -7,4 +7,4 @@ if [ -n "$active" ] && [ "$active" != "0x0" ]; then
         exit 0
     fi
 fi
-exec ~/.config/i3/scripts/lock-now
+exec ~/.config/i3/scripts/lock-now "$1"
diff --git a/i3/scripts/lock-now b/i3/scripts/lock-now
index e5f04dc..d7b8f91 100755
--- a/i3/scripts/lock-now
+++ b/i3/scripts/lock-now
@@ -1,5 +1,6 @@
 #!/bin/bash
-img=$(find /sync/images/wallpapers/ -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n1)
+wall_dir="${1:?wallpaper directory required}"
+img=$(find "$wall_dir" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n1)
 tmp=/tmp/lockscreen.png
 res=$(xrandr --current | awk '/ connected/ {getline; print $1; exit}')
 : "${res:=1920x1080}"
diff --git a/i3/scripts/wallpaper-rotate b/i3/scripts/wallpaper-rotate
index 6215a67..f77e365 100755
--- a/i3/scripts/wallpaper-rotate
+++ b/i3/scripts/wallpaper-rotate
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Rotate wallpaper every 20 minutes from /sync/images/wallpapers/
+wall_dir="${1:?wallpaper directory required}"
 while true; do
-    img=$(find /sync/images/wallpapers/ -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n1)
+    img=$(find "$wall_dir" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n1)
     [ -n "$img" ] && feh --bg-fill "$img"
     sleep 1200
 done
diff --git a/polybar/config.ini b/polybar/config.ini
index a00f088..5a9258d 100755
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -31,15 +31,13 @@ disabled = #707070
 bottom = false
 width = 100%
 height = 20pt
-radius = 8
+radius = 0
 
 ; dpi = 96
 
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-tray-position = right
-tray-background = ${colors.background-alt}
 line-size = 2pt
 
 border-size = 0
@@ -48,7 +46,7 @@ border-color = #00000000
 padding-left = 1
 padding-right = 1
 
-module-margin = 1
+;module-margin = 1
 
 separator = |
 separator-foreground = ${colors.disabled}
@@ -57,15 +55,13 @@ font-0 = JetBrainsMono Nerd Font:size=14;3
 #font-0 = 0xProto Nerd Font:pixelsize=14;3
 
 modules-left = xworkspaces xwindow 
-modules-right = polytiramisu memory cpu date battery xkeyboard
+modules-right = date polytiramisu memory cpu battery xkeyboard tray
 
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; tray-position = right
-
 ; wm-restack = generic
 ; wm-restack = bspwm
 ; wm-restack = i3
@@ -185,6 +181,11 @@ exec = ~/.config/polybar/scripts/polytiramisu.sh
 format = <label>
 tail = true
 
+[module/tray]
+type = internal/tray
+tray-background = ${colors.background}
+tray-spacing = 4pt
+
 [settings]
 screenchange-reload = true
 pseudo-transparency = true