From dd7ae53aea0c820b07bd2373922f5c7282735334 Mon Sep 17 00:00:00 2001
From: Sheppy <yannik.schmidt@fau.de>
Date: Fri, 20 Apr 2018 00:46:33 +0200
Subject: [PATCH] [git fast commit] 20. Apr 2018 - 00:46:33

---
 herbstluftwm/autostart           | 4 ++--
 herbstluftwm/hl_status_deamon.py | 4 ++--
 htop/htoprc                      | 4 ++--
 playercount.py                   | 5 +++++
 vim/rc                           | 1 +
 zshrc                            | 5 ++++-
 6 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100755 playercount.py

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 713a3fb..28bf285 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -35,7 +35,7 @@ if [[ "$HOST" == "atlantislaptop" ]]; then
     hc keybind XF86MonBrightnessUp spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) + 5)"' 
     hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
     #/usr/bin/dunst & 
-    hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh && sudo s2disk"
+    hc keybind $Mod-Shift-o spawn /bin/bash -c "sudo s2ram"
 fi
 
 ### Atlantis general
@@ -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-j spawn /bin/bash -c "rm $HOME/.config/herbstluftwm/irc.log && herbstclient spawn urxvt -e 'exit'"
 hc keybind $Mod-e spawn rofi -combi-mode window,run -show combi -modi combi
 hc keybind $Mod-Shift-e spawn rofi -show run
 
diff --git a/herbstluftwm/hl_status_deamon.py b/herbstluftwm/hl_status_deamon.py
index 0ed653a..b8032fb 100755
--- a/herbstluftwm/hl_status_deamon.py
+++ b/herbstluftwm/hl_status_deamon.py
@@ -39,7 +39,7 @@ def pw():
 
 def cip_logins(ignore=""):
             MAX_LOGINS=5
-            cmd="wget -q -O- --user cip --password "+pw()+" 'https://atlantishq.de/cipactive/active_logins'"
+            cmd="wget -q -O- --user cip --password "+pw()+" 'https://atlantishq.de:/cipactive/active_logins'"
             try:
                 l=hl_utils.shexec(cmd).split("\n")
             except:
@@ -163,7 +163,7 @@ last_ip="LOL"
 def ip_status():
     global last_ip
     try:
-        ip="Public IP: "+ hl_utils.shexec("wget --timeout=3 -O- --quiet https://atlantishq.de/ipcheck")
+        ip="Public IP: "+ hl_utils.shexec("wget --no-proxy --timeout=3 -O- --quiet https://atlantishq.de:8002/ipcheck")
         if last_ip == ip:
                 return
         else:
diff --git a/htop/htoprc b/htop/htoprc
index 72d7adb..469efb2 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=2
 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=0
+tree_view=1
 header_margin=1
 detailed_cpu_time=0
 cpu_count_from_zero=0
diff --git a/playercount.py b/playercount.py
new file mode 100755
index 0000000..c70f2ba
--- /dev/null
+++ b/playercount.py
@@ -0,0 +1,5 @@
+#!/usr/bin/python3
+import valve.source.a2s as a2
+s=a2.ServerQuerier("atlantishq.de",27015)
+print(s.players()["player_count"])
+s.close()
diff --git a/vim/rc b/vim/rc
index 428f4c1..d9692b2 100644
--- a/vim/rc
+++ b/vim/rc
@@ -100,3 +100,4 @@ set clipboard=unnamed
 " python-jedi config
 "let g:jedi#popup_on_dot = 0
 autocmd FileType python setlocal completeopt-=preview
+autocmd BufNewFile,BufRead *.sm   set syntax=cpp
diff --git a/zshrc b/zshrc
index a6ea5f5..abffac2 100644
--- a/zshrc
+++ b/zshrc
@@ -193,6 +193,7 @@ 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"
@@ -294,7 +295,7 @@ export whateverprovides
 ssh_func(){
     printf '\033]708;red\007';
     /usr/bin/ssh $@;
-    printf '\033]708;black\007'
+    printf '\033]708;black\007';
 }
 alias ssh="ssh_func"
 
@@ -319,3 +320,5 @@ alias insurgency_status="ssh insurgency@atlantishq.de -t /usr/local/bin/insurgen
 alias python=python3
 alias dirc="ssh sheppy@atlantishq.de -t 'command;tmux a -d'"
 alias gfc='git commit . -m "[git fast commit] $(date +"%d. %h %Y - %H:%M:%S")" && git push'
+alias -g atip="echo 93.104.211.59"
+alias atp="~/.config/playercount.py"