From: martin f. krafft Date: Tue, 8 Apr 2025 12:07:23 +0000 (+0200) Subject: clean up broken plugins X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/ad650e967740e885da3efdd1d7826a3607687ca5?hp=2111f57ad96adfcb96cb106b9d53f10a96dc074c clean up broken plugins --- diff --git a/.vim/after/plugin/TabularMaps.vim b/.vim/after/plugin/TabularMaps.vim deleted file mode 120000 index 236e16a0..00000000 --- a/.vim/after/plugin/TabularMaps.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/after/plugin/TabularMaps.vim \ No newline at end of file diff --git a/.vim/autoload/editorconfig.vim b/.vim/autoload/editorconfig.vim deleted file mode 120000 index c6d022e6..00000000 --- a/.vim/autoload/editorconfig.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-editorconfig/autoload/editorconfig.vim \ No newline at end of file diff --git a/.vim/autoload/fugitive.vim b/.vim/autoload/fugitive.vim deleted file mode 120000 index 62940baa..00000000 --- a/.vim/autoload/fugitive.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/autoload/fugitive.vim \ No newline at end of file diff --git a/.vim/autoload/khuno.vim b/.vim/autoload/khuno.vim deleted file mode 120000 index bdff76c5..00000000 --- a/.vim/autoload/khuno.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/autoload/khuno.vim \ No newline at end of file diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 120000 index aa9233f4..00000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/autoload/pathogen.vim \ No newline at end of file diff --git a/.vim/autoload/tabular.vim b/.vim/autoload/tabular.vim deleted file mode 120000 index e10a6f59..00000000 --- a/.vim/autoload/tabular.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/autoload/tabular.vim \ No newline at end of file diff --git a/.vim/autoload/vim_snippets.vim b/.vim/autoload/vim_snippets.vim deleted file mode 120000 index 7a266b61..00000000 --- a/.vim/autoload/vim_snippets.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/autoload/vim_snippets.vim \ No newline at end of file diff --git a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/__init__.cpython-37.pyc b/.vim/autoload/voom/voom_vimplugin2657/__pycache__/__init__.cpython-37.pyc deleted file mode 100644 index fbfd99b9..00000000 Binary files a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/__init__.cpython-37.pyc and /dev/null differ diff --git a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_mode_fmr.cpython-37.pyc b/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_mode_fmr.cpython-37.pyc deleted file mode 100644 index bca8ee30..00000000 Binary files a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_mode_fmr.cpython-37.pyc and /dev/null differ diff --git a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_vim.cpython-37.pyc b/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_vim.cpython-37.pyc deleted file mode 100644 index 2120ec24..00000000 Binary files a/.vim/autoload/voom/voom_vimplugin2657/__pycache__/voom_vim.cpython-37.pyc and /dev/null differ diff --git a/.vim/autoload/youcompleteme.vim b/.vim/autoload/youcompleteme.vim deleted file mode 120000 index 861db0b0..00000000 --- a/.vim/autoload/youcompleteme.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-youcompleteme/autoload/youcompleteme.vim \ No newline at end of file diff --git a/.vim/doc/Tabular.txt b/.vim/doc/Tabular.txt deleted file mode 120000 index 461c669a..00000000 --- a/.vim/doc/Tabular.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/doc/Tabular.txt \ No newline at end of file diff --git a/.vim/doc/editorconfig.txt b/.vim/doc/editorconfig.txt deleted file mode 120000 index e62146cb..00000000 --- a/.vim/doc/editorconfig.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-editorconfig/doc/editorconfig.txt \ No newline at end of file diff --git a/.vim/doc/fugitive.txt b/.vim/doc/fugitive.txt deleted file mode 120000 index 57417073..00000000 --- a/.vim/doc/fugitive.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/doc/fugitive.txt \ No newline at end of file diff --git a/.vim/doc/lastplace.txt b/.vim/doc/lastplace.txt deleted file mode 120000 index 9c00f5b8..00000000 --- a/.vim/doc/lastplace.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/doc/lastplace.txt \ No newline at end of file diff --git a/.vim/doc/youcompleteme.txt b/.vim/doc/youcompleteme.txt deleted file mode 120000 index f5669d20..00000000 --- a/.vim/doc/youcompleteme.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-youcompleteme/doc/youcompleteme.txt \ No newline at end of file diff --git a/.vim/ftdetect/fugitive.vim b/.vim/ftdetect/fugitive.vim deleted file mode 120000 index 9cd163aa..00000000 --- a/.vim/ftdetect/fugitive.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/ftdetect/fugitive.vim \ No newline at end of file diff --git a/.vim/ftplugin/mediawiki.vim b/.vim/ftplugin/mediawiki.vim deleted file mode 100644 index c068d71e..00000000 --- a/.vim/ftplugin/mediawiki.vim +++ /dev/null @@ -1,51 +0,0 @@ -" Many MediaWiki wikis prefer line breaks only at the end of paragraphs -" (like in a text processor), which results in long, wrapping lines. -setlocal wrap linebreak -setlocal textwidth=0 - -" No auto-wrap at all. -setlocal formatoptions-=tc formatoptions+=l -if v:version >= 602 | setlocal formatoptions-=a | endif - -" Make navigation more amenable to the long wrapping lines. -noremap k gk -noremap j gj -noremap gk -noremap gj -noremap 0 g0 -noremap ^ g^ -noremap $ g$ -noremap D dg$ -noremap C cg$ -noremap A g$a - -inoremap gk -inoremap gj - -" utf-8 should be set if not already done globally -setlocal fileencoding=utf-8 -setlocal matchpairs+=<:> - -" Treat lists, indented text and tables as comment lines and continue with the -" same formatting in the next line (i.e. insert the comment leader) when hitting -" or using "o". -setlocal comments=n:#,n:*,n:\:,s:{\|,m:\|,ex:\|} -setlocal formatoptions+=roq - -" match HTML tags (taken directly from $VIM/ftplugin/html.vim) -if exists("loaded_matchit") - let b:match_ignorecase=0 - let b:match_skip = 's:Comment' - let b:match_words = '<:>,' . - \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' . - \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' . - \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>' -endif - -" Other useful mappings -" Insert a matching = automatically while starting a new header. -inoremap = =(getline('.')==''\|\|getline('.')=~'^=\+$')?"==\Left>":"=" - -" Enable folding based on ==sections== -setlocal foldexpr=getline(v:lnum)=~'^\\(=\\+\\)[^=]\\+\\1\\(\\s*\\)\\=\\s*$'?\">\".(len(matchstr(getline(v:lnum),'^=\\+'))-1):\"=\" -setlocal fdm=expr diff --git a/.vim/ftplugin/python/khuno.vim b/.vim/ftplugin/python/khuno.vim deleted file mode 120000 index e8573f4d..00000000 --- a/.vim/ftplugin/python/khuno.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/ftplugin/python/khuno.vim \ No newline at end of file diff --git a/.vim/plugin/Tabular.vim b/.vim/plugin/Tabular.vim deleted file mode 120000 index fa1b87b7..00000000 --- a/.vim/plugin/Tabular.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/Tabular.vim \ No newline at end of file diff --git a/.vim/plugin/editorconfig.vim b/.vim/plugin/editorconfig.vim deleted file mode 120000 index 395bd7a7..00000000 --- a/.vim/plugin/editorconfig.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-editorconfig/plugin/editorconfig.vim \ No newline at end of file diff --git a/.vim/plugin/fugitive.vim b/.vim/plugin/fugitive.vim deleted file mode 120000 index 751fa63e..00000000 --- a/.vim/plugin/fugitive.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/fugitive.vim \ No newline at end of file diff --git a/.vim/plugin/justify.vim b/.vim/plugin/justify.vim deleted file mode 120000 index de74822b..00000000 --- a/.vim/plugin/justify.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/justify.vim \ No newline at end of file diff --git a/.vim/plugin/lastplace.vim b/.vim/plugin/lastplace.vim deleted file mode 120000 index a5f99740..00000000 --- a/.vim/plugin/lastplace.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/lastplace.vim \ No newline at end of file diff --git a/.vim/plugin/matchit.vim b/.vim/plugin/matchit.vim deleted file mode 120000 index 93044285..00000000 --- a/.vim/plugin/matchit.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/matchit.vim \ No newline at end of file diff --git a/.vim/plugin/vimsnippets.vim b/.vim/plugin/vimsnippets.vim deleted file mode 120000 index 1a92c87f..00000000 --- a/.vim/plugin/vimsnippets.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/plugin/vimsnippets.vim \ No newline at end of file diff --git a/.vim/plugin/youcompleteme.vim b/.vim/plugin/youcompleteme.vim deleted file mode 120000 index b6f29b66..00000000 --- a/.vim/plugin/youcompleteme.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim-youcompleteme/plugin/youcompleteme.vim \ No newline at end of file diff --git a/.vim/syntax/fugitive.vim b/.vim/syntax/fugitive.vim deleted file mode 120000 index 34b43d92..00000000 --- a/.vim/syntax/fugitive.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/syntax/fugitive.vim \ No newline at end of file diff --git a/.vim/syntax/fugitiveblame.vim b/.vim/syntax/fugitiveblame.vim deleted file mode 120000 index c1b9ab87..00000000 --- a/.vim/syntax/fugitiveblame.vim +++ /dev/null @@ -1 +0,0 @@ -/usr/share/vim/addons/syntax/fugitiveblame.vim \ No newline at end of file diff --git a/.vim/syntax/mediawiki.vim b/.vim/syntax/mediawiki.vim deleted file mode 100644 index 950b0164..00000000 --- a/.vim/syntax/mediawiki.vim +++ /dev/null @@ -1,293 +0,0 @@ -" mediawiki.vim (formerly named Wikipedia.vim) -" -" Vim syntax file -" Language: MediaWiki, http://www.mediawiki.org/ -" Maintainer: This syntax file needs a maintainer in order to ship -" with Vim. Please contact [[User:Unforgettableid]] if you want -" to volunteer. -" Home: http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim -" Last Change: 2011 Sep 19 -" Credits: [[User:Aepd87]], [[User:Danny373]], [[User:Ingo Karkat]], et al. -" -" Published on Wikipedia in 2003-04 and declared authorless. -" -" Based on the HTML syntax file. Probably too closely based, in fact. -" There may well be name collisions everywhere, but ignorance is bliss, -" so they say. -" -" To do: plug-in support for downloading and uploading to the server. - -if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") - finish - endif - let main_syntax = "html" -endif - -syntax case ignore -if v:version >= 700 - syntax spell toplevel -endif - -" Mark illegal characters -sy match htmlError "[<>&]" - -" Tags -sy region htmlString contained start=+"+ end=+"+ contains=htmlSpecialChar,@htmlPreproc -sy region htmlString contained start=+'+ end=+'+ contains=htmlSpecialChar,@htmlPreproc -sy match htmlValue contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1 contains=@htmlPreproc -sy region htmlEndTag start=++ contains=htmlTagN,htmlTagError -sy region htmlTag start=+<[^/]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster -sy match htmlTagN contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster -sy match htmlTagN contained +]<"ms=s+1 - -" Allowed HTML tag names -sy keyword htmlTagName contained big blockquote br caption center cite code -sy keyword htmlTagName contained dd del div dl dt font hr ins li -sy keyword htmlTagName contained ol p pre rb rp rt ruby s small span strike sub -sy keyword htmlTagName contained sup table td th tr tt ul var -sy match htmlTagName contained "\<\(b\|i\|u\|h[1-6]\|em\|strong\)\>" -" Allowed Wiki tag names -sy keyword htmlTagName contained math nowiki references source syntaxhighlight - -" Allowed arg names -sy keyword htmlArg contained align lang dir width height nowrap bgcolor clear -sy keyword htmlArg contained noshade cite datetime size face color type start -sy keyword htmlArg contained value compact summary border frame rules -sy keyword htmlArg contained cellspacing cellpadding valign char charoff -sy keyword htmlArg contained colgroup col span abbr axis headers scope rowspan -sy keyword htmlArg contained colspan id class name style title - -" Special characters -sy match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};" - -" Comments -sy region htmlComment start=++ contains=htmlCommentPart,htmlCommentError -sy match htmlCommentError contained "[^>+ - -if !exists("html_no_rendering") - sy cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,@htmlPreproc - - sy region htmlBold start="" end=""me=e-4 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic - sy region htmlBold start="" end=""me=e-9 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic - sy region htmlBoldUnderline contained start="" end=""me=e-4 contains=@htmlTop,htmlBoldUnderlineItalic - sy region htmlBoldItalic contained start="" end=""me=e-4 contains=@htmlTop,htmlBoldItalicUnderline - sy region htmlBoldItalic contained start="" end=""me=e-5 contains=@htmlTop,htmlBoldItalicUnderline - sy region htmlBoldUnderlineItalic contained start="" end=""me=e-4 contains=@htmlTop - sy region htmlBoldUnderlineItalic contained start="" end=""me=e-5 contains=@htmlTop - sy region htmlBoldItalicUnderline contained start="" end=""me=e-4 contains=@htmlTop,htmlBoldUnderlineItalic - - sy region htmlUnderline start="" end=""me=e-4 contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic - sy region htmlUnderlineBold contained start="" end=""me=e-4 contains=@htmlTop,htmlUnderlineBoldItalic - sy region htmlUnderlineBold contained start="" end=""me=e-9 contains=@htmlTop,htmlUnderlineBoldItalic - sy region htmlUnderlineItalic contained start="" end=""me=e-4 contains=@htmlTop,htmlUnderlineItalicBold - sy region htmlUnderlineItalic contained start="" end=""me=e-5 contains=@htmlTop,htmlUnderlineItalicBold - sy region htmlUnderlineItalicBold contained start="" end=""me=e-4 contains=@htmlTop - sy region htmlUnderlineItalicBold contained start="" end=""me=e-9 contains=@htmlTop - sy region htmlUnderlineBoldItalic contained start="" end=""me=e-4 contains=@htmlTop - sy region htmlUnderlineBoldItalic contained start="" end=""me=e-5 contains=@htmlTop - - sy region htmlItalic start="" end=""me=e-4 contains=@htmlTop,htmlItalicBold,htmlItalicUnderline - sy region htmlItalic start="" end=""me=e-5 contains=@htmlTop - sy region htmlItalicBold contained start="" end=""me=e-4 contains=@htmlTop,htmlItalicBoldUnderline - sy region htmlItalicBold contained start="" end=""me=e-9 contains=@htmlTop,htmlItalicBoldUnderline - sy region htmlItalicBoldUnderline contained start="" end=""me=e-4 contains=@htmlTop - sy region htmlItalicUnderline contained start="" end=""me=e-4 contains=@htmlTop,htmlItalicUnderlineBold - sy region htmlItalicUnderlineBold contained start="" end=""me=e-4 contains=@htmlTop - sy region htmlItalicUnderlineBold contained start="" end=""me=e-9 contains=@htmlTop - - sy region htmlH1 start="" end=""me=e-5 contains=@htmlTop - sy region htmlH2 start="" end=""me=e-5 contains=@htmlTop - sy region htmlH3 start="" end=""me=e-5 contains=@htmlTop - sy region htmlH4 start="" end=""me=e-5 contains=@htmlTop - sy region htmlH5 start="" end=""me=e-5 contains=@htmlTop - sy region htmlH6 start="" end=""me=e-5 contains=@htmlTop -endif - - -" No htmlTop and wikiPre inside HTML preformatted areas, because -" MediaWiki renders everything in there literally (HTML tags and -" entities, too):
 tags work as the combination of  and
