diff --git a/macos/.zshrc b/macos/.zshrc
index 0510aca..6780198 100644
--- a/macos/.zshrc
+++ b/macos/.zshrc
@@ -3,19 +3,26 @@
 
 # Path to your Oh My Zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
-export PATH=/opt/homebrew/bin:$PATH
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-export PATH=$HOME/.local/bin:$PATH
-export EDITOR="/usr/bin/vim"
+# Configure PATH
+export PATH=/opt/homebrew/bin:$HOME/.local/bin:$HOME/.dotfiles/sh:$HOME/go/bin:$PATH
+# Editor 
+export EDITOR="/usr/bin/nvim"
 export ANSIBLE_CONFIG="$HOME/ansible/ansible.cfg"
+# Configurate remote docker host
 export DOCKER_HOST=tcp://192.168.19.244:2376
 export DOCKER_CERT_PATH="$HOME/.docker/cert-for-docker"
 export DOCKER_TLS_VERIFY=1
-
-
-ZSH_THEME="crunch"
+# Export variables nackernvim
+export NACKER_ANSIBLE_PATH=$HOME/ansible
+export NACKER_TERRAFROM_PATH=$HOME/terraform
+export NACKER_DOTFILES_PATH=$HOME/.dotfiles
+export NACKER_PROJECT_PATH=$HOME/dev
+# 
+ZSH_THEME="nacker"
 plugins=(git docker vscode zsh-autosuggestions zsh-syntax-highlighting)
 source $ZSH/oh-my-zsh.sh
+# Configure bat Replacement cat tail less > bat
 if [[ -e $(which batcat) ]]; then
     export bat="batcat"
     alias bat="batcat"
@@ -66,11 +73,13 @@ _lori_completion() {
   compadd "$@" -- "${keys[@]}"
 }
 compdef _lori_completion lori
-
+# Configire custom aliases
 if [ -f ~/.dotfiles/macos/zsh_aliases ]; then
   . ~/.dotfiles/macos/zsh_aliases
 fi
 
+
+
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 PRELINE="\r\033[A"
 
diff --git a/macos/zsh_aliases b/macos/zsh_aliases
index 05652ca..9f6efc4 100644
--- a/macos/zsh_aliases
+++ b/macos/zsh_aliases
@@ -1,4 +1,4 @@
-alias add-alias="vim ~/.dotfiles/macos/zsh_aliases"
+alias add-alias="nvim ~/.dotfiles/macos/zsh_aliases"
 alias vim="nvim"
 alias untar="tar xvf"
 alias uz="unzip"
diff --git a/nackernvim b/nackernvim
index c33407a..c95cedb 160000
--- a/nackernvim
+++ b/nackernvim
@@ -1 +1 @@
-Subproject commit c33407ad0b62641d077d4cffb4a60d3ed10f97df
+Subproject commit c95cedb35f9410818ca514af1a5fa478d721fc43