From a81ab8698cac67fae4f39074fd7f992ce5785ebf Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 3 May 2020 17:31:58 +0200 Subject: [PATCH] Update vim and zshrc * Use vim > 8 pack istead of pathogen * ZSH : use p10k theme --- .gitmodules | 3 - vim/autoload/pathogen.vim | 353 ------------------ vim/bundle/icinga2-vim/README | 15 - vim/bundle/icinga2-vim/ftdetect/icinga2.vim | 2 - vim/bundle/icinga2-vim/syntax/icinga2.vim | 232 ------------ vim/bundle/nginx.vim | 1 - vim/bundle/vim-airline | 1 - vim/bundle/vim-airline-themes | 1 - vim/bundle/vim-monokai/LICENSE.txt | 21 -- vim/bundle/vim-monokai/README.md | 15 - vim/bundle/vim-monokai/colors/monokai.vim | 109 ------ vim/bundle/vim-sensible | 1 - vim/bundle/vim-yaml/README.md | 4 - vim/bundle/vim-yaml/after/ftplugin/yaml.vim | 37 -- vim/colors/molokai.vim | 211 ----------- .../vendor/start/color-scheme-holokai-for-vim | 1 + vim/pack/vendor/start/icinga2-vim | 1 + vim/pack/vendor/start/molokai | 1 + vim/pack/vendor/start/nerdtree | 1 + vim/pack/vendor/start/nginx.vim | 1 + vim/pack/vendor/start/vim-airline | 1 + vim/pack/vendor/start/vim-airline-themes | 1 + .../start}/vim-go/.github/CONTRIBUTING.md | 0 .../start}/vim-go/.github/ISSUE_TEMPLATE.md | 0 .../vendor/start}/vim-go/.gitignore | 0 .../vendor/start}/vim-go/.travis.yml | 0 .../vendor/start}/vim-go/CHANGELOG.md | 0 .../vendor/start}/vim-go/LICENSE | 0 .../vendor/start}/vim-go/Makefile | 0 .../vendor/start}/vim-go/README.md | 0 .../vendor/start}/vim-go/addon-info.json | 0 .../start}/vim-go/assets/screenshot.png | Bin .../vendor/start}/vim-go/assets/vim-go.png | Bin .../vendor/start}/vim-go/assets/vim-go.svg | 0 .../start}/vim-go/autoload/ctrlp/decls.vim | 0 .../start}/vim-go/autoload/go/alternate.vim | 0 .../start}/vim-go/autoload/go/asmfmt.vim | 0 .../vendor/start}/vim-go/autoload/go/cmd.vim | 0 .../start}/vim-go/autoload/go/complete.vim | 0 .../start}/vim-go/autoload/go/coverage.vim | 0 .../vendor/start}/vim-go/autoload/go/def.vim | 0 .../start}/vim-go/autoload/go/def_test.vim | 0 .../vendor/start}/vim-go/autoload/go/doc.vim | 0 .../vendor/start}/vim-go/autoload/go/fmt.vim | 0 .../start}/vim-go/autoload/go/fmt_test.vim | 0 .../vendor/start}/vim-go/autoload/go/guru.vim | 0 .../vendor/start}/vim-go/autoload/go/impl.vim | 0 .../start}/vim-go/autoload/go/import.vim | 0 .../vendor/start}/vim-go/autoload/go/job.vim | 0 .../start}/vim-go/autoload/go/jobcontrol.vim | 0 .../vendor/start}/vim-go/autoload/go/lint.vim | 0 .../vendor/start}/vim-go/autoload/go/list.vim | 0 .../start}/vim-go/autoload/go/package.vim | 0 .../vendor/start}/vim-go/autoload/go/path.vim | 0 .../vendor/start}/vim-go/autoload/go/play.vim | 0 .../start}/vim-go/autoload/go/rename.vim | 0 .../start}/vim-go/autoload/go/statusline.vim | 0 .../vendor/start}/vim-go/autoload/go/tags.vim | 0 .../start}/vim-go/autoload/go/tags_test.vim | 0 .../start}/vim-go/autoload/go/template.vim | 0 .../vendor/start}/vim-go/autoload/go/term.vim | 0 .../autoload/go/test-fixtures/def/jump.go | 0 .../autoload/go/test-fixtures/fmt/hello.go | 0 .../go/test-fixtures/fmt/hello_golden.go | 0 .../go/test-fixtures/tags/add_all_golden.go | 0 .../go/test-fixtures/tags/add_all_input.go | 0 .../test-fixtures/tags/remove_all_golden.go | 0 .../go/test-fixtures/tags/remove_all_input.go | 0 .../start}/vim-go/autoload/go/textobj.vim | 0 .../vendor/start}/vim-go/autoload/go/tool.vim | 0 .../vendor/start}/vim-go/autoload/go/ui.vim | 0 .../vendor/start}/vim-go/autoload/go/util.vim | 0 .../vendor/start}/vim-go/compiler/go.vim | 0 .../vendor/start}/vim-go/doc/vim-go.txt | 0 .../start}/vim-go/ftdetect/gofiletype.vim | 0 .../vendor/start}/vim-go/ftplugin/asm.vim | 0 .../vendor/start}/vim-go/ftplugin/go.vim | 0 .../start}/vim-go/ftplugin/go/commands.vim | 0 .../start}/vim-go/ftplugin/go/mappings.vim | 0 .../start}/vim-go/ftplugin/go/snippets.vim | 0 .../start}/vim-go/ftplugin/go/tagbar.vim | 0 .../start}/vim-go/ftplugin/gohtmltmpl.vim | 0 .../vim-go/gosnippets/UltiSnips/go.snippets | 0 .../start}/vim-go/gosnippets/snippets/go.snip | 0 .../vendor/start}/vim-go/indent/go.vim | 0 .../start}/vim-go/indent/gohtmltmpl.vim | 0 .../vendor/start}/vim-go/plugin/go.vim | 0 .../vendor/start}/vim-go/scripts/runtest.vim | 0 .../vendor/start}/vim-go/scripts/test.sh | 0 .../vendor/start}/vim-go/syntax/go.vim | 0 .../start}/vim-go/syntax/godefstack.vim | 0 .../start}/vim-go/syntax/gohtmltmpl.vim | 0 .../start}/vim-go/syntax/gotexttmpl.vim | 0 .../vendor/start}/vim-go/syntax/vimgo.vim | 0 .../start}/vim-go/templates/hello_world.go | 0 vim/pack/vendor/start/vim-monokai | 1 + vim/pack/vendor/start/vim-yaml | 1 + vimrc | 186 ++++++++- zshrc | 13 +- 99 files changed, 193 insertions(+), 1021 deletions(-) delete mode 100644 vim/autoload/pathogen.vim delete mode 100644 vim/bundle/icinga2-vim/README delete mode 100644 vim/bundle/icinga2-vim/ftdetect/icinga2.vim delete mode 100644 vim/bundle/icinga2-vim/syntax/icinga2.vim delete mode 160000 vim/bundle/nginx.vim delete mode 160000 vim/bundle/vim-airline delete mode 160000 vim/bundle/vim-airline-themes delete mode 100644 vim/bundle/vim-monokai/LICENSE.txt delete mode 100644 vim/bundle/vim-monokai/README.md delete mode 100644 vim/bundle/vim-monokai/colors/monokai.vim delete mode 160000 vim/bundle/vim-sensible delete mode 100644 vim/bundle/vim-yaml/README.md delete mode 100644 vim/bundle/vim-yaml/after/ftplugin/yaml.vim delete mode 100644 vim/colors/molokai.vim create mode 160000 vim/pack/vendor/start/color-scheme-holokai-for-vim create mode 160000 vim/pack/vendor/start/icinga2-vim create mode 160000 vim/pack/vendor/start/molokai create mode 160000 vim/pack/vendor/start/nerdtree create mode 160000 vim/pack/vendor/start/nginx.vim create mode 160000 vim/pack/vendor/start/vim-airline create mode 160000 vim/pack/vendor/start/vim-airline-themes rename vim/{bundle => pack/vendor/start}/vim-go/.github/CONTRIBUTING.md (100%) rename vim/{bundle => pack/vendor/start}/vim-go/.github/ISSUE_TEMPLATE.md (100%) rename vim/{bundle => pack/vendor/start}/vim-go/.gitignore (100%) rename vim/{bundle => pack/vendor/start}/vim-go/.travis.yml (100%) rename vim/{bundle => pack/vendor/start}/vim-go/CHANGELOG.md (100%) rename vim/{bundle => pack/vendor/start}/vim-go/LICENSE (100%) rename vim/{bundle => pack/vendor/start}/vim-go/Makefile (100%) rename vim/{bundle => pack/vendor/start}/vim-go/README.md (100%) rename vim/{bundle => pack/vendor/start}/vim-go/addon-info.json (100%) rename vim/{bundle => pack/vendor/start}/vim-go/assets/screenshot.png (100%) rename vim/{bundle => pack/vendor/start}/vim-go/assets/vim-go.png (100%) rename vim/{bundle => pack/vendor/start}/vim-go/assets/vim-go.svg (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/ctrlp/decls.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/alternate.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/asmfmt.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/cmd.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/complete.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/coverage.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/def.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/def_test.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/doc.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/fmt.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/fmt_test.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/guru.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/impl.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/import.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/job.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/jobcontrol.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/lint.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/list.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/package.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/path.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/play.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/rename.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/statusline.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/tags.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/tags_test.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/template.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/term.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/def/jump.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/fmt/hello.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/fmt/hello_golden.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/tags/add_all_golden.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/tags/add_all_input.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/tags/remove_all_golden.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/test-fixtures/tags/remove_all_input.go (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/textobj.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/tool.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/ui.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/autoload/go/util.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/compiler/go.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/doc/vim-go.txt (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftdetect/gofiletype.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/asm.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/go.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/go/commands.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/go/mappings.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/go/snippets.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/go/tagbar.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/ftplugin/gohtmltmpl.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/gosnippets/UltiSnips/go.snippets (100%) rename vim/{bundle => pack/vendor/start}/vim-go/gosnippets/snippets/go.snip (100%) rename vim/{bundle => pack/vendor/start}/vim-go/indent/go.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/indent/gohtmltmpl.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/plugin/go.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/scripts/runtest.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/scripts/test.sh (100%) rename vim/{bundle => pack/vendor/start}/vim-go/syntax/go.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/syntax/godefstack.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/syntax/gohtmltmpl.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/syntax/gotexttmpl.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/syntax/vimgo.vim (100%) rename vim/{bundle => pack/vendor/start}/vim-go/templates/hello_world.go (100%) create mode 160000 vim/pack/vendor/start/vim-monokai create mode 160000 vim/pack/vendor/start/vim-yaml diff --git a/.gitmodules b/.gitmodules index f8ff223..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vim/bundle/nginx.vim"] - path = vim/bundle/nginx.vim - url = https://github.com/chr4/nginx.vim diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 59a75c1..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,353 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). Curly braces are expanded with pathogen#expand(): -" "bundle/{}" finds all subdirectories inside "bundle" inside all directories -" in the runtime path. -function! pathogen#infect(...) abort - for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}'] - if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]' - call pathogen#surround(path) - elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - elseif path =~# '[{}*]' - call pathogen#interpose(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#interpose(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" Section: Deprecated - -function! s:warn(msg) abort - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Prepend all subdirectories of path to the rtp, and append all 'after' -" directories in those subdirectories. Deprecated. -function! pathogen#runtime_prepend_subdirectories(path) abort - call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')') - return pathogen#surround(a:path . pathogen#slash() . '{}') -endfunction - -function! pathogen#incubate(...) abort - let name = a:0 ? a:1 : 'bundle/{}' - call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')') - return pathogen#interpose(name) -endfunction - -" Deprecated alias for pathogen#interpose(). -function! pathogen#runtime_append_all_bundles(...) abort - if a:0 - call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')') - else - call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()') - endif - return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}') -endfunction - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction - -function! s:Findcomplete(A,L,P) - let sep = pathogen#slash() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/bundle/icinga2-vim/README b/vim/bundle/icinga2-vim/README deleted file mode 100644 index b84912f..0000000 --- a/vim/bundle/icinga2-vim/README +++ /dev/null @@ -1,15 +0,0 @@ -Icinga 2 Configuration Vim Syntax Highlighting -============================================== - -$ PREFIX=~/.vim -$ mkdir -p $PREFIX/{syntax,ftdetect} -$ cp syntax/icinga2.vim $PREFIX/syntax/ -$ cp ftdetect/icinga2.vim $PREFIX/ftdetect/ - -Modify 'ftdetect/icinga2.vim' if your configuration isn't located in -'/etc/icinga2'. - -Now test it :-) - -$ vim /etc/icinga2/conf.d/templates.conf - diff --git a/vim/bundle/icinga2-vim/ftdetect/icinga2.vim b/vim/bundle/icinga2-vim/ftdetect/icinga2.vim deleted file mode 100644 index 5a78d0a..0000000 --- a/vim/bundle/icinga2-vim/ftdetect/icinga2.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Modify -au BufNewFile,BufRead /*etc/icinga2/*.conf,/*usr/share/icinga2/include/{itl,plugins,*.conf} set filetype=icinga2 diff --git a/vim/bundle/icinga2-vim/syntax/icinga2.vim b/vim/bundle/icinga2-vim/syntax/icinga2.vim deleted file mode 100644 index 146e5ba..0000000 --- a/vim/bundle/icinga2-vim/syntax/icinga2.vim +++ /dev/null @@ -1,232 +0,0 @@ -" Vim syntax file -" Filename: icinga2.vim -" Language: Icinga2 object configuration file -" Author: Carlos Cesario -" Version: 0.0.2 -" Based: javascript.vim / nagios.vim - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") - finish - endif - let main_syntax = 'icinga2' -endif - - -" case off -syntax case ignore - -" comments -syn keyword icinga2CommentTodo TODO FIXME XXX TBD contained -syn match icinga2LineComment "\/\/.*" contains=icinga2CommentTodo -syn match icinga2LineComment "#.*" contains=icinga2CommentTodo -syn match icinga2CommentSkip "^[ \t]*\*\($\|[ \t]\+\)" -syn region icinga2Comment start="/\*" end="\*/" contains=icinga2CommentTodo - -" type definitions -" - double quotes " -" - single quotes ' -" - brackets <> - -syn region StringD start=+"+ end=+"\|$+ -syn region StringS start=+'+ end=+'\|$+ -syn match angleBrackets "<\w\+>" - - -" Braces and Parens definition -" Braces are used in dictionary definition - -syn match Braces "[{}\[\]]" -syn match Parens "[()]" - - -" objects types -syn match icinga2ObjDef "object[ \t]\+\(hostgroup\|host\|servicegroup\|service\|usergroup\|user\)" -syn match icinga2ObjDef "object[ \t]\+\(checkcommand\|notificationcommand\|eventcommand\|notification\)" -syn match icinga2Objdef "object[ \t]\+\(timeperiod\|scheduleddowntime\|dependency\|perfdatawriter\)" -syn match icinga2ObjDef "object[ \t]\+\(graphitewriter\|idomysqlconnection\|idomysqlconnection\)" -syn match icinga2ObjDef "object[ \t]\+\(livestatuslistener\|statusdatawriter\|externalcommandlistener\)" -syn match icinga2ObjDef "object[ \t]\+\(compatlogger\|checkresultreader\|checkcomponent\|notificationcomponent\)" -syn match icinga2ObjDef "object[ \t]\+\(filelogger\|sysloglogger\|icingaapplication\|apilistener\|apiuser\|endpoint\|zone\)" - - -" apply def -syn match icinga2ApplyDef "apply[ \t]\+\(Service\|Dependency\|Notification\|ScheduledDowntime\)" - - -" objects attributes -syn keyword icinga2ObjAttr contained accept_commands accept_config action_url address address6 arguments author bind_host -syn keyword icinga2ObjAttr contained bind_port ca_path categories cert_path check_command check_interval -syn keyword icinga2ObjAttr contained check_period child_host_name child_service_name cleanup client_cn command command_endpoint command_path -syn keyword icinga2ObjAttr contained comment compat_log_path crl_path database disable_checks disable_notifications -syn keyword icinga2ObjAttr contained display_name duration email enable_active_checks enable_event_handlers enable_event_handler -syn keyword icinga2ObjAttr contained enable_flapping enable_ha enable_host_checks enable_notifications enable_passive_checks enable_perfdata -syn keyword icinga2ObjAttr contained enable_service_checks endpoints env event_command failover_timeout fixed flapping_threshold groups host -syn keyword icinga2ObjAttr contained host_format_template host_name host_name_template host_perfdata_path host_temp_path icon_image -syn keyword icinga2ObjAttr contained icon_image_alt instance_description instance_name interval key_path log_dir -syn keyword icinga2ObjAttr contained log_duration max_check_attempts methods name notes notes_url objects_path -syn keyword icinga2ObjAttr contained pager parent parent_host_name parent_service_name password path period permissions -syn keyword icinga2ObjAttr contained port ranges retry_interval rotation_interval rotation_method -syn keyword icinga2ObjAttr contained service_format_template service_name service_name_template service_perfdata_path service_temp_path -syn keyword icinga2ObjAttr contained severity socket_path socket_type spool_dir states status_path table_prefix -syn keyword icinga2ObjAttr contained timeout times types update_interval user user_groups users volatile zone -syn match icinga2ObjAttr contained "\(vars.\w\+\)" - - -" keywords -syn keyword icinga2Keyword template const import include include_recursive var function return to use locals globals this - - -" Assign conditions -syn match icinga2AssingCond contained "\(assign[ \t]\+\where\|ignore[ \t]\+\where\)" - - -" Global functions -syn keyword icinga2GFunction contained regex match cidr_match len union intersection keys string -syn keyword icinga2GFunction contained number bool random log typeof get_time parse_performance_data dirname -syn keyword icinga2GFunction contained basename escape_shell_arg escape_shell_cmd escape_create_process_arg exit - - -" Accessor Functions -syn keyword icinga2AFunction contained get_host get_service get_user get_check_command get_event_command get_notification_command -syn keyword icinga2AFunction contained get_host_group get_service_group get_user_group get_time_period - - -" Math functions -syn match icinga2MathFunction contained "\(Math.E\|Math.LN2\|Math.LN10\|Math.LOG2E\|Math.PI\|Math.SQRT1_2\|Math.SQRT2\)" -syn match icinga2MathFunction contained "\(Math.abs\|Math.acos\|Math.asin\|Math.atan\|Math.atan2\|Math.ceil\|Math.cos\)" -syn match icinga2MathFunction contained "\(Math.exp\|Math.floor\|Math.isinf\|Math.isnan\|Math.log\|Math.max\|Math.min\)" -syn match icinga2MathFunction contained "\(Math.pow\|Math.random\|Math.round\|Math.sign\|Math.sin\|Math.sqrt\|Math.tan\)" - -" Json functions -syn match icinga2JsonFunction contained "\(Json.encode\|Json.decode\)" - -" String functions -syn match icinga2StrFunction contained "\(\.find\)" -syn match icinga2StrFunction contained "\(\.contains\)" -syn match icinga2StrFunction contained "\(\.len\)" -syn match icinga2StrFunction contained "\(\.lower\)" -syn match icinga2StrFunction contained "\(\.upper\)" -syn match icinga2StrFunction contained "\(\.replace\)" -syn match icinga2StrFunction contained "\(\.split\)" -syn match icinga2StrFunction contained "\(\.substr\)" -syn match icinga2StrFunction contained "\(\.to_string\)" -syn match icinga2StrFunction contained "\(\.reverse\)" - -" Array and Dict Functions -syn match icinga2ArrFunction contained "\(\.clone\)" -syn match icinga2ArrFunction contained "\(\.add(\)" -syn match icinga2ArrFunction contained "\(\.clear\)" -syn match icinga2ArrFunction contained "\(\.shallow_clone\)" -syn match icinga2ArrFunction contained "\(\.contains\)" -syn match icinga2ArrFunction contained "\(\.len\)" -syn match icinga2ArrFunction contained "\(\.remove\)" -syn match icinga2ArrFunction contained "\(\.set\)" -syn match icinga2ArrFunction contained "\(\.get\)" -syn match icinga2ArrFunction contained "\(\.sort\)" -syn match icinga2ArrFunction contained "\(\.join\)" -syn match icinga2ArrFunction contained "\(\.reverse\)" -syn match icinga2ArrFunction contained "\(\.keys\)" -syn match icinga2ArrFunction contained "\(\.call\)" -syn match icinga2ArrFunction contained "\(\.callv\)" - - -" Conditional statements -syn keyword icinga2Cond if else - -" Loops -syn keyword icinga2Loop while for break continue - -" Operators -syn match icinga2Operators "[ \t]\+\(\.\)\+" -syn match icinga2Operators "[ \t]\+\(!\)\+" -syn match icinga2Operators "[ \t]\+\(\~\)\+" -syn match icinga2Operators "[ \t]\+\(+\)\+" -syn match icinga2Operators "[ \t]\+\(-\)\+" -syn match icinga2Operators "[ \t]\+\(*\)\+" -syn match icinga2Operators "[ \t]\+\(/[^/\*]\)\+" -syn match icinga2Operators "[ \t]\+\(%\)\+" -syn match icinga2Operators "[ \t]\+\(+\)\+" -syn match icinga2Operators "[ \t]\+\(-\)\+" -syn match icinga2Operators "[ \t]\+\(=\)\+" -syn match icinga2Operators "[ \t]\+\(<\)[ \t]\+" -syn match icinga2Operators "[ \t]\+\(>\)[ \t]\+" -syn match icinga2Operators "[ \t]\+\(<<\)\+" -syn match icinga2Operators "[ \t]\+\(>>\)\+" -syn match icinga2Operators "[ \t]\+\(<=\)\+" -syn match icinga2Operators "[ \t]\+\(>=\)\+" -syn match icinga2Operators "[ \t]\+\(in\)\+" -syn match icinga2Operators "[ \t]\+\(!in\)\+" -syn match icinga2Operators "[ \t]\+\(==\)\+" -syn match icinga2Operators "[ \t]\+\(!=\)\+" -syn match icinga2Operators "[ \t]\+\(&\)\+" -syn match icinga2Operators "[ \t]\+\(\^\)\+" -syn match icinga2Operators "[ \t]\+\(|\)\+" -syn match icinga2Operators "[ \t]\+\(&&\)\+" -syn match icinga2Operators "[ \t]\+\(||\)\+" -syn match icinga2Operators "[ \t]\+\(=>\)\+" -syn match icinga2Operators "[ \t]\+\(+=\)\+" -syn match icinga2Operators "[ \t]\+\(-=\)\+" -syn match icinga2Operators "[ \t]\+\(*=\)\+" -syn match icinga2Operators "[ \t]\+\(/=\)\+" - -" global constats -syn keyword icinga2Gconst PrefixDir SysconfDir ZonesDir LocalStateDir RunDir PkgDataDir StatePath ObjectsPath -syn keyword icinga2Gconst PidPath NodeName ApplicationType UseVfork RunAsUser RunAsGroup PluginDir -" global types -syn keyword icinga2Gconst Number String Boolean Array Dictionary Value Object ConfigObject Command CheckResult -syn keyword icinga2Gconst Checkable CustomVarObject DbConnection Type PerfdataValue Comment Downtime Logger Application - -" values type -syn keyword valueBoolean contained true false -syn keyword valueNull contained null - - - -syn region nagiosDefBody start='{' end='}' - \ contains=icinga2Comment, icinga2LineComment, StringD, Braces, Parens, icinga2ObjDef, - \ icinga2ApplyDef, icinga2ObjAttr, icinga2Keyword, icinga2Keyword, icinga2AssignCond, - \ icinga2Cond, icinga2Loop, icinga2Operators, icinga2GFunction, icinga2AFunction, - \ icinga2MathFunction, icinga2Gconst, icinga2JsonFunction, icinga2StrFunction, - \ icinga2ArrFunction, valueBoolean, valueNull - - -" Highlighting -hi link icinga2Comment Comment -hi link icinga2LineComment Comment -hi link icinga2CommentTodo Todo - -hi link Braces Function -hi link Parens Function - -hi link StringS String -hi link StringD String -hi link angleBrackets String - -hi link icinga2ObjDef Statement -hi link icinga2ApplyDef Statement -hi link icinga2ObjAttr Define -hi link icinga2Keyword Keyword - -hi link icinga2AssignCond Conditional - -hi link icinga2Cond Statement -hi link icinga2Loop Statement -hi link icinga2Operators Operator - -hi link icinga2AFunction Function -hi link icinga2MathFunction Function -hi link icinga2GFunction Function -hi link icinga2JsonFunction Function -hi link icinga2StrFunction Function -hi link icinga2ArrFunction Function - - -hi link icinga2Gconst Statement - -hi link valueBoolean Boolean -hi link valueNull Special diff --git a/vim/bundle/nginx.vim b/vim/bundle/nginx.vim deleted file mode 160000 index 6a70b18..0000000 --- a/vim/bundle/nginx.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6a70b18a180099360d44d9cce55e7cdfc6b8d395 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline deleted file mode 160000 index c7fb175..0000000 --- a/vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7fb175d3565159699885653767214a6aa583ea4 diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes deleted file mode 160000 index 6e798f9..0000000 --- a/vim/bundle/vim-airline-themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e798f9030d0853d484078043ddbb41e611ab7a6 diff --git a/vim/bundle/vim-monokai/LICENSE.txt b/vim/bundle/vim-monokai/LICENSE.txt deleted file mode 100644 index db80871..0000000 --- a/vim/bundle/vim-monokai/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2009-2016 Marcin Kulik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vim/bundle/vim-monokai/README.md b/vim/bundle/vim-monokai/README.md deleted file mode 100644 index d2409ac..0000000 --- a/vim/bundle/vim-monokai/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# vim-monokai - -Monokai color scheme for Vim converted with [coloration](http://coloration.sickill.net) from Textmate theme with the same name. - -## Screenshots - -![Monokai in Vim](https://cloud.github.com/downloads/sickill/vim-monokai/vim-monokai.png) - - -## Installation - -Put `monokai.vim` file in your `~/.vim/colors/` directory and add the following line to your `~/.vimrc`: - - syntax enable - colorscheme monokai diff --git a/vim/bundle/vim-monokai/colors/monokai.vim b/vim/bundle/vim-monokai/colors/monokai.vim deleted file mode 100644 index 1b4f167..0000000 --- a/vim/bundle/vim-monokai/colors/monokai.vim +++ /dev/null @@ -1,109 +0,0 @@ -" Vim color file -" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration) - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -set t_Co=256 -let g:colors_name = "monokai" - -hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE -hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE -hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE -hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline -hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold -hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE -hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi IncSearch term=reverse cterm=reverse ctermfg=193 ctermbg=16 gui=reverse guifg=#C4BE89 guibg=#000000 -hi Search term=reverse cterm=NONE ctermfg=231 ctermbg=24 gui=NONE guifg=#f8f8f2 guibg=#204a87 -hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE -hi SignColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE -hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold -hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE -hi DiffChange ctermfg=NONE ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE -hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold -hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE -hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE -hi SpecialComment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE -hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold -hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold -hi Type ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi htmlTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi htmlEndTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/vim/bundle/vim-sensible b/vim/bundle/vim-sensible deleted file mode 160000 index c82c6d4..0000000 --- a/vim/bundle/vim-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c82c6d4978be28adcf85dc1e61fa428e801bd525 diff --git a/vim/bundle/vim-yaml/README.md b/vim/bundle/vim-yaml/README.md deleted file mode 100644 index dd13341..0000000 --- a/vim/bundle/vim-yaml/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# For pathogen - -Thanks: https://gist.github.com/871107 - diff --git a/vim/bundle/vim-yaml/after/ftplugin/yaml.vim b/vim/bundle/vim-yaml/after/ftplugin/yaml.vim deleted file mode 100644 index 58d43ad..0000000 --- a/vim/bundle/vim-yaml/after/ftplugin/yaml.vim +++ /dev/null @@ -1,37 +0,0 @@ -" Vim indent file -" Language: Yaml -" Author: Ian Young - -if exists("b:did_indent") - finish -endif -"runtime! indent/ruby.vim -"unlet! b:did_indent -let b:did_indent = 1 - -setlocal autoindent sw=2 et -setlocal indentexpr=GetYamlIndent() -setlocal indentkeys=o,O,*,!^F - -function! GetYamlIndent() - let prevlnum = v:lnum - 1 - if prevlnum == 0 - return 0 - endif - let line = substitute(getline(v:lnum),'\s\+$','','') - let prevline = substitute(getline(prevlnum),'\s\+$','','') - - let indent = indent(prevlnum) - let increase = indent + &sw - let decrease = indent - &sw - - if prevline =~ ':$' - return increase - elseif prevline =~ '^\s\+\-' && line =~ '^\s\+[^-]\+:' - return decrease - else - return indent - endif -endfunction - -" vim:set sw=2: diff --git a/vim/colors/molokai.vim b/vim/colors/molokai.vim deleted file mode 100644 index aae9420..0000000 --- a/vim/colors/molokai.vim +++ /dev/null @@ -1,211 +0,0 @@ -" Vim color file -" -" Author: Tomas Restrepo -" -" Note: Based on the monokai theme for textmate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -set background=dark -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#F8F8F0 -hi Debug guifg=#BCA3A3 gui=bold -hi Define guifg=#66D9EF -hi Delimiter guifg=#8F8F8F -hi DiffAdd guibg=#13354A -hi DiffChange guifg=#89807D guibg=#4C4745 -hi DiffDelete guifg=#960050 guibg=#1E0010 -hi DiffText guibg=#4C4745 gui=italic,bold - -hi Directory guifg=#A6E22E gui=bold -hi Error guifg=#960050 guibg=#1E0010 -hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold -hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi FoldColumn guifg=#465457 guibg=#000000 -hi Folded guifg=#465457 guibg=#000000 -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F -hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 - -hi Keyword guifg=#F92672 gui=bold -hi Label guifg=#E6DB74 gui=none -hi Macro guifg=#C4BE89 gui=italic -hi SpecialKey guifg=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF - -hi PreCondit guifg=#A6E22E gui=bold -hi PreProc guifg=#A6E22E -hi Question guifg=#66D9EF -hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 -" marks column -hi SignColumn guifg=#A6E22E guibg=#232526 -hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#465457 gui=bold -hi Special guifg=#66D9EF guibg=bg gui=italic -hi SpecialKey guifg=#888A85 gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif -hi Statement guifg=#F92672 gui=bold -hi StatusLine guifg=#455354 guibg=fg -hi StatusLineNC guifg=#808080 guibg=#080808 -hi StorageClass guifg=#FD971F gui=italic -hi Structure guifg=#66D9EF -hi Tag guifg=#F92672 gui=italic -hi Title guifg=#ef5939 -hi Todo guifg=#FFFFFF guibg=bg gui=bold - -hi Typedef guifg=#66D9EF -hi Type guifg=#66D9EF gui=none -hi Underlined guifg=#808080 gui=underline - -hi VertSplit guifg=#808080 guibg=#080808 gui=bold -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D -hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold -hi WildMenu guifg=#66D9EF guibg=#000000 - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 - hi Comment guifg=#75715E - hi CursorLine guibg=#3E3D32 - hi CursorColumn guibg=#3E3D32 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#BCBCBC guibg=#3B3A32 -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#465457 - hi CursorLine guibg=#293739 - hi CursorColumn guibg=#293739 - hi LineNr guifg=#BCBCBC guibg=#232526 - hi NonText guifg=#BCBCBC guibg=#232526 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - hi String ctermfg=144 - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=253 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=118 cterm=bold - hi Error ctermfg=219 ctermbg=89 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=118 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=118 - hi Identifier ctermfg=208 - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi Keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=16 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermbg=244 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=118 cterm=bold - hi PreProc ctermfg=118 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=253 ctermbg=66 - - " marks column - hi SignColumn ctermfg=118 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 ctermbg=232 - hi SpecialKey ctermfg=245 - - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - hi Normal ctermfg=252 ctermbg=233 - hi Comment ctermfg=59 - hi CursorLine ctermbg=234 cterm=none - hi CursorColumn ctermbg=234 - hi LineNr ctermfg=250 ctermbg=234 - hi NonText ctermfg=250 ctermbg=234 -end diff --git a/vim/pack/vendor/start/color-scheme-holokai-for-vim b/vim/pack/vendor/start/color-scheme-holokai-for-vim new file mode 160000 index 0000000..3f6cb4f --- /dev/null +++ b/vim/pack/vendor/start/color-scheme-holokai-for-vim @@ -0,0 +1 @@ +Subproject commit 3f6cb4fb28344bb63aa592f36a0f1d467abebaee diff --git a/vim/pack/vendor/start/icinga2-vim b/vim/pack/vendor/start/icinga2-vim new file mode 160000 index 0000000..79a4bf5 --- /dev/null +++ b/vim/pack/vendor/start/icinga2-vim @@ -0,0 +1 @@ +Subproject commit 79a4bf5e4b45123835c9f27ebf41dbbfc41e1d0d diff --git a/vim/pack/vendor/start/molokai b/vim/pack/vendor/start/molokai new file mode 160000 index 0000000..c3c3cc7 --- /dev/null +++ b/vim/pack/vendor/start/molokai @@ -0,0 +1 @@ +Subproject commit c3c3cc749ce7a58fad9584d904da204cc21ac26c diff --git a/vim/pack/vendor/start/nerdtree b/vim/pack/vendor/start/nerdtree new file mode 160000 index 0000000..29a321d --- /dev/null +++ b/vim/pack/vendor/start/nerdtree @@ -0,0 +1 @@ +Subproject commit 29a321d061032df5b2ec347b6b4b778f665305a6 diff --git a/vim/pack/vendor/start/nginx.vim b/vim/pack/vendor/start/nginx.vim new file mode 160000 index 0000000..0b67dd4 --- /dev/null +++ b/vim/pack/vendor/start/nginx.vim @@ -0,0 +1 @@ +Subproject commit 0b67dd4db92207fb3295a49832d60413b5658065 diff --git a/vim/pack/vendor/start/vim-airline b/vim/pack/vendor/start/vim-airline new file mode 160000 index 0000000..eff4828 --- /dev/null +++ b/vim/pack/vendor/start/vim-airline @@ -0,0 +1 @@ +Subproject commit eff4828b37d7f631aaec0465a315d627651b9037 diff --git a/vim/pack/vendor/start/vim-airline-themes b/vim/pack/vendor/start/vim-airline-themes new file mode 160000 index 0000000..3fb676b --- /dev/null +++ b/vim/pack/vendor/start/vim-airline-themes @@ -0,0 +1 @@ +Subproject commit 3fb676b8729a98817f561ef1554c0ad1a514c96a diff --git a/vim/bundle/vim-go/.github/CONTRIBUTING.md b/vim/pack/vendor/start/vim-go/.github/CONTRIBUTING.md similarity index 100% rename from vim/bundle/vim-go/.github/CONTRIBUTING.md rename to vim/pack/vendor/start/vim-go/.github/CONTRIBUTING.md diff --git a/vim/bundle/vim-go/.github/ISSUE_TEMPLATE.md b/vim/pack/vendor/start/vim-go/.github/ISSUE_TEMPLATE.md similarity index 100% rename from vim/bundle/vim-go/.github/ISSUE_TEMPLATE.md rename to vim/pack/vendor/start/vim-go/.github/ISSUE_TEMPLATE.md diff --git a/vim/bundle/vim-go/.gitignore b/vim/pack/vendor/start/vim-go/.gitignore similarity index 100% rename from vim/bundle/vim-go/.gitignore rename to vim/pack/vendor/start/vim-go/.gitignore diff --git a/vim/bundle/vim-go/.travis.yml b/vim/pack/vendor/start/vim-go/.travis.yml similarity index 100% rename from vim/bundle/vim-go/.travis.yml rename to vim/pack/vendor/start/vim-go/.travis.yml diff --git a/vim/bundle/vim-go/CHANGELOG.md b/vim/pack/vendor/start/vim-go/CHANGELOG.md similarity index 100% rename from vim/bundle/vim-go/CHANGELOG.md rename to vim/pack/vendor/start/vim-go/CHANGELOG.md diff --git a/vim/bundle/vim-go/LICENSE b/vim/pack/vendor/start/vim-go/LICENSE similarity index 100% rename from vim/bundle/vim-go/LICENSE rename to vim/pack/vendor/start/vim-go/LICENSE diff --git a/vim/bundle/vim-go/Makefile b/vim/pack/vendor/start/vim-go/Makefile similarity index 100% rename from vim/bundle/vim-go/Makefile rename to vim/pack/vendor/start/vim-go/Makefile diff --git a/vim/bundle/vim-go/README.md b/vim/pack/vendor/start/vim-go/README.md similarity index 100% rename from vim/bundle/vim-go/README.md rename to vim/pack/vendor/start/vim-go/README.md diff --git a/vim/bundle/vim-go/addon-info.json b/vim/pack/vendor/start/vim-go/addon-info.json similarity index 100% rename from vim/bundle/vim-go/addon-info.json rename to vim/pack/vendor/start/vim-go/addon-info.json diff --git a/vim/bundle/vim-go/assets/screenshot.png b/vim/pack/vendor/start/vim-go/assets/screenshot.png similarity index 100% rename from vim/bundle/vim-go/assets/screenshot.png rename to vim/pack/vendor/start/vim-go/assets/screenshot.png diff --git a/vim/bundle/vim-go/assets/vim-go.png b/vim/pack/vendor/start/vim-go/assets/vim-go.png similarity index 100% rename from vim/bundle/vim-go/assets/vim-go.png rename to vim/pack/vendor/start/vim-go/assets/vim-go.png diff --git a/vim/bundle/vim-go/assets/vim-go.svg b/vim/pack/vendor/start/vim-go/assets/vim-go.svg similarity index 100% rename from vim/bundle/vim-go/assets/vim-go.svg rename to vim/pack/vendor/start/vim-go/assets/vim-go.svg diff --git a/vim/bundle/vim-go/autoload/ctrlp/decls.vim b/vim/pack/vendor/start/vim-go/autoload/ctrlp/decls.vim similarity index 100% rename from vim/bundle/vim-go/autoload/ctrlp/decls.vim rename to vim/pack/vendor/start/vim-go/autoload/ctrlp/decls.vim diff --git a/vim/bundle/vim-go/autoload/go/alternate.vim b/vim/pack/vendor/start/vim-go/autoload/go/alternate.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/alternate.vim rename to vim/pack/vendor/start/vim-go/autoload/go/alternate.vim diff --git a/vim/bundle/vim-go/autoload/go/asmfmt.vim b/vim/pack/vendor/start/vim-go/autoload/go/asmfmt.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/asmfmt.vim rename to vim/pack/vendor/start/vim-go/autoload/go/asmfmt.vim diff --git a/vim/bundle/vim-go/autoload/go/cmd.vim b/vim/pack/vendor/start/vim-go/autoload/go/cmd.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/cmd.vim rename to vim/pack/vendor/start/vim-go/autoload/go/cmd.vim diff --git a/vim/bundle/vim-go/autoload/go/complete.vim b/vim/pack/vendor/start/vim-go/autoload/go/complete.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/complete.vim rename to vim/pack/vendor/start/vim-go/autoload/go/complete.vim diff --git a/vim/bundle/vim-go/autoload/go/coverage.vim b/vim/pack/vendor/start/vim-go/autoload/go/coverage.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/coverage.vim rename to vim/pack/vendor/start/vim-go/autoload/go/coverage.vim diff --git a/vim/bundle/vim-go/autoload/go/def.vim b/vim/pack/vendor/start/vim-go/autoload/go/def.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/def.vim rename to vim/pack/vendor/start/vim-go/autoload/go/def.vim diff --git a/vim/bundle/vim-go/autoload/go/def_test.vim b/vim/pack/vendor/start/vim-go/autoload/go/def_test.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/def_test.vim rename to vim/pack/vendor/start/vim-go/autoload/go/def_test.vim diff --git a/vim/bundle/vim-go/autoload/go/doc.vim b/vim/pack/vendor/start/vim-go/autoload/go/doc.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/doc.vim rename to vim/pack/vendor/start/vim-go/autoload/go/doc.vim diff --git a/vim/bundle/vim-go/autoload/go/fmt.vim b/vim/pack/vendor/start/vim-go/autoload/go/fmt.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/fmt.vim rename to vim/pack/vendor/start/vim-go/autoload/go/fmt.vim diff --git a/vim/bundle/vim-go/autoload/go/fmt_test.vim b/vim/pack/vendor/start/vim-go/autoload/go/fmt_test.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/fmt_test.vim rename to vim/pack/vendor/start/vim-go/autoload/go/fmt_test.vim diff --git a/vim/bundle/vim-go/autoload/go/guru.vim b/vim/pack/vendor/start/vim-go/autoload/go/guru.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/guru.vim rename to vim/pack/vendor/start/vim-go/autoload/go/guru.vim diff --git a/vim/bundle/vim-go/autoload/go/impl.vim b/vim/pack/vendor/start/vim-go/autoload/go/impl.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/impl.vim rename to vim/pack/vendor/start/vim-go/autoload/go/impl.vim diff --git a/vim/bundle/vim-go/autoload/go/import.vim b/vim/pack/vendor/start/vim-go/autoload/go/import.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/import.vim rename to vim/pack/vendor/start/vim-go/autoload/go/import.vim diff --git a/vim/bundle/vim-go/autoload/go/job.vim b/vim/pack/vendor/start/vim-go/autoload/go/job.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/job.vim rename to vim/pack/vendor/start/vim-go/autoload/go/job.vim diff --git a/vim/bundle/vim-go/autoload/go/jobcontrol.vim b/vim/pack/vendor/start/vim-go/autoload/go/jobcontrol.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/jobcontrol.vim rename to vim/pack/vendor/start/vim-go/autoload/go/jobcontrol.vim diff --git a/vim/bundle/vim-go/autoload/go/lint.vim b/vim/pack/vendor/start/vim-go/autoload/go/lint.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/lint.vim rename to vim/pack/vendor/start/vim-go/autoload/go/lint.vim diff --git a/vim/bundle/vim-go/autoload/go/list.vim b/vim/pack/vendor/start/vim-go/autoload/go/list.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/list.vim rename to vim/pack/vendor/start/vim-go/autoload/go/list.vim diff --git a/vim/bundle/vim-go/autoload/go/package.vim b/vim/pack/vendor/start/vim-go/autoload/go/package.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/package.vim rename to vim/pack/vendor/start/vim-go/autoload/go/package.vim diff --git a/vim/bundle/vim-go/autoload/go/path.vim b/vim/pack/vendor/start/vim-go/autoload/go/path.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/path.vim rename to vim/pack/vendor/start/vim-go/autoload/go/path.vim diff --git a/vim/bundle/vim-go/autoload/go/play.vim b/vim/pack/vendor/start/vim-go/autoload/go/play.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/play.vim rename to vim/pack/vendor/start/vim-go/autoload/go/play.vim diff --git a/vim/bundle/vim-go/autoload/go/rename.vim b/vim/pack/vendor/start/vim-go/autoload/go/rename.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/rename.vim rename to vim/pack/vendor/start/vim-go/autoload/go/rename.vim diff --git a/vim/bundle/vim-go/autoload/go/statusline.vim b/vim/pack/vendor/start/vim-go/autoload/go/statusline.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/statusline.vim rename to vim/pack/vendor/start/vim-go/autoload/go/statusline.vim diff --git a/vim/bundle/vim-go/autoload/go/tags.vim b/vim/pack/vendor/start/vim-go/autoload/go/tags.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/tags.vim rename to vim/pack/vendor/start/vim-go/autoload/go/tags.vim diff --git a/vim/bundle/vim-go/autoload/go/tags_test.vim b/vim/pack/vendor/start/vim-go/autoload/go/tags_test.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/tags_test.vim rename to vim/pack/vendor/start/vim-go/autoload/go/tags_test.vim diff --git a/vim/bundle/vim-go/autoload/go/template.vim b/vim/pack/vendor/start/vim-go/autoload/go/template.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/template.vim rename to vim/pack/vendor/start/vim-go/autoload/go/template.vim diff --git a/vim/bundle/vim-go/autoload/go/term.vim b/vim/pack/vendor/start/vim-go/autoload/go/term.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/term.vim rename to vim/pack/vendor/start/vim-go/autoload/go/term.vim diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/def/jump.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/def/jump.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/def/jump.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/def/jump.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/fmt/hello.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/fmt/hello.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/fmt/hello.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/fmt/hello.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/fmt/hello_golden.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/fmt/hello_golden.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/fmt/hello_golden.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/fmt/hello_golden.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/tags/add_all_golden.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/add_all_golden.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/tags/add_all_golden.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/add_all_golden.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/tags/add_all_input.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/add_all_input.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/tags/add_all_input.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/add_all_input.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/tags/remove_all_golden.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/remove_all_golden.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/tags/remove_all_golden.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/remove_all_golden.go diff --git a/vim/bundle/vim-go/autoload/go/test-fixtures/tags/remove_all_input.go b/vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/remove_all_input.go similarity index 100% rename from vim/bundle/vim-go/autoload/go/test-fixtures/tags/remove_all_input.go rename to vim/pack/vendor/start/vim-go/autoload/go/test-fixtures/tags/remove_all_input.go diff --git a/vim/bundle/vim-go/autoload/go/textobj.vim b/vim/pack/vendor/start/vim-go/autoload/go/textobj.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/textobj.vim rename to vim/pack/vendor/start/vim-go/autoload/go/textobj.vim diff --git a/vim/bundle/vim-go/autoload/go/tool.vim b/vim/pack/vendor/start/vim-go/autoload/go/tool.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/tool.vim rename to vim/pack/vendor/start/vim-go/autoload/go/tool.vim diff --git a/vim/bundle/vim-go/autoload/go/ui.vim b/vim/pack/vendor/start/vim-go/autoload/go/ui.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/ui.vim rename to vim/pack/vendor/start/vim-go/autoload/go/ui.vim diff --git a/vim/bundle/vim-go/autoload/go/util.vim b/vim/pack/vendor/start/vim-go/autoload/go/util.vim similarity index 100% rename from vim/bundle/vim-go/autoload/go/util.vim rename to vim/pack/vendor/start/vim-go/autoload/go/util.vim diff --git a/vim/bundle/vim-go/compiler/go.vim b/vim/pack/vendor/start/vim-go/compiler/go.vim similarity index 100% rename from vim/bundle/vim-go/compiler/go.vim rename to vim/pack/vendor/start/vim-go/compiler/go.vim diff --git a/vim/bundle/vim-go/doc/vim-go.txt b/vim/pack/vendor/start/vim-go/doc/vim-go.txt similarity index 100% rename from vim/bundle/vim-go/doc/vim-go.txt rename to vim/pack/vendor/start/vim-go/doc/vim-go.txt diff --git a/vim/bundle/vim-go/ftdetect/gofiletype.vim b/vim/pack/vendor/start/vim-go/ftdetect/gofiletype.vim similarity index 100% rename from vim/bundle/vim-go/ftdetect/gofiletype.vim rename to vim/pack/vendor/start/vim-go/ftdetect/gofiletype.vim diff --git a/vim/bundle/vim-go/ftplugin/asm.vim b/vim/pack/vendor/start/vim-go/ftplugin/asm.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/asm.vim rename to vim/pack/vendor/start/vim-go/ftplugin/asm.vim diff --git a/vim/bundle/vim-go/ftplugin/go.vim b/vim/pack/vendor/start/vim-go/ftplugin/go.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/go.vim rename to vim/pack/vendor/start/vim-go/ftplugin/go.vim diff --git a/vim/bundle/vim-go/ftplugin/go/commands.vim b/vim/pack/vendor/start/vim-go/ftplugin/go/commands.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/go/commands.vim rename to vim/pack/vendor/start/vim-go/ftplugin/go/commands.vim diff --git a/vim/bundle/vim-go/ftplugin/go/mappings.vim b/vim/pack/vendor/start/vim-go/ftplugin/go/mappings.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/go/mappings.vim rename to vim/pack/vendor/start/vim-go/ftplugin/go/mappings.vim diff --git a/vim/bundle/vim-go/ftplugin/go/snippets.vim b/vim/pack/vendor/start/vim-go/ftplugin/go/snippets.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/go/snippets.vim rename to vim/pack/vendor/start/vim-go/ftplugin/go/snippets.vim diff --git a/vim/bundle/vim-go/ftplugin/go/tagbar.vim b/vim/pack/vendor/start/vim-go/ftplugin/go/tagbar.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/go/tagbar.vim rename to vim/pack/vendor/start/vim-go/ftplugin/go/tagbar.vim diff --git a/vim/bundle/vim-go/ftplugin/gohtmltmpl.vim b/vim/pack/vendor/start/vim-go/ftplugin/gohtmltmpl.vim similarity index 100% rename from vim/bundle/vim-go/ftplugin/gohtmltmpl.vim rename to vim/pack/vendor/start/vim-go/ftplugin/gohtmltmpl.vim diff --git a/vim/bundle/vim-go/gosnippets/UltiSnips/go.snippets b/vim/pack/vendor/start/vim-go/gosnippets/UltiSnips/go.snippets similarity index 100% rename from vim/bundle/vim-go/gosnippets/UltiSnips/go.snippets rename to vim/pack/vendor/start/vim-go/gosnippets/UltiSnips/go.snippets diff --git a/vim/bundle/vim-go/gosnippets/snippets/go.snip b/vim/pack/vendor/start/vim-go/gosnippets/snippets/go.snip similarity index 100% rename from vim/bundle/vim-go/gosnippets/snippets/go.snip rename to vim/pack/vendor/start/vim-go/gosnippets/snippets/go.snip diff --git a/vim/bundle/vim-go/indent/go.vim b/vim/pack/vendor/start/vim-go/indent/go.vim similarity index 100% rename from vim/bundle/vim-go/indent/go.vim rename to vim/pack/vendor/start/vim-go/indent/go.vim diff --git a/vim/bundle/vim-go/indent/gohtmltmpl.vim b/vim/pack/vendor/start/vim-go/indent/gohtmltmpl.vim similarity index 100% rename from vim/bundle/vim-go/indent/gohtmltmpl.vim rename to vim/pack/vendor/start/vim-go/indent/gohtmltmpl.vim diff --git a/vim/bundle/vim-go/plugin/go.vim b/vim/pack/vendor/start/vim-go/plugin/go.vim similarity index 100% rename from vim/bundle/vim-go/plugin/go.vim rename to vim/pack/vendor/start/vim-go/plugin/go.vim diff --git a/vim/bundle/vim-go/scripts/runtest.vim b/vim/pack/vendor/start/vim-go/scripts/runtest.vim similarity index 100% rename from vim/bundle/vim-go/scripts/runtest.vim rename to vim/pack/vendor/start/vim-go/scripts/runtest.vim diff --git a/vim/bundle/vim-go/scripts/test.sh b/vim/pack/vendor/start/vim-go/scripts/test.sh similarity index 100% rename from vim/bundle/vim-go/scripts/test.sh rename to vim/pack/vendor/start/vim-go/scripts/test.sh diff --git a/vim/bundle/vim-go/syntax/go.vim b/vim/pack/vendor/start/vim-go/syntax/go.vim similarity index 100% rename from vim/bundle/vim-go/syntax/go.vim rename to vim/pack/vendor/start/vim-go/syntax/go.vim diff --git a/vim/bundle/vim-go/syntax/godefstack.vim b/vim/pack/vendor/start/vim-go/syntax/godefstack.vim similarity index 100% rename from vim/bundle/vim-go/syntax/godefstack.vim rename to vim/pack/vendor/start/vim-go/syntax/godefstack.vim diff --git a/vim/bundle/vim-go/syntax/gohtmltmpl.vim b/vim/pack/vendor/start/vim-go/syntax/gohtmltmpl.vim similarity index 100% rename from vim/bundle/vim-go/syntax/gohtmltmpl.vim rename to vim/pack/vendor/start/vim-go/syntax/gohtmltmpl.vim diff --git a/vim/bundle/vim-go/syntax/gotexttmpl.vim b/vim/pack/vendor/start/vim-go/syntax/gotexttmpl.vim similarity index 100% rename from vim/bundle/vim-go/syntax/gotexttmpl.vim rename to vim/pack/vendor/start/vim-go/syntax/gotexttmpl.vim diff --git a/vim/bundle/vim-go/syntax/vimgo.vim b/vim/pack/vendor/start/vim-go/syntax/vimgo.vim similarity index 100% rename from vim/bundle/vim-go/syntax/vimgo.vim rename to vim/pack/vendor/start/vim-go/syntax/vimgo.vim diff --git a/vim/bundle/vim-go/templates/hello_world.go b/vim/pack/vendor/start/vim-go/templates/hello_world.go similarity index 100% rename from vim/bundle/vim-go/templates/hello_world.go rename to vim/pack/vendor/start/vim-go/templates/hello_world.go diff --git a/vim/pack/vendor/start/vim-monokai b/vim/pack/vendor/start/vim-monokai new file mode 160000 index 0000000..ae77538 --- /dev/null +++ b/vim/pack/vendor/start/vim-monokai @@ -0,0 +1 @@ +Subproject commit ae7753878f8740fbdb2cef5617911ef83255349b diff --git a/vim/pack/vendor/start/vim-yaml b/vim/pack/vendor/start/vim-yaml new file mode 160000 index 0000000..4b37a4f --- /dev/null +++ b/vim/pack/vendor/start/vim-yaml @@ -0,0 +1 @@ +Subproject commit 4b37a4fa8a91c44b517e3fb6de3ebba5e02ec9fb diff --git a/vimrc b/vimrc index 2819147..4662da7 100644 --- a/vimrc +++ b/vimrc @@ -1,18 +1,176 @@ -execute pathogen#infect() -syntax on -filetype plugin indent on -"colors molokai -colors monokai -let g:airline_powerline_fonts = 1 -filetype plugin indent on -" show existing tab with 4 spaces width -set tabstop=4 -set softtabstop=0 noexpandtab -" when indenting with '>', use 4 spaces width -set shiftwidth=4 -" Enable highlighted search +" ======================================================= +" Vim configuration file +" Author: Florent Demuynck +" Homepage: https://www.demuynck.fr +" ~/.vimrc +" ======================================================= + + +set nocompatible " be iMproved + + +" ======================================================= +" General +" ======================================================= + +" Sets how many lines of history VIM has to remember +set history=500 + +" Enable filetype plugins +filetype plugin on +filetype indent on + +" Set to auto read when a file is changed from the outside +set autoread +au FocusGained,BufEnter * checktime + +" :W sudo saves the file +" (useful for handling the permission-denied error) +command! W execute 'w !sudo tee % > /dev/null' edit! + +" Automatically reload instances config on vimrc change +if has("autocmd") + autocmd! bufwritepost .vimrc source ~/.vimrc +endif + + +" ======================================================= +" VIM user interface +" ======================================================= + +" Set 7 lines to the cursor - when moving vertically using j/k +set so=7 + +" Turn on the Wild menu +set wildmenu + +"Always show current position +set ruler + + +" Height of the command bar +set cmdheight=1 + +" A buffer becomes hidden when it is abandoned +set hid + +" Configure backspace so it acts as it should act +set backspace=eol,start,indent +set whichwrap+=<,>,h,l + +" Ignore case when searching +set ignorecase + +" When searching try to be smart about cases +set smartcase + +" Highlight search results set hlsearch + +" Makes search act like search in modern browsers +set incsearch + " Use to clear the highlighting of :set hlsearch. +if maparg('', 'n') ==# '' + nnoremap :nohlsearch=has('diff')?'diffupdate':'' +endif + +" For regular expressions turn magic on +set magic + +" Show matching brackets when text indicator is over them +set showmatch +" How many tenths of a second to blink when matching brackets +set mat=2 + +" No annoying sound on errors +set noerrorbells +set novisualbell +set t_vb= +set tm=500 + +" Add a bit extra margin to the left +"set foldcolumn=1 + +" Show line numbers +set number + + +" ======================================================= +" Colors and Fonts +" ======================================================= + +" Enable syntax highlighting +syntax enable + +"colorscheme molokai +colorscheme monokai +"colorscheme holokai + +set background=dark + +" Set utf8 as standard encoding and en_US as the standard language +set encoding=utf8 + + +" ======================================================= +" Files, backups and undo +" ======================================================= + +" Turn backup off, since most stuff is in SVN, git etc. anyway... +set nobackup +set nowb +set noswapfile + + +" ======================================================= +" Text, tab and indent related +" ======================================================= + +" Use spaces instead of tabs +set expandtab + +" Be smart when using tabs ;) +set smarttab + +" 1 tab == 4 spaces +set shiftwidth=4 +set tabstop=4 + +" Linebreak on 500 characters +set lbr +set tw=500 + +set ai "Auto indent +set si "Smart indent +set wrap "Wrap lines + + +" ======================================================= +" Plugins specific +" ======================================================= + +" airline: integrate with powerline fonts +let g:airline_powerline_fonts = 1 +" airline: theme +let g:airline_theme='deus' +"let g:airline_theme='powerlineish' +"let g:airline_theme='molokai' +"let g:airline_theme='bubblegum' +"let g:airline_theme='minimalist' + +" nerdtree: open using CTRL+n +map :NERDTreeToggle + + +" ======================================================= +" Misc +" ======================================================= + " Disable VIM matching parenthesis highlighting -let loaded_matchparen = 1 +"let loaded_matchparen = 1 + " Automatically removing all trailing whitespace autocmd BufWritePre * %s/\s\+$//e + + +" vim:set ft=vim et sw=2: diff --git a/zshrc b/zshrc index c186d0c..1720fe6 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,10 @@ +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi + # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh @@ -7,7 +14,8 @@ export ZSH=$HOME/.oh-my-zsh # time that oh-my-zsh is loaded. #ZSH_THEME="robbyrussell" #ZSH_THEME="risto" -ZSH_THEME="agnoster" +#ZSH_THEME="agnoster" +ZSH_THEME="powerlevel10k/powerlevel10k" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -113,3 +121,6 @@ export EDITOR="vim" # force screen unicode to render powerfont correctly alias screen="screen -U" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh