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

2018-07-28 11:37:42 -05:00
parent 9627470c6d 117278ea13
commit 5bf3a08cf3
7 changed files with 14 additions and 40 deletions
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -10,6 +10,9 @@ set showtabline=2
 set hidden
 set incsearch

+" share system clipboard
+set clipboard=^unnamed,unnamedplus
+
 " hide showmode because its in statusline
 set noshowmode

@@ -25,6 +28,8 @@ set fileformat=unix
 "highlight cursorline cterm=none ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 hi cursorline cterm=none term=none ctermbg=236
 set cursorline
+" vertical column at 79 so you know when to wrap
+set colorcolumn=79

 "enable relative line numbers
 "set number relativenumber