diff options
| -rw-r--r-- | .gitmodules | 57 | ||||
| -rwxr-xr-x | install | 14 | ||||
| -rwxr-xr-x | utils/vim_bundles_update | 12 | ||||
| m--------- | vim/3rdparty/vim-pathogen | 0 | ||||
| -rw-r--r-- | vim/autoload/pathogen.vim | 266 | ||||
| m--------- | vim/bundle/YouCompleteMe | 0 | ||||
| m--------- | vim/bundle/lightline-ale | 0 | ||||
| m--------- | vim/bundle/lightline.vim | 0 | ||||
| m--------- | vim/bundle/neomutt.vim | 0 | ||||
| m--------- | vim/bundle/nerdcommenter | 0 | ||||
| m--------- | vim/bundle/tagbar | 0 | ||||
| m--------- | vim/bundle/tlib_vim | 0 | ||||
| m--------- | vim/bundle/ultisnips | 0 | ||||
| m--------- | vim/bundle/vim-addon-mw-utils | 0 | ||||
| m--------- | vim/bundle/vim-autotag | 0 | ||||
| m--------- | vim/bundle/vim-gitgutter | 0 | ||||
| m--------- | vim/bundle/vim-indent-guides | 0 | ||||
| m--------- | vim/bundle/vim-openscad | 0 | ||||
| m--------- | vim/bundle/vim-repeat | 0 | ||||
| m--------- | vim/bundle/vim-snippets | 0 | ||||
| m--------- | vim/bundle/vim-surround | 0 | ||||
| m--------- | vim/bundle/vim-table-mode | 0 | ||||
| m--------- | vim/pack/git-plugins/start/ale | 0 | ||||
| -rw-r--r-- | vim/syntax/iptables.vim | 380 | ||||
| -rw-r--r-- | vimrc | 31 |
25 files changed, 35 insertions, 725 deletions
diff --git a/.gitmodules b/.gitmodules index 0210d4a..39db33f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,3 @@ -[submodule "vim/bundle/YouCompleteMe"] - path = vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git -[submodule "vim/bundle/lightline.vim"] - path = vim/bundle/lightline.vim - url = https://github.com/itchyny/lightline.vim.git -[submodule "vim/bundle/tlib_vim"] - path = vim/bundle/tlib_vim - url = https://github.com/tomtom/tlib_vim.git -[submodule "vim/bundle/tagbar"] - path = vim/bundle/tagbar - url = https://github.com/majutsushi/tagbar.git -[submodule "vim/bundle/vim-addon-mw-utils"] - path = vim/bundle/vim-addon-mw-utils - url = https://github.com/MarcWeber/vim-addon-mw-utils.git -[submodule "vim/bundle/vim-gitgutter"] - path = vim/bundle/vim-gitgutter - url = git://github.com/airblade/vim-gitgutter.git -[submodule "vim/bundle/vim-snippets"] - path = vim/bundle/vim-snippets - url = https://github.com/honza/vim-snippets.git -[submodule "vim/bundle/vim-table-mode"] - path = vim/bundle/vim-table-mode - url = https://github.com/dhruvasagar/vim-table-mode.git -[submodule "vim/3rdparty/vim-pathogen"] - path = vim/3rdparty/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git [submodule "private"] path = private url = git@cynerd.cz:myconfigs-private -[submodule "vim/bundle/vim-autotag"] - path = vim/bundle/vim-autotag - url = https://github.com/craigemery/vim-autotag.git -[submodule "vim/bundle/ultisnips"] - path = vim/bundle/ultisnips - url = https://github.com/SirVer/ultisnips.git -[submodule "vim/bundle/nerdcommenter"] - path = vim/bundle/nerdcommenter - url = https://github.com/scrooloose/nerdcommenter.git -[submodule "vim/bundle/vim-indent-guides"] - path = vim/bundle/vim-indent-guides - url = git://github.com/nathanaelkane/vim-indent-guides.git -[submodule "vim/bundle/vim-surround"] - path = vim/bundle/vim-surround - url = git://github.com/tpope/vim-surround.git -[submodule "vim/bundle/vim-repeat"] - path = vim/bundle/vim-repeat - url = https://github.com/tpope/vim-repeat.git -[submodule "vim/bundle/ale"] - path = vim/pack/git-plugins/start/ale - url = https://github.com/w0rp/ale.git -[submodule "vim/bundle/neomutt.vim"] - path = vim/bundle/neomutt.vim - url = https://github.com/neomutt/neomutt.vim.git -[submodule "vim/bundle/vim-openscad"] - path = vim/bundle/vim-openscad - url = https://github.com/sirtaj/vim-openscad.git -[submodule "vim/bundle/lightline-ale"] - path = vim/bundle/lightline-ale - url = https://github.com/maximbaz/lightline-ale.git @@ -39,19 +39,17 @@ fi YCM_PATH=~/.vim/bundle/YouCompleteMe if ask "Install VIM scripts"; then - # See if we have anything different from what we have in repository - YCM_REV="$(cd $YCM_PATH && git --work-tree=. diff --exit-code -s && echo y)" inst vimrc ~/.vimrc inst vim/ ~/.vim inst local/bin/vim-project-gen ~/.local/bin/vim-project-gen mkdir -p ~/.cache/vim # directory for *.swp files mkdir -p ~/.cache/vim-undo # directory for undo files - if [ "$YCM_REV" != "y" ]; then ( - cd $YCM_PATH - ./install.py --clang-completer --system-libclang - ); else - echo "YouCompleteMe is not required to be recompiled" - fi + # Vim plugin manager + [ -d ~/.vim/bundle/Vundle.vim ] || { + mkdir -p ~/.vim/bundle + git clone "https://github.com/VundleVim/Vundle.vim.git" ~/.vim/bundle/Vundle.vim + } + vim +PluginInstall +qall fi if ask "Install email synchronization"; then diff --git a/utils/vim_bundles_update b/utils/vim_bundles_update deleted file mode 100755 index eb502c6..0000000 --- a/utils/vim_bundles_update +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -[ -d vim/bundle ] || (echo Run in root of myconfigs only! && exit 1) - -for dir in vim/bundle/*; do - pushd $dir - git checkout master - git pull - git submodule update --init --recursive - popd -done diff --git a/vim/3rdparty/vim-pathogen b/vim/3rdparty/vim-pathogen deleted file mode 160000 -Subproject ddfb1f14d7597e6aedc749be06b559a673c437a diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 2ec30e1..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,266 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope <http://tpo.pe/> -" 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() 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. -" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}" -" on versions of Vim without native package support. -function! pathogen#infect(...) abort - if a:0 - let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")') - else - let paths = ['bundle/{}', 'pack/{}/start/{}'] - endif - if has('packages') - call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"') - endif - let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$' - for path in filter(copy(paths), 'v:val =~# static') - call pathogen#surround(path) - endfor - for path in filter(copy(paths), 'v:val !~# static') - if path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call pathogen#surround(path) - else - 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,'\\\@<!\%(\\\\\)*\zs,') - return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")') -endfunction - -" Convert a list to a path. -function! pathogen#join(...) abort - if type(a:1) == type(1) && a:1 - let i = 1 - let space = ' ' - else - let i = 0 - let space = '' - endif - let path = "" - while i < a:0 - if type(a:000[i]) == type([]) - let list = a:000[i] - let j = 0 - while j < len(list) - let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g') - let path .= ',' . escaped - let j += 1 - endwhile - else - let path .= "," . a:000[i] - endif - let i += 1 - endwhile - return substitute(path,'^,','','') -endfunction - -" Convert a list to a path with escaped spaces for 'path', 'tag', etc. -function! pathogen#legacyjoin(...) abort - return call('pathogen#join',[1] + a:000) -endfunction - -" Turn filetype detection off and back on again if it was already enabled. -function! pathogen#cycle_filetype() abort - if exists('g:did_load_filetypes') - filetype off - filetype on - endif -endfunction - -" Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_blacklist or the -" comma delimited environment variable $VIMBLACKLIST. -function! pathogen#is_disabled(path) abort - if a:path =~# '\~$' - return 1 - endif - let sep = pathogen#slash() - let blacklist = - \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST) - if !empty(blacklist) - call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') - endif - return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction - -" Prepend the given directory to the runtime path and append its corresponding -" after directory. Curly braces are expanded with pathogen#expand(). -function! pathogen#surround(path) abort - let sep = pathogen#slash() - let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':s?[\\/]\=$??') - let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') - call filter(rtp, 'index(before + after, v:val) == -1') - let &rtp = pathogen#join(before, rtp, after) - return &rtp -endfunction - -" For each directory in the runtime path, add a second entry with the given -" argument appended. Curly braces are expanded with pathogen#expand(). -function! pathogen#interpose(name) abort - let sep = pathogen#slash() - let name = a:name - if has_key(s:done_bundles, name) - return "" - endif - let s:done_bundles[name] = 1 - let list = [] - for dir in pathogen#split(&rtp) - if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] - else - let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') - endif - endfor - let &rtp = pathogen#join(pathogen#uniq(list)) - return 1 -endfunction - -let s:done_bundles = {} - -" Invoke :helptags on all non-$VIM doc directories in runtimepath. -function! pathogen#helptags() abort - let sep = pathogen#slash() - for glob in pathogen#split(&rtp) - for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep') - if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir) - endif - endfor - endfor -endfunction - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort - for command in a:000 - execute command - endfor - return '' -endfunction - -" Section: Unofficial - -function! pathogen#is_absolute(path) abort - return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]') -endfunction - -" Given a string, returns all possible permutations of comma delimited braced -" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields -" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard -" and globbed. Actual globs are preserved. -function! pathogen#expand(pattern, ...) abort - let after = a:0 ? a:1 : '' - let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '') - if pattern =~# '{[^{}]\+}' - let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) - let found = map(split(pat, ',', 1), 'pre.v:val.post') - let results = [] - for pattern in found - call extend(results, pathogen#expand(pattern)) - endfor - elseif pattern =~# '{}' - let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)') - let post = pattern[strlen(pat) : -1] - let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') - else - let results = [pattern] - endif - let vf = pathogen#slash() . 'vimfiles' - call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') - return filter(results, '!empty(v:val)') -endfunction - -" \ on Windows unless shellslash is set, / everywhere else. -function! pathogen#slash() abort - return !exists("+shellslash") || &shellslash ? '/' : '\' -endfunction - -function! pathogen#separator() abort - return pathogen#slash() -endfunction - -" Convenience wrapper around glob() which returns a list. -function! pathogen#glob(pattern) abort - let files = split(glob(a:pattern),"\n") - return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction - -" Like pathogen#glob(), only limit the results to directories. -function! pathogen#glob_directories(pattern) abort - return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction - -" Remove duplicates from a list. -function! pathogen#uniq(list) abort - let i = 0 - let seen = {} - while i < len(a:list) - if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i]) - call remove(a:list,i) - elseif a:list[i] ==# '' - let i += 1 - let empty = 1 - else - let seen[a:list[i]] = 1 - let i += 1 - endif - endwhile - return a:list -endfunction - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - 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 - -" 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/YouCompleteMe b/vim/bundle/YouCompleteMe deleted file mode 160000 -Subproject e37923a752c7eee184cd6d96ac34e303fb7cfae diff --git a/vim/bundle/lightline-ale b/vim/bundle/lightline-ale deleted file mode 160000 -Subproject dd59077f9537b344f7ae80f713c1e4856ec1520 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim deleted file mode 160000 -Subproject 47765c787ddc981c2eab6105ade84067d164893 diff --git a/vim/bundle/neomutt.vim b/vim/bundle/neomutt.vim deleted file mode 160000 -Subproject b1115c87b6b1355c7d2d4c93bd57f5b1c629832 diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter deleted file mode 160000 -Subproject fdf950f20b3907c6a6fa0bc5c7ac0aeb567841d diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar deleted file mode 160000 -Subproject 387bbadda98e1376ff3871aa461b1f0abd4ece7 diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim deleted file mode 160000 -Subproject ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243 diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips deleted file mode 160000 -Subproject 6fdc3647f72e0a1f321ea6bd092ecd01f7c187b diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils deleted file mode 160000 -Subproject 295862ba6be47ec3b11b6c85c10d982ffd9bc0b diff --git a/vim/bundle/vim-autotag b/vim/bundle/vim-autotag deleted file mode 160000 -Subproject b2847e15cb448e7e3194c500527fdfe042a4378 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter deleted file mode 160000 -Subproject 50a7062909d91a290fae04219887b1b45f3138d diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides deleted file mode 160000 -Subproject 54d889a63716ee2f1818aa2ec5082db47147147 diff --git a/vim/bundle/vim-openscad b/vim/bundle/vim-openscad deleted file mode 160000 -Subproject 2ac407dcc73176862524e0cf18c00d85146fac5 diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat deleted file mode 160000 -Subproject 43d2678fa59d068c815d8298331c195e850ff5a diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets deleted file mode 160000 -Subproject b51c01137259ac7cd59381001279fa36baefbc5 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround deleted file mode 160000 -Subproject 597068870b8f093a8b2d11536c62ff31222ee8d diff --git a/vim/bundle/vim-table-mode b/vim/bundle/vim-table-mode deleted file mode 160000 -Subproject 5483e163bd0a67e729e0e8436315f33f9e126ba diff --git a/vim/pack/git-plugins/start/ale b/vim/pack/git-plugins/start/ale deleted file mode 160000 -Subproject 143c3cd09f52996c90b78059275a400d3c2327b diff --git a/vim/syntax/iptables.vim b/vim/syntax/iptables.vim deleted file mode 100644 index 0f65a61..0000000 --- a/vim/syntax/iptables.vim +++ /dev/null @@ -1,380 +0,0 @@ -"============================================================================ -" -" Source: https://raw.githubusercontent.com/vim-scripts/iptables/master/syntax/iptables.vim -" iptables-save/restore syntax highlighter -" -" Language: iptables-save/restore file -" Version: Not Specified -" Date: 07-Jun-2014 -" Maintainer: Eric Haarbauer <ehaar70{AT}gmail{DOT}com> -" License: This file is placed in the public domain. -" -"============================================================================ -" Section: Notes {{{1 -"============================================================================ -" -" This vim syntax script highlights files used by Harald Welte's iptables-save -" and iptables-restore utilities. Both utilities are part of the iptables -" application (http://www.netfilter.org/projects/iptables). -" -" Features: -" -" * Distinguishes commands, options, modules, targets and chains. -" * Distinguishes numeric IP addresses from net masks. -" * Highlights tokens that occur only in hand-edited files; for example, -" "--append" and "destination-unreachable". -" * Special handling for module names; for example, the tcp module is -" colored differently from the tcp protocol. -" -" Options: -" -" Customize the behavior of this script by setting values for the following -" options in your .vimrc file. (Type ":h vimrc" in vim for more information -" on the .vimrc file.) -" -" g:Iptables_SpecialDelimiters -" This variable, if set to a non-zero value, distinguishes numeric -" delimiters, including the dots in IP addresses, the slash that separates -" an IP address from a netmask, and the colon that separates the ends of a -" port range. If not set, this option defaults to off. -" -" Known Issues: -" -" * Some special argument tokens are highlighted whether or not they are -" used with the correct option. For example, "destination-unreachable" -" gets special highlighting whether or not is used as an argument to the -" --icmp-type option. In practice, this is rarely a problem. -" -" Reporting Issues: -" -" If you discover an iptables file that this script highlights incorrectly, -" please email the author (address at the top of the script) with the -" following information: -" -" * Problem iptables file WITH ANY SENSITIVE INFORMATION REMOVED -" * The release version of this script (see top of the script) -" * If possible, a patch to fix the problem -" -" Design Notes: -" -" Part of this script is autogenerated from the output of the iptables man -" page. The source code for generating the script is available from the -" author on request (see email address at the top of the script). The -" script should build from source on most Linux systems with iptables -" installed. -" -" The build system that generates this script strips special CVS tokens -" (like "Id:") so that CVS no longer recognizes them. This allows users to -" place the script in their own version control system without losing -" information. The author encourages other vim script developers to adopt a -" similar approach in their own scripts. -" -" Installation: -" -" Put this file in your user runtime syntax directory, usually ~/.vim/syntax -" in *NIX or C:\Program Files\vim\vimfiles\syntax in Windows. Type ":h -" syn-files" from within vim for more information. -" -" The iptables-save and iptables-restore applications do not specify a -" naming standard for the files they use. However, iptables-save places a -" comment in the first line of its output. Other applications, such as -" Fedora's system-config-securitylevel uses the iptables-save/restore -" format, but with a different leading comment. We can use these leading -" comments to identify the filetype by placing the following code in the -" scripts.vim file in your user runtime directory: -" -" if getline(1) =~ "^# Generated by iptables-save" || -" \ getline(1) =~ "^# Firewall configuration written by" -" setfiletype iptables -" set commentstring=#%s -" finish -" endif -" -" Setting the commentstring on line 4 allows Meikel Brandmeyer's -" EnhancedCommentify script (vimscript #23) to work with iptables files. -" (Advanced users may want to set the commentstring option in an ftplugin -" file or in autocommands defined in .vimrc.) -" -"============================================================================ -" Source File: Id: iptables.src.vim 43 2014-06-08 03:21:32Z ehaar -"============================================================================ -" Section: Initialization {{{1 -"============================================================================ - -" 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 = 'iptables' -endif - -" Don't use standard HiLink, it will not work with included syntax files -if version < 508 - command! -nargs=+ IptablesHiLink highlight link <args> -else - command! -nargs=+ IptablesHiLink highlight default link <args> -endif - -syntax case match - -if version < 600 - set iskeyword+=- -else - setlocal iskeyword+=- -endif - -" Initialize global public variables: {{{2 - -" Support deprecated variable name used prior to release 1.07. -if exists("g:iptablesSpecialDelimiters") && -\ !exists("g:Iptables_SpecialDelimiters") - - let g:Iptables_SpecialDelimiters = g:iptablesSpecialDelimiters - unlet g:iptablesSpecialDelimiters - " echohl WarningMsg | echo "Warning:" | echohl None - " echo "The g:iptablesSpecialDelimiters variable is deprecated." - " echo "Please use g:Iptables_SpecialDelimiters in your .vimrc instead" - -endif - -if exists("g:Iptables_SpecialDelimiters") - let s:Iptables_SpecialDelimiters = g:Iptables_SpecialDelimiters -else - let s:Iptables_SpecialDelimiters = 0 -endif - -"============================================================================ -" Section: Group Definitions {{{1 -"============================================================================ - -syntax keyword iptablesSaveDirective COMMIT -syntax match iptablesSaveOperation "^[:*]" - -syntax keyword iptablesTable filter nat mangle raw - -syntax keyword iptablesTarget - \ ACCEPT DROP QUEUE RETURN BALANCE CLASSIFY CLUSTERIP CONNMARK - \ CONNSECMARK CONNTRACK DNAT DSCP ECN IPMARK IPV4OPSSTRIP LOG - \ MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT - \ ROUTE SAME SECMARK SET SNAT TARPIT TCPMSS TOS TRACE TTL ULOG XOR - -syntax keyword iptablesBuiltinChain - \ INPUT OUTPUT FORWARD PREROUTING POSTROUTING - -syntax keyword iptablesCommand -A -D -I -R -L -F -Z -N -X -P -E - \ --append --delete --insert --replace --list --flush --zero - \ --new-chain --delete-chain --policy --rename-chain - -syntax keyword iptablesParam -p -s -d -j -i -o -f -c -t - -syntax match iptablesOperator "\s\zs!\ze\s" - -syntax keyword iptablesModuleName contained - \ account addrtype ah childlevel comment condition connbytes connlimit - \ connmark connrate conntrack dccp dscp dstlimit ecn esp fuzzy hashlimit - \ helper icmp iprange ipv4options length limit mac mark mport multiport - \ nth osf owner physdev pkttype policy psd quota random realm recent - \ sctp set state string tcp tcpmss time tos ttl u32 udp unclean - -syntax keyword iptablesModuleType - \ UNSPEC UNICAST LOCAL BROADCAST ANYCAST MULTICAST BLACKHOLE UNREACHABLE - \ PROHIBIT THROW NAT XRESOLVE INVALID ESTABLISHED NEW RELATED SYN ACK FIN - \ RST URG PSH ALL NONE - -" From --reject-with option -syntax keyword iptablesModuleType - \ icmp-net-unreachable - \ icmp-host-unreachable - \ icmp-port-unreachable - \ icmp-proto-unreachable - \ icmp-net-prohibited - \ icmp-host-prohibited - \ icmp-admin-prohibited - -" From --icmp-type option -syntax keyword iptablesModuleType - \ any - \ echo-reply - \ destination-unreachable - \ network-unreachable - \ host-unreachable - \ protocol-unreachable - \ port-unreachable - \ fragmentation-needed - \ source-route-failed - \ network-unknown - \ host-unknown - \ network-prohibited - \ host-prohibited - \ TOS-network-unreachable - \ TOS-host-unreachable - \ communication-prohibited - \ host-precedence-violation - \ precedence-cutoff - \ source-quench - \ redirect - \ network-redirect - \ host-redirect - \ TOS-network-redirect - \ TOS-host-redirect - \ echo-request - \ router-advertisement - \ router-solicitation - \ time-exceeded - \ ttl-zero-during-transit - \ ttl-zero-during-reassembly - \ parameter-problem - \ ip-header-bad - \ required-option-missing - \ timestamp-request - \ timestamp-reply - \ address-mask-request - \ address-mask-reply - -" If we used a keyword for this, port names would be colored the same -" as modules with the same name (e.g. tcp, udp, icmp). -syntax keyword iptablesParam -m --match skipwhite nextgroup=iptablesModuleName - -syntax region iptablesString start=+"+ skip=+\\"+ end=+"+ oneline - -syntax match iptablesComment "^#.*" contains=iptablesTodo -syntax match iptablesBadComment "^\s\+\zs#.*" " Pound must be in first column - -syntax keyword iptablesTodo contained TODO FIXME XXX NOT NOTE - -" Special Delimiters: {{{2 - -if s:Iptables_SpecialDelimiters != 0 - syntax match iptablesNumber "\<[0-9./:]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "[./:]" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -else " s:Iptables_SpecialDelimiters == 0 - syntax match iptablesNumber "\<[0-9./]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "/" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -endif - -"============================================================================ -" Section: Autogenerated Groups {{{2 -"============================================================================ - -" Begin autogenerated section. -" iptables2vim: "iptables2vim 43 2014-06-08 03:21:32Z ehaar" -" iptables: "iptables v1.4.19.1" - -syntax keyword iptablesLongParam - \ --zone --xor-tos --xor-mark --weekdays --vproto --vportctl --vport - \ --vmethod --verbose --vdir --validmark --vaddr --update - \ --ulog-qthreshold --ulog-prefix --ulog-nlgroup --ulog-cprange - \ --uid-owner --u --type --tunnel-src --tunnel-dst --ttl-set --ttl-lt - \ --ttl-inc --ttl-gt --ttl-eq --ttl-dec --ttl --transparent --tproxy-mark - \ --total-nodes --tos --to-source --to-ports --to-port --to-destination - \ --to --timestop --timestart --timeout --tcp-option --tcp-flags --table - \ --syn --strip-options --string --strict --state --src-type --src-range - \ --src-pfx --src-group --src --sports --sport --spi --source-ports - \ --source-port --source --soft --socket-exists --set-xmark --set-tos - \ --set-mss --set-mark --set-dscp-class --set-dscp --set-counters - \ --set-class --set --selctx --seconds --save-mark --save --rttl --rt-type - \ --rt-segsleft --rt-len --rt- --rsource --return--nomatch --restore-mark - \ --restore --reqid --remove --reject-with --reap --realm --rdest --rcheck - \ --rateest-pps --rateest-name --rateest-lt --rateest-interval - \ --rateest-gt --rateest-ewmalog --rateest-eq --rateest-delta - \ --rateest-bps --rateest --random --quota --queue-num --queue-bypass - \ --queue-balance --protocol --proto --probability --ports --pol - \ --pkt-type --physdev-out --physdev-is-out --physdev-is-in - \ --physdev-is-bridged --physdev-in --persistent --packet --out-interface - \ --or-tos --or-mark --on-port --on-ip --numeric --notrack --nodst - \ --nflog-threshold --nflog-range --nflog-prefix --nflog-group - \ --nfacct-name --next --new --name --mss --monthdays --modprobe --mode - \ --mh-type --mask --mark --mangle-mac-d --mac-source --loose --log-uid - \ --log-tcp-sequence --log-tcp-options --log-prefix --log-level - \ --log-ip-options --log --local-node --line-numbers --limit-iface-out - \ --limit-iface-in --limit-burst --limit --length --led-trigger-id - \ --led-delay --led-always-blink --label --kerneltz --jump --ipvs --ipv - \ --invert --in-interface --icmpv --icmp-type --hmark-tuple - \ --hmark-src-prefix --hmark-sport-mask --hmark-spi-mask --hmark-rnd - \ --hmark-proto-mask --hmark-offset --hmark-mod --hmark-dst-prefix - \ --hmark-dport-mask --hl-set --hl-lt --hl-inc --hl-gt --hl-eq --hl-dec - \ --hitcount --hex-string --helper --help --header --hbh-opts --hbh-len - \ --hashmode --hashlimit-upto --hashlimit-srcmask --hashlimit-src - \ --hashlimit-name --hashlimit-mode --hashlimit-mask - \ --hashlimit-htable-size --hashlimit-htable-max - \ --hashlimit-htable-gcinterval --hashlimit-htable-expire - \ --hashlimit-dstmask --hashlimit-burst --hashlimit-above --hashlimit - \ --hash-init --h-length --goto --gid-owner --genre --gateway --from - \ --fragres --fragmore --fragment --fraglen --fraglast --fragid - \ --fragfirst --expevents --exist --exact --every --espspi - \ --ecn-tcp-remove --ecn-tcp-ece --ecn-tcp-cwr --ecn-ip-ect --dst-type - \ --dst-range --dst-pfx --dst-opts --dst-len --dst-group --dst - \ --dscp-class --dscp --dports --dport --dir --destination-ports - \ --destination-port --destination --del-set --dccp-types --dccp-option - \ --datestop --datestart --ctstatus --ctstate --ctreplsrcport --ctreplsrc - \ --ctrepldstport --ctrepldst --ctproto --ctorigsrcport --ctorigsrc - \ --ctorigdstport --ctorigdst --ctexpire --ctevents --ctdir --cpu - \ --contiguous --connlimit-upto --connlimit-saddr --connlimit-mask - \ --connlimit-daddr --connlimit-above --connbytes-mode --connbytes-dir - \ --connbytes --comment --clustermac --cluster-total-nodes - \ --cluster-local-nodemask --cluster-local-node --cluster-hash-seed --clus - \ --clamp-mss-to-pmtu --chunk-types --checksum-fill --check --bytecode - \ --and-tos --and-mark --algo --ahspi --ahres --ahlen --add-set - \ --accept-local -" End autogenerated section. - -"============================================================================ -" Section: Group Linking {{{1 -"============================================================================ - -IptablesHiLink iptablesSaveDirective PreProc -IptablesHiLink iptablesSaveOperation PreProc - -IptablesHiLink iptablesTable Statement -IptablesHiLink iptablesTarget Statement -IptablesHiLink iptablesBuiltinChain Type - -IptablesHiLink iptablesCommand Operator - -IptablesHiLink iptablesModuleName Type -IptablesHiLink iptablesModuleType Type - -IptablesHiLink iptablesOperator Operator -IptablesHiLink iptablesParam Identifier -IptablesHiLink iptablesLongParam Identifier - -IptablesHiLink iptablesNumber Constant - -if s:Iptables_SpecialDelimiters != 0 - IptablesHiLink iptablesMask PreProc - IptablesHiLink iptablesDelimiter Delimiter -else " s:Iptables_SpecialDelimiters == 0 - IptablesHiLink iptablesMask Special - IptablesHiLink iptablesDelimiter None -endif - -IptablesHiLink iptablesString Constant - -IptablesHiLink iptablesComment Comment -IptablesHiLink iptablesBadComment Error -IptablesHiLink iptablesTodo Todo - -"============================================================================ -" Section: Clean Up {{{1 -"============================================================================ - -delcommand IptablesHiLink - -let b:current_syntax = "iptables" - -if main_syntax == 'iptables' - unlet main_syntax -endif - -" Autoconfigure vim indentation settings -" vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=- @@ -2,11 +2,38 @@ " :diffg RE " get from REMOTE " :diffg BA " get from BASE " :diffg LO " get from LOCAL -execute pathogen#infect() -syntax on +set nocompatible +filetype off +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +Plugin 'VundleVim/Vundle.vim' +" Visual +Plugin 'itchyny/lightline.vim' +Plugin 'nathanaelkane/vim-indent-guides' +Plugin 'airblade/vim-gitgutter' +" Programming +Plugin 'w0rp/ale' +Plugin 'maximbaz/lightline-ale' +Plugin 'majutsushi/tagbar' +Plugin 'SirVer/ultisnips' +Plugin 'honza/vim-snippets' +Bundle 'craigemery/vim-autotag' +Plugin 'scrooloose/nerdcommenter' +" Movement, format and others +Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-repeat' +Plugin 'dhruvasagar/vim-table-mode' +" Syntax +Plugin 'vim-scripts/iptables' +Plugin 'neomutt/neomutt.vim' +Plugin 'sirtaj/vim-openscad' + +call vundle#end() filetype plugin indent on colorscheme elflord +syntax on set exrc set secure |