Merge remote-tracking branch 'origin/laptop'

zsh/.zshrc

@@ -69,8 +69,12 @@ source $ZSH/oh-my-zsh.sh
 
 # additional path variables
 export PATH=$PATH:~/.local/bin
+export PATH=$PATH:~/.emacs.d/bin
 
 ### ALIAS' ###
+# docker
+alias docker='sudo docker'
+
 #jokes
 alias dog='cat'
 alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash'	#rickroll
@@ -139,8 +143,6 @@ alias ftemplate='git fetch template'
 alias mtemplate='git merge template/master --allow-unrelated-histories'
 alias log='git log'
 
-# docker
-alias docker='sudo docker' # use normal docker command but keep sudo requirement
 
 ### AUTOSTART ###
 
@@ -160,9 +162,3 @@ else
 fi
 unset __conda_setup
 # <<< conda initialize <<<
-
-
-# fcitx init
-export export GTK_IM_MODULE=fcitx
-export QT_IM_MODULE=fcitx
-export XMODIFIERS=@im=fcitx