Merge branch 'master' of gitlab.cs.fau.de:ik15ydit/config

herbstluftwm/autostart

@@ -67,7 +67,7 @@ hc keybind $Mod-i spawn urxvt -e nohup zsh -c "chromium &" #need to reliably use
 if [[ $HOST =~ atlantis* ]]; then
     hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t
 else
-    hc keybind $Mod-l spawn xlock
+    hc keybind $Mod-l spawn xlock -fg green
     hc keybind $Mod-Shift-x spawn xlock -mode blank -geometry 1x1
     hc keybind $Mod-x spawn xlock -mode blank -geometry 1x1
 fi
@@ -75,11 +75,10 @@ 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-t spawn urxvt -e ssh telegram-sheppy@atlantishq.de -t "/home/telegram-sheppy/tg/bin/telegram-cli"
+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
-hc keybind $Mod-b spawn /home/cip/2013/ik15ydit/ciptmp/reps/WebScan/burpsuite/BurpSuiteFree
 
 # basic movement
 # focusing clients

herbstluftwm/hl_constants.py

@@ -0,0 +1,18 @@
+SEP = " | "
+RED = 0xff0000
+GREEN = 0x32CD32
+YELLOW = 0xffff00
+GREY = 0x909090
+WHITE = 0xefefef
+DEFAULT_FG = 0x476243 
+COLOR_BORDER = 5.0
+BAT_COLOR_OFFSET = 10
+
+PRINT_LOG   = "pracct.log"
+VPN_LOG     = "vpn_status.log"
+BATTERY_LOG = "battery.log"
+IP_LOG      = "ip.log"
+
+BATTERY_CRITICAL = 2 # in %
+BAT_WARNING_STR  = ">>>>>>>>>>>>>>>> ------------ WARNING BATTER FAILURE IMMINENT ------------ <<<<<<<<<<<<<"
+VALUES_KEPT = 10

herbstluftwm/hl_status_deamon.py

@@ -136,6 +136,15 @@ def save():
             battery_status()
             ip_status()
 
+def trace_login():
+        if is_cip():
+                try:
+                    tmp = shexec("wget --timeout=3 -O- --quiet 'https://atlantishq.de/ciplog/"+socket.gethostname()+"&active&"+str(datetime.now())+"'")
+                except:
+                    tmp = "Service Unreachable"
+                with open(hlpath("cip_logins.log"),'w') as f:
+                        f.write(tmp)
+
 if __name__ == '__main__':
         signal.signal(signal.SIGUSR1,sigusr1_handler)
         signal.siginterrupt(signal.SIGUSR1, True)

herbstluftwm/test_cal.py

@@ -1,11 +0,0 @@
-import urllib3
-import socket
-
-http = urllib3.PoolManager()
-socket.setdefaulttimeout(5)
-url = 'https://squarez.fauiwg.de:7001/radicale/testuser/cal.ics/'
-headers = urllib3.util.make_headers(basic_auth='testuser:test')
-r = http.request('GET', url, headers=headers)
-f = open(test.log,'w')
-f.write(r)
-f.close()