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

This commit is contained in:
Sheppy
2017-04-09 09:39:56 +02:00
3 changed files with 19 additions and 2 deletions

View File

@@ -58,6 +58,8 @@ if [[ $HOST =~ atlantis* ]]; then
hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t
else else
hc keybind $Mod-l spawn xlock hc keybind $Mod-l spawn xlock
hc keybind $Mod-Shift-x spawn xlock -mode blank -geometry 1x1
hc keybind $Mod-x spawn xlock -mode blank -geometry 1x1
fi fi
hc keybind $Mod-p spawn pavucontrol hc keybind $Mod-p spawn pavucontrol
hc keybind $Mod-Shift-l spawn libreoffice hc keybind $Mod-Shift-l spawn libreoffice

View File

@@ -76,6 +76,8 @@ def battery():
if hl_utils.is_laptop(): if hl_utils.is_laptop():
try: try:
bat = hl_utils.shexec("acpi -b") bat = hl_utils.shexec("acpi -b")
if bat == '':
return color_panel("BATTERY FAILURE",RED)
bat = re.compile(r'Battery [0-9]+: ').sub('',bat) bat = re.compile(r'Battery [0-9]+: ').sub('',bat)
plain = int(bat.split('%')[0][-3:].rstrip('%').lstrip(',')) plain = int(bat.split('%')[0][-3:].rstrip('%').lstrip(','))

17
zshrc
View File

@@ -68,6 +68,13 @@ alias ..='cd ..'
## Anti-LD-Preload Chromium Wrapper ## ## Anti-LD-Preload Chromium Wrapper ##
alias chromium="export TMP_PRELD=$LD_PRELOAD && /bin/bash -c 'unset LD_PRELOAD && chromium' && export LD_PRELOAD=$TMP_PRELD" alias chromium="export TMP_PRELD=$LD_PRELOAD && /bin/bash -c 'unset LD_PRELOAD && chromium' && export LD_PRELOAD=$TMP_PRELD"
## GIT ##
alias gstat="git status"
alias gpull="git pull"
alias gpush="git push"
alias gcom="git commit -a"
alias gadd="git add"
## LOCKS ## ## LOCKS ##
if [[ $HOST =~ atlantis* ]]; then if [[ $HOST =~ atlantis* ]]; then
alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png" alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
@@ -88,9 +95,13 @@ if [[ $HOST =~ atlantis* ]]; then
alias x='startx' alias x='startx'
else else
alias pcolor='for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i} "; if [[ $(((($i+3)/6)*6)) -eq $(($i+3)) ]]; then echo; fi; done'
alias telegram='/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub' alias telegram='/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
fi fi
alias rehash="source ~/.config/zshrc"
function qfind {
find . -name "$1"
}
alias pcolor='for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i} "; if [[ $(((($i+3)/6)*6)) -eq $(($i+3)) ]]; then echo; fi; done'
alias "ipconf"="ip addr show" alias "ipconf"="ip addr show"
## General ## ## General ##
@@ -185,7 +196,9 @@ alias l="ls -lh --color=auto"
## SSH-KEYS ## ## SSH-KEYS ##
gitssh=~/.ssh/gitrsa gitssh=~/.ssh/gitrsa
function key(){ function key(){
eval `ssh-agent` if [[ -z $SSH_AUTH_SOCK ]]; then
eval `ssh-agent`
fi
ssh-add $gitssh ssh-add $gitssh
} }