Merge branch 'atlantispc'

Conflicts:
	vim/rc
	zshrc
This commit is contained in:
Sheppy
2016-11-16 17:26:22 +01:00
16 changed files with 387 additions and 28 deletions

51
zshrc
View File

@@ -38,6 +38,8 @@ zstyle ':completion:*:expand:*' keep-prefix yes #halt praefix behalten, HOME nic
zstyle ':completion:*' list-suffixes yes # completet a/b/c<tab> zu abc/bcd/coo
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} # dircolors für completion
bindkey '^R' history-incremental-pattern-search-backward
#pipe
alias -g E='2>&1'
alias -g N='>/dev/null'
alias -g EN='2>/dev/null'
@@ -46,18 +48,48 @@ alias -g G='| grep'
alias -g S='| sort'
alias -g ...='../..'
alias ..='cd ..'
alias telegram='~/ciptmp/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
alias comp='https://est_ik15ydit@faui2hg.cs.fau.de/mcc/exercises/WS15/est_ik15ydit'
alias w="php /proj/ciptmp/av37umic/scripts/woist.php show"
alias ww="php /proj/ciptmp/av37umic/scripts/woist.php all"
alias wa="php /proj/ciptmp/av37umic/scripts/woist.php add"
alias wd="php /proj/ciptmp/av37umic/scripts/woist.php del"
alias wl="php /proj/ciptmp/av37umic/scripts/woist.php list"
#general shortcuts
alias psearch="apt-cache search"
alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t"
#alias telegram='~/ciptmp/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
alias x='startx'
#ignore errormessages that are useless anyway
alias gedit="gedit 2>/dev/null"
alias kpaint="kolourpaint 2>/dev/null"
#converting
alias -g jpg2png="echo 'use convert [file_in.jpg] [file_out.png]'"
#cipstalk
alias w="ssh faui00n.cs.fau.de php /proj/ciptmp/av37umic/scripts/woist.php show"
alias ww="ssh faui00n.cs.fau.de php /proj/ciptmp/av37umic/scripts/woist.php all"
alias wa="ssh faui00n.cs.fau.de php /proj/ciptmp/av37umic/scripts/woist.php add"
alias wd="ssh faui00n.cs.fau.de php /proj/ciptmp/av37umic/scripts/woist.php del"
alias wl="ssh faui00n.cs.fau.de php /proj/ciptmp/av37umic/scripts/woist.php list"
#uni
alias irc="ssh ircbox.cs.fau.de -t 'command; tmux a'"
alias -g uni="faui06c.cs.fau.de"
alias cipkey="ssh-add ~/.ssh/ciplogin"
#direct to config
alias hlconf="vim ~/.config/herbstluftwm/autostart"
alias zshconf="vim ~/.zshrc"
alias vimconf="vim ~/.vimrc"
alias sshconf="vim ~/.ssh/config"
#ambigious aliases
alias dual="xrandr --output DVI-I-2 --right-of DVI-I-1"
alias hlmove="herbstclient move"
alias shutown="/sbin/poweroff"
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'
#AuD and java
alias javac-all-test4='javac -cp .:/usr/share/java/junit4.jar *.java'
alias java-test4='java -cp .:/usr/share/java/junit4.jar'
#aliases migrated from bashrc
alias spc='gcc -std=c99 -pedantic -Wall -Werror -D_XOPEN_SOURCE=700 -o'
@@ -67,6 +99,11 @@ alias rudipub='cd /home/cip/2010/he29heri/pub/'
alias cltex="rm *.log *.aux *.fdb_latexmk *.fls"
alias wordcount="find . -type f -exec cat {} + | wc -w"
#ls and la
LS_COLORS=$LS_COLORS:'di=0;35:'; export LS_COLORS
alias la="ls -la --color=auto"
alias ll="ls -ll --color=auto"
#pipealiases
alias -g D='| dot -Tpng >'