Author: Honza Pokorny <me@honza.ca>
Remove all kinds of vim stuff
.gitmodules | 144 --------------- vim/bundle/django/syntax/django.vim | 96 ---------- vim/bundle/tomorrow/colors/tomorrow.vim | 107 ----------- vim/ftplugin/python/folding.vim | 252 --------------------------- vim/snippets/_.snippets | 54 ----- vim/snippets/clojure.snippets | 3 vim/snippets/coffee.snippets | 4 vim/snippets/haskell.snippets | 82 -------- vim/snippets/htmldjango.snippets | 93 --------- vim/snippets/javascript.snippets | 18 - vim/snippets/mkd.snippets | 8 vim/snippets/python.snippets | 84 --------- vim/snippets/rst.snippets | 5 vim/snippets/sh.snippets | 2 vim/snippets/tex.snippets | 153 ---------------- vim/snippets/yaml.snippets | 12 - vim/syntax/fish.vim | 138 -------------- vimrc | 138 --------------
diff --git a/.gitmodules b/.gitmodules index 5ea48a5fa81a0f7ff54eb54d1296fd7461a8fbb8..81806d1550810709876dde99b62d6766cfc44537 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,159 +1,15 @@ -[submodule "vim/bundle/fugitive"] - path = vim/bundle/fugitive - url = git://github.com/tpope/vim-fugitive.git -[submodule "vim/bundle/surround"] - path = vim/bundle/surround - url = git://github.com/tpope/vim-surround.git -[submodule "vim/bundle/haml"] - path = vim/bundle/haml - url = git://github.com/tpope/vim-haml.git -[submodule "vim/bundle/solarized"] - path = vim/bundle/solarized - url = git://github.com/altercation/vim-colors-solarized.git -[submodule "vim/bundle/ack"] - path = vim/bundle/ack - url = git://github.com/mileszs/ack.vim.git -[submodule "vim/bundle/syntastic"] - path = vim/bundle/syntastic - url = git://github.com/scrooloose/syntastic.git -[submodule "vim/bundle/coffeescript"] - path = vim/bundle/coffeescript - url = git://github.com/kchmck/vim-coffee-script.git -[submodule "vim/bundle/snipmate"] - path = vim/bundle/snipmate - url = git://github.com/garbas/vim-snipmate.git -[submodule "vim/bundle/utils"] - path = vim/bundle/utils - url = git://github.com/MarcWeber/vim-addon-mw-utils.git -[submodule "vim/bundle/tlib"] - path = vim/bundle/tlib - url = git://github.com/tomtom/tlib_vim.git -[submodule "vim/bundle/javascript"] - path = vim/bundle/javascript - url = git://github.com/pangloss/vim-javascript.git -[submodule "vim/bundle/mustache"] - path = vim/bundle/mustache - url = git://github.com/juvenn/mustache.vim.git -[submodule "vim/bundle/indent-guide"] - path = vim/bundle/indent-guide - url = git://github.com/nathanaelkane/vim-indent-guides.git -[submodule "vim/bundle/pathogen"] - path = vim/bundle/pathogen - url = git://github.com/tpope/vim-pathogen.git -[submodule "vim/bundle/orgmode"] - path = vim/bundle/orgmode - url = git://github.com/jceb/vim-orgmode.git -[submodule "vim/bundle/speeddating"] - path = vim/bundle/speeddating - url = git://github.com/tpope/vim-speeddating.git -[submodule "vim/bundle/commentary"] - path = vim/bundle/commentary - url = git://github.com/tpope/vim-commentary.git -[submodule "vim/bundle/pep8"] - path = vim/bundle/pep8 - url = git://github.com/nvie/vim-pep8.git -[submodule "vim/bundle/indent-object"] - path = vim/bundle/indent-object - url = git://github.com/michaeljsmith/vim-indent-object.git [submodule "vim/bundle/css-color"] path = vim/bundle/css-color url = git://github.com/skammer/vim-css-color.git -[submodule "vim/bundle/matchtag"] - path = vim/bundle/matchtag - url = git://github.com/gregsexton/MatchTag.git [submodule "vim/bundle/tomorrow-night"] path = vim/bundle/tomorrow-night url = git://github.com/ChrisKempson/Vim-Tomorrow-Theme.git [submodule "vim/bundle/clojure"] path = vim/bundle/clojure url = git://github.com/vim-scripts/VimClojure.git -[submodule "vim/bundle/stylus"] - path = vim/bundle/stylus - url = git://github.com/wavded/vim-stylus.git -[submodule "vim/bundle/jade"] - path = vim/bundle/jade - url = git://github.com/digitaltoad/vim-jade.git -[submodule "vim/bundle/badwolf"] - path = vim/bundle/badwolf - url = git://github.com/sjl/badwolf.git -[submodule "vim/bundle/molokai"] - path = vim/bundle/molokai - url = git://github.com/tomasr/molokai.git [submodule "vim/bundle/vimclojure"] path = vim/bundle/vimclojure url = git://github.com/vim-scripts/VimClojure.git -[submodule "vim/bundle/vim-clojure-static"] - path = vim/bundle/vim-clojure-static - url = git://github.com/guns/vim-clojure-static.git -[submodule "vim/bundle/vim-classpath"] - path = vim/bundle/vim-classpath - url = git://github.com/tpope/vim-classpath.git -[submodule "vim/bundle/fireplace"] - path = vim/bundle/fireplace - url = git://github.com/tpope/vim-fireplace.git -[submodule "vim/bundle/americanize"] - path = vim/bundle/americanize - url = git@github.com:nelstrom/vim-americanize.git -[submodule "vim/bundle/abolish"] - path = vim/bundle/abolish - url = git@github.com:tpope/vim-abolish.git -[submodule "vim/bundle/puppet"] - path = vim/bundle/puppet - url = git@github.com:rodjek/vim-puppet.git -[submodule "vim/bundle/vim-python-indent"] - path = vim/bundle/vim-python-indent - url = git@github.com:hynek/vim-python-pep8-indent.git -[submodule "vim/bundle/less"] - path = vim/bundle/less - url = git@github.com:groenewege/vim-less.git -[submodule "vim/bundle/base16"] - path = vim/bundle/base16 - url = git@github.com:chriskempson/base16-vim.git -[submodule "vim/bundle/haskell"] - path = vim/bundle/haskell - url = git@github.com:dag/vim2hs.git -[submodule "vim/bundle/idris"] - path = vim/bundle/idris - url = git@github.com:idris-hackers/idris-vim.git -[submodule "vim/bundle/rust"] - path = vim/bundle/rust - url = git@github.com:wting/rust.vim.git -[submodule "vim/bundle/vim-clojure-highlight"] - path = vim/bundle/vim-clojure-highlight - url = git@github.com:guns/vim-clojure-highlight.git -[submodule "vim/bundle/slamhound"] - path = vim/bundle/slamhound - url = git@github.com:guns/vim-slamhound.git -[submodule "vim/bundle/rainbow"] - path = vim/bundle/rainbow - url = git@github.com:kien/rainbow_parentheses.vim.git -[submodule "vim/bundle/vim-sexp"] - path = vim/bundle/vim-sexp - url = git@github.com:guns/vim-sexp.git -[submodule "vim/bundle/toml"] - path = vim/bundle/toml - url = git@github.com:cespare/vim-toml.git -[submodule "vim/bundle/purescript"] - path = vim/bundle/purescript - url = git@github.com:raichoo/purescript-vim.git -[submodule "vim/bundle/go"] - path = vim/bundle/go - url = git@github.com:fatih/vim-go.git -[submodule "vim/bundle/vim-jsx"] - path = vim/bundle/vim-jsx - url = git@github.com:mxw/vim-jsx.git -[submodule "vim/bundle/scala"] - path = vim/bundle/scala - url = git@github.com:derekwyatt/vim-scala.git -[submodule "vim/bundle/vim-markdown"] - path = vim/bundle/vim-markdown - url = git@github.com:plasticboy/vim-markdown.git -[submodule "vim/bundle/ledger"] - path = vim/bundle/ledger - url = git@github.com:ledger/vim-ledger.git -[submodule "vim/bundle/supertab"] - path = vim/bundle/supertab - url = git@github.com:ervandew/supertab.git [submodule "vim/bundle/alduin"] path = vim/bundle/alduin url = git@github.com:AlessandroYorba/Alduin.git diff --git a/vim/bundle/django/syntax/django.vim b/vim/bundle/django/syntax/django.vim deleted file mode 100644 index 67c46b7260ef72cc80ff939675e424a923af7d0d..0000000000000000000000000000000000000000 --- a/vim/bundle/django/syntax/django.vim +++ /dev/null @@ -1,96 +0,0 @@ -" Vim syntax file -" Language: Django template -" Maintainer: Dave Hodder <dmh@dmh.org.uk> -" Last Change: 2010 May 19 - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syntax case match - -" Mark illegal characters -syn match djangoError "%}\|}}\|#}" - -" Django template built-in tags and parameters -" 'comment' doesn't appear here because it gets special treatment -syn keyword djangoStatement contained autoescape csrf_token empty -" FIXME ==, !=, <, >, <=, and >= should be djangoStatements: -" syn keyword djangoStatement contained == != < > <= >= -syn keyword djangoStatement contained and as block endblock by cycle debug else -syn keyword djangoStatement contained extends filter endfilter firstof for -syn keyword djangoStatement contained endfor if endif ifchanged endifchanged -syn keyword djangoStatement contained ifequal endifequal ifnotequal -syn keyword djangoStatement contained endifnotequal in include load not now or -syn keyword djangoStatement contained parsed regroup reversed spaceless -syn keyword djangoStatement contained endspaceless ssi templatetag openblock -syn keyword djangoStatement contained closeblock openvariable closevariable -syn keyword djangoStatement contained openbrace closebrace opencomment -syn keyword djangoStatement contained closecomment widthratio url with endwith -syn keyword djangoStatement contained get_current_language trans noop blocktrans -syn keyword djangoStatement contained endblocktrans get_available_languages -syn keyword djangoStatement contained get_current_language_bidi plural - -" Django templete built-in filters -syn keyword djangoFilter contained add addslashes capfirst center cut date -syn keyword djangoFilter contained default default_if_none dictsort -syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs -syn keyword djangoFilter contained filesizeformat first fix_ampersands -syn keyword djangoFilter contained floatformat get_digit join last length length_is -syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust -syn keyword djangoFilter contained lower make_list phone2numeric pluralize -syn keyword djangoFilter contained pprint random removetags rjust slice slugify -syn keyword djangoFilter contained safe safeseq stringformat striptags -syn keyword djangoFilter contained time timesince timeuntil title -syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode -syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno - -" Keywords to highlight within comments -syn keyword djangoTodo contained TODO FIXME XXX - -" Django template constants (always surrounded by double quotes) -syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/ - -" Mark illegal characters within tag and variables blocks -syn match djangoTagError contained "#}\|{{\|[^%]}}\|[&#]" -syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]" - -" Django template tag and variable blocks -syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display -syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display - -" Django template 'comment' tag and comment block -syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo -syn region djangoComBlock start="{#" end="#}" contains=djangoTodo - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_django_syn_inits") - if version < 508 - let did_django_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink djangoTagBlock PreProc - HiLink djangoVarBlock PreProc - HiLink djangoStatement Statement - HiLink djangoFilter Identifier - HiLink djangoArgument Constant - HiLink djangoTagError Error - HiLink djangoVarError Error - HiLink djangoError Error - HiLink djangoComment Comment - HiLink djangoComBlock Comment - HiLink djangoTodo Todo - - delcommand HiLink -endif - -let b:current_syntax = "django" diff --git a/vim/bundle/tomorrow/colors/tomorrow.vim b/vim/bundle/tomorrow/colors/tomorrow.vim deleted file mode 100644 index d3cd3104f07d0f3e0eb61145bb5e554f549f58fc..0000000000000000000000000000000000000000 --- a/vim/bundle/tomorrow/colors/tomorrow.vim +++ /dev/null @@ -1,107 +0,0 @@ -" Vim color file -" Converted from Textmate theme Tomorrow Night using Coloration v0.3.3 (http://github.com/sickill/coloration) - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "Tomorrow-Night" - -hi Cursor ctermfg=234 ctermbg=145 cterm=NONE guifg=#1d1f21 guibg=#aeafad gui=NONE -hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#373b41 gui=NONE -hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#2e3032 gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#2e3032 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#2e3032 gui=NONE -hi LineNr ctermfg=59 ctermbg=236 cterm=NONE guifg=#717474 guibg=#2e3032 gui=NONE -hi VertSplit ctermfg=239 ctermbg=239 cterm=NONE guifg=#4e5051 guibg=#4e5051 gui=NONE -hi MatchParen ctermfg=139 ctermbg=NONE cterm=underline guifg=#b294bb guibg=NONE gui=underline -hi StatusLine ctermfg=251 ctermbg=239 cterm=bold guifg=#c5c8c6 guibg=#4e5051 gui=bold -hi StatusLineNC ctermfg=251 ctermbg=239 cterm=NONE guifg=#c5c8c6 guibg=#4e5051 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=#373b41 gui=NONE -hi IncSearch ctermfg=234 ctermbg=143 cterm=NONE guifg=#1d1f21 guibg=#b5bd68 gui=NONE -hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi Directory ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi Folded ctermfg=246 ctermbg=234 cterm=NONE guifg=#969896 guibg=#1d1f21 gui=NONE - -hi Normal ctermfg=251 ctermbg=234 cterm=NONE guifg=#c5c8c6 guibg=#1d1f21 gui=NONE -hi Boolean ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi Character ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi Comment ctermfg=246 ctermbg=NONE cterm=NONE guifg=#969896 guibg=NONE gui=NONE -hi Conditional ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Define ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi DiffAdd ctermfg=251 ctermbg=64 cterm=bold guifg=#c5c8c6 guibg=#44810b gui=bold -hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#890607 guibg=NONE gui=NONE -hi DiffChange ctermfg=251 ctermbg=23 cterm=NONE guifg=#c5c8c6 guibg=#1e3554 gui=NONE -hi DiffText ctermfg=251 ctermbg=24 cterm=bold guifg=#c5c8c6 guibg=#204a87 gui=bold -hi ErrorMsg ctermfg=252 ctermbg=167 cterm=NONE guifg=#ced2cf guibg=#df5f5f gui=NONE -hi WarningMsg ctermfg=252 ctermbg=167 cterm=NONE guifg=#ced2cf guibg=#df5f5f gui=NONE -hi Float ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi Function ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi Identifier ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi Keyword ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi Label ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi NonText ctermfg=59 ctermbg=235 cterm=NONE guifg=#4b4e55 guibg=#252729 gui=NONE -hi Number ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi Operator ctermfg=109 ctermbg=NONE cterm=NONE guifg=#8abeb7 guibg=NONE gui=NONE -hi PreProc ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi Special ctermfg=251 ctermbg=NONE cterm=NONE guifg=#c5c8c6 guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=236 cterm=NONE guifg=#4b4e55 guibg=#2e3032 gui=NONE -hi Statement ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi StorageClass ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi String ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi Tag ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi Title ctermfg=251 ctermbg=NONE cterm=bold guifg=#c5c8c6 guibg=NONE gui=bold -hi Todo ctermfg=246 ctermbg=NONE cterm=inverse,bold guifg=#969896 guibg=NONE gui=inverse,bold -hi Type ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi rubyClass ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi rubyFunction ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubySymbol ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi rubyConstant ctermfg=222 ctermbg=NONE cterm=NONE guifg=#f0c674 guibg=NONE gui=NONE -hi rubyStringDelimiter ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi rubyBlockParameter ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi rubyInstanceVariable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyInclude ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyGlobalVariable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyRegexp ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyEscape ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi rubyControl ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyOperator ctermfg=109 ctermbg=NONE cterm=NONE guifg=#8abeb7 guibg=NONE gui=NONE -hi rubyException ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi rubyRailsUserClass ctermfg=222 ctermbg=NONE cterm=NONE guifg=#f0c674 guibg=NONE gui=NONE -hi rubyRailsARAssociationMethod ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyRailsARMethod ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyRailsRenderMethod ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi rubyRailsMethod ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi erubyDelimiter ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi erubyComment ctermfg=246 ctermbg=NONE cterm=NONE guifg=#969896 guibg=NONE gui=NONE -hi erubyRailsMethod ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi htmlTag ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi htmlEndTag ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi htmlTagName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi htmlArg ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=139 ctermbg=NONE cterm=NONE guifg=#b294bb guibg=NONE gui=NONE -hi javaScriptRailsFunction ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlKey ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi yamlAnchor ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi yamlAlias ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi yamlDocumentHeader ctermfg=143 ctermbg=NONE cterm=NONE guifg=#b5bd68 guibg=NONE gui=NONE -hi cssURL ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi cssFunctionName ctermfg=109 ctermbg=NONE cterm=NONE guifg=#81a2be guibg=NONE gui=NONE -hi cssColor ctermfg=109 ctermbg=NONE cterm=NONE guifg=#8abeb7 guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi cssClassName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cc6666 guibg=NONE gui=NONE -hi cssValueLength ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=173 ctermbg=NONE cterm=NONE guifg=#de935f guibg=NONE gui=NONE -hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/vim/ftplugin/python/folding.vim b/vim/ftplugin/python/folding.vim deleted file mode 100644 index 6be00c892d3b8522ca0dd267c04dea093c66e32b..0000000000000000000000000000000000000000 --- a/vim/ftplugin/python/folding.vim +++ /dev/null @@ -1,252 +0,0 @@ -" Fold routines for python code, version 3.2 -" Source: http://www.vim.org/scripts/script.php?script_id=2527 -" Last Change: 2009 Feb 25 -" Author: Jurjen Bos -" Bug fixes and helpful comments: Grissiom, David Froger, Andrew McNabb - -" Principles: -" - a def/class starts a fold -" a line with indent less than the previous def/class ends a fold -" empty lines and comment lines are linked to the previous fold -" comment lines outside a def/class are never folded -" other lines outside a def/class are folded together as a group -" for algorithm, see bottom of script - -" - optionally, you can get empty lines between folds, see (***) -" - another option is to ignore non-python files see (**) -" - you can also modify the def/class check, -" allowing for multiline def and class definitions see (*) - -" Note for vim 7 users: -" Vim 6 line numbers always take 8 columns, while vim 7 has a numberwidth variable -" you can change the 8 below to &numberwidth if you have vim 7, -" this is only really useful when you plan to use more than 8 columns (i.e. never) - -" Note for masochists trying to read this: -" I wanted to keep the functions short, so I replaced occurences of -" if condition -" statement -" by -" if condition | statement -" wherever I found that useful - -" (*) -" class definitions are supposed to ontain a colon on the same line. -" function definitions are *not* required to have a colon, to allow for multiline defs. -" I you disagree, use instead of the pattern '^\s*\(class\s.*:\|def\s\)' -" to enforce : for defs: '^\s*\(class\|def\)\s.*:' -" you'll have to do this in two places. -let s:defpat = '^\s*\(@\|class\s.*:\|def\s\)' - -" (**) Ignore non-python files -" Commented out because some python files are not recognized by Vim -if &filetype != 'python' - finish -endif - -setlocal foldmethod=expr -setlocal foldexpr=GetPythonFold(v:lnum) -setlocal foldtext=PythonFoldText() - -function! PythonFoldText() - " ignore decorators - let fs = v:foldstart - while getline(fs) =~ '^\s*@' | let fs = nextnonblank(fs + 1) - endwhile - let line = getline(fs) - - let nucolwidth = &fdc + &number * &numberwidth - let windowwidth = winwidth(0) - nucolwidth - 3 - let foldedlinecount = v:foldend - v:foldstart - - " expand tabs into spaces - let onetab = strpart(' ', 0, &tabstop) - let line = substitute(line, '\t', onetab, 'g') - - let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount)) - let fillcharcount = windowwidth - len(line) - len(foldedlinecount) - return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' ' -endfunction - -function! PythonFoldTextDocstrings() - " ignore decorators - let fs = v:foldstart - while getline(fs) =~ '^\s*@' | let fs = nextnonblank(fs + 1) - endwhile - - " add docstrings - let line = getline(fs) - if getline(fs + 1) =~ '^\s*"""' - " Not sure which wrapping symbols I like yet. - " «»≺≻⸮⸫ - let line = line . " «" . getline(fs + 1) . "»" - let line = substitute(line, '\s*"""', '', 'g') - let line = substitute(line, '"""', '', 'g') - endif - - let nucolwidth = &fdc + &number * &numberwidth - let windowwidth = winwidth(0) - nucolwidth - 3 - let foldedlinecount = v:foldend - v:foldstart - - " expand tabs into spaces - let onetab = strpart(' ', 0, &tabstop) - let line = substitute(line, '\t', onetab, 'g') - - let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount)) - let fillcharcount = windowwidth - len(line) - len(foldedlinecount) - return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' ' -endfunction - -function! GetBlockIndent(lnum) - " Auxiliary function; determines the indent level of the surrounding def/class - " "global" lines are level 0, first def &shiftwidth, and so on - " scan backwards for class/def that is shallower or equal - let ind = 100 - let p = a:lnum+1 - while indent(p) >= 0 - let p = p - 1 - " skip empty and comment lines - if getline(p) =~ '^$\|^\s*#' | continue - " zero-level regular line - elseif indent(p) == 0 | return 0 - " skip deeper or equal lines - elseif indent(p) >= ind || getline(p) =~ '^$\|^\s*#' | continue - " indent is strictly less at this point: check for def/class - elseif getline(p) =~ s:defpat && getline(p) !~ '^\s*@' - " level is one more than this def/class - return indent(p) + &shiftwidth - endif - " shallower line that is neither class nor def: continue search at new level - let ind = indent(p) - endwhile - "beginning of file - return 0 -endfunction - -" Clever debug code, use as: call PrintIfCount(n,"Line: ".a:lnum.", value: ".x) -let s:counter=0 -function! PrintIfCount(n,t) - "Print text the nth time this function is called - let s:counter = s:counter+1 - if s:counter==a:n | echo a:t - endif -endfunction - -function! GetPythonFold(lnum) - " Determine folding level in Python source (see "higher foldlevel theory" below) - let line = getline(a:lnum) - let ind = indent(a:lnum) - " Case D***: class and def start a fold - " If previous line is @, it is not the first - if line =~ s:defpat && getline(prevnonblank(a:lnum-1)) !~ '^\s*@' - " let's see if this range of 0 or more @'s end in a class/def - let n = a:lnum - while getline(n) =~ '^\s*@' | let n = nextnonblank(n + 1) - endwhile - " yes, we have a match: this is the first of a real def/class with decorators - if getline(n) =~ s:defpat - return ">".(ind/&shiftwidth+1) - endif - " Case E***: empty lines fold with previous - " (***) change '=' to -1 if you want empty lines/comment out of a fold - elseif line == '' && getline(a:lnum-1) == '' | return '-1' - elseif line == '' && getline(a:lnum-1) != '' | return '=' - endif - " now we need the indent from previous - let p = prevnonblank(a:lnum-1) - while p>0 && getline(p) =~ '^\s*#' | let p = prevnonblank(p-1) - endwhile - let pind = indent(p) - " If previous was definition: count as one level deeper - if getline(p) =~ s:defpat && getline(prevnonblank(a:lnum - 1)) !~ '^\s*@' - let pind = pind + &shiftwidth - " if begin of file: take zero - elseif p==0 | let pind = 0 - endif - " Case S*=* and C*=*: indent equal - if ind>0 && ind==pind | return '=' - " Case S*>* and C*>*: indent increase - elseif ind>pind | return '=' - " All cases with 0 indent - elseif ind==0 - " Case C*=0*: separate global code blocks - if pind==0 && line =~ '^#' | return 0 - " Case S*<0* and S*=0*: global code - elseif line !~'^#' - " Case S*<0*: new global statement if/while/for/try/with - if 0<pind && line!~'^else\s*:\|^except.*:\|^elif.*:\|^finally\s*:' | return '>1' - " Case S*=0*, after level 0 comment - elseif 0==pind && getline(prevnonblank(a:lnum-1)) =~ '^\s*#' | return '>1' - " Case S*=0*, other, stay 1 - else | return '=' - endif - endif - " Case C*<0= and C*<0<: compute next indent - let n = nextnonblank(a:lnum+1) - while n>0 && getline(n) =~'^\s*#' | let n = nextnonblank(n+1) - endwhile - " Case C*<0=: split definitions - if indent(n)==0 | return 0 - " Case C*<0<: shallow comment - else | return -1 - end - endif - " now we really need to compute the actual fold indent - " do the hard computation - let blockindent = GetBlockIndent(a:lnum) - " Case SG<* and CG<*: global code, level 1 - if blockindent==0 | return 1 - endif - " now we need the indent from next - let n = nextnonblank(a:lnum+1) - while n>0 && getline(n) =~'^\s*#' | let n = nextnonblank(n+1) - endwhile - let nind = indent(n) - " Case CR<= and CR<> - "if line !~ '^\s*#' | call PrintIfCount(4,"Line: ".a:lnum.", blockindent: ".blockindent.", n: ".n.", nind: ".nind.", p: ".p.", pind: ".pind) - endif - if line =~ '^\s*#' && ind>=nind | return -1 - " Case CR<<: return next indent - elseif line =~ '^\s*#' | return nind / &shiftwidth - " Case SR<*: return actual indent - else | return blockindent / &shiftwidth - endif -endfunction - -" higher foldlevel theory -" There are five kinds of statements: S (code), D (def/class), E (empty), C (comment) - -" Note that a decorator statement (beginning with @) counts as definition, -" but that of a sequence of @,@,@,def only the first one counts -" This means that a definiion only counts if not preceded by a decorator - -" There are two kinds of folds: R (regular), G (global statements) - -" There are five indent situations with respect to the previous non-emtpy non-comment line: -" > (indent), < (dedent), = (same); < and = combine with 0 (indent is zero) -" Note: if the previous line is class/def, its indent is interpreted as one higher - -" There are three indent situations with respect to the next (non-E non-C) line: -" > (dedent), < (indent), = (same) - -" Situations (in order of the script): -" stat fold prev next -" SDEC RG ><=00 ><= -" D * * * begin fold level if previous is not @: '>'.ind/&sw+1 -" E * * * keep with previous: '=' -" S * = * stays the same: '=' -" C * = * combine with previous: '=' -" S * > * stays the same: '=' -" C * > * combine with previous: '=' -" C * =0 * separate blocks: 0 -" S * <0 * becomes new level 1: >1 (except except/else: 1) -" S * =0 * stays 1: '=' (after level 0 comment: '>1') -" C * <0 = split definitions: 0 -" C * <0 < shallow comment: -1 -" C * <0 > [never occurs] -" S G < * global, not the first: 1 -" C G < * indent isn't 0: 1 -" C R < = foldlevel as computed for next line: -1 -" C R < > foldlevel as computed for next line: -1 -" S R < * compute foldlevel the hard way: use function -" C R < < foldlevel as computed for this line: use function diff --git a/vim/snippets/_.snippets b/vim/snippets/_.snippets deleted file mode 100644 index 74090f0e9b4b45809c983e1fbe48f816795706f7..0000000000000000000000000000000000000000 --- a/vim/snippets/_.snippets +++ /dev/null @@ -1,54 +0,0 @@ -# Global snippets - -# (c) holds no legal value ;) -snippet c) - Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.${2} -snippet date - `strftime("%Y-%m-%d")` -snippet ddate - `strftime("%B %d, %Y")` -snippet lorem - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -snippet bsd - Copyright (c) `strftime("%Y")` ${1:`g:snips_author`} - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -snippet mit - Copyright (c) `strftime("%Y")` ${1:`g:snips_author`} - - 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/snippets/clojure.snippets b/vim/snippets/clojure.snippets deleted file mode 100644 index 1d0fdbb2c49728f64fa23bb07edaa8d5d4b8bebe..0000000000000000000000000000000000000000 --- a/vim/snippets/clojure.snippets +++ /dev/null @@ -1,3 +0,0 @@ -snippet defn - (defn ${1} [${2}] - ${3}) diff --git a/vim/snippets/coffee.snippets b/vim/snippets/coffee.snippets deleted file mode 100644 index 27deb2e0098f7e255b2fc0323fc788cc054d9f21..0000000000000000000000000000000000000000 --- a/vim/snippets/coffee.snippets +++ /dev/null @@ -1,4 +0,0 @@ -snippet cl - console.log ${1} -snippet caller - arguments.callee.caller.toString()${1} diff --git a/vim/snippets/haskell.snippets b/vim/snippets/haskell.snippets deleted file mode 100644 index 3857d8b4ea7faf74d22d9de19dfbaf06e10d3ed2..0000000000000000000000000000000000000000 --- a/vim/snippets/haskell.snippets +++ /dev/null @@ -1,82 +0,0 @@ -snippet lang - {-# LANGUAGE ${1:OverloadedStrings} #-} -snippet info - -- | - -- Module : ${1:Module.Namespace} - -- Copyright : ${2:Author} ${3:2011-2012} - -- License : ${4:BSD3} - -- - -- Maintainer : ${5:email@something.com} - -- Stability : ${6:experimental} - -- Portability : ${7:unknown} - -- - -- ${8:Description} - -- -snippet import - import ${1:Data.Text} -snippet import2 - import ${1:Data.Text} (${2:head}) -snippet importq - import qualified ${1:Data.Text} as ${2:T} -snippet inst - instance ${1:Monoid} ${2:Type} where - ${3} -snippet type - type ${1:Type} = ${2:Type} -snippet data - data ${1:Type} = ${2:$1} ${3:Int} -snippet newtype - newtype ${1:Type} = ${2:$1} ${3:Int} -snippet class - class ${1:Class} a where - ${2} -snippet module - module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` ( - ) where - `expand('%') =~ 'Main' ? "\n\nmain = do\n print \"hello world\"" : ""` - -snippet const - ${1:name} :: ${2:a} - $1 = ${3:undefined} -snippet fn - ${1:fn} :: ${2:a} -> ${3:a} - $1 ${4} = ${5:undefined} -snippet fn2 - ${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} - $1 ${5} = ${6:undefined} -snippet ap - ${1:map} ${2:fn} ${3:list} -snippet do - do - -snippet λ - \${1:x} -> ${2} -snippet \ - \${1:x} -> ${2} -snippet <- - ${1:a} <- ${2:m a} -snippet ← - ${1:a} <- ${2:m a} -snippet -> - ${1:m a} -> ${2:a} -snippet → - ${1:m a} -> ${2:a} -snippet tup - (${1:a}, ${2:b}) -snippet tup2 - (${1:a}, ${2:b}, ${3:c}) -snippet tup3 - (${1:a}, ${2:b}, ${3:c}, ${4:d}) -snippet rec - ${1:Record} { ${2:recFieldA} = ${3:undefined} - , ${4:recFieldB} = ${5:undefined} - } -snippet case - case ${1:something} of - ${2} -> ${3} -snippet let - let ${1} = ${2} - in ${3} -snippet where - where - ${1:fn} = ${2:undefined} diff --git a/vim/snippets/htmldjango.snippets b/vim/snippets/htmldjango.snippets deleted file mode 100644 index 3e63d8d2b535f2b34f63c2cca0ec617f1266e5d1..0000000000000000000000000000000000000000 --- a/vim/snippets/htmldjango.snippets +++ /dev/null @@ -1,93 +0,0 @@ -snippet doc - <!doctype html> -snippet html - <html> - <head> - </head> - <body> - ${1} - </body> - </html> -snippet body - <body> - ${1} - </body> -snippet head - <head> - <title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title> - ${2} - </head> -snippet title - <title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>${2} -snippet script - <script type="text/javascript"> - ${1} - </script>${2} -snippet scriptsrc - <script src="${1}.js" type="text/javascript"></script>${2} -snippet style - <style type="text/css" media="${1:screen}"> - ${2} - </style>${3} -snippet div - <div id="${1:name}"> - ${2} - </div> -snippet input - <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="${3}"`Close()`>${4} -snippet link - <link rel="${1}" href="${2}" type="text/css"> -snippet em - <em>${1:text}</em>${2} -snippet li - <li>${1:item}</li>${2} -snippet p - <p>${1:text}</p>${2} -snippet span - <span${1}>${2}</span>${3} -snippet strong - <strong>${1:text}</strong>${2} -snippet ul - <ul> - <li>${1:item}</li>${2} - </ul> -snippet ulc - <ul class="${1:class}"> - <li>${2:item}</li>${3} - </ul> -snippet uli - <ul id="${1:id}"> - <li>${2:item}</li>${3} - </ul> -# django -snippet % - {% ${1} %}${2} -snippet %% - {% ${1:tag_name} %} - ${2} - {% end$1 %} -snippet { - {{ ${1} }}${2} -snippet block - {% block ${1} %} - ${2} - {% endblock %} -snippet for - {% for ${1} in ${2} %} - ${3} - {% endfor %} -snippet if - {% if ${1} %} - ${2} - {% endif %} -snippet else - {% else %} - ${1} -snippet include - {% include "${1}" %} -snippet load - {% load ${1} %} -snippet url - {% url ${1} %} -snippet cl - console.log(${1}); diff --git a/vim/snippets/javascript.snippets b/vim/snippets/javascript.snippets deleted file mode 100644 index 3e81eafa767d1231fb66085e3150759bd632841c..0000000000000000000000000000000000000000 --- a/vim/snippets/javascript.snippets +++ /dev/null @@ -1,18 +0,0 @@ -snippet shebang - #!/usr/bin/env node -snippet jq - (function($) { - ${1://code} - })(jQuery); -snippet (f - (function(${1}) { - ${3:/* code */} - }(${2})); -snippet cl - console.log(${1}); -snippet caller - arguments.callee.caller.toString()${1} -snippet fn - var ${1} = function(${2}) { - ${3} - }; diff --git a/vim/snippets/mkd.snippets b/vim/snippets/mkd.snippets deleted file mode 100644 index 41642fd75d44d2b8b497df8b0b4780c2e4ac182a..0000000000000000000000000000000000000000 --- a/vim/snippets/mkd.snippets +++ /dev/null @@ -1,8 +0,0 @@ -# Markdown - -snippet [ - [${1:text}](${2:address})${3} -snippet [[ - [${1:text}][${2:ref}]${3} -snippet  diff --git a/vim/snippets/python.snippets b/vim/snippets/python.snippets deleted file mode 100644 index 2566a51cf9943c0d7d9251e8dd001c8e41e26561..0000000000000000000000000000000000000000 --- a/vim/snippets/python.snippets +++ /dev/null @@ -1,84 +0,0 @@ -snippet shebang - #!/usr/bin/env python -snippet imp - import ${1:module} -snippet d - print dir(${1}) -snippet for - for ${1:needle} in ${2:haystack}: - ${3:# code...} -# New Function -snippet def - def ${1:fname}(${2:`indent('.') ? 'self' : ''`}): - ${3} -# New Method -snippet defs - def ${1:mname}(self, ${2:arg}): - ${3:pass} -snippet . - self. -snippet ifmain - if __name__ == '__main__': - ${1:main()} -# __magic__ -snippet _ - __${1:init}__${2} -# Django ######################################### -snippet bool - ${1:FIELDNAME} = models.BooleanField(${2:default=True}) -snippet char - ${1:FIELDNAME} = models.CharField(max_length=${2}${3:, blank=True}) -snippet date - ${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True}) -snippet datetime - ${1:FIELDNAME} = models.DateTimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True}) -snippet float - ${1:FIELDNAME} = models.FloatField() -snippet int - ${1:FIELDNAME} = models.IntegerField() -snippet text - ${1:FIELDNAME} = models.TextField(${2:blank=True}) -snippet fk - ${1:FIELDNAME} = models.ForeignKey(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, to_field=''}) -snippet m2m - ${1:FIELDNAME} = models.ManyToManyField(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, symmetrical=False}${6:, through=''}${7:, db_table=''}) -snippet o2o - ${1:FIELDNAME} = models.OneToOneField(${2:OtherModel}${3:, parent_link=True}${4:, related_name=''}${5:, limit_choices_to=}${6:, to_field=''}) - -snippet form - class ${1:FormName}(forms.Form): - """${2:docstring}""" - ${3} - -snippet model - class ${1:ModelName}(models.Model): - ${2:field} - -snippet modeladmin - class ${1:ModelName}Admin(admin.ModelAdmin): - ${2} - - admin.site.register($1, $1Admin) - -snippet tabularinline - class ${1:ModelName}Inline(admin.TabularInline): - model = $1 - -snippet stackedinline - class ${1:ModelName}Inline(admin.StackedInline): - model = $1 - -snippet r2r - return render_to_response('${1:template.html}', { - ${2} - }${3:, context_instance=RequestContext(request)}) - -snippet geto - get_object_or_404(${1:Model}, ${2:pk=1}) - ${3:next} -snippet " - """ - ${1:docs} - """ -snippet ipdb - from ipdb import set_trace; set_trace() diff --git a/vim/snippets/rst.snippets b/vim/snippets/rst.snippets deleted file mode 100644 index 3b54c3ebf4d5d286990e402acbe423d9ec85d2ab..0000000000000000000000000000000000000000 --- a/vim/snippets/rst.snippets +++ /dev/null @@ -1,5 +0,0 @@ -# Socrates post -snippet post - :title: ${1:Title} - :date: `strftime("%Y-%m-%d %H:%M")` - :categories: ${2:Categories} diff --git a/vim/snippets/sh.snippets b/vim/snippets/sh.snippets deleted file mode 100644 index 349a083e8c927c15ed70e18004f056b3a41dfdea..0000000000000000000000000000000000000000 --- a/vim/snippets/sh.snippets +++ /dev/null @@ -1,2 +0,0 @@ -snippet shebang - #!/usr/bin/env sh diff --git a/vim/snippets/tex.snippets b/vim/snippets/tex.snippets deleted file mode 100644 index 4346e384daa722a5f5a90884292afe551521328f..0000000000000000000000000000000000000000 --- a/vim/snippets/tex.snippets +++ /dev/null @@ -1,153 +0,0 @@ -# \begin{}...\end{} -snippet begin - \begin{${1:env}} - ${2} - \end{$1} -# Tabular -snippet tab - \begin{${1:tabular}}{${2:c}} - ${3} - \end{$1} -# Align(ed) -snippet ali - \begin{align${1:ed}} - ${2} - \end{align$1} -# Gather(ed) -snippet gat - \begin{gather${1:ed}} - ${2} - \end{gather$1} -# Equation -snippet eq - \begin{equation} - ${1} - \end{equation} -# Unnumbered Equation -snippet \ - \\[ - ${1} - \\] -# Enumerate -snippet enum - \begin{enumerate} - \item ${1} - \end{enumerate} -# Itemize -snippet item - \begin{itemize} - \item ${1} - \end{itemize} -# Description -snippet desc - \begin{description} - \item[${1}] ${2} - \end{description} -# Matrix -snippet mat - \begin{${1:p/b/v/V/B/small}matrix} - ${2} - \end{$1matrix} -# Cases -snippet cas - \begin{cases} - ${1:equation}, &\text{ if }${2:case}\\ - ${3} - \end{cases} -# Split -snippet spl - \begin{split} - ${1} - \end{split} -# Part -snippet part - \part{${1:part name}} % (fold) - \label{prt:${2:$1}} - ${3} - % part $2 (end) -# Chapter -snippet cha - \chapter{${1:chapter name}} % (fold) - \label{cha:${2:$1}} - ${3} - % chapter $2 (end) -# Section -snippet sec - \section{${1:section name}} % (fold) - \label{sec:${2:$1}} - ${3} - % section $2 (end) -# Sub Section -snippet sub - \subsection{${1:subsection name}} % (fold) - \label{sub:${2:$1}} - ${3} - % subsection $2 (end) -# Sub Sub Section -snippet subs - \subsubsection{${1:subsubsection name}} % (fold) - \label{ssub:${2:$1}} - ${3} - % subsubsection $2 (end) -# Paragraph -snippet par - \paragraph{${1:paragraph name}} % (fold) - \label{par:${2:$1}} - ${3} - % paragraph $2 (end) -# Sub Paragraph -snippet subp - \subparagraph{${1:subparagraph name}} % (fold) - \label{subp:${2:$1}} - ${3} - % subparagraph $2 (end) -#References -snippet itd - \item[${1:description}] ${2:item} -snippet figure - ${1:Figure}~\ref{${2:fig:}}${3} -snippet table - ${1:Table}~\ref{${2:tab:}}${3} -snippet listing - ${1:Listing}~\ref{${2:list}}${3} -snippet section - ${1:Section}~\ref{${2:sec:}}${3} -snippet page - ${1:page}~\pageref{${2}}${3} -#Formating text: italic, bold, underline, small capital, emphase .. -snippet it - \textit{${1:text}} -snippet bf - \textbf{${1:text}} -snippet under - \underline{${1:text}} -snippet emp - \emph{${1:text}} -snippet sc - \textsc{${1:text}} -#Choosing font -snippet sf - \textsf{${1:text}} -snippet rm - \textrm{${1:text}} -snippet tt - \texttt{${1:text}} -#misc -snippet ft - \footnote{${1:text}} -snippet fig - \begin{figure} - \begin{center} - \includegraphics[scale=$1]{Figures/$2} - \end{center} - \caption{$3} - \label{fig:$4} - \end{figure} -#math -snippet frac - \frac{$1}{$2} -snippet sum - $\sum^{${1:n}}_{${2:i=1}}{$3}$ -#cite -snippet cite - \cite{$1} diff --git a/vim/snippets/yaml.snippets b/vim/snippets/yaml.snippets deleted file mode 100644 index b18f4439d757bad0e2bd169b7075349c27a6e826..0000000000000000000000000000000000000000 --- a/vim/snippets/yaml.snippets +++ /dev/null @@ -1,12 +0,0 @@ -snippet post - slug: ${1:slug} - english_title: ${2:title} - czech_title: ${3:nazev} - english_body: | - - $4 - - czech_body: | - - images: [] - published: `strftime("%Y-%m-%d %H:%M:%S")` diff --git a/vim/syntax/fish.vim b/vim/syntax/fish.vim deleted file mode 100644 index 680bf394e2ce5a5ec64c83bb10dee5494633ebf0..0000000000000000000000000000000000000000 --- a/vim/syntax/fish.vim +++ /dev/null @@ -1,138 +0,0 @@ -" Vim syntax file -" Language: fish -" Maintainer: yann monclair <yann@monclair.info> -" Heavily based on zsh.vim by Felix von Leitner -" there is still much work to be done, this is just a start, it should get -" better with time -" Url: http://monclair.info/~yann/vim -" Last Change: 2005/11/08 - - - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" String and Character contstants -" Highlight special characters (those which have a backslash) differently -syn match fishSpecial "\\\d\d\d\|\\[abcfnrtv\\']" -syn region fishSinglequote start=+'+ skip=+\\'+ end=+'+ -" A bunch of useful fish keywords -syn keyword fishFunction function -syn keyword fishStatement . and bg begin bind break builtin -syn keyword fishStatement case cd command commandline complete continue count -syn keyword fishStatement dirh dirs end else eval exec exit -syn keyword fishStatement fg fishd for function functions -syn keyword fishStatement help if jobs mimedb nextd not or -syn keyword fishStatement popd prevd pushd random return read -syn keyword fishStatement set set_color switch tokenize -syn keyword fishStatement ulimit umask while -syn keyword fishInputrc backward-char backward-delete-char backward-kill-line backward-kill-word backward-word -syn keyword fishInputrc beginning-of-history beginning-of-line complete delete-char delete-line -syn keyword fishInputrc explain forward-char forward-word history-search-backward history-search-forward -syn keyword fishInputrc kill-line kill-whole-line kill-word yank yank-pop - -syn keyword fishConditional if else case then in -syn keyword fishRepeat while for done - - -" Following is worth to notice: command substitution, file redirection and functions (so these features turns red) -syn match fishFunctionName "\h\w*\s*()" -syn region fishshCommandSub start=+(+ end=+)+ contains=ALLBUT,fishFunction -syn match fishRedir "\d\=\(<\|<<\|>\|>>\)\(|\|&\d\)\=" - -syn keyword fishColors black red green brown yellow blue magenta purple cyan white normal - -syn keyword fishSpecialCommands fish_on_exit fish_on_exec fish_on_return - -syn keyword fishTodo contained TODO - -syn keyword fishVariables fish_prompt fish_title history status _ umask -syn keyword fishShellVariables USER LOGNAME HOME PATH CDPATH SHELL BROWSER -syn keyword fishVariables fish_color_normal fish_color_command fish_color_substitution fish_color_redirection fish_color_end fish_color_error fish_color_param fish_color_comment fish_color_match fish_color_search_match fish_color_cwd fish_pager_color_prefix fish_pager_color_completion fish_pager_color_description fish_pager_color_progress - -"syn keyword fishShellVariables LC_TYPE LC_MESSAGE MAIL MAILCHECK -"syn keyword fishShellVariables PS1 PS2 IFS EGID EUID ERRNO GID UID -"syn keyword fishShellVariables HOST LINENO MACHTYPE OLDPWD OPTARG -"syn keyword fishShellVariables OPTIND OSTYPE PPID PWD RANDOM SECONDS -"syn keyword fishShellVariables SHLVL TTY signals TTYIDLE USERNAME -"syn keyword fishShellVariables VENDOR fish_NAME fish_VERSION ARGV0 -"syn keyword fishShellVariables BAUD COLUMNS cdpath DIRSTACKSIZE -"syn keyword fishShellVariables FCEDIT fignore fpath histchars HISTCHARS -"syn keyword fishShellVariables HISTFILE HISTSIZE KEYTIMEOUT LANG -"syn keyword fishShellVariables LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES -"syn keyword fishShellVariables LC_TIME LINES LISTMAX LOGCHECK mailpath -"syn keyword fishShellVariables MAILPATH MANPATH manpath module_path -"syn keyword fishShellVariables MODULE_PATH NULLCMD path POSTEDIT -"syn keyword fishShellVariables PS3 PS4 PROMPT PROMPT2 PROMPT3 PROMPT4 -"syn keyword fishShellVariables psvar PSVAR prompt READNULLCMD -"syn keyword fishShellVariables REPORTTIME RPROMPT RPS1 SAVEHIST -"syn keyword fishShellVariables SPROMPT STTY TIMEFMT TMOUT TMPPREFIX -"syn keyword fishShellVariables watch WATCH WATCHFMT WORDCHARS ZDOTDIR -syn match fishSpecialShellVar "\$[-#@*$?!0-9]" -syn keyword fishSetVariables ignoreeof noclobber -syn region fishDerefOpr start="\${" end="}" contains=fishShellVariables -syn match fishDerefIdentifier "\$[a-zA-Z_][a-zA-Z0-9_]*\>" -syn match fishOperator "[][}{&;|)(]" - - - -syn match fishNumber "-\=\<\d\+\>" -syn match fishComment "#.*$" contains=fishNumber,fishTodo - - -syn match fishTestOpr "-\<[oeaznlg][tfqet]\=\>\|!\==\|-\<[b-gkLprsStuwjxOG]\>" -syn region fishTest start="\[" skip="\\$" end="\]" contains=fishString,fishTestOpr,fishDerefIdentifier,fishDerefOpr -syn region fishString start=+"+ skip=+\\"+ end=+"+ contains=fishSpecial,fishOperator,fishDerefIdentifier,fishDerefOpr,fishSpecialShellVar,fishSinglequote,fishCommandSub - -syn region fishFunctions start=+function+ end=+end+ contains=fishShellVariables,fishRedir,fishCommandSub,fishVariables, fishConditional,fishRepeat,fishStatement - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_fish_syntax_inits") - if version < 508 - let did_fish_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink fishSinglequote fishString - HiLink fishConditional fishStatement - HiLink fishRepeat fishStatement - HiLink fishFunctionName fishFunction - HiLink fishFunctions fishFunction - HiLink fishCommandSub fishOperator - HiLink fishRedir fishOperator - HiLink fishSetVariables fishShellVariables - HiLink fishSpecialShellVar fishShellVariables - HiLink fishColors fishVariables - HiLink fishTestOpr fishOperator - HiLink fishDerefOpr fishSpecial - HiLink fishDerefIdentifier fishShellVariables - HiLink fishOperator Operator - HiLink fishStatement Statement - HiLink fishNumber Number - HiLink fishString String - HiLink fishComment Comment - HiLink fishSpecial Special - HiLink fishTodo Todo - HiLink fishShellVariables Special - hi fishOperator term=underline ctermfg=6 guifg=Purple gui=bold - " hi fishShellVariables term=underline ctermfg=2 guifg=SeaGreen gui=bold - " hi fishVariables term=underline ctermfg=5 guifg=Blue gui=bold - " hi fishFunction guifg=Red gui=bold - " hi fishFunctionName guifg=Blue gui=bold - "hi fishVariables ctermbg=3 guifg=Blue gui=bold - - delcommand HiLink -endif - -let b:current_syntax = "fish" - -" vim: ts=8 diff --git a/vimrc b/vimrc index 530e6822f19608ff8036c4d085d0acf683844ed2..938789df302e961874670d5f98246d8cde4ef43f 100644 --- a/vimrc +++ b/vimrc @@ -1,14 +1,8 @@ -" Load pathogen -source ~/.vim/bundle/pathogen/autoload/pathogen.vim - set nocompatible " Silence please set vb set t_vb= - -" Pathogen -call pathogen#interpose('bundle/{}') " Change the leader to , let mapleader = "," @@ -112,12 +106,6 @@ " HTML tag folding nnoremap <leader>ft Vatzf -function! g:CopyTheTextPlease() - normal! gv - silent '<,'>w !pbcopy -endfunction -vnoremap <leader>y :<c-u>call g:CopyTheTextPlease()<cr> - " Toggle whitespace characters nmap <leader>l :set list!<cr> @@ -148,14 +136,6 @@ " Open help files in a vertical split au BufWinEnter *.txt if &ft == 'help' | wincmd L | endif -let g:syntastic_enable_signs=1 -let g:syntastic_javascript_checkers=["eslint"] -let g:syntastic_error_symbol='✗' -let g:syntastic_warning_symbol='✗' - -let g:syntastic_python_checkers=["flake8"] -let g:syntastic_haskell_checkers=["hlint"] - let g:snips_author="Honza Pokorny" " Status line stuff @@ -164,7 +144,7 @@ set statusline+=%h " Help buffer flag, e.g. [Help] set statusline+=%m " Modified flag set statusline+=%r " Read only flag set statusline+=%w " Preview window flag -set statusline+=%=%{\"[\".(&fenc==\"\"?&enc:&fenc).\"]\\"}%k\%=%{fugitive#statusline()} +set statusline+=%=%{\"[\".(&fenc==\"\"?&enc:&fenc).\"]\\"}%k\%= set statusline+=%y\[%l\/%L,%c] " file type, line num, num lines, col num set laststatus=2 set scrolloff=3 @@ -175,14 +155,6 @@ " Make vim able to edit crontab set backupskip=/tmp/*,/private/tmp/*" -au Filetype rst nnoremap <buffer> <localleader>1 yypVr= -au Filetype rst nnoremap <buffer> <localleader>2 yypVr- -au Filetype rst nnoremap <buffer> <localleader>3 yypVr~ -au Filetype rst nnoremap <buffer> <localleader>4 yypVr` - -au Filetype mkd nnoremap <buffer> <localleader>1 yypVr= -au Filetype mkd nnoremap <buffer> <localleader>2 yypVr- - " Keep splits sized properly au VimResized * exe "normal! \<cw>=" @@ -193,18 +165,6 @@ " Format nnoremap Q gqip -" vagrant -au BufRead,BufNewFile Vagrantfile set ft=ruby - -" fish -augroup ft_fish - au! - - au BufNewFile,BufRead *.fish setlocal filetype=fish - - au FileType fish setlocal foldmethod=marker foldmarker={{{,}}} -augroup END - " Substitute nnoremap <leader>s :%s//g<left><left> @@ -229,43 +189,7 @@ endfun command! -nargs=* Only call CloseHiddenBuffers() -nmap \ <Plug>CommentaryLine - -" ctrlp -let g:ctrlp_working_path_mode = 0 -let g:ctrlp_extensions = ['tag'] - -let my_ctrlp_ffind_command = "ffind --dir %s --type e -B -f" - -let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_ffind_command] -let g:selecta_path = "selecta" -function! SelectaMatch(items, str, limit, mmode, ispath, crfile, regex) - let cachefile = ctrlp#utils#cachedir().'/selecta.cache' - - if !( filereadable(cachefile) && a:items == readfile(cachefile) ) - call writefile(a:items, cachefile) - endif - - if !filereadable(cachefile) - return [] - endif - - let cmd = "cat ".cachefile." | ".g:selecta_path." ".a:str - return split(system(cmd), "\n") - -endfunction - -let g:ctrlp_match_func = {'match' : 'SelectaMatch' } - -" Use c-\ to do c-] but open it in a new split. -nnoremap <c-\> <c-w>v<c-]>zvzz - -" Send visual selection to gist.honza.ca (custom sprunge.us) -" - places gist url to clipboard -" via @dotvimrc -" https://github.com/honza/heroku-sprunge -vnoremap <leader>S :w !curl -sF 'sprunge=<-' 'http://gist.honza.ca' \| pbcopy<cr> " Space to toggle folds. nnoremap <Space> za @@ -274,65 +198,5 @@ " Toggle paste set pastetoggle=<F9> -let g:pymode_doc = 1 -let g:pymode_doc_key = '<localleader>ds' -let g:pydoc = 'pydoc' -let g:pymode_syntax = 1 -let g:pymode_syntax_all = 0 -let g:pymode_syntax_builtin_objs = 1 -let g:pymode_syntax_print_as_function = 0 -let g:pymode_syntax_space_errors = 0 -let g:pymode_run = 0 -let g:pymode_lint = 0 -let g:pymode_breakpoint = 0 -let g:pymode_utils_whitespaces = 0 -let g:pymode_virtualenv = 0 -let g:pymode_folding = 0 - -let g:pymode_options_indent = 0 -let g:pymode_options_fold = 0 -let g:pymode_options_other = 0 - -let g:pymode_rope = 1 -let g:pymode_rope_global_prefix = "<localleader>R" -let g:pymode_rope_local_prefix = "<localleader>r" -let g:pymode_rope_auto_project = 1 -let g:pymode_rope_enable_autoimport = 0 -let g:pymode_rope_autoimport_generate = 1 -let g:pymode_rope_autoimport_underlineds = 0 -let g:pymode_rope_codeassist_maxfixes = 10 -let g:pymode_rope_sorted_completions = 1 -let g:pymode_rope_extended_complete = 1 -let g:pymode_rope_autoimport_modules = ["os", "shutil", "datetime"] -let g:pymode_rope_confirm_saving = 1 -let g:pymode_rope_vim_completion = 1 -let g:pymode_rope_guess_project = 1 -let g:pymode_rope_goto_def_newwin = 0 -let g:pymode_rope_always_show_complete_menu = 0 - -" Clojure -autocmd FileType clojure set commentstring=;;\ %s - -au VimEnter * RainbowParenthesesToggle -au Syntax * RainbowParenthesesLoadRound -au Syntax * RainbowParenthesesLoadSquare -au Syntax * RainbowParenthesesLoadBraces - -" Golang -autocmd FileType go set commentstring=//\ %s - -" Fish -autocmd FileType fish set commentstring=\#\ %s - -" Markdown -au FileType mkd setlocal foldmethod=manual -let g:vim_markdown_folding_disabled=1 - -" Salt files -au BufRead,BufNewFile *.sls set ft=yaml - -let g:haskell_conceal = 0 - syntax enable set background=dark -colorscheme solarized