3 files changed, 5 insertions, 2 deletions

diff --git a/alias b/alias
index 38123f8..cc069d0 100644
--- a/alias
+++ b/alias
@@ -512,6 +512,7 @@ tk() { task rc.context=`cat ~/.task/context` $@; }
 tkc(){ echo $1 >~/.task/context; }
 tkcn() { echo none >~/.task/context; }
 tkch() { echo home >~/.task/context; }
+[ $shell = zsh ] && compdef _task tk
 alias tka='tk annotate'
 alias tkd='tk done'
 alias tkD='tk delete'
diff --git a/bin/init/load-settings.sh b/bin/init/load-settings.sh
index fcd6494..eca5a60 100755
--- a/bin/init/load-settings.sh
+++ b/bin/init/load-settings.sh
@@ -7,7 +7,7 @@ export XDG_CONFIG_HOME=~/.config
 
 # Get current shell
 export shell=$(</proc/$$/cmdline sed -E 's/(.)-.+$/\1/' | tr -d '[\0\-]')
-shell=${shell##*/}
+export shell=${shell##*/}
 
 # load custom aliases
 source $SETTING_DIR/alias
diff --git a/zsh/zshrc b/zsh/zshrc
index c11e798..b96e853 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -11,7 +11,6 @@ echo '\e[1 q'
 export SETTING_DIR=$HOME/helper
 fpath=($SETTING_DIR/zsh $fpath)
 source $SETTING_DIR/zsh/completion.zsh
-source $SETTING_DIR/bin/init/load-settings.sh
 
 # Reload zshrc
 function .() {
@@ -104,6 +103,9 @@ alias grep='grep --color'
 # Quick jump to parent folders
 source ~/helper/zsh/bd.zsh
 
+# Load my general settings
+source $SETTING_DIR/bin/init/load-settings.sh
+
 
 # Finally, make sure the terminal is in application mode, when zle is
 # active. Only then are the values from $terminfo valid.