diff --git a/files/config/zsh/alias b/files/config/zsh/alias
deleted file mode 100644
index 9f342f7..0000000
--- a/files/config/zsh/alias
+++ /dev/null
@@ -1,5 +0,0 @@
-alias ls="ls --color"
-alias vim=nvim
-alias ssh='TERM="xterm-256color" ssh'
-alias -s pdf="zathura"
-alias -s jpg="imv-wayland"
diff --git a/files/zsh/.zprofile b/files/zsh/.zprofile
deleted file mode 100755
index 94b829e..0000000
--- a/files/zsh/.zprofile
+++ /dev/null
@@ -1,22 +0,0 @@
-for file in ~/.config/environment.d/*.conf
-do
-    while read -r line
-    do
-        varname=${line%=*}
-        value=${${(e)line#*=}//\"}
-        export $varname="${value}"
-    done < $file
-done
-
-#notmutch
-export NOTMUCH_CONFIG="${HOME}/.config/notmuch/config"
-export PATH=~/.local/bin:$PATH
-unset DEBUGINFOD_URLS
-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-    export  QT_QPA_PLATFORM="wayland-egl"
-    export  QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-    export  MOZ_ENABLE_WAYLAND=1
-    export  QT_QPA_PLATFORMTHEME="gtk3"
-    export  NO_AT_BRIDGE=1
-    exec ~/.local/bin/sway.sh
-fi
diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc
deleted file mode 100755
index a01e70c..0000000
--- a/files/zsh/.zshrc
+++ /dev/null
@@ -1,61 +0,0 @@
-SAVEHIST=10000                              
-HISTSIZE=10000
-HISTFILE="$HOME/.local/share/zsh/zhistory"
-
-
-setopt EXTENDED_HISTORY                     
-setopt APPEND_HISTORY                       
-setopt HIST_FIND_NO_DUPS                    
-setopt HIST_EXPIRE_DUPS_FIRST               
-setopt HIST_IGNORE_SPACE                    
-setopt HIST_VERIFY                          
-setopt SHARE_HISTORY                        
-setopt HIST_IGNORE_DUPS                     
-setopt INC_APPEND_HISTORY                   
-setopt HIST_REDUCE_BLANKS  
-# Activate extended gobbing
-setopt extended_glob
-
-# Install Zinit
-ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
-[ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)"
-[ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
-source "${ZINIT_HOME}/zinit.zsh"
-autoload -Uz _zinit
-(( ${+_comps} )) && _comps[zinit]=_zinit
-
-
-zinit ice pick"async.sh" src"scripts/base16-default-dark.sh"
-zinit load "chriskempson/base16-shell"
-
-zinit ice wait"1a" lucid
-zinit light "zdharma/fast-syntax-highlighting"
-
-# Some completions
-zinit ice wait"0" blockf lucid
-zinit load "zsh-users/zsh-completions"
-
-# Apply Pure theme
-zinit ice pick"async.zsh" src"pure.zsh"
-zinit light "sindresorhus/pure"
-
-#Search
-zinit light "zdharma/history-search-multi-word"
-zinit light "zsh-users/zsh-history-substring-search"
-
-autoload -Uz compinit && compinit 
-zinit cdreplay -q
-
-# Keymap
-bindkey '^[[A' history-substring-search-up
-bindkey '^[[B' history-substring-search-down
-
-# dirscolors
-if [ -f ~/.dir_colors ]; then
-  eval `dircolors ~/.dir_colors`
-fi
-
-# imports Aliases
-if [ -f "${XDG_CONFIG_DIR:-"${HOME}/.config"}/zsh/alias" ]; then
-    source "${XDG_CONFIG_DIR:-"${HOME}/.config"}/zsh/alias"
-fi
diff --git a/playbook.yml b/playbook.yml
index bb8d1c1..eeeda4a 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -48,14 +48,21 @@
         state: present
       become: true
 
-    - name: Copy ZSH files
-      ansible.builtin.copy:
-        src: '{{ item }}'
-        dest: '{{ ansible_user_dir }}'
-        mode: '0640'
-      loop:
-        - zsh/.zshrc
-        - zsh/.zprofile
+    - name: Clone my zsh repository
+      ansible.builtin.git:
+        repo: ssh://git@git.epha.se:24422/ephase/zsh_config.git
+        dest: '{{ ansible_user_dir }}/.config/zsh'
+  
+    - name: Symlink .zshenv to ~
+      ansible.builtin.file:
+        src: '{{ ansible_user_dir }}/.config/zsh/.zshenv'
+        dest: '{{ ansible_user_dir }}/.zshenv'
+        state: link
+
+    - name: Clone my neovim repository
+      ansible.builtin.git:
+        repo: ssh://git@git.epha.se:24422/ephase/nvim_config.git
+        dest: '{{ ansible_user_dir }}/.config/nvim'
 
 - name: Launch Sway related roles
   hosts: all