diff --git a/chrootInstall.sh b/chrootInstall.sh
index faf152f..fd24d68 100755
--- a/chrootInstall.sh
+++ b/chrootInstall.sh
@@ -61,7 +61,7 @@ permit nopass $username as root cmd /usr/bin/poweroff
 permit nopass $username as root cmd /usr/bin/reboot
 " > /etc/doas.conf
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/doas-completion -o /usr/share/bash-completion/completions/doas
-ln -s /usr/bin/doas /usr/bin/sudo
+ln -s /usr/bin/doas /usr/local/bin/sudo
 
 # pacman configuration
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/pacman.conf -o /etc/pacman.conf
@@ -208,10 +208,10 @@ echo -e ""$username"        soft    memlock        64\n"$username"        hard
 echo 'pinentry-program /usr/bin/pinentry-tty' > /home/"$username"/.gnupg/gpg-agent.conf  # forces gpg prompts to use terminal input
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/gai.conf -o /etc/gai.conf  # configure gai to prefer IPv6
 echo 'vm.max_map_count=2147483642' > /etc/sysctl.d/90-override.conf  # increase max virtual memory maps (helps with some Wine games)
-pacman -S neofetch htop vim --needed --noconfirm
-curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/vimrc -o /home/"$username"/.vimrc
-chown "$username":users /home/"$username"/.vimrc
-chmod 644 /home/"$username"/.vimrc
+pacman -S neofetch htop neovim --needed --noconfirm
+mkdir -p /etc/xdg/nvim
+curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/sysinit.vim -o /etc/xdg/nvim/sysinit.vim
+ln -s /usr/bin/nvim /usr/local/bin/vim
 
 # finishing up + cleaning
 rm -rf /chrootInstall.sh /tempfiles
diff --git a/config-files/shell-profile b/config-files/shell-profile
index 2adeb9d..b05916a 100644
--- a/config-files/shell-profile
+++ b/config-files/shell-profile
@@ -15,7 +15,7 @@ export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
 
-export EDITOR=micro
+export EDITOR=nvim
 export BUILDDIR=/tmp/makepkg
 
 [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] && exec dbus-run-session startplasma-wayland
diff --git a/config-files/vimrc b/config-files/sysinit.vim
similarity index 92%
rename from config-files/vimrc
rename to config-files/sysinit.vim
index bae45d1..37ed1b4 100644
--- a/config-files/vimrc
+++ b/config-files/sysinit.vim
@@ -1,5 +1,4 @@
 " ensure correct basic settings
-set nocompatible
 set fileencoding=utf-8
 
 " show line numbers
@@ -9,6 +8,7 @@ set number
 set tabstop=4
 set shiftwidth=4
 set expandtab
+autocmd FileType go set noexpandtab
 
 " enable visually indented text wrapping
 set wrap
@@ -32,7 +32,7 @@ set smartcase
 "  :20  :  up to 20 lines of command-line history will be remembered
 "  %    :  saves and restores the buffer list
 "  n... :  where to save the viminfo files
-set viminfo='10,\"100,:20,%,n~/.viminfo
+set viminfo='10,\"100,:20,%,n~/.local/share/nviminfo
 
 " restores cursor position in recently opened files
 function! ResCur()