diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 8a2e5b2..f6892c0 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -40,8 +40,8 @@ fi ### Atlantis general if [[ ( "$HOST" == "atlantispc" ) || ( "$HOST" == "atlantislaptop" ) ]]; then xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh & - hc keybind $Mod-c spawn /bin/bash -c "sudo stopvpn.sh; sudo /usr/bin/openvpn_cip.sh & ~/.config/herbstluftwm/hl_status_deamon.py --refresh" - hc keybind $Mod-Shift-c spawn /bin/bash -c "sudo stopvpn.sh && ~/.config/herbstluftwm/hl_status_deamon.py --refresh" + hc keybind $Mod-c spawn /bin/bash -c "sudo stopvpn.sh; sudo /usr/bin/openvpn_cip.sh & sleep 2 && pkill --signal USR1 hl_status" + hc keybind $Mod-Shift-c spawn /bin/bash -c "sudo stopvpn.sh && sleep 2 && pkill --signal USR1 hl_status" fi diff --git a/herbstluftwm/hl_status_deamon.py b/herbstluftwm/hl_status_deamon.py index 74cffde..dfb8530 100755 --- a/herbstluftwm/hl_status_deamon.py +++ b/herbstluftwm/hl_status_deamon.py @@ -50,7 +50,9 @@ def cip_logins(ignore=""): elif len(l) <= 1: ret = "" else: - color = hl_utils.get_color(len(l),MAX_LOGINS,0) + #color = hl_utils.get_color(len(l),0,MAX_LOGINS+3) + #color = color[0:2]+color[4:6]+color[2:4]+color[6:8] + ret='' l=sorted(l) for line in l: @@ -58,7 +60,7 @@ def cip_logins(ignore=""): continue ret = ret + line + ", " ret = ret[:-len(", ")] - ret = hl_utils.color_panel("Logins: "+ret,color) + ret = hl_utils.color_panel("Logins: "+ret,GREEN) with open(hl_utils.hlpath(LOGINS_LOG),'w') as f: f.write(ret) diff --git a/zshrc b/zshrc index 3fbb3f7..8a9ae0c 100644 --- a/zshrc +++ b/zshrc @@ -303,9 +303,10 @@ genocide(){ TMP=$(wget -q -O- --user cip --password $(cat $HOME/.config/herbstluftwm/password.cip) "https://atlantishq.de/cipactive/active_logins") echo $TMP | while read line; do if [[ $line != $HOST ]]; then - ssh -n -q $line -t "pkill -u ik15ydit" + ssh -n -q ${line}.cs.fau.de -t "pkill --signal USR2 hl_status && pkill -u ik15ydit" fi done } export genocide + alias insurgency_status="ssh insurgency@atlantishq.de -t /usr/local/bin/insurgency_rcon status"