Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2017-06-25 21:52:34 +02:00
2 changed files with 11 additions and 3 deletions

12
vimrc
View File

@@ -46,6 +46,8 @@ Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'mhinz/vim-grepper'
Plug 'sheerun/vim-polyglot' Plug 'sheerun/vim-polyglot'
Plug 'christoomey/vim-tmux-navigator' Plug 'christoomey/vim-tmux-navigator'
@@ -84,11 +86,15 @@ let g:netrw_liststyle=3
set splitright set splitright
set splitbelow set splitbelow
set ignorecase
" set ignorecase
set infercase
set smartcase set smartcase
set incsearch set incsearch
set hlsearch set hlsearch
set gdefault
set number set number
set report=0 set report=0
@@ -111,7 +117,9 @@ set secure
" Text Formatting {{{ " Text Formatting {{{
set list set list
set listchars=tab:▸\ ,extends:,precedes:,nbsp:␣,trail:- set listchars=tab:▸\ ,extends:,precedes:,nbsp:␣,trail:-
set linebreak "set linebreak
set breakindent
set showbreak= set showbreak=
set tabstop=4 set tabstop=4
set expandtab set expandtab