From 1728a04d6017580eb4beed79db145d8bcae6f515 Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Wed, 1 Apr 2026 16:09:33 +0800
Subject: move .setup to .mycfg

---
 des/i3/config                       | 27 +++++++++++++++------------
 des/i3/i3blocks/config              | 17 ++++++-----------
 des/i3/i3blocks/scripts/archupdates | 11 +----------
 des/i3/i3lock-color-custom.sh       |  2 +-
 4 files changed, 23 insertions(+), 34 deletions(-)
 mode change 100755 => 120000 des/i3/i3blocks/scripts/archupdates

(limited to 'des')

diff --git a/des/i3/config b/des/i3/config
index 961e1e2..56d9bab 100644
--- a/des/i3/config
+++ b/des/i3/config
@@ -27,21 +27,24 @@ exec --no-startup-id dunst
 bindsym $mod+F12 exec --no-startup-id /usr/bin/dunstctl close
 bindsym $mod+Shift+F12 exec --no-startup-id /usr/bin/dunstctl history-pop
 
-# Order monitors
-exec --no-startup-id xrandr --output DVI-D-0 --auto --output HDMI-0 --auto --left-of DVI-D-0
+# Detect Monitors
+exec --no-startup-id autorandr --change
 
 # Background
-exec --no-startup-id feh --bg-fill ~/.setup/des/i3/assets/wallpaper/yosemite_color_block.png
+exec --no-startup-id feh --bg-fill ~/.mycfg/des/i3/assets/wallpaper/yosemite_color_block.png
 
 # Change background randomly
-bindsym $mod+F8 exec --no-startup-id feh --bg-fill --randomize ~/.setup/des/i3/assets/wallpaper
+bindsym $mod+F8 exec --no-startup-id feh --bg-fill --randomize ~/.mycfg/des/i3/assets/wallpaper
+
+# Toggle VPN or Proxy
+bindsym $mod+F4 exec --no-startup-id ~/.mycfg/scripts/toggle-xray.sh
 
 # Compositor
 exec --no-startup-id compton --config ~/.config/compton.conf -b
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
-exec --no-startup-id xss-lock --transfer-sleep-lock "~/.setup/des/i3/i3lock-color-custom.sh"
+exec --no-startup-id xss-lock --transfer-sleep-lock "~/.mycfg/des/i3/i3lock-color-custom.sh"
 
 ## Allow yad to float for i3bar calendar
 for_window [class="Yad"] floating enable
@@ -63,10 +66,10 @@ bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 1%- && pkil
 # Take a screenshot
 bindsym --release $mod+F3 exec --no-startup-id "/usr/bin/import ~/workspace/scratch/screenshots/latest.png && cp ~/workspace/scratch/screenshots/latest.png ~/workspace/scratch/screenshots/$(date +%F_%T.%N).png"
 
-# Use change_fan (int .setup dir) to adjust fan speeds
+# Use change_fan (int .mycfg dir) to adjust fan speeds
 # TBD
 
-# Use format_displays (in .setup dir) to configure external displays
+# Use format_displays (in .mycfg dir) to configure external displays
 bindsym XF86LaunchA exec --no-startup-id format_displays
 
 # Use Mouse+$mod to drag floating windows to their wanted position
@@ -84,11 +87,11 @@ bindsym $mod+q kill
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
 # bindsym $mod+space exec --no-startup-id i3-dmenu-desktop
-bindsym $mod+space exec --no-startup-id rofi -show drun -theme ~/.setup/theme.rasi
-bindsym $mod+Tab exec --no-startup-id rofi -show window -theme ~/.setup/theme.rasi
+bindsym $mod+space exec --no-startup-id rofi -show drun -theme ~/.mycfg/theme.rasi
+bindsym $mod+Tab exec --no-startup-id rofi -show window -theme ~/.mycfg/theme.rasi
 
 # Lock screen
-bindsym $mod+F9 exec --no-startup-id "~/.setup/des/i3/i3lock-color-custom.sh"
+bindsym $mod+F9 exec --no-startup-id "~/.mycfg/des/i3/i3lock-color-custom.sh"
 
 # change focus
 bindsym $mod+h focus left
@@ -154,8 +157,8 @@ set $ws9 "9"
 set $ws10 "10"
 
 ## AD2 Specific
-workspace $ws1 output HDMI-0
-workspace $ws2 output DVI-D-0
+workspace $ws1 output eDP-1
+workspace $ws2 output DP-3
 
 # # switch to monitor
 # bindsym $mod+Mod1+1 focus output eDP-1
diff --git a/des/i3/i3blocks/config b/des/i3/i3blocks/config
index 8858ae9..ec921cc 100644
--- a/des/i3/i3blocks/config
+++ b/des/i3/i3blocks/config
@@ -3,15 +3,6 @@ separator=false
 separator_block_width=15
 markup=pango
 
-[test]
-command=date +%s
-interval=once
-signal=11
-
-[xray]
-interval=once
-signal=11
-
 [battery]
 interval=1
 color=#a8afb0
@@ -39,8 +30,12 @@ color=#cb4b16
 
 [archupdates]
 interval=60
-color=#49E20E
+color=#49e20e
 
 [calendar]
 interval=60
-color=#ffffff
\ No newline at end of file
+color=#ffffff
+
+[xray]
+interval=once
+signal=11
diff --git a/des/i3/i3blocks/scripts/archupdates b/des/i3/i3blocks/scripts/archupdates
deleted file mode 100755
index b74f872..0000000
--- a/des/i3/i3blocks/scripts/archupdates
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-
-PAC_UPDATES=$(checkupdates | wc -l)
-AUR_UPDATES=$(auracle sync -q | wc -l)
-
-if [[ $PAC_UPDATES -gt 0 || $AUR_UPDATES -gt 0 ]]; then
-   echo " [$PAC_UPDATES .. $AUR_UPDATES]"
-else
-   echo "<span color=\"#586e75\"> 0</span>"
-fi
diff --git a/des/i3/i3blocks/scripts/archupdates b/des/i3/i3blocks/scripts/archupdates
new file mode 120000
index 0000000..aba6472
--- /dev/null
+++ b/des/i3/i3blocks/scripts/archupdates
@@ -0,0 +1 @@
+archupdates
\ No newline at end of file
diff --git a/des/i3/i3lock-color-custom.sh b/des/i3/i3lock-color-custom.sh
index a0e1e95..7c0649c 100755
--- a/des/i3/i3lock-color-custom.sh
+++ b/des/i3/i3lock-color-custom.sh
@@ -28,7 +28,7 @@ i3lock \
 --bshl-color=$W        \
 \
 --screen 1            \
--i "$HOME/.setup/des/i3/assets/lockscreen/dark_forest.png" \
+-i "$HOME/.mycfg/des/i3/assets/lockscreen/dark_forest.png" \
 --clock               \
 --indicator           \
 --time-str="%H:%M:%S"  \
-- 
cgit v1.2.3