up

5 files changed, 71 insertions, 52 deletions

diff --git a/.config/conkyrc b/.config/conkyrc
index 4b95633..10498cf 100644
--- a/.config/conkyrc
+++ b/.config/conkyrc
@@ -53,11 +53,10 @@ ${color grey}OS:       ${font1}${color white}${sysname}${font}
 ${color grey}Kernel:   ${font1}${color white}${kernel}${font}
 ${color grey}Uptime:   ${font1}${color white}${uptime}${font}
 ${hr}${if_mpd_playing}
-${color grey}${alignc}MPD
 ${font1}${color white}${goto 140}${mpd_artist}
 ${goto 140}${scroll wait 25 3 1 ${mpd_title}}
 ${goto 140}${mpd_elapsed}/${mpd_length} ${mpd_bar}
-${execi 5 ~/.local/bin/conky_cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 20,150 -n}
+${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 20,150 -n}
 ${hr}${endif}${if_up enx4ce1734c425a}
 ${font2}${color white}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}
 ${hr}${endif}
@@ -83,19 +82,6 @@ ${font1}${color white}${top_mem name 3} ${alignr}${top_mem pid 3}  ${top_mem cpu
 ${font1}${color  grey}${top_mem name 4} ${alignr}${top_mem pid 4}  ${top_mem cpu 4}  ${top_mem mem_res 4}${font}
 ${color grey}---------
 ${color grey}Processes: ${color white}${processes}
-${hr}${if_up enx4ce1734c425a}
-${color grey}LAN IP:    ${font1}${color white}${addr enx4ce1734c425a}${font}
-${color grey}---------
-${color grey}VPN IP:    ${font1}${color white}${addr proton0}${font}
-${color grey}---------
-${color grey}Public IP: ${color white}${font1}${execi 300 curl -s https://ifconfig.me || echo No Address}${font}${color grey}
 ${hr}
-${color grey}Down: ${color white}${font1}${downspeed enx4ce1734c425a} ${font}${color grey}- Up: ${color white}${font1}${upspeed enx4ce1734c425a}${font}
-${color grey}Down: ${color white}${downspeedgraph enx4ce1734c425a bfbfbf c0c0c0  125829120}
-${color grey}Up:   ${color white}${upspeedgraph   enx4ce1734c425a bfbfbf c0c0c0  125829120}
-${hr}
-${color grey}${alignc}DNS
-${font1}${color white}${nameserver 0}${font}
-${font1}${color white}${nameserver 1}${font}
-${hr}${endif}
+${execp ~/.local/bin/conky/net.sh}
 ]]
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index acb0dfc..065acfa 100755
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -17,55 +17,53 @@
 #xfce-mcs-manager &
 
 # select OS
-# 1: Artix
-# 2: Pop OS
-# 3: FreeBSD
 
 os="$(uname)"
 
-if [ "$os" = "Linux" ]; then
-	grep "Artix" /etc/issue >/dev/null 2>&1 && os=1 || os=2
-elif [ "$os" = "FreeBSD" ]; then
-	os=3
-else
-	echo "unknown OS"
-	exit 1
-fi
+case $os in
+	"Linux") grep "Artix" /etc/issue >/dev/null 2>&1 && os=1 || os=2 ;;
+	"FreeBSD") os=3 ;;
+esac
+case $os in
+	1)
+		icon=" "
+		mpd="mpd"
+		xscr="xscreensaver --no-splash"
+		;;
+	2)
+		icon=" "
+		mpd="mpd"
+		xscr="xscreensaver"
+		;;
+	3)
+		icon=" "
+		mpd="musicpd"
+		xscr="xscreensaver --no-splash"
+		;;
+esac
 
 startif() {
 	pgrep "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 &
 }
 
-delay_desktop() {
-	sleep 5
-	startif conky -d -c "$HOME"/.config/conkyrc
-	startif tint2
-	startif plank
-}
-
 export LANG='en_US.UTF-8'
-case $os in
-	1) icon=" " ;;
-	2) icon=" " ;;
-	3) icon=" " ;;
-esac
-
 startif dunst
 startif picom
 startif mpd-notification
-# startif xscreensaver
+pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1
+startif $xscr
 "$HOME"/.local/bin/setwp "$HOME"/pics/wp.jpg
 "$HOME"/.local/bin/kb
 xset s off
 xset -dpms
-if xrandr | grep -F 'DisplayPort-0 connected' >/dev/null 2>&1; then
-	"$HOME"/.local/bin/scr
-else
-	"$HOME"/.local/bin/dscr
-fi
-delay_desktop &
+# if xrandr | grep -F 'DisplayPort-0 connected' >/dev/null 2>&1; then
+# 	"$HOME"/.local/bin/scr
+# else
+# 	"$HOME"/.local/bin/dscr
+# fi
+startif conky -d -c "$HOME"/.config/conkyrc
+startif tint2
+startif plank
 cd "$HOME"
 xrdb "$HOME"/.config/x11/xresources
-
-notify-send -u normal 'Welcome' "  Welcome back, partner\!"
-# dbus-launch openbox
+notify-send -u normal 'Welcome' "$icon Welcome back, partner!"
diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index fbfa04f..b54bca3 100755
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -295,12 +295,12 @@
     </keybind>
     <keybind key="W-C-h">
       <action name="MoveResizeTo">
-        <monitor>next</monitor>
+        <monitor>prev</monitor>
       </action>
     </keybind>
     <keybind key="W-C-l">
       <action name="MoveResizeTo">
-        <monitor>prev</monitor>
+        <monitor>next</monitor>
       </action>
     </keybind>
     <!-- <keybind key="W-d"> -->
diff --git a/.local/bin/conky_cover.sh b/.local/bin/conky/cover.sh
index ffdd403..ffdd403 100755
--- a/.local/bin/conky_cover.sh
+++ b/.local/bin/conky/cover.sh
diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh
new file mode 100755
index 0000000..4316e1a
--- /dev/null
+++ b/.local/bin/conky/net.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+os="$(uname)"
+
+if [ "$os" = "Linux" ]; then
+	grep "Artix" /etc/issue >/dev/null 2>&1 && os=1 || os=2
+elif [ "$os" = "FreeBSD" ]; then
+	os=3
+else
+	echo "unknown OS"
+	exit 1
+fi
+
+case $os in
+	1) icon=" " ;;
+	2) icon=" " ;;
+	3) icon=" " ;;
+esac
+
+echo '${color grey}Net'
+# ${hr}${if_up enx4ce1734c425a}
+# ${color grey}LAN IP:    ${font1}${color white}${addr enx4ce1734c425a}${font}
+# ${color grey}---------
+# ${color grey}VPN IP:    ${font1}${color white}${addr proton0}${font}
+# ${color grey}---------
+# ${color grey}Public IP: ${color white}${font1}${execi 300 curl -s https://ifconfig.me || echo No Address}${font}${color grey}
+# ${hr}
+# ${color grey}Down: ${color white}${font1}${downspeed enx4ce1734c425a} ${font}${color grey}- Up: ${color white}${font1}${upspeed enx4ce1734c425a}${font}
+# ${color grey}Down: ${color white}${downspeedgraph enx4ce1734c425a bfbfbf c0c0c0  125829120}
+# ${color grey}Up:   ${color white}${upspeedgraph   enx4ce1734c425a bfbfbf c0c0c0  125829120}
+# ${hr}
+# ${color grey}DNS:
+# ${font1}${color white}${nameserver 0}${font}
+# ${font1}${color white}${nameserver 1}${font}
+# ${hr}${endif}