Improve organization of colorscheme definitions + add/configure vim-bookmarks

This commit is contained in:
Kevin MacMartin 2014-10-28 15:33:37 -04:00
parent cdf56f34a0
commit f170b77156
6 changed files with 265 additions and 255 deletions

3
.gitmodules vendored
View file

@ -112,3 +112,6 @@
[submodule "vim/bundle/rename.vim"]
path = vim/bundle/rename.vim
url = https://github.com/danro/rename.vim.git
[submodule "vim/bundle/vim-bookmarks"]
path = vim/bundle/vim-bookmarks
url = https://github.com/MattesGroeger/vim-bookmarks.git

View file

@ -182,8 +182,9 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l
* [tcommand_vim](https://github.com/tomtom/tcommand_vim): Select commands, menu items etc. from a list.
* [tlib_vim](https://github.com/tomtom/tlib_vim): Some utility functions for VIM.
* [tcomment_vim](https://github.com/tomtom/tcomment_vim): File-type sensible comments that can be easily toggled on and off for blocks of text.
* [vim-bookmarks](https://github.com/MattesGroeger/vim-bookmarks): Bookmark or annotate lines and quickly navigate between them.
* [vim-easytags](https://github.com/xolox/vim-easytags): Automated tag file generation and syntax highlighting of tags in Vim.
* [vim-misc](https://github.com/xolox/vim-misc): Miscellaneous auto-load Vim scripts.
* [vim-misc](https://github.com/xolox/vim-misc): Miscellaneous auto-load Vim scripts required by vim-easytags.
* [vim-extradite](https://github.com/int3/vim-extradite): A git commit browser extending vim-fugitive that displays differences and optionally loads old revisions.
* [vimfiler.vim](https://github.com/Shougo/vimfiler.vim): A curses-style file manager for vim that runs on it's own or in a sidebar and can associate handlers for file types.
* [unite.vim](https://github.com/Shougo/unite.vim): A library used by Vim Filer to help build its user interface.

@ -0,0 +1 @@
Subproject commit 93904787c61805334895662feb6672a9164820be

View file

@ -283,7 +283,7 @@ hi SpellLocal guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NON
"format: ('name','fg ','bg ','style ',s:lowcolor-fg,'lowcolor-bg')
"example:('Line','000000','f0f0f0','italic,bold',s:termBlack ,'White')
"core style
"CORE: {{{
call s:X("Normal","#eaeaea","#262626","","White",s:termBlack)
hi Normal ctermfg=254 ctermbg=235
hi! link Conceal Normal
@ -366,17 +366,9 @@ call s:X("DiffAdd","#ffd787","","standout","Yellow","")
call s:X("DiffDelete","#d75f5f","","standout","Red","")
call s:X("DiffChange","#87d7ff","","standout","Blue","")
call s:X("DiffText","#c6c6c6","","standout","White","")
"}}}
"version control
call s:X("SignifySignAdd","#ffd787","","bold","","Yellow")
call s:X("SignifySignDelete","#d75f5f","","bold","","Red")
call s:X("SignifySignChange","#ffd787","","bold","","Yellow")
hi! link SignifyLineAdd DiffAdd
hi! link SignifyLineDelete DiffDelete
hi! link SignifyLineChange DiffChange
hi! link gitconfigAssignment Label
hi! link ExtraditeLogName Type
"SYNTAX: {{{
"html
hi! link htmlTitle Title
call s:X("htmlH1","#d75f5f","","bold","Red","")
@ -415,6 +407,7 @@ hi! link javascriptHtmlEvents javaScriptSpecial
hi! link javascriptDomElemAttrs javaScriptSpecial
hi! link javascriptDomElemFuncs javaScriptFunction
"json
autocmd BufEnter,FileType json hi! link Label Constant
autocmd BufEnter,FileType json hi! link Number Todo
autocmd BufEnter,FileType json hi! link String Statement
@ -462,14 +455,6 @@ call s:X("rubyGlobalVariable","","","bold","","")
"lua
hi! link luaOperator Conditional
"vim config/vimscript
call s:X("IndentGuidesOdd","","#7c7c7c","","","Grey")
call s:X("IndentGuidesEven","","#1c1c1c","","",s:termBlack)
if !exists("g:indent_guides_auto_colors")
let g:indent_guides_auto_colors=0
endif
call s:X("vimOperParen","#87d7ff","","","Blue","")
"systemd unit files
hi! link sdKey Identifier
hi! link sdFilename String
@ -493,6 +478,18 @@ hi! link sdSymbol sdValue
hi! link sdOtherSignal sdValue
hi! link sdDevAllow Keyword
hi! link sdCapability sdDevAllow
"}}}
"MISC: {{{
"bookmarks
call s:X("BookmarkSign","#87d7ff","","bold","Blue","")
"email
hi! link mailHeaderKey Identifier
"git
hi! link gitconfigAssignment Label
hi! link ExtraditeLogName Type
"notes
call s:X("notesRule","","","bold","","")
@ -516,9 +513,6 @@ hi! link notesCodeEnd notesCodeStart
hi! link notesLastEdited Statement
hi! link notesAtxHeading Comment
"email
hi! link mailHeaderKey Identifier
"quicktask
hi! link quicktaskDatestamp Identifier
hi! link quicktaskTimestamp Identifier
@ -526,16 +520,13 @@ hi! link quicktaskSection Todo
call s:X("quicktaskTimeNote","#ffd787","","bold","Yellow","")
call s:X("quicktaskTask","#ffffff","","bold","White","")
"taskwarrior
call s:X("taskwarrior_tablehead","#d0d0d0","","standout,bold",s:termBlack,"White")
call s:X("taskwarrior_field","","","standout,bold","","")
hi! link taskwarrior_id Comment
hi! link taskwarrior_project Keyword
hi! link taskwarrior_entry Identifier
hi! link taskwarrior_description String
"taglist
hi! link TagListFileName Directory
"signify
call s:X("SignifySignAdd","#ffd787","","bold","","Yellow")
call s:X("SignifySignDelete","#d75f5f","","bold","","Red")
call s:X("SignifySignChange","#ffd787","","bold","","Yellow")
hi! link SignifyLineAdd DiffAdd
hi! link SignifyLineDelete DiffDelete
hi! link SignifyLineChange DiffChange
"syntastic
call s:X("SyntasticError","#d75f5f","","standout,bold","Red","")
@ -547,6 +538,18 @@ hi! link SyntasticWarningSign SyntasticWarning
hi! link qfSeparator Delimiter
hi! link qfLineNr SyntasticError
"taglist
hi! link TagListFileName Directory
"taskwarrior
call s:X("taskwarrior_tablehead","#d0d0d0","","standout,bold",s:termBlack,"White")
call s:X("taskwarrior_field","","","standout,bold","","")
hi! link taskwarrior_id Comment
hi! link taskwarrior_project Keyword
hi! link taskwarrior_entry Identifier
hi! link taskwarrior_description String
"}}}
"delete functions {{{
delf s:X
delf s:rgb

View file

@ -80,11 +80,11 @@
" ` | (A) -> toggle the gutter(line numbers, folds and signify)
"
" <Space><Space> | (N) -> toggle selected fold
" <Leader>= | (N) -> open all folds
" <Leader>+ | (N) -> open all folds
" <Leader>- | (N) -> unopen all folds
" <Leader>_ | (N) -> unopen all folds
" <Leader>0 | (N) -> reset all folds using default fold level
" <Space>= | (N) -> open all folds
" <Space>+ | (N) -> open all folds
" <Space>- | (N) -> unopen all folds
" <Space>_ | (N) -> unopen all folds
" <Space>0 | (N) -> reset all folds using default fold level
"
" <Ctrl-F1> | (A) -> toggle vimfiler sidebar
" <Ctrl-F2> | (A) -> toggle the gundo sidebar
@ -420,11 +420,11 @@
nnoremap <silent><expr> <Space>+ 'zn:echo "all folds have been opened"<CR>'
"close folds set to be closed
nnoremap <silent><expr> <Leader>- 'zN:echo "all opened folds have been closed"<CR>'
nnoremap <silent><expr> <Leader>_ 'zN:echo "all opened folds have been closed"<CR>'
nnoremap <silent><expr> <Space>- 'zN:echo "all opened folds have been closed"<CR>'
nnoremap <silent><expr> <Space>_ 'zN:echo "all opened folds have been closed"<CR>'
"reset all folds to the default fold level
nnoremap <silent><expr> <Leader>0 'zX:echo "all folds have been reset"<CR>'
nnoremap <silent><expr> <Space>0 'zX:echo "all folds have been reset"<CR>'
"trigger vimfiler
nnoremap <silent><expr> <C-F1> ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45<CR>'

View file

@ -31,6 +31,11 @@
set tags=./.tags;,~/.vim/tags
"}}}
"BOOKMARKS: {{{
let g:bookmark_sign = '★'
let g:bookmark_annotation_sign = '📌'
"}}}
"EASYTAGS: {{{
let g:easytags_suppress_ctags_warning=1
if !filereadable(glob("~/.vim/tags"))|let g:easytags_file='~/.vim/tags'|endif
@ -175,16 +180,13 @@
endif
"}}}
"TAGBAR: {{{
" TableFormat() for formatting markdown tables with Tabular
"TABULAR: {{{
"format markdown tables
function! s:TableFormat()
let l:pos = getpos('.')
normal! {
" Search instead of `normal! j` because of the table at beginning of file edge case.
call search('|')
normal! j
" Remove everything that is not a pipe othewise well formated tables would grow
" because of addition of 2 spaces on the separator line by Tabularize /|.
s/[^|]//g
Tabularize /|
s/ /-/g