From 38d4ccdce9c08aedb2d80e23ca048d10f09945ac Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 9 Mar 2023 10:40:34 +0100 Subject: MARS --- .config/openbox/autostart | 7 ++++++- .config/zsh/alias.zsh | 2 +- .local/bin/conky/getif.sh | 2 +- .local/bin/conky/net.sh | 2 +- .local/bin/conky/weather.sh | 6 +++--- .local/bin/idea | 2 +- .local/bin/powercmd | 8 ++++---- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.config/openbox/autostart b/.config/openbox/autostart index f8e05ef..0710086 100755 --- a/.config/openbox/autostart +++ b/.config/openbox/autostart @@ -24,21 +24,26 @@ case $(hostname -s) in mpd="mpd" xscr="xscreensaver --no-splash" sleep="sleep 1" + ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" ;; po-rbo) icon=" " mpd="mpd" xscr="xscreensaver" sleep="sleep 1" + ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" ;; - fbsd-tp) + mars) icon=" " mpd="musicpd" xscr="xscreensaver --no-splash" sleep="gsleep 1" + ping="ping -c1 -t1 9.9.9.9 >/dev/null 2>&1" ;; esac +$ping && git --git-dir="$HOME"/docs/dotfiles-bsd --work-tree="$HOME" pull + startif() { pgrep "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 & } diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 30537ed..35bb513 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -210,7 +210,7 @@ update() { nix-channel --update nix-env -u ;; - fbsd-tp) + mars) doas pkg update && doas pkg upgrade ;; esac diff --git a/.local/bin/conky/getif.sh b/.local/bin/conky/getif.sh index cf7d921..a4aff49 100755 --- a/.local/bin/conky/getif.sh +++ b/.local/bin/conky/getif.sh @@ -11,7 +11,7 @@ case "$(hostname -s)" in if_main="enx4ce1734c425a" if_alt="wlp1s0" ;; - fbsd-tp) + mars) if_main="em0" if_alt="wlan0" exit diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh index 883d906..8def12f 100755 --- a/.local/bin/conky/net.sh +++ b/.local/bin/conky/net.sh @@ -9,7 +9,7 @@ case "$(hostname -s)" in if_main="enx4ce1734c425a" if_alt="wlp1s0" ;; - fbsd-tp) + mars) if_main="em0" if_alt="wlan0" exit diff --git a/.local/bin/conky/weather.sh b/.local/bin/conky/weather.sh index 4188814..b24f589 100755 --- a/.local/bin/conky/weather.sh +++ b/.local/bin/conky/weather.sh @@ -2,10 +2,10 @@ case "$(hostname -s)" in mother | po-rbo) - ping -c1 -w1 1.1.1.1 >/dev/null 2>&1 || exit + ping -c1 -w1 9.9.9.9 >/dev/null 2>&1 || exit ;; - fbsd-tp) - ping -c1 -t1 1.1.1.1 >/dev/null 2>&1 || exit + mars) + ping -c1 -t1 9.9.9.9 >/dev/null 2>&1 || exit ;; esac diff --git a/.local/bin/idea b/.local/bin/idea index c6ffa6d..86335c8 100755 --- a/.local/bin/idea +++ b/.local/bin/idea @@ -18,7 +18,7 @@ html_fmt='\t\t\t\t

'"${date}"'

\ ' case $(hostname -s) in mother|po-rbo) sed="sed -i" ;; - fbsd-tp) sed="sed -i ''" ;; + mars) sed="sed -i ''" ;; esac $sed -e '/$/{n;s#^#'"${html_fmt}"'#;}' \ diff --git a/.local/bin/powercmd b/.local/bin/powercmd index 371f911..6e6c613 100755 --- a/.local/bin/powercmd +++ b/.local/bin/powercmd @@ -6,7 +6,7 @@ host="$(hostname -s)" case $host in mother) icon=" " ;; po-rbo) icon=" " ;; - fbsd-tp) icon=" " ;; + mars) icon=" " ;; esac case $1 in @@ -19,7 +19,7 @@ case $1 in case $host in mother) loginctl suspend ;; po-rbo) systemctl suspend ;; - fbsd-tp) acpiconf -s 3 ;; + mars) acpiconf -s 3 ;; esac ;; "reboot") @@ -29,7 +29,7 @@ case $1 in case $host in mother) loginctl reboot ;; po-rbo) systemctl reboot ;; - fbsd-tp) shutdown -r now ;; + mars) shutdown -r now ;; esac ;; "poweroff") @@ -39,7 +39,7 @@ case $1 in case $host in mother) loginctl poweroff ;; po-rbo) systemctl poweroff ;; - fbsd-tp) shutdown -p now ;; + mars) shutdown -p now ;; esac ;; *) -- cgit v1.2.3