From 405234aebf2c3109df76dbfc7f1e305ee13786ba Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sun, 21 Jun 2020 12:43:17 +0200 Subject: [PATCH] atlaptop --- herbstluftwm/autostart | 18 +++++++++--------- herbstluftwm/hl_status_deamon.py | 4 ++-- htop/htoprc | 4 ++-- xconf/Xresources | 20 -------------------- zshrc | 10 ++++------ 5 files changed, 17 insertions(+), 39 deletions(-) diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 7981c4d..02eef67 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -39,12 +39,12 @@ if [[ "$HOST" == "atlantislaptop" ]]; then fi ### Atlantis general -if [[ ( "$HOST" == "atlantispc" ) || ( "$HOST" == "atlantislaptop" ) ]]; then - xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh & - xautolock -unlocknow # fixes anoying bug that causes lockscreen to start after autologon - 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 +#if [[ ( "$HOST" == "atlantispc" ) || ( "$HOST" == "atlantislaptop" ) ]]; then +# xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh & +# xautolock -unlocknow # fixes anoying bug that causes lockscreen to start after autologon +# 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 ######### GENERAL SETUP ######### @@ -77,8 +77,8 @@ hc keybind $Mod-p spawn pavucontrol hc keybind $Mod-Shift-l spawn libreoffice hc keybind $Mod-t spawn /bin/bash -c "LC_ALL=en_DK.utf8 && export LC_ALL && thunderbird" hc keybind $Mod-Shift-i spawn urxvt -e ssh ik15ydit@ircbox.cs.fau.de -t 'tmux a -d' -hc keybind $Mod-Shift-j spawn urxvt -e ssh sheppy@atlantishq.de -t 'tmux a -d' -hc keybind $Mod-Shift-t spawn urxvt -e ssh telegram-sheppy@atlantishq.de -i ~/.ssh/telegram -t "/home/telegram-sheppy/tg/bin/telegram-cli" +hc keybind $Mod-Shift-j spawn urxvt -e ssh sheppy-irc@athq.de -t 'tmux a -d' +#hc keybind $Mod-Shift-t spawn urxvt -e ssh telegram-sheppy@atlantishq.de -i ~/.ssh/telegram -t "/home/telegram-sheppy/tg/bin/telegram-cli" hc keybind $Mod-e spawn rofi -combi-mode window,run -show combi -modi combi hc keybind $Mod-Shift-e spawn rofi -show run @@ -239,7 +239,7 @@ herbstclient set tree_style '╾│ ├└╼─┐' # do multi monitor setup here, e.g.: # hc set_monitors 1280x1024+0+0 1280x1024+1280+0 # or simply: -# hc detect_monitors +hc detect_monitors # find the panel hlpath="${HOME}/.config/herbstluftwm" diff --git a/herbstluftwm/hl_status_deamon.py b/herbstluftwm/hl_status_deamon.py index f68ca59..b82d2f0 100755 --- a/herbstluftwm/hl_status_deamon.py +++ b/herbstluftwm/hl_status_deamon.py @@ -205,7 +205,7 @@ def vpn_status(): try: if not hl_utils.is_cip(): out_vpn = hl_utils.shexec("ip r g 8.8.8.8").split("\n")[0] - if "dev cip_tun" in out_vpn: + if "dev athq_tun" in out_vpn: out_vpn = hl_utils.color_panel("VPN: In Use",GREEN) else: out_vpn = hl_utils.color_panel("VPN: Link Down",RED) @@ -224,7 +224,7 @@ last_ip="LOL" def ip_status(): global last_ip try: - ip="Public IP: "+ hl_utils.shexec("wget -4 --no-proxy --timeout=3 -O- --quiet https://atlantishq.de:8002/ipcheck") + ip="Public IP: "+ hl_utils.shexec("wget -4 --no-proxy --timeout=3 -O- --quiet ipcheck.atlantishq.de") if last_ip == ip: return else: diff --git a/htop/htoprc b/htop/htoprc index 17f4cb6..9679ba3 100644 --- a/htop/htoprc +++ b/htop/htoprc @@ -1,7 +1,7 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 +sort_key=47 sort_direction=1 hide_threads=0 hide_kernel_threads=1 @@ -12,7 +12,7 @@ show_program_path=1 highlight_base_name=0 highlight_megabytes=1 highlight_threads=1 -tree_view=1 +tree_view=0 header_margin=1 detailed_cpu_time=0 cpu_count_from_zero=0 diff --git a/xconf/Xresources b/xconf/Xresources index 54afe7a..6e28d81 100755 --- a/xconf/Xresources +++ b/xconf/Xresources @@ -13,24 +13,4 @@ URxvt.keysym.C-plus: resize-font:bigger URxvt.keysym.C-equal: resize-font:reset URxvt.keysym.C-question: resize-font:show - - - URxvt.iso14755 :false - -!experimental -!URxvt*externalBorder: 3 -!URxvt*borderLess: false -!URxvt*internalBorder: 5 -!URxvt*borderColor: red - -XLock*mode: image -XLock*image.bitmap: ~/.xlock.xpm -XLock*image.count: 1 -XLock*image.erasedelay: 0 -XLock*erasedelay: 0 -XLock*icongeometry: 180x180 -XLock*background: Black -XLock*foreground: White -XLock*description: off -XLock*info: diff --git a/zshrc b/zshrc index 33eb29f..e039428 100644 --- a/zshrc +++ b/zshrc @@ -191,10 +191,6 @@ if [[ $HOST =~ faui* || $HOST =~ ircbox ]]; then mesg n fi -## Connect to ircbox and attach tmux -alias irc="ssh ircbox.cs.fau.de -t 'command; tmux a'" -alias dirc="ssh sheppy@atlantishq.de -t 'command; tmux a'" - ## lock screen but still let people read it alias transparent_xlock="xlock -mode blank -geometry 1x1" @@ -220,7 +216,6 @@ alias gadd="git add" ## REMOTE HOSTS ## alias -g sq="sheppy@squarez.fauiwg.de" -alias -g pine="sheppy@sheppy.chickenkiller.com" ## PACKAGE MANAGEMENT ## alias psearch="apt-cache search" @@ -324,7 +319,10 @@ alias bc="cd /proj/cipdata/ik15ydit/license-confusion-bc" export PYTHONPATH=/home/cip/2013/ik15ydit/python-local alias -g atip="echo 93.104.211.59" alias atp="~/.config/playercount.py" -alias mongo="LD_PRELOAD=/home/cip/2013/ik15ydit/libyaml-cpp.so.0.5 ~/mongo github" alias players='~/trash/test/test.py' alias cleanhistory="awk '{if (a[$0] < NR || a[$0] == 0){a[$0]=NR}}END{for (i in a){print a[i] " " i}}' file | sort -n | cut 1" alias ths="ssh root@ths.atlantishq.de" + +# insurgency debugging +alias balance="curl localhost:5000/getbalancedteams\?players=Shepppy,OrhunReiz,Bluejalapeno4,RandomItaliano\&names=true" +alias quality="curl localhost:5000/quality\?playerswithteams=Shepppy,OrhunReiz\|Bluejalapeno4,RandomItaliano\&names=true"