various changes

This commit is contained in:
Sheppy
2017-09-26 11:40:36 +02:00
parent ba8478b064
commit 16d1a2309b
6 changed files with 23 additions and 6 deletions

3
.gitignore vendored
View File

@@ -36,6 +36,7 @@ herbstluftwm/restartpanels.sh
htop/ htop/
inkscape/ inkscape/
libfm/ libfm/
spectaclerc
libvirt/ libvirt/
libreoffice libreoffice
mc/ mc/
@@ -43,6 +44,7 @@ menus/
mimeapps.list mimeapps.list
nautilus/ nautilus/
pulse/ pulse/
unity3d/
pavucontrol.ini pavucontrol.ini
pcmanfm/ pcmanfm/
ristretto/ ristretto/
@@ -65,6 +67,7 @@ eventviewsrc
herbstluftwm/__pycache__/ herbstluftwm/__pycache__/
korgacrc korgacrc
korganizerrc korganizerrc
kolourpaintrc
nohup.out nohup.out
specialmailcollectionsrc specialmailcollectionsrc
unity3d/tubus/ unity3d/tubus/

View File

@@ -74,7 +74,7 @@ hc keybind $Mod-p spawn pavucontrol
hc keybind $Mod-Shift-l spawn libreoffice 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-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-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-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-e spawn rofi -combi-mode window,run -show combi -modi combi
hc keybind $Mod-Shift-e spawn rofi -show run hc keybind $Mod-Shift-e spawn rofi -show run

View File

@@ -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)) return color_panel("Discharging",RED,seper=False) + color_panel(bat.lstrip("Discharging ,").strip('\n'),get_color(plain,0,100))
else: else:
return color_panel(bat.strip('\n'),get_color(plain,0,100)) return color_panel(bat.strip('\n'),get_color(plain,0,100))
except ValueError as e: except ValueError as e:
return color_panel(str(e),RED) return color_panel(str(e),RED)
def battery_status(): def battery_status():
if is_laptop: if is_laptop:

11
herbstluftwm/test_cal.py Normal file
View File

@@ -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()

View File

@@ -1,3 +1,4 @@
xrdb ~/.Xressources xrdb ~/.Xressources
xset r rate 300 25
eval `ssh-agent` eval `ssh-agent`
exec herbstluftwm exec herbstluftwm

8
zshrc
View File

@@ -104,6 +104,7 @@ if [[ $HOST =~ atlantis* ]]; then
alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png" alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t" alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t"
alias -g sq="sheppy@squarez.fauiwg.de" alias -g sq="sheppy@squarez.fauiwg.de"
alias -g pine="sheppy@sheppy.chickenkiller.com"
else else
alias transparent_xlock="xlock -mode blank -geometry 1x1" alias transparent_xlock="xlock -mode blank -geometry 1x1"
fi fi
@@ -115,13 +116,12 @@ alias psearch="apt-cache search"
if [[ $HOST =~ atlantis* ]]; then if [[ $HOST =~ atlantis* ]]; then
#alias gedit="gedit 2&>/dev/null &" #alias gedit="gedit 2&>/dev/null &"
alias kpaint="kolourpaint 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 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 x='exec startx'
alias vpn='sudo /usr/bin/openvpn_cip.sh' alias vpn='sudo /usr/bin/openvpn_cip.sh'
else 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 alias burp=/home/cip/2013/ik15ydit/ciptmp/reps/WebScan/burpsuite/BurpSuiteFree
fi fi
alias rehash="source ~/.config/zshrc" alias rehash="source ~/.config/zshrc"
@@ -244,7 +244,7 @@ ssh_func(){
ssh $@; ssh $@;
printf '\033]708;black\007' printf '\033]708;black\007'
} }
alias -g ssh="ssh_func" alias ssh="ssh_func"
### REVERSE SEARCH ### ### REVERSE SEARCH ###
@@ -271,3 +271,5 @@ else
export FIRST_RUN export FIRST_RUN
exec zsh exec zsh
fi fi
alias hgrep="cat ~/.config/zshhistory.log | grep"