diff --git a/.bash_aliases b/.bash_aliases
index 92741d9..8db98e4 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -8,8 +8,8 @@
 
 # some more ls aliases
 alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+alias la='ls -a'
+# alias l='ls -CF'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
@@ -25,6 +25,8 @@ alias ...='cd ../..'
 alias gs='git status'
 alias gc='git commit -m'
 alias ga='git add'
+alias gd='git diff'
+alias gac='git commit -a'
 
 # vi and nvim aliases
 
diff --git a/.bashrc b/.bashrc
index 5b05038..ae9efc9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -121,7 +121,7 @@ fi
 export GOPATH=$HOME/dev/go
 export GOBIN=$HOME/dev/go/bin
 
-export EDITOR=vim
+export EDITOR=nvim
 
 # Use the Powerline_go prompt system
 function _update_ps1() {
@@ -138,15 +138,11 @@ fi
 # Add my local /bin to the path
 export PATH=/home/drwasabi/.local/bin:$PATH
 
-# cd to my wsl2 home folder
-cd ~
+# XDG
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
 
-# Print a lolcat banner 
-#echo ''
-#echo '**************************************************'|lolcat
-#cowsay -f tux "Welcome Dr. The system is ready to accept your commands.  Have a nice day" | lolcat
-#echo '**************************************************'|lolcat
-#echo ''
 
 # Look in my ascii-art folder, and use shuf to get a randome file name.
 BANNERFILE=$(ls ~/mydocs/ascii-art/ | shuf -n 1)
@@ -158,5 +154,5 @@ lolcat ~/mydocs/ascii-art/$BANNERFILE
 /usr/bin/keychain --nogui $HOME/.ssh/id_rsa
 source $HOME/.keychain/$HOSTNAME-sh
 
-# Run fish
-# fish
+# cd to my wsl2 home folder
+cd ~
diff --git a/init.vim b/init.vim
index 61e14b4..d87c45d 100644
--- a/init.vim
+++ b/init.vim
@@ -8,25 +8,10 @@
 "  my neovim init.vim config file
 "  Russell R. Riker (aka: Dr. WaSaBi)
 "  *************************************************************
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = $runtimepath
-source ~/.vimrc
 
-" Some of my settings, need to figure out how to do these things for only some
-" file types.  like txt and mkd file, wouldn't really want this.
-set tabstop=4
-set expandtab
-set number
+" Load my basic settings, mappings, etc..
+source ~/.config/nvim/nvim-basic-settings.vim
 
-" turn spelling on for text based documents
-autocmd FileType tex,latex,markdown setlocal spell spelllang=en_us
-
-" copy to the system clipboard
-set clipboard+=unnamedplus
-
-" set the vimwiki folder path and file type
-let g:vimwiki_list = [{'path': '~/vimwiki/',
-                      \ 'syntax': 'markdown', 'ext': '.md'}]
 
 " ***********************************************************
 " ********************* install pluggins ********************
@@ -52,23 +37,6 @@ call plug#begin('~/.vim/plugged')
 call plug#end()
 
 
-
-" ***********************************************************
-" ****************** basic remap keys ***********************
-" ***********************************************************
-" remap the split window motion keybindings
-" stole these from BrodieRobertson
-map <A-h> <C-w>h
-map <A-j> <C-w>j
-map <A-k> <C-w>k
-map <A-l> <C-w>l
-
-" nerdtree file manager
-:nmap <silent> <C-D> :NERDTreeToggle<CR>
-
-" buffers
-:nnoremap <F5> :buffers<CR>:buffer<Space>
-
 " ***********************************************************
 " **************** fzf & ripgrep config *********************
 " ***********************************************************