-" the standard HTML 
 tag: the content will preformatted, and it
-" will not be parsed, but shown as in the wikitext source.
-"
-" With wikiPre, indented lines would be rendered differently from
-" unindented lines.
-sy match htmlPreTag       /
/         contains=htmlTag
-sy match htmlPreEndTag    /<\/pre>/       contains=htmlEndTag
-sy match wikiNowikiTag    //      contains=htmlTag
-sy match wikiNowikiEndTag /<\/nowiki>/    contains=htmlEndTag
-sy match wikiSourceTag    /]\+>/ contains=htmlTag
-sy match wikiSourceEndTag /<\/source>/    contains=htmlEndTag
-sy match wikiSyntaxHLTag    /]\+>/ contains=htmlTag
-sy match wikiSyntaxHLEndTag /<\/syntaxhighlight>/    contains=htmlEndTag
- 
-" Note: Cannot use 'start="
"rs=e', so still have the 
 tag
-" highlighted correctly via separate sy-match. Unfortunately, this will
-" also highlight 
 tags inside the preformatted region. 
-sy region htmlPre    start="
"                 end="<\/pre>"me=e-6    contains=htmlPreTag
-sy region wikiNowiki start=""              end="<\/nowiki>"me=e-9 contains=wikiNowikiTag
-sy region wikiSource start="]\+>"         keepend end="<\/source>"me=e-9 contains=wikiSourceTag
-sy region wikiSyntaxHL start="]\+>" keepend end="<\/syntaxhighlight>"me=e-18 contains=wikiSyntaxHLTag
- 
-sy include @TeX syntax/tex.vim
-sy region wikiTeX matchgroup=htmlTag start="" end="<\/math>"  contains=@texMathZoneGroup,wikiNowiki,wikiNowikiEndTag
-sy region wikiRef matchgroup=htmlTag start=""  end="<\/ref>"   contains=wikiNowiki,wikiNowikiEndTag
- 
-sy cluster wikiTop contains=@Spell,wikiLink,wikiNowiki,wikiNowikiEndTag
- 
-sy region wikiItalic        start=+'\@
-else
-  command! -nargs=+ HtmlHiLink hi def link 
-endif
- 
-if version >= 508 || !exists("did_html_syn_inits")
-  HtmlHiLink htmlTag            Function
-  HtmlHiLink htmlEndTag         Identifier
-  HtmlHiLink htmlArg            Type
-  HtmlHiLink htmlTagName        htmlStatement
-  HtmlHiLink htmlSpecialTagName Exception
-  HtmlHiLink htmlValue          String
-  HtmlHiLink htmlSpecialChar    Special
- 
-  if !exists("html_no_rendering")
-    HtmlHiLink htmlTitle Title
-    HtmlHiLink htmlH1    htmlTitle
-    HtmlHiLink htmlH2    htmlTitle
-    HtmlHiLink htmlH3    htmlTitle
-    HtmlHiLink htmlH4    htmlTitle
-    HtmlHiLink htmlH5    htmlTitle
-    HtmlHiLink htmlH6    htmlTitle
- 
-    HtmlHiLink htmlPreProc          PreProc
-    HtmlHiLink htmlHead             htmlPreProc
-    HtmlHiLink htmlPreProcAttrName  htmlPreProc
-    HtmlHiLink htmlPreStmt          htmlPreProc
- 
-    HtmlHiLink htmlSpecial          Special
-    HtmlHiLink htmlCssDefinition    htmlSpecial
-    HtmlHiLink htmlEvent            htmlSpecial
-    HtmlHiLink htmlSpecialChar      htmlSpecial
- 
-    HtmlHiLink htmlComment          Comment
-    HtmlHiLink htmlCommentPart      htmlComment
-    HtmlHiLink htmlCssStyleComment  htmlComment
- 
-    HtmlHiLink htmlString           String
-    HtmlHiLink htmlPreAttr          htmlString
-    HtmlHiLink htmlValue            htmlString
- 
-    HtmlHiLink htmlError            Error
-    HtmlHiLink htmlBadArg           htmlError
-    HtmlHiLink htmlBadTag           htmlError
-    HtmlHiLink htmlCommentError     htmlError
-    HtmlHiLink htmlPreError         htmlError  
-    HtmlHiLink htmlPreProcAttrError htmlError
-    HtmlHiLink htmlTagError         htmlError
- 
-    HtmlHiLink htmlStatement        Statement
- 
-    HtmlHiLink htmlConstant         Constant
- 
-    HtmlHiLink htmlBoldItalicUnderline htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineItalicBold htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineBoldItalic htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicBoldUnderline htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicUnderlineBold htmlBoldUnderlineItalic
- 
-    HtmlHiLink htmlItalicBold          htmlBoldItalic
-    HtmlHiLink htmlItalicUnderline     htmlUnderlineItalic
-    HtmlHiLink htmlUnderlineBold       htmlBoldUnderline
- 
-    HtmlHiLink htmlLink Underlined
- 
-    if !exists("html_my_rendering")
-      hi def htmlBold                term=bold                  cterm=bold                  gui=bold
-      hi def htmlBoldUnderline       term=bold,underline        cterm=bold,underline        gui=bold,underline
-      hi def htmlBoldItalic          term=bold,italic           cterm=bold,italic           gui=bold,italic
-      hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
-      hi def htmlUnderline           term=underline             cterm=underline             gui=underline
-      hi def htmlUnderlineItalic     term=italic,underline      cterm=italic,underline      gui=italic,underline
-      hi def htmlItalic              term=italic                cterm=italic                gui=italic
-    endif
- 
-  endif " !exists("html_no_rendering")
- 
-  if version < 508
-    let did_html_syn_inits = 1
-  endif
- 
-endif " version >= 508 || !exists("did_html_syn_inits")
- 
-" Wiki highlighting
- 
-HtmlHiLink wikiItalic        htmlItalic
-HtmlHiLink wikiBold          htmlBold
-HtmlHiLink wikiBoldItalic    htmlBoldItalic
-HtmlHiLink wikiItalicBold    htmlBoldItalic
-HtmlHiLink wikiBoldAndItalic htmlBoldItalic
- 
-HtmlHiLink wikiH1 htmlTitle
-HtmlHiLink wikiH2 htmlTitle
-HtmlHiLink wikiH3 htmlTitle
-HtmlHiLink wikiH4 htmlTitle
-HtmlHiLink wikiH5 htmlTitle
-HtmlHiLink wikiH6 htmlTitle
- 
-HtmlHiLink wikiLink           htmlLink
-HtmlHiLink wikiTemplate       htmlSpecial
-HtmlHiLink wikiParaFormatChar htmlSpecial
-HtmlHiLink wikiPre            htmlConstant
-HtmlHiLink wikiRef            htmlComment
- 
-HtmlHiLink wikiSource         wikiPre
-HtmlHiLink wikiSyntaxHL       wikiPre
- 
- 
-let b:current_syntax = "html"
- 
-delcommand HtmlHiLink
- 
-if main_syntax == "html"
-  unlet main_syntax
-endif
- 
-" vim: set et sts=2 sw=2:
diff --git a/.vim/syntax/puppet.vim b/.vim/syntax/puppet.vim
deleted file mode 100644
index 698fc803..00000000
--- a/.vim/syntax/puppet.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" puppet syntax file
-" Filename:     puppet.vim
-" Language:     puppet configuration file
-" Maintainer:   Luke Kanies 
-" URL:         
-" Last Change:
-" Version:     
-"
-
-" Copied from the cfengine, ruby, and perl syntax files
-" 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
-
-syn region  puppetDefine        start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
-syn keyword puppetDefType       class define site node inherits contained
-syn keyword puppetInherits      inherits contained
-syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
-syn match   puppetArgument      "\w\+" contained
-syn match   puppetArgument      "\$\w\+" contained
-syn match   puppetArgument      "'[^']+'" contained
-syn match   puppetArgument      '"[^"]+"' contained
-syn match   puppetDefName     "\w\+" contained
-
-syn match   puppetInstance           "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault
-syn match   puppetTypeBrace       "{" contained
-syn match   puppetTypeName       "[a-z]\w*" contained
-syn match   puppetTypeDefault    "[A-Z]\w*" contained
-
-syn match   puppetParam           "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName
-syn match   puppetParamRArrow       "=>" contained
-syn match   puppetParamName       "\w\+" contained
-syn match   puppetVariable           "$\w\+"
-syn match   puppetVariable           "${\w\+}"
-syn match   puppetParen           "("
-syn match   puppetParen           ")"
-syn match   puppetBrace           "{"
-syn match   puppetBrace           "}"
-
-syn region  puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable
-
-syn keyword puppetBoolean    true false
-syn keyword puppetKeyword    import inherits include
-syn keyword puppetControl    case default
-
-" comments last overriding everything else
-syn match   puppetComment            "\s*#.*$" contains=puppetTodo
-syn keyword puppetTodo               TODO NOTE FIXME XXX contained
-
-" 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_puppet_syn_inits")
-  if version < 508
-    let did_puppet_syn_inits = 1
-    command -nargs=+ HiLink hi link 
-  else
-    command -nargs=+ HiLink hi def link 
-  endif
-
-  HiLink puppetVariable             Identifier
-  HiLink puppetBoolean              Boolean
-  HiLink puppetType                 Identifier
-  HiLink puppetDefault              Identifier
-  HiLink puppetKeyword              Define
-  HiLink puppetTypeDefs             Define
-  HiLink puppetComment              Comment
-  HiLink puppetString               String
-  HiLink puppetTodo                 Todo
-"  HiLink puppetBrace                Delimiter
-"  HiLink puppetTypeBrace            Delimiter
-"  HiLink puppetParen                Delimiter
-  HiLink puppetDelimiter            Delimiter
-  HiLink puppetControl              Statement
-  HiLink puppetDefType              Define
-  HiLink puppetDefName              Type
-  HiLink puppetTypeName             Statement
-  HiLink puppetTypeDefault          Type
-  HiLink puppetParamName            Identifier
-  HiLink puppetArgument             Identifier
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "puppet"