diff --git a/pre_run_01 b/pre_run_01
index 7496bba..e1df342 100755
--- a/pre_run_01
+++ b/pre_run_01
@@ -1,5 +1,10 @@
 #!/bin/zsh
 
-[[ ! -d $HOME/bin ]] && mkdir $HOME/bin
 [[ ! -d $HOME/.config ]] && mkdir $HOME/.config
 [[ ! -d $HOME/.local ]] && mkdir $HOME/.local
+[[ ! -d $HOME/.local/bin ]] && mkdir $HOME/.local/bin
+[[ ! -d $HOME/.local/build ]] && mkdir $HOME/.local/build
+[[ ! -d $HOME/.local/tmp ]] && mkdir $HOME/.local/tmp
+
+# [[ ! -d $HOME/dbox ]] && mkdir $HOME/dbox
+[[ ! -d $HOME/dev ]] && mkdir $HOME/dev
diff --git a/runs/neovim b/runs/neovim
index 92868e8..ccbbb41 100755
--- a/runs/neovim
+++ b/runs/neovim
@@ -1,8 +1,32 @@
 #!/bin/zsh
 
-neovim_dir=$HOME/bin/neovim
-git clone -b v0.10.3 https://github.com/neovim/neovim.git $neovim_dir
-brew install cmake gettext lua5.1 liblua5.1-0-dev
-cd $neovim_dir
-make CMAKE_BUILD_TYPE=RelWithDebInfo
-sudo make install
+install_command="sudo apt install"
+[[ -x $(which brew) ]] && install_command="brew install"
+
+neovim_dir=$HOME/.local/build/neovim
+neovim_version="v0.10.3"
+[ ! -z $NVIM_VERSION ] && neovim_version="$NVIM_VERSION"
+echo "neovim_version: \"$neovim_version\""
+
+[ ! -d $neovim_dir ] && git clone https://github.com/neovim/neovim.git $neovim_dir
+git -C $neovim_dir fetch --all
+git -C $neovim_dir checkout $neovim_version
+
+$install_command cmake gettext lua@5.1 liblua5.1-0-dev
+
+make -C $neovim_dir clean
+make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
+sudo make -C $neovim_dir install
+
+# lines below from primeagen's dev repo, uncomment/edit as needed
+# git clone https://github.com/ThePrimeagen/harpoon.git $HOME/personal/harpoon
+# cd $HOME/personal/harpoon
+# git fetch
+# git checkout harpoon2
+
+# git clone https://github.com/ThePrimeagen/vim-apm.git $HOME/personal/vim-apm
+# git clone https://github.com/ThePrimeagen/vim-with-me.git $HOME/personal/vim-with-me
+# git clone https://github.com/ThePrimeagen/vim-arcade.git $HOME/personal/vim-arcade
+# git clone https://github.com/ThePrimeagen/caleb.git $HOME/personal/caleb
+# git clone https://github.com/nvim-lua/plenary.nvim.git $HOME/personal/plenary
+