Merge branch 'master' of github.com:uvaes/dotfiles

3 files changed, 20 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 07d47bc..377383c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 mutt/cache/
 mutt/mailboxes/
 vim/bundle/
-vifm/Trash/
+vifm/Trash
+passwords
 mutt/mutt-colors-solarized/
 mutt/temp/
 mutt/cache/
diff --git a/make b/make
index b00ac4b..b706c27 100755
--- a/make
+++ b/make
@@ -45,5 +45,4 @@ mkdir temp
 cd 
 rm -rf .tmux
 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-
 tmux source-file ~/.tmux.conf
diff --git a/vim/vimrc b/vim/vimrc
index 83a30cf..481eec4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,26 +6,26 @@ set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
 
 ""  Plugins
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-obsession'
-Plugin 'tpope/vim-sensible'
-Plugin 'tpope/vim-scriptease'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-commentary'
 Plugin 'gmarik/vundle'
 Plugin 'LaTeX-Box-Team/latex-box'
+Plugin 'SirVer/ultisnips'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'christoomey/vim-tmux-navigator'
+Plugin 'godlygeek/tabular'
 Plugin 'gregsexton/gitv'
-Plugin 'UltiSnips'
+Plugin 'honza/vim-snippets'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
+Plugin 'sjl/Gundo.vim'
 Plugin 'tommcdo/vim-exchange'
-Plugin 'unimpaired.vim'
-Plugin 'Tabular'
-Plugin 'Gundo'
-Plugin 'altercation/vim-colors-solarized'
-Plugin 'honza/vim-snippets'
-Plugin 'Valloric/YouCompleteMe'
+Plugin 'tpope/vim-commentary'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-obsession'
+Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-scriptease'
+Plugin 'tpope/vim-sensible'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-unimpaired'
 
 filetype plugin indent on
 syntax on
@@ -94,7 +94,7 @@ set foldmethod=expr
 set foldlevel=0
 
 "  Search
-set hlsearch
+set nohlsearch
 
 "  Back up files
 set noswapfile
@@ -106,7 +106,7 @@ set undodir=/home/urbain/.vim/vimundo/
 set nonumber
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
-set showbreak=\ \ \ \ \ \ ...
+set showbreak=...
 set colorcolumn=0
 set scrolloff=0
 set t_Co=256
@@ -132,6 +132,7 @@ set ignorecase
 set noautochdir
 set cpoptions+=I
 set encoding=utf-8
+set mouse=a
 
 ""  Colorscheme
 try | colorscheme solarized | catch | endtry
@@ -159,6 +160,7 @@ nnoremap <Leader>w :w<cr>
 nnoremap <Leader>q :q!<cr>
 nnoremap <Leader>h :set hlsearch!<cr>
 nnoremap <Leader>n :set relativenumber!<cr>
+nnoremap <Leader>sp :set paste!
 nnoremap <Leader>sv :source ~/.vim/vimrc<cr>
 nnoremap <Leader>sc :source %<cr>
 nnoremap <Leader>es :UltiSnipsEdit<Return>