pick updates from ganymede

This commit is contained in:
Barak Michener 2020-06-04 17:09:07 -07:00
parent 48360b9169
commit 6a49e78789
7 changed files with 123 additions and 48 deletions

35
.vim/coc-settings.json Normal file
View file

@ -0,0 +1,35 @@
{
"suggest.timeout": 5000,
"suggest.enablePreview": 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",
"filetypes": ["c", "cc", "cpp", "cuda", "objc", "objcpp"],
"rootPatterns": [".ccls", "compile_commands.json", ".vim/", ".git/", ".hg/"],
"initializationOptions": {
"cache": {
"directory": ".ccls-cache"
}
}
},
"golang": {
"command": "gopls",
"rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
"filetypes": ["go"]
}
},
"python.autoComplete.extraPaths": [
"${env:SPARK_HOME}/python",
"${env:SPARK_HOME}/python/pyspark"
]
}

View file

@ -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,3 +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 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