diff --git a/.config/nvim b/.config/nvim
index d6f6f47..3b4586d 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit d6f6f4721444555aff8b57df24f84b600b221cb2
+Subproject commit 3b4586d60019785aa59e0d824a31f283de75d2c3
diff --git a/.zshrc b/.zshrc
index c1f7f3d..e90f238 100644
--- a/.zshrc
+++ b/.zshrc
@@ -13,6 +13,8 @@ alias gg=lazygit
 alias reload="source ~/.zshrc"
 alias gls=/bin/ls
 alias bat=batcat
+alias neorg='nvim -c "Neorg workspace $1"'
+
 ### non standard aliases
 if [ -f ~/.zsh_aliases ]; then
     source ~/.zsh_aliases
@@ -31,8 +33,19 @@ function cachekeys () { exec 2>/dev/null;
 function newpass() {
     LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-$0}
 }
-setopt autocd              # change directory just by typing its name
-#setopt correct            # auto correct mistakes
+function condac() {
+    conda activate $@
+    export HOST=$(hostname)
+}
+
+### ---- zsh options -------------------------------------
+setopt autocd
+setopt correct            # auto correct mistakes
+setopt HIST_FIND_NO_DUPS
+setopt HIST_IGNORE_ALL_DUPS
+setopt appendhistory
+setopt INC_APPEND_HISTORY
+setopt SHARE_HISTORY
 setopt interactivecomments # allow comments in interactive mode
 setopt magicequalsubst     # enable filename expansion for arguments of the form ‘anything=expression’
 setopt nonomatch           # hide error message if there is no match for the pattern