From e932f9e3fed0b46ab168b001ddfa0f8b3fcfcdcf Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Fri, 7 Jun 2019 13:41:12 -0700
Subject: [PATCH] update vimrc colors with signify

---
 .vim/coc-settings.json   | 14 ++++++++++++--
 .vim/colors/baraknew.vim | 24 ++++++++++++++++++------
 .vimrc                   | 21 ++++++++++++++++++++-
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index afd24cd..6b89f4f 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -1,10 +1,16 @@
 {
     "suggest.timeout": 5000,
     "suggest.enablePreview": true,
-    "diagnostic.displayByAle": true,
+    "suggest.maxPreviewWidth": 70,
+    "diagnostic.displayByAle": false,
+    "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
+    "python.linting.mypyEnabled": true,
+    "python.linting.mypyArgs": ["--ignore-missing-imports"],
     "python.jediEnabled": true,
     "python.autoComplete.addBrackets": false,
+    "suggest.detailField": "abbr",
+    "suggest.snippetIndicator": "",
     "languageserver": {
       "ccls": {
         "command": "ccls",
@@ -21,5 +27,9 @@
       "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
       "filetypes": ["go"]
     }
-  }
+},
+"python.autoComplete.extraPaths": [
+    "${env:SPARK_HOME}/python",
+    "${env:SPARK_HOME}/python/pyspark"
+]
 }
diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim
index 5c6b486..49d17c4 100644
--- a/.vim/colors/baraknew.vim
+++ b/.vim/colors/baraknew.vim
@@ -287,13 +287,13 @@ hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
 " ----
 " added line
 hi DiffAdd          guifg=#80a090           guibg=#313c36           gui=none
-hi DiffAdd          ctermfg=18             ctermbg=22              cterm=none
+hi DiffAdd          ctermfg=fg             ctermbg=22              cterm=none
 " changed line
 hi DiffChange       guifg=NONE              guibg=#4a343a           gui=none
-hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
+hi DiffChange       ctermfg=fg              ctermbg=58              cterm=none
 " deleted line
 hi DiffDelete       guifg=#6c6661           guibg=#3c3631           gui=none
-hi DiffDelete       ctermfg=59              ctermbg=58              cterm=none
+hi DiffDelete       ctermfg=fg              ctermbg=52              cterm=none
 " changed text within line
 hi DiffText         guifg=#f05060           guibg=#4a343a           gui=bold
 hi DiffText         ctermfg=203             ctermbg=52             cterm=bold
@@ -322,11 +322,13 @@ hi Search                                    ctermbg=214            cterm=none
 " Popup Menu
 " ----------
 " normal item in popup
+"hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
+"hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
 hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
+hi Pmenu            ctermfg=253             ctermbg=237             cterm=none
 " selected item in popup
 hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
+hi PmenuSel         ctermfg=186             ctermbg=239             cterm=none
 " scrollbar in popup
 hi PMenuSbar                                guibg=#505860           gui=none
 hi PMenuSbar                                ctermbg=59              cterm=none
@@ -419,4 +421,14 @@ hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE
 "
 
 hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27
-hi link NormalFloat  PmenuSel
+hi link NormalFloat  Pmenu
+
+
+" Vim-Signify
+" ----
+hi SignifySignAdd          guifg=#80a090          guibg=#181818 gui=none
+hi SignifySignAdd          ctermfg=29             ctermbg=233   cterm=none
+hi SignifySignChange       guifg=#4a343a          guibg=#181818 gui=none
+hi SignifySignChange       ctermfg=100             ctermbg=233   cterm=none
+hi SignifySignDelete       guifg=#6c6661          guibg=#181818 gui=none
+hi SignifySignDelete       ctermfg=124             ctermbg=233   cterm=none
diff --git a/.vimrc b/.vimrc
index a0f0390..8fc5b41 100644
--- a/.vimrc
+++ b/.vimrc
@@ -118,7 +118,8 @@ Plug 'bps/vim-textobj-python'
 Plug 'scrooloose/nerdcommenter'
 Plug 'sjbach/lusty'
 Plug 'w0rp/ale'
-Plug 'airblade/vim-gitgutter'
+"Plug 'airblade/vim-gitgutter'
+Plug 'mhinz/vim-signify'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'junegunn/fzf'
@@ -197,6 +198,17 @@ nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 
+" Use K to show documentation in preview window
+nnoremap <silent> K :call <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
 "NeoBundle 'eclim'
 "https://git.wincent.com/command-t.git
 filetype plugin indent on    " required
@@ -332,6 +344,13 @@ let g:NERDTreeDirArrows=0
 let g:NERDTreeMarkBookmarks = 0
 let g:NERDTreeMinimalUI = 1
 
+" * Signify
+let g:signify_realtime = 0
+let g:signify_vcs_list = ['git']
+let g:signify_sign_change = '~'
+let g:signify_sign_changedelete = g:signify_sign_change
+let g:signify_sign_show_count = 0
+
 " * VimFiler
 let g:vimfiler_tree_indentation = 2