diff --git a/.config/nvim b/.config/nvim
new file mode 120000
index 0000000..2d6a266
--- /dev/null
+++ b/.config/nvim
@@ -0,0 +1 @@
+/home/hunner/.vim
\ No newline at end of file
diff --git a/.nvim b/.nvim
deleted file mode 120000
index 8355b52..0000000
--- a/.nvim
+++ /dev/null
@@ -1 +0,0 @@
-.vim
\ No newline at end of file
diff --git a/.nvimrc b/.nvimrc
deleted file mode 120000
index 1490f7a..0000000
--- a/.nvimrc
+++ /dev/null
@@ -1 +0,0 @@
-.vimrc
\ No newline at end of file
diff --git a/.vim/init.vim b/.vim/init.vim
new file mode 120000
index 0000000..a6e49e6
--- /dev/null
+++ b/.vim/init.vim
@@ -0,0 +1 @@
+/home/hunner/.vimrc
\ No newline at end of file
diff --git a/.zshenv b/.zshenv
index e64cf5c..e2a1859 100644
--- a/.zshenv
+++ b/.zshenv
@@ -182,7 +182,6 @@ alias vir=vr
 alias vis=vs
 alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
 alias n=nvim
-export NVIM_TUI_ENABLE_TRUE_COLOR=1
 
 ## For forwarding ssh auth I think
 if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh-agent" ] ; then
@@ -313,7 +312,8 @@ if [ x$DISPLAY != x ] ; then
     preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : }
 fi
 alias resize="printf '\33]50;%s%d\007' 'xft:DroidSansMonoDotted:pixelsize=' $1" # ':antialias=true'"
-alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
+#alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
+alias asdf="setxkbmap us dvorak ctrl:nocaps"
 alias auie="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
 alias aoeu='setxkbmap us'
 alias bepo='setxkbmap fr bepo "ctrl:swapcaps"'