From 16d1a2309b12c71a85dc83a5bce0c981aacf9abe Mon Sep 17 00:00:00 2001
From: Sheppy <yannik.schmidt@fau.de>
Date: Tue, 26 Sep 2017 11:40:36 +0200
Subject: [PATCH] various changes

---
 .gitignore                       |  3 +++
 herbstluftwm/autostart           |  2 +-
 herbstluftwm/hl_status_deamon.py |  4 ++--
 herbstluftwm/test_cal.py         | 11 +++++++++++
 xconf/.xinitrc                   |  1 +
 zshrc                            |  8 +++++---
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 herbstluftwm/test_cal.py

diff --git a/.gitignore b/.gitignore
index 6aa3774..f9f345a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ herbstluftwm/restartpanels.sh
 htop/
 inkscape/
 libfm/
+spectaclerc
 libvirt/
 libreoffice
 mc/
@@ -43,6 +44,7 @@ menus/
 mimeapps.list
 nautilus/
 pulse/
+unity3d/
 pavucontrol.ini
 pcmanfm/
 ristretto/
@@ -65,6 +67,7 @@ eventviewsrc
 herbstluftwm/__pycache__/
 korgacrc
 korganizerrc
+kolourpaintrc
 nohup.out
 specialmailcollectionsrc
 unity3d/tubus/
diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 5b93ef1..e89357c 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -74,7 +74,7 @@ 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 ik15ydit@faui06c.cs.fau.de -t "/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub"
+hc keybind $Mod-Shift-t spawn urxvt -e ssh telegram-sheppy@atlantishq.de -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 f5d8da4..5790392 100755
--- a/herbstluftwm/hl_status_deamon.py
+++ b/herbstluftwm/hl_status_deamon.py
@@ -64,8 +64,8 @@ def battery():
                             return color_panel("Discharging",RED,seper=False) + color_panel(bat.lstrip("Discharging ,").strip('\n'),get_color(plain,0,100))
                     else:
                             return color_panel(bat.strip('\n'),get_color(plain,0,100))
-                except ValueError as e:
-                        return color_panel(str(e),RED)
+            except ValueError as e:
+                    return color_panel(str(e),RED)
 
 def battery_status():
         if is_laptop:
diff --git a/herbstluftwm/test_cal.py b/herbstluftwm/test_cal.py
new file mode 100644
index 0000000..c697d43
--- /dev/null
+++ b/herbstluftwm/test_cal.py
@@ -0,0 +1,11 @@
+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()        
diff --git a/xconf/.xinitrc b/xconf/.xinitrc
index ecb5f13..f2a6ba0 100644
--- a/xconf/.xinitrc
+++ b/xconf/.xinitrc
@@ -1,3 +1,4 @@
 xrdb ~/.Xressources
+xset r rate 300 25
 eval `ssh-agent`
 exec herbstluftwm
diff --git a/zshrc b/zshrc
index c3d33c9..e56dd29 100644
--- a/zshrc
+++ b/zshrc
@@ -104,6 +104,7 @@ if [[ $HOST =~ atlantis* ]]; then
     alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
     alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t"
     alias -g sq="sheppy@squarez.fauiwg.de"
+    alias -g pine="sheppy@sheppy.chickenkiller.com"
 else
     alias transparent_xlock="xlock -mode blank -geometry 1x1"
 fi
@@ -115,13 +116,12 @@ alias psearch="apt-cache search"
 if [[ $HOST =~ atlantis* ]]; then
     #alias gedit="gedit 2&>/dev/null &"
     alias kpaint="kolourpaint 2&>/dev/null &"
-    alias telegram='ssh uni -t "/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub"'
+    alias telegram='ssh telegram-sheppy@atlantishq.de -t "~/tg/bin/telegram-cli"'
     alias telegram-plain='ssh uni -t "/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli --disable-colors --disable-readline -k tg-server.pub"'
 
     alias x='exec startx'
     alias vpn='sudo /usr/bin/openvpn_cip.sh'
 else
-    alias telegram='/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
     alias burp=/home/cip/2013/ik15ydit/ciptmp/reps/WebScan/burpsuite/BurpSuiteFree
 fi
 alias rehash="source ~/.config/zshrc"
@@ -244,7 +244,7 @@ ssh_func(){
     ssh $@;
     printf '\033]708;black\007'
 }
-alias -g ssh="ssh_func"
+alias ssh="ssh_func"
 
 
 ### REVERSE SEARCH ###
@@ -271,3 +271,5 @@ else
     export FIRST_RUN
     exec zsh
 fi
+
+alias hgrep="cat ~/.config/zshhistory.log | grep"