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

.gitignore

@@ -2,7 +2,9 @@
 *_old
 .nfs*
 *.log
+*.swp
 
+tubus/
 Florian_Hackenberger/
 Luminance/
 QtProject.conf
@@ -48,7 +50,24 @@ roxterm.sourceforge.net/
 SEGGER/
 sonata/
 spring
-tubus/
+agent_socket
+akonadi-firstrunrc
+akonadi_akonotes_resource_0rc
+akonadi_contacts_resource_0rc
+akonadi_davgroupware_resource_1rc
+akonadi_ical_resource_0rc
+akonadi_maildir_resource_0rc
+akonadi_newmailnotifier_agentrc
+dunst/
+emaildefaults
+emailidentities
+eventviewsrc
+herbstluftwm/__pycache__/
+korgacrc
+korganizerrc
+nohup.out
+specialmailcollectionsrc
+unity3d/tubus/
 user-dirs.dirs
 user-dirs.locale
 VirtualBox/

zshrc

@@ -12,7 +12,7 @@ HISTFILE=~/.config/zshhistory.log
 
 ### COLOR STDERR ###
 #legacy, this causes problems in output odering exec 2>>( while IFS='' read X; do print "\e[91m${X}\e[0m" > /dev/tty; done & )
-if [[ NO_LDPRELOAD == false ]]; then
+if [[ $NO_LDPRELOAD == false ]]; then
     LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
     COLORED_STDERR_FDS=2,
     export LD_PRELOAD COLORED_STDERR_FDS
@@ -95,6 +95,7 @@ alias gadd="git add"
 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"
 else
     alias transparent_xlock="xlock -mode blank -geometry 1x1"
 fi
@@ -169,8 +170,8 @@ if [[ $HOST =~ faui* ]]; then
     alias mpstubs="cd /proj/ciptmp/ik15ydit/reps/mpstubs/"
     alias reps="cd /proj/ciptmp/ik15ydit/reps/"
     alias rudipub='cd /home/cip/2010/he29heri/pub/'
-    alias sudo="echo THIS IS THE CIP NOT YOUT COMPUTER!!!!! >&2"
-    alias su="echo THIS IS THE CIP NOT YOUT COMPUTER!!!!! >&2"
+    alias sudo="echo THIS IS THE CIP NOT YOUR COMPUTER!!!!! >&2"
+    alias su="echo THIS IS THE CIP NOT YOUR COMPUTER!!!!! >&2"
 fi
 ## MOUNTABLE CIP-SHORTCUTS ##
 if [[ $HOST =~ atlantis* ]]; then