Merge remote-tracking branch 'refs/remotes/origin/master'

5 files changed, 6 insertions, 19 deletions

diff --git a/bash/.bash_aliases b/bash/.bash_aliases
index 397a823..73f0d8f 100644
--- a/bash/.bash_aliases
+++ b/bash/.bash_aliases
@@ -23,6 +23,7 @@ alias l='ls -CF'
 
 # vim open multiple files in tabs
 alias vim='vim -p'
+alias nvim='nvim -p'
 
 # show me the terminal colors
 alias 256color='(x=`tput op` y=`printf %76s`;for i in {0..256};do o=00$i;echo -e ${o:${#o}-3:3} `tput setaf $i;tput setab $i`${y// /=}$x;done)'
diff --git a/bash/.bash_profile b/bash/.bash_profile
index c4f3457..affc9db 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -18,5 +18,5 @@ export TERM=xterm-256color
 ################################################################
 # Create .config if it doesn't exist and set XDG vars
 mkdir -p $HOME/.config
-XDG_CONFIG_HOME=${XDG_CONFIG_HOME:=$HOME/.config}
-XDG_DATA_HOME=${XDG_DATA_HOME:=$HOME/.config}
+export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:=$HOME/.config}
+export XDG_DATA_HOME=${XDG_DATA_HOME:=$HOME/.config}
diff --git a/nvim/nvim/ftplugin/html.vim b/nvim/nvim/ftplugin/html.vim
index fc0d53a..6a56808 100644
--- a/nvim/nvim/ftplugin/html.vim
+++ b/nvim/nvim/ftplugin/html.vim
@@ -1,11 +1,2 @@
 set tabstop=2 softtabstop=0 expandtab shiftwidth=2
 set autoindent
-
-" Test some wrapping on the html
-setlocal textwidth=79
-setlocal formatoptions+=t
-
-" Highlight where the lines are more than 80 characters wide
-setlocal colorcolumn=80
-highlight ColorColumn ctermbg=LightGreen
-
diff --git a/nvim/nvim/init.vim b/nvim/nvim/init.vim
index 497fa83..22315c9 100644
--- a/nvim/nvim/init.vim
+++ b/nvim/nvim/init.vim
@@ -1,8 +1,8 @@
 " Vundle stuff ----------------------------------------------
 set nocompatible
 filetype off
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+set rtp+=$XDG_CONFIG_HOME/nvim/bundle/Vundle.vim
+call vundle#begin($XDG_CONFIG_HOME . '/nvim/bundle/')
 
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
@@ -25,12 +25,7 @@ syntax on
 filetype plugin on
 
 " Show trailing spaces
-highlight ExtraWhitespace ctermbg=red guibg=red
-match ExtraWhitespace /\s\+$/
-autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
-autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
-autocmd InsertLeave * match ExtraWhitespace /\s\+$/
-autocmd BufWinLeave * call clearmatches()
+set list lcs=trail:·,tab:»·
 
 " Clear trailing spaces on <F2>
 function TrimWhiteSpace()
diff --git a/nvim/nvim/shada/main.shada b/nvim/nvim/shada/main.shada
index 5bd2ed1..bf34b3d 100644
--- a/nvim/nvim/shada/main.shada
+++ b/nvim/nvim/shada/main.shada