set some more options

2 files changed, 15 insertions, 6 deletions

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 587813e..72e6ae1 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1 +1,2 @@
 nnoremap setlocal spell
+set colorcolumn=80,120 " show color columns
diff --git a/vimrc b/vimrc
index a8b4a26..018c423 100644
--- a/vimrc
+++ b/vimrc
@@ -9,7 +9,7 @@ set encoding=utf-8    " Set default encoding to UTF-8
 set modelines=0       " do not check file for set commands
 set scrolloff=3       " always show 3 lines above and below cursor
 set gdefault          " use global substitution by default
-set showmatch         " show matching bracket.
+set showmatch         " show matching bracket
 set showcmd           " show last command in last line of screen.
 set showmode          " display mode in last line (e.g VISUAL)
 set hidden            " hide buffers instead of closing them.
@@ -58,13 +58,16 @@ set ignorecase  " searches are case insensitive...
 set smartcase   " ... unless they contain at least one capital letter
 set showmatch   " briefly jump to the matching bracket.
 set cmdheight=1 " Give more space for displaying messages.
+set showtabline=2 " always show tab page labels
+set shell=bash
+
 if !has("nvim")
   set signcolumn=number
 endif
 
 runtime macros/matchit.vim
 color happy_hacking
-syntax enable         " Turn on syntax highlighting allowing local overrides
+syntax on
 set t_Co=256
 if has("termguicolors")
   let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
@@ -74,6 +77,9 @@ endif
 set termencoding=utf-8
 set encoding=utf-8
 set re=1
+set diffopt=vertical
+set updatetime=200
+set completeopt=menu,preview
 
 " }}}}
 
@@ -106,10 +112,11 @@ set wildignore+=*/tmp/*,*.so,*/coverage/*
 ""
 
 " where to put backup files.
-set backupdir=/tmp//
+set backupdir=~/tmp,/var/tmp,/tmp/
 
 " where to put swap files.
-set directory=/tmp//
+set directory=~/tmp,/var/tmp,/tmp/
+
 " }}}}
 
 "" File type-specific settings {{{{
@@ -278,11 +285,12 @@ iabbrev pwns Co-authored-by: Nishant Sinha <nishnha@github.com>
 
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail'
+let g:ruby_indent_assignment_style = 'variable'
+let g:ruby_indent_block_style = 'do'
+let g:snipMate = { 'snippet_version' : 1 }
 let g:syntastic_always_populate_loc_list = 0
 let g:syntastic_auto_loc_list = 0
 let g:syntastic_check_on_open = 0
 let g:syntastic_check_on_wq = 0
 
-let g:snipMate = { 'snippet_version' : 1 }
-
 " }}}}