From d9ea8954ce2c5f769cc0f2bdfa8ae2bfcda7e90c Mon Sep 17 00:00:00 2001 From: Patrick Auernig Date: Thu, 4 May 2023 16:40:35 +0200 Subject: [PATCH] Update configuration Move configuration from VimL to Lua --- .gitignore | 4 - UltiSnips/all.snippets | 36 - UltiSnips/c.snippets | 99 -- UltiSnips/cpp.snippets | 1 - UltiSnips/haskell.snippets | 11 - UltiSnips/sh.snippets | 62 - UltiSnips/tex.snippets | 48 - after/ftplugin/cabal.vim | 3 - after/ftplugin/css.vim | 2 - after/ftplugin/fish.vim | 3 - after/ftplugin/haskell.vim | 8 - after/ftplugin/man.vim | 10 - after/ftplugin/markdown.vim | 2 - after/ftplugin/ocaml.vim | 2 - after/ftplugin/pandoc.vim | 2 - after/ftplugin/python.vim | 5 - after/ftplugin/ruby.vim | 4 - after/ftplugin/scss.vim | 2 - after/ftplugin/sh.vim | 4 - after/ftplugin/snippets.vim | 3 - after/ftplugin/tex.vim | 3 - after/ftplugin/vim.vim | 7 - after/ftplugin/yaml.vim | 2 - after/plugin/lsp.lua | 38 + after/plugin/telescope.lua | 34 + after/plugin/treesitter.lua | 10 + autoload/myfold.vim | 25 - autoload/plug.vim | 2526 ----------------------------------- colors/better-default.vim | 20 - colors/molokai.vim | 276 ---- colors/seoul256-light.vim | 78 -- colors/seoul256.vim | 425 ------ colors/sourcerer.vim | 216 --- ftdetect/c.vim | 1 - init.lua | 2 + init.vim | 93 -- keymaps.vim | 96 -- lua/valeth/init.lua | 25 + lua/valeth/packer.lua | 89 ++ plugin/packer_compiled.lua | 209 +++ plugins.vim | 71 - pythonx/ultisnips/all.py | 32 - pythonx/ultisnips/c.py | 29 - syntax/mips.vim | 251 ---- syntax/systemd.vim.orig | 277 ---- 45 files changed, 407 insertions(+), 4739 deletions(-) delete mode 100644 UltiSnips/all.snippets delete mode 100644 UltiSnips/c.snippets delete mode 100644 UltiSnips/cpp.snippets delete mode 100644 UltiSnips/haskell.snippets delete mode 100644 UltiSnips/sh.snippets delete mode 100644 UltiSnips/tex.snippets delete mode 100644 after/ftplugin/cabal.vim delete mode 100644 after/ftplugin/css.vim delete mode 100644 after/ftplugin/fish.vim delete mode 100644 after/ftplugin/haskell.vim delete mode 100644 after/ftplugin/man.vim delete mode 100644 after/ftplugin/markdown.vim delete mode 100644 after/ftplugin/ocaml.vim delete mode 100644 after/ftplugin/pandoc.vim delete mode 100644 after/ftplugin/python.vim delete mode 100644 after/ftplugin/ruby.vim delete mode 100644 after/ftplugin/scss.vim delete mode 100644 after/ftplugin/sh.vim delete mode 100644 after/ftplugin/snippets.vim delete mode 100644 after/ftplugin/tex.vim delete mode 100644 after/ftplugin/vim.vim delete mode 100644 after/ftplugin/yaml.vim create mode 100644 after/plugin/lsp.lua create mode 100644 after/plugin/telescope.lua create mode 100644 after/plugin/treesitter.lua delete mode 100644 autoload/myfold.vim delete mode 100644 autoload/plug.vim delete mode 100644 colors/better-default.vim delete mode 100644 colors/molokai.vim delete mode 100644 colors/seoul256-light.vim delete mode 100644 colors/seoul256.vim delete mode 100644 colors/sourcerer.vim delete mode 100644 ftdetect/c.vim create mode 100644 init.lua delete mode 100644 init.vim delete mode 100644 keymaps.vim create mode 100644 lua/valeth/init.lua create mode 100644 lua/valeth/packer.lua create mode 100644 plugin/packer_compiled.lua delete mode 100644 plugins.vim delete mode 100644 pythonx/ultisnips/all.py delete mode 100644 pythonx/ultisnips/c.py delete mode 100644 syntax/mips.vim delete mode 100644 syntax/systemd.vim.orig diff --git a/.gitignore b/.gitignore index ebf9b1e..a0e76af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -*.bak -*.old -*.pyc .netrwhist -.init.vim-rplugin~ diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets deleted file mode 100644 index 3ca60f1..0000000 --- a/UltiSnips/all.snippets +++ /dev/null @@ -1,36 +0,0 @@ -global !p -from ultisnips.all import * -endglobal - - -snippet wpanet "wpa_supplicant WPA network entry" b -network=\{ - ssid="${1:SSID}" - key_mgmt=${2:WPA-PSK} - proto=${3:RSN WPA} - pairwise=${4:CCMP TKIP} - group=${5:CCMP TKIP} - #psk="${6:PSK}" - psk=`!p snip.rv = getWPAPassphraseHash(t[1], t[6])` - priority=${7:10} -\} - -endsnippet - - -snippet eapnet "wpa_supplicant EAP network entry" b -network=\{ - ssid="${1:eduroam}" - scan_ssid=${2:1} - key_mgmt=${3:WPA-EAP} - eap=${4:PEAP} - identity="${5:ID}" - #password="${6:PASSPHRASE}" - password=hash:`!p snip.rv = getEAPPassphraseHash(t[6])` - phase1="${7:peaplabel=0}" - phase2="${8:auth=MSCHAPV2}" - priority=${9:10} -\} - -endsnippet - diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets deleted file mode 100644 index 40e5c91..0000000 --- a/UltiSnips/c.snippets +++ /dev/null @@ -1,99 +0,0 @@ -global !p -from ultisnips.all import * -from ultisnips.c import * -endglobal - - -snippet fun "C function" b -${1:int} ${2:main}(${3:void}) -{ - ${0} - return `!p snip.rv = returnval(t[1], t[2])`; -} - -endsnippet - - -snippet note "Add a note (TODO, FIXME or XXX)" b -/* ${1}`!p -snip.rv =getNoteCandidates(t[1]) -`(`!p -snip.rv = getUsername("valeth", True) -` @ `!v -strftime("%d.%m.%y") -`): ${2:DESCRIPTION} */ -endsnippet - - -snippet doxfun "Doxygen function documentation" b -/** -* ${1:DESCRIPTION} -* @brief ${2:BRIEF} -* @param ${3:PARAM} -* @return ${4:RETURN} -*/ -endsnippet - - -snippet doxhead "Doxygen documentation file header" b -/** -* @author ${1:`!p snip.rv = getUsername("valeth", True)`} -* @date ${2:`!v strftime("%d.%m.%Y")`} -* @file ${3:`!v expand("%:t")`} -*/ - -endsnippet - - -snippet malloc "Allocate memory on the heap" -${1:TYPE} ${2:NAME} = ($1)malloc(sizeof(*$2)); -endsnippet - - -snippet calloc "Allocate memory on the heap" -${1:TYPE} ${2:NAME} = ($1)calloc(${3:N}, sizeof(*$2)); -endsnippet - - -snippet incl "Default includes" -#include -#include -endsnippet - - -snippet for "For loop" -for (${1:INITIALIZER}; ${2:TEST}; ${3:INCREMENTER}) \{ - ${4:#error "incomplete for loop"} -\} -endsnippet - - -snippet while "While loop" -while (${1:TEST}) \{ - ${2:#error "incomplete while loop"} -\} -endsnippet - - -snippet if "If-Then control construct" -if (${1:TEST}) \{ - ${2:#error "incomplete if branch"} -\} -endsnippet - - -snippet ite "If-Then-Else control construct" -if (${1:TEST}) \{ - ${2:#error "incomplete if branch"} -\} else \{ - ${3:#error "incomplete else branch"} -\} -endsnippet - - -snippet elif "Else-If control construct" -else if (${1:TEST}) \{ - ${2:#error "incomplete elif branch"} -\} -endsnippet - diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets deleted file mode 100644 index d00728a..0000000 --- a/UltiSnips/cpp.snippets +++ /dev/null @@ -1 +0,0 @@ -extends c diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets deleted file mode 100644 index e62a7eb..0000000 --- a/UltiSnips/haskell.snippets +++ /dev/null @@ -1,11 +0,0 @@ -snippet mod "Create new module" b -module ${1:`!p snip.rv = snip.basename`} ( - ) where - -endsnippet - -snippet hdfun "Haddock function documentation" b --- | ${1:DESCRIPTION} --- ${2} -endsnippet - diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets deleted file mode 100644 index 22cac5b..0000000 --- a/UltiSnips/sh.snippets +++ /dev/null @@ -1,62 +0,0 @@ -# shellscript snippest - -snippet #! "shebang line" b -#!/usr/bin/env bash - - -endsnippet - - -snippet fun "function" b -function ${1:NAME} -{ - ${0:STATEMENTS} -} -endsnippet - - -snippet switch "switch-case" -case ${1:ARG} in -${2:PATTERN}) - ${3:STATEMENTS} -;; -esac -endsnippet - - -snippet if "if-then" -if ${1:TEST}; then - ${2:STATEMENTS} -fi -endsnippet - - -snippet ite "if-then-else" -if ${1:TEST}; then - ${2:STATEMENTS} -else - ${3:STATEMENTS} -fi -endsnippet - - -snippet foreach "foreach loop" -for ${1:ELEMENT} in ${2:LIST}; do - ${3:STATEMENTS} -done -endsnippet - - -snippet forseq "for sequence" -for ${1:VAR} in $(seq ${2:FROM} ${3:TO}); do - ${4:STATEMENTS} -done -endsnippet - - -snippet while "while loop" -while ${1:TEST}; do - ${2:STATEMENTS} -done -endsnippet - diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets deleted file mode 100644 index b8e7b95..0000000 --- a/UltiSnips/tex.snippets +++ /dev/null @@ -1,48 +0,0 @@ -global !p -from ultisnips.all import * -endglobal - - -snippet title "LaTeX title page" b -\documentclass[a4paper]\{${1:article}\} -\title\{${2:TITLE}\} -\author\{${3:`!p snip.rv = getUsername("valeth", True)`}\} -\date\{${4:\today}\} - - -endsnippet - -snippet doc "Document section" b -\begin\{document\} -\maketitle -\pagebreak - -$0 - -\end\{document\} - -endsnippet - - -snippet sec "Section" -\begin\{section\}\{${1:HEADER}\} - $0 -\end\{section\} -\pagebreak - -endsnippet - - -snippet ssec "Subsection" -\begin\{subsection\}\{${1:HEADER}\} - $0 -\end\{subsection\} -endsnippet - - -snippet sssec "Sub-subsection" b -\begin\{subsubsection\}\{${1:HEADER}\} - $0 -\end\{subsubsection\} -endsnippet - diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim deleted file mode 100644 index 00a6a64..0000000 --- a/after/ftplugin/cabal.vim +++ /dev/null @@ -1,3 +0,0 @@ -set expandtab -set shiftwidth=2 -set softtabstop=2 diff --git a/after/ftplugin/css.vim b/after/ftplugin/css.vim deleted file mode 100644 index 33173f0..0000000 --- a/after/ftplugin/css.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=2 diff --git a/after/ftplugin/fish.vim b/after/ftplugin/fish.vim deleted file mode 100644 index e8a356b..0000000 --- a/after/ftplugin/fish.vim +++ /dev/null @@ -1,3 +0,0 @@ -set expandtab -set shiftwidth=4 -set softtabstop=4 diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim deleted file mode 100644 index 9bed331..0000000 --- a/after/ftplugin/haskell.vim +++ /dev/null @@ -1,8 +0,0 @@ -set expandtab -set shiftwidth=4 -set softtabstop=4 -set shiftround - -" Disable haskell-vim omnifunc -let g:haskellmode_completion_ghc = 0 -autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc diff --git a/after/ftplugin/man.vim b/after/ftplugin/man.vim deleted file mode 100644 index bb05e39..0000000 --- a/after/ftplugin/man.vim +++ /dev/null @@ -1,10 +0,0 @@ -set readonly -set nomodifiable -set nolist -set nocursorcolumn -set colorcolumn=0 - -noremap q :q -noremap -noremap b -nnoremap K :Man =expand(\\\"\\\") diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim deleted file mode 100644 index 8e7a69f..0000000 --- a/after/ftplugin/markdown.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=4 diff --git a/after/ftplugin/ocaml.vim b/after/ftplugin/ocaml.vim deleted file mode 100644 index 8e7a69f..0000000 --- a/after/ftplugin/ocaml.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=4 diff --git a/after/ftplugin/pandoc.vim b/after/ftplugin/pandoc.vim deleted file mode 100644 index 8e7a69f..0000000 --- a/after/ftplugin/pandoc.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=4 diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim deleted file mode 100644 index 4b96ee3..0000000 --- a/after/ftplugin/python.vim +++ /dev/null @@ -1,5 +0,0 @@ -set expandtab -set shiftwidth=4 -set foldmethod=indent -set foldnestmax=2 -set formatoptions=croql diff --git a/after/ftplugin/ruby.vim b/after/ftplugin/ruby.vim deleted file mode 100644 index f5c9f29..0000000 --- a/after/ftplugin/ruby.vim +++ /dev/null @@ -1,4 +0,0 @@ -set expandtab -set shiftwidth=2 -set softtabstop=2 -set shiftround diff --git a/after/ftplugin/scss.vim b/after/ftplugin/scss.vim deleted file mode 100644 index 33173f0..0000000 --- a/after/ftplugin/scss.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=2 diff --git a/after/ftplugin/sh.vim b/after/ftplugin/sh.vim deleted file mode 100644 index 3fc9045..0000000 --- a/after/ftplugin/sh.vim +++ /dev/null @@ -1,4 +0,0 @@ -set expandtab -set shiftwidth=4 - -let g:sh_fold_enabled=1 diff --git a/after/ftplugin/snippets.vim b/after/ftplugin/snippets.vim deleted file mode 100644 index c3076f2..0000000 --- a/after/ftplugin/snippets.vim +++ /dev/null @@ -1,3 +0,0 @@ -set noexpandtab -set shiftwidth=4 -set tabstop=4 diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim deleted file mode 100644 index e46ae1c..0000000 --- a/after/ftplugin/tex.vim +++ /dev/null @@ -1,3 +0,0 @@ -set noexpandtab -set tabstop=4 -set shiftwidth=4 diff --git a/after/ftplugin/vim.vim b/after/ftplugin/vim.vim deleted file mode 100644 index 96ac6d6..0000000 --- a/after/ftplugin/vim.vim +++ /dev/null @@ -1,7 +0,0 @@ -set expandtab -set shiftwidth=4 -set softtabstop=4 -set foldmethod=marker -set foldlevel=0 - -let g:vimsyn_folding='af' diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim deleted file mode 100644 index 33173f0..0000000 --- a/after/ftplugin/yaml.vim +++ /dev/null @@ -1,2 +0,0 @@ -set expandtab -set shiftwidth=2 diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua new file mode 100644 index 0000000..6784062 --- /dev/null +++ b/after/plugin/lsp.lua @@ -0,0 +1,38 @@ +local lsp = require("lsp-zero") + +lsp.preset("recommended") + +lsp.ensure_installed { + "rust_analyzer" +} + +lsp.nvim_workspace() + +local cmp = require("cmp") +local cmp_select = { behavior = cmp.SelectBehavior.Select } + +lsp.setup_nvim_cmp({ + mapping = lsp.defaults.cmp_mappings({ + [""] = cmp.mapping.select_prev_item(cmp_select), + [""] = cmp.mapping.select_next_item(cmp_select), + [""] = cmp.mapping.complete(), + }) +}) + +lsp.on_attach(function(client, buffnr) + lsp.default_keymaps({ buffer = buffnr }) + + vim.keymap.set("n", "fmt", function() + vim.lsp.buf.format({ async = false, timeout_ms = 5000 }) + end) +end) + +-- NOTE: Format on save does not support async formatting +lsp.format_on_save({ + servers = { + ["rust_analyzer"] = {"rust"} + } +}) + + +lsp.setup() diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua new file mode 100644 index 0000000..cb4a2ef --- /dev/null +++ b/after/plugin/telescope.lua @@ -0,0 +1,34 @@ +local telescope = require("telescope") +local actions = require("telescope.actions") + +telescope.setup { + pickers = { + buffers = { + mappings = { + i = { + [""] = actions.delete_buffer + actions.move_to_top, + }, + n = { + ["dd"] = actions.delete_buffer, + } + } + }, + } +} + +local telescope_builtin = require("telescope.builtin") + +vim.keymap.set("n", "ff", telescope_builtin.find_files) +vim.keymap.set("n", "fb", telescope_builtin.buffers) +vim.keymap.set("n", "fgc", telescope_builtin.git_commits) +vim.keymap.set("n", "fgs", telescope_builtin.git_status) +vim.keymap.set("n", "fgd", telescope_builtin.git_stash) + +local telescope_ext = require("telescope").extensions +local harpoon_mark = require("harpoon.mark") +local harpoon_ui = require("harpoon.ui") + +vim.keymap.set("n", "fh", telescope_ext.harpoon.marks) +vim.keymap.set("n", "am", harpoon_mark.add_file) +vim.keymap.set("n", "gn", harpoon_ui.nav_next) +vim.keymap.set("n", "gp", harpoon_ui.nav_prev) diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua new file mode 100644 index 0000000..26b14d3 --- /dev/null +++ b/after/plugin/treesitter.lua @@ -0,0 +1,10 @@ +require("nvim-treesitter.configs").setup { + ensure_installed = { "rust", "lua", "javascript" }, + + auto_install = true, + + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + }, +} diff --git a/autoload/myfold.vim b/autoload/myfold.vim deleted file mode 100644 index a677a8e..0000000 --- a/autoload/myfold.vim +++ /dev/null @@ -1,25 +0,0 @@ -function! myfold#text() - " get actual numberwidth of the current document - let nw_add = (len(line('$')) - (&numberwidth - 1)) - if nw_add > 0 - let nw = &numberwidth + nw_add - else - let nw = &numberwidth - endif - - let numfold_w =(nw * &number) + &foldcolumn - let window_w = winwidth(0) - numfold_w - let onetab = strpart(' ', 0, &tabstop) - - let foldtxt_start = getline(v:foldstart) . ' …' - let foldtxt_start = substitute(foldtxt_start, '\t', onetab, 'g') - let foldtxt_start_w = len(foldtxt_start) - 2 - - let foldtxt_end = '+' . string(foldclosedend(v:foldend) - foldclosed(v:foldstart)) . '  ' - let foldtxt_end_w = len(foldtxt_end) - - let foldtxt_mid_w = window_w - (foldtxt_start_w + foldtxt_end_w) - let foldtxt_mid = repeat(' ', foldtxt_mid_w + 2) - - return foldtxt_start . foldtxt_mid . foldtxt_end -endfunction diff --git a/autoload/plug.vim b/autoload/plug.vim deleted file mode 100644 index 4e05630..0000000 --- a/autoload/plug.vim +++ /dev/null @@ -1,2526 +0,0 @@ -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" -" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align -" Plug 'junegunn/vim-easy-align' -" -" " Any valid git URL is allowed -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Multiple Plug commands can be written in a single line using | separators -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using a non-master branch -" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } -" -" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) -" Plug 'fatih/vim-go', { 'tag': '*' } -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Initialize plugin system -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" -" Plug options: -" -"| Option | Description | -"| ----------------------- | ------------------------------------------------ | -"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | -"| `rtp` | Subdirectory that contains Vim plugin | -"| `dir` | Custom directory for the plugin | -"| `as` | Use different name for the plugin | -"| `do` | Post-update hook (string or funcref) | -"| `on` | On-demand loading: Commands or ``-mappings | -"| `for` | On-demand loading: File types | -"| `frozen` | Do not update unless explicitly specified | -" -" More information: https://github.com/junegunn/vim-plug -" -" -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" 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. - -if exists('g:loaded_plug') - finish -endif -let g:loaded_plug = 1 - -let s:cpo_save = &cpo -set cpo&vim - -let s:plug_src = 'https://github.com/junegunn/vim-plug.git' -let s:plug_tab = get(s:, 'plug_tab', -1) -let s:plug_buf = get(s:, 'plug_buf', -1) -let s:mac_gui = has('gui_macvim') && has('gui_running') -let s:is_win = has('win32') -let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) -let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -let s:me = resolve(expand(':p')) -let s:base_spec = { 'branch': 'master', 'frozen': 0 } -let s:TYPE = { -\ 'string': type(''), -\ 'list': type([]), -\ 'dict': type({}), -\ 'funcref': type(function('call')) -\ } -let s:loaded = get(s:, 'loaded', {}) -let s:triggers = get(s:, 'triggers', {}) - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(fnamemodify(expand(a:1), ':p')) - elseif exists('g:plug_home') - let home = s:path(g:plug_home) - elseif !empty(&rtp) - let home = s:path(split(&rtp, ',')[0]) . '/plugged' - else - return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') - endif - if fnamemodify(home, ':t') ==# 'plugin' && fnamemodify(home, ':h') ==# s:first_rtp - return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') - endif - - let g:plug_home = home - let g:plugs = {} - let g:plugs_order = [] - let s:triggers = {} - - call s:define_commands() - return 1 -endfunction - -function! s:define_commands() - command! -nargs=+ -bar Plug call plug#() - if !executable('git') - return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) - command! -nargs=0 -bar -bang PlugClean call s:clean(0) - command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif - command! -nargs=0 -bar PlugStatus call s:status() - command! -nargs=0 -bar PlugDiff call s:diff() - command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) -endfunction - -function! s:to_a(v) - return type(a:v) == s:TYPE.list ? a:v : [a:v] -endfunction - -function! s:to_s(v) - return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" -endfunction - -function! s:glob(from, pattern) - return s:lines(globpath(a:from, a:pattern)) -endfunction - -function! s:source(from, ...) - let found = 0 - for pattern in a:000 - for vim in s:glob(a:from, pattern) - execute 'source' s:esc(vim) - let found = 1 - endfor - endfor - return found -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -endfunction - -function! s:ask(message, ...) - call inputsave() - echohl WarningMsg - let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) - echohl None - call inputrestore() - echo "\r" - return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 -endfunction - -function! s:ask_no_interrupt(...) - try - return call('s:ask', a:000) - catch - return 0 - endtry -endfunction - -function! s:lazy(plug, opt) - return has_key(a:plug, a:opt) && - \ (empty(s:to_a(a:plug[a:opt])) || - \ !isdirectory(a:plug.dir) || - \ len(s:glob(s:rtp(a:plug), 'plugin')) || - \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) -endfunction - -function! plug#end() - if !exists('g:plugs') - return s:err('Call plug#begin() first') - endif - - if exists('#PlugLOD') - augroup PlugLOD - autocmd! - augroup END - augroup! PlugLOD - endif - let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - - if exists('g:did_load_filetypes') - filetype off - endif - for name in g:plugs_order - if !has_key(g:plugs, name) - continue - endif - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') - let s:loaded[name] = 1 - continue - endif - - if has_key(plug, 'on') - let s:triggers[name] = { 'map': [], 'cmd': [] } - for cmd in s:to_a(plug.on) - if cmd =~? '^.\+' - if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) - call s:assoc(lod.map, cmd, name) - endif - call add(s:triggers[name].map, cmd) - elseif cmd =~# '^[A-Z]' - let cmd = substitute(cmd, '!*$', '', '') - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - else - call s:err('Invalid `on` option: '.cmd. - \ '. Should start with an uppercase letter or ``.') - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - augroup filetypedetect - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - augroup END - endif - for type in types - call s:assoc(lod.ft, type, name) - endfor - endif - endfor - - for [cmd, names] in items(lod.cmd) - execute printf( - \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', - \ cmd, string(cmd), string(names)) - endfor - - for [map, names] in items(lod.map) - for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] - execute printf( - \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', - \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) - endfor - endfor - - for [ft, names] in items(lod.ft) - augroup PlugLOD - execute printf('autocmd FileType %s call lod_ft(%s, %s)', - \ ft, string(ft), string(names)) - augroup END - endfor - - call s:reorg_rtp() - filetype plugin indent on - if has('vim_starting') - if has('syntax') && !exists('g:syntax_on') - syntax enable - end - else - call s:reload_plugins() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:load_plugin(spec) - call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') -endfunction - -function! s:reload_plugins() - for name in s:loaded_names() - call s:load_plugin(g:plugs[name]) - endfor -endfunction - -function! s:trim(str) - return substitute(a:str, '[\/]\+$', '', '') -endfunction - -function! s:version_requirement(val, min) - for idx in range(0, len(a:min) - 1) - let v = get(a:val, idx, 0) - if v < a:min[idx] | return 0 - elseif v > a:min[idx] | return 1 - endif - endfor - return 1 -endfunction - -function! s:git_version_requirement(...) - if !exists('s:git_version') - let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)') - endif - return s:version_requirement(s:git_version, a:000) -endfunction - -function! s:progress_opt(base) - return a:base && !s:is_win && - \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' -endfunction - -if s:is_win - function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) - endfunction - - function! s:path(path) - return s:trim(substitute(a:path, '/', '\', 'g')) - endfunction - - function! s:dirpath(path) - return s:path(a:path) . '\' - endfunction - - function! s:is_local_plug(repo) - return a:repo =~? '^[a-z]:\|^[%~]' - endfunction -else - function! s:rtp(spec) - return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) - endfunction - - function! s:path(path) - return s:trim(a:path) - endfunction - - function! s:dirpath(path) - return substitute(a:path, '[/\\]*$', '/', '') - endfunction - - function! s:is_local_plug(repo) - return a:repo[0] =~ '[/$~]' - endfunction -endif - -function! s:err(msg) - echohl ErrorMsg - echom '[vim-plug] '.a:msg - echohl None -endfunction - -function! s:warn(cmd, msg) - echohl WarningMsg - execute a:cmd 'a:msg' - echohl None -endfunction - -function! s:esc(path) - return escape(a:path, ' ') -endfunction - -function! s:escrtp(path) - return escape(a:path, ' ,') -endfunction - -function! s:remove_rtp() - for name in s:loaded_names() - let rtp = s:rtp(g:plugs[name]) - execute 'set rtp-='.s:escrtp(rtp) - let after = globpath(rtp, 'after') - if isdirectory(after) - execute 'set rtp-='.s:escrtp(after) - endif - endfor -endfunction - -function! s:reorg_rtp() - if !empty(s:first_rtp) - execute 'set rtp-='.s:first_rtp - execute 'set rtp-='.s:last_rtp - endif - - " &rtp is modified from outside - if exists('s:prtp') && s:prtp !=# &rtp - call s:remove_rtp() - unlet! s:middle - endif - - let s:middle = get(s:, 'middle', &rtp) - let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') - let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') - let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') - \ . ','.s:middle.',' - \ . join(map(afters, 'escape(v:val, ",")'), ',') - let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') - let s:prtp = &rtp - - if !empty(s:first_rtp) - execute 'set rtp^='.s:first_rtp - execute 'set rtp+='.s:last_rtp - endif -endfunction - -function! s:doautocmd(...) - if exists('#'.join(a:000, '#')) - execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) - endif -endfunction - -function! s:dobufread(names) - for name in a:names - let path = s:rtp(g:plugs[name]).'/**' - for dir in ['ftdetect', 'ftplugin'] - if len(finddir(dir, path)) - if exists('#BufRead') - doautocmd BufRead - endif - return - endif - endfor - endfor -endfunction - -function! plug#load(...) - if a:0 == 0 - return s:err('Argument missing: plugin name(s) required') - endif - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 - let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') - if !empty(unknowns) - let s = len(unknowns) > 1 ? 's' : '' - return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) - end - let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') - if !empty(unloaded) - for name in unloaded - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - call s:dobufread(unloaded) - return 1 - end - return 0 -endfunction - -function! s:remove_triggers(name) - if !has_key(s:triggers, a:name) - return - endif - for cmd in s:triggers[a:name].cmd - execute 'silent! delc' cmd - endfor - for map in s:triggers[a:name].map - execute 'silent! unmap' map - execute 'silent! iunmap' map - endfor - call remove(s:triggers, a:name) -endfunction - -function! s:lod(names, types, ...) - for name in a:names - call s:remove_triggers(name) - let s:loaded[name] = 1 - endfor - call s:reorg_rtp() - - for name in a:names - let rtp = s:rtp(g:plugs[name]) - for dir in a:types - call s:source(rtp, dir.'/**/*.vim') - endfor - if a:0 - if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) - execute 'runtime' a:1 - endif - call s:source(rtp, a:2) - endif - call s:doautocmd('User', name) - endfor -endfunction - -function! s:lod_ft(pat, names) - let syn = 'syntax/'.a:pat.'.vim' - call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) - execute 'autocmd! PlugLOD FileType' a:pat - call s:doautocmd('filetypeplugin', 'FileType') - call s:doautocmd('filetypeindent', 'FileType') -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) -endfunction - -function! s:lod_map(map, names, with_prefix, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - - if a:with_prefix - let prefix = v:count ? v:count : '' - let prefix .= '"'.v:register.a:prefix - if mode(1) == 'no' - if v:operator == 'c' - let prefix = "\" . prefix - endif - let prefix .= v:operator - endif - call feedkeys(prefix, 'n') - endif - call feedkeys(substitute(a:map, '^', "\", '') . extra) -endfunction - -function! plug#(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??')) - let spec = extend(s:infer_properties(name, repo), opts) - if !has_key(g:plugs, name) - call add(g:plugs_order, name) - endif - let g:plugs[name] = spec - let s:loaded[name] = get(s:loaded, name, 0) - catch - return s:err(v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - if type == s:TYPE.string - let opts.tag = a:arg - elseif type == s:TYPE.dict - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(expand(opts.dir)) - endif - else - throw 'Invalid argument type (expected: string or dictionary)' - endif - return opts -endfunction - -function! s:infer_properties(name, repo) - let repo = a:repo - if s:is_local_plug(repo) - return { 'dir': s:dirpath(expand(repo)) } - else - if repo =~ ':' - let uri = repo - else - if repo !~ '/' - throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } - endif -endfunction - -function! s:install(force, names) - call s:update_impl(0, a:force, a:names) -endfunction - -function! s:update(force, names) - call s:update_impl(1, a:force, a:names) -endfunction - -function! plug#helptags() - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - for spec in values(g:plugs) - let docd = join([s:rtp(spec), 'doc'], '/') - if isdirectory(docd) - silent! execute 'helptags' s:esc(docd) - endif - endfor - return 1 -endfunction - -function! s:syntax() - syntax clear - syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber - syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX - syn match plugNumber /[0-9]\+[0-9.]*/ contained - syn match plugBracket /[[\]]/ contained - syn match plugX /x/ contained - syn match plugDash /^-/ - syn match plugPlus /^+/ - syn match plugStar /^*/ - syn match plugMessage /\(^- \)\@<=.*/ - syn match plugName /\(^- \)\@<=[^ ]*:/ - syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ - syn match plugTag /(tag: [^)]\+)/ - syn match plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag - syn match plugEdge /^ \X\+$/ - syn match plugEdge /^ \X*/ contained nextgroup=plugSha - syn match plugSha /[0-9a-f]\{7,9}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ - syn match plugH2 /^.*:\n-\+$/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - hi def link plugH2 Type - hi def link plugX Exception - hi def link plugBracket Structure - hi def link plugNumber Number - - hi def link plugDash Special - hi def link plugPlus Constant - hi def link plugStar Boolean - - hi def link plugMessage Function - hi def link plugName Label - hi def link plugInstall Function - hi def link plugUpdate Type - - hi def link plugError Error - hi def link plugDeleted Ignore - hi def link plugRelDate Comment - hi def link plugEdge PreProc - hi def link plugSha Identifier - hi def link plugTag Constant - - hi def link plugNotLoaded Comment -endfunction - -function! s:lpad(str, len) - return a:str . repeat(' ', a:len - len(a:str)) -endfunction - -function! s:lines(msg) - return split(a:msg, "[\r\n]") -endfunction - -function! s:lastline(msg) - return get(s:lines(a:msg), -1, '') -endfunction - -function! s:new_window() - execute get(g:, 'plug_window', 'vertical topleft new') -endfunction - -function! s:plug_window_exists() - let buflist = tabpagebuflist(s:plug_tab) - return !empty(buflist) && index(buflist, s:plug_buf) >= 0 -endfunction - -function! s:switch_in() - if !s:plug_window_exists() - return 0 - endif - - if winbufnr(0) != s:plug_buf - let s:pos = [tabpagenr(), winnr(), winsaveview()] - execute 'normal!' s:plug_tab.'gt' - let winnr = bufwinnr(s:plug_buf) - execute winnr.'wincmd w' - call add(s:pos, winsaveview()) - else - let s:pos = [winsaveview()] - endif - - setlocal modifiable - return 1 -endfunction - -function! s:switch_out(...) - call winrestview(s:pos[-1]) - setlocal nomodifiable - if a:0 > 0 - execute a:1 - endif - - if len(s:pos) > 1 - execute 'normal!' s:pos[0].'gt' - execute s:pos[1] 'wincmd w' - call winrestview(s:pos[2]) - endif -endfunction - -function! s:finish_bindings() - nnoremap R :call retry() - nnoremap D :PlugDiff - nnoremap S :PlugStatus - nnoremap U :call status_update() - xnoremap U :call status_update() - nnoremap ]] :silent! call section('') - nnoremap [[ :silent! call section('b') -endfunction - -function! s:prepare(...) - if empty(getcwd()) - throw 'Invalid current working directory. Cannot proceed.' - endif - - for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] - if exists(evar) - throw evar.' detected. Cannot proceed.' - endif - endfor - - call s:job_abort() - if s:switch_in() - if b:plug_preview == 1 - pc - endif - enew - else - call s:new_window() - endif - - nnoremap q :if b:plug_preview==1pcendifbd - if a:0 == 0 - call s:finish_bindings() - endif - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - - for k in ['', 'L', 'o', 'X', 'd', 'dd'] - execute 'silent! unmap ' k - endfor - setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell - if exists('+colorcolumn') - setlocal colorcolumn= - endif - setf vim-plug - if exists('g:syntax_on') - call s:syntax() - endif -endfunction - -function! s:assign_name() - " Assign buffer name - let prefix = '[Plugins]' - let name = prefix - let idx = 2 - while bufexists(name) - let name = printf('%s (%s)', prefix, idx) - let idx = idx + 1 - endwhile - silent! execute 'f' fnameescape(name) -endfunction - -function! s:chsh(swap) - let prev = [&shell, &shellcmdflag, &shellredir] - if s:is_win - set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1 - elseif a:swap - set shell=sh shellredir=>%s\ 2>&1 - endif - return prev -endfunction - -function! s:bang(cmd, ...) - try - let [sh, shellcmdflag, shrd] = s:chsh(a:0) - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let batchfile = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = batchfile - endif - let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') - execute "normal! :execute g:_plug_bang\\" - finally - unlet g:_plug_bang - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win - call delete(batchfile) - endif - endtry - return v:shell_error ? 'Exit status: ' . v:shell_error : '' -endfunction - -function! s:regress_bar() - let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') - call s:progress_bar(2, bar, len(bar)) -endfunction - -function! s:is_updated(dir) - return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir)) -endfunction - -function! s:do(pull, force, todo) - for [name, spec] in items(a:todo) - if !isdirectory(spec.dir) - continue - endif - let installed = has_key(s:update.new, name) - let updated = installed ? 0 : - \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let error = '' - let type = type(spec.do) - if type == s:TYPE.string - if spec.do[0] == ':' - if !get(s:loaded, name, 0) - let s:loaded[name] = 1 - call s:reorg_rtp() - endif - call s:load_plugin(spec) - try - execute spec.do[1:] - catch - let error = v:exception - endtry - if !s:plug_window_exists() - cd - - throw 'Warning: vim-plug was terminated by the post-update hook of '.name - endif - else - let error = s:bang(spec.do) - endif - elseif type == s:TYPE.funcref - try - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - catch - let error = v:exception - endtry - else - let error = 'Invalid hook type' - endif - call s:switch_in() - call setline(4, empty(error) ? (getline(4) . 'OK') - \ : ('x' . getline(4)[1:] . error)) - if !empty(error) - call add(s:update.errors, name) - call s:regress_bar() - endif - cd - - endif - endfor -endfunction - -function! s:hash_match(a, b) - return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 -endfunction - -function! s:checkout(spec) - let sha = a:spec.commit - let output = s:system('git rev-parse HEAD', a:spec.dir) - if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) - let output = s:system( - \ 'git fetch --depth 999999 && git checkout '.s:esc(sha).' --', a:spec.dir) - endif - return output -endfunction - -function! s:finish(pull) - let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) - if new_frozen - let s = new_frozen > 1 ? 's' : '' - call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) - endif - call append(3, '- Finishing ... ') | 4 - redraw - call plug#helptags() - call plug#end() - call setline(4, getline(4) . 'Done!') - redraw - let msgs = [] - if !empty(s:update.errors) - call add(msgs, "Press 'R' to retry.") - endif - if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') - call s:finish_bindings() -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - echo - call s:update_impl(s:update.pull, s:update.force, - \ extend(copy(s:update.errors), [s:update.threads])) -endfunction - -function! s:is_managed(name) - return has_key(g:plugs[a:name], 'uri') -endfunction - -function! s:names(...) - return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) -endfunction - -function! s:check_ruby() - silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") - if !exists('g:plug_ruby') - redraw! - return s:warn('echom', 'Warning: Ruby interface is broken') - endif - let ruby_version = split(g:plug_ruby, '\.') - unlet g:plug_ruby - return s:version_requirement(ruby_version, [1, 8, 7]) -endfunction - -function! s:update_impl(pull, force, args) abort - let sync = index(a:args, '--sync') >= 0 || has('vim_starting') - let args = filter(copy(a:args), 'v:val != "--sync"') - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', 16) - - let managed = filter(copy(g:plugs), 's:is_managed(v:key)') - let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : - \ filter(managed, 'index(args, v:key) >= 0') - - if empty(todo) - return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) - endif - - if !s:is_win && s:git_version_requirement(2, 3) - let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' - let $GIT_TERMINAL_PROMPT = 0 - for plug in values(todo) - let plug.uri = substitute(plug.uri, - \ '^https://git::@github\.com', 'https://github.com', '') - endfor - endif - - if !isdirectory(g:plug_home) - try - call mkdir(g:plug_home, 'p') - catch - return s:err(printf('Invalid plug directory: %s. '. - \ 'Try to call plug#begin with a valid directory', g:plug_home)) - endtry - endif - - if has('nvim') && !exists('*jobwait') && threads > 1 - call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') - endif - - let use_job = s:nvim || s:vim8 - let python = (has('python') || has('python3')) && !use_job - let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare(1) - call append(0, ['', '']) - normal! 2G - silent! redraw - - let s:clone_opt = get(g:, 'plug_shallow', 1) ? - \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' - - if has('win32unix') - let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' - endif - - let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 - redir => pyv - silent python import platform; print platform.python_version() - redir END - let python = s:version_requirement( - \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) - endif - - if (python || ruby) && s:update.threads > 1 - try - let imd = &imd - if s:mac_gui - set noimd - endif - if ruby - call s:update_ruby() - else - call s:update_python() - endif - catch - let lines = getline(4, '$') - let printed = {} - silent! 4,$d _ - for line in lines - let name = s:extract_name(line, '.', '') - if empty(name) || !has_key(printed, name) - call append('$', line) - if !empty(name) - let printed[name] = 1 - if line[0] == 'x' && index(s:update.errors, name) < 0 - call add(s:update.errors, name) - end - endif - endif - endfor - finally - let &imd = imd - call s:update_finish() - endtry - else - call s:update_vim() - while use_job && sync - sleep 100m - if s:update.fin - break - endif - endwhile - endif -endfunction - -function! s:log4(name, msg) - call setline(4, printf('- %s (%s)', a:msg, a:name)) - redraw -endfunction - -function! s:update_finish() - if exists('s:git_terminal_prompt') - let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt - endif - if s:switch_in() - call append(3, '- Updating ...') | 4 - for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) - let [pos, _] = s:logpos(name) - if !pos - continue - endif - if has_key(spec, 'commit') - call s:log4(name, 'Checking out '.spec.commit) - let out = s:checkout(spec) - elseif has_key(spec, 'tag') - let tag = spec.tag - if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir)) - if !v:shell_error && !empty(tags) - let tag = tags[0] - call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) - call append(3, '') - endif - endif - call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.s:esc(tag).' -- 2>&1', spec.dir) - else - let branch = s:esc(get(spec, 'branch', 'master')) - call s:log4(name, 'Merging origin/'.branch) - let out = s:system('git checkout -q '.branch.' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir) - endif - if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && - \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) - call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) - endif - let msg = s:format_message(v:shell_error ? 'x': '-', name, out) - if v:shell_error - call add(s:update.errors, name) - call s:regress_bar() - silent execute pos 'd _' - call append(4, msg) | 4 - elseif !empty(out) - call setline(pos, msg[0]) - endif - redraw - endfor - silent 4 d _ - try - call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) - catch - call s:warn('echom', v:exception) - call s:warn('echo', '') - return - endtry - call s:finish(s:update.pull) - call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') - call s:switch_out('normal! gg') - endif -endfunction - -function! s:job_abort() - if (!s:nvim && !s:vim8) || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - if s:nvim - silent! call jobstop(j.jobid) - elseif s:vim8 - silent! call job_stop(j.jobid) - endif - if j.new - call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir)) - endif - endfor - let s:jobs = {} -endfunction - -function! s:last_non_empty_line(lines) - let len = len(a:lines) - for idx in range(len) - let line = a:lines[len-idx-1] - if !empty(line) - return line - endif - endfor - return '' -endfunction - -function! s:job_out_cb(self, data) abort - let self = a:self - let data = remove(self.lines, -1) . a:data - let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') - call extend(self.lines, lines) - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if !self.running || self.tick % len(s:jobs) == 0 - let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') - let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) - call s:log(bullet, self.name, result) - endif -endfunction - -function! s:job_exit_cb(self, data) abort - let a:self.running = 0 - let a:self.error = a:data != 0 - call s:reap(a:self.name) - call s:tick() -endfunction - -function! s:job_cb(fn, job, ch, data) - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - call call(a:fn, [a:job, a:data]) -endfunction - -function! s:nvim_cb(job_id, data, event) dict abort - return a:event == 'stdout' ? - \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : - \ s:job_cb('s:job_exit_cb', self, 0, a:data) -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], - \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '', - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd - if !empty(job.batchfile) - call writefile(["@echo off\r", cmd . "\r"], job.batchfile) - let cmd = job.batchfile - endif - let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) - - if s:nvim - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = jobstart(argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = [jid < 0 ? argv[0].' is not executable' : - \ 'Invalid arguments (or job table is full)'] - endif - elseif s:vim8 - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'out_mode': 'raw' - \}) - if job_status(jid) == 'run' - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = ['Failed to start job'] - endif - else - let job.lines = s:lines(call('s:system', [cmd])) - let job.error = v:shell_error != 0 - let job.running = 0 - endif -endfunction - -function! s:reap(name) - let job = s:jobs[a:name] - if job.error - call add(s:update.errors, a:name) - elseif get(job, 'new', 0) - let s:update.new[a:name] = 1 - endif - let s:update.bar .= job.error ? 'x' : '=' - - let bullet = job.error ? 'x' : '-' - let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) - call s:log(bullet, a:name, empty(result) ? 'OK' : result) - call s:bar() - - if has_key(job, 'batchfile') && !empty(job.batchfile) - call delete(job.batchfile) - endif - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - for i in range(4, line('$')) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, line('$')) - if getline(j) !~ '^ ' - return [i, j - 1] - endif - endfor - return [i, i] - endif - endfor - return [0, 0] -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let [b, e] = s:logpos(a:name) - if b > 0 - silent execute printf('%d,%d d _', b, e) - if b > winheight('.') - let b = 4 - endif - else - let b = 4 - endif - " FIXME For some reason, nomodifiable is set after :d in vim8 - setlocal modifiable - call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) - call s:switch_out() - endif -endfunction - -function! s:update_vim() - let s:jobs = {} - - call s:bar() - call s:tick() -endfunction - -function! s:tick() - let pull = s:update.pull - let prog = s:progress_opt(s:nvim || s:vim8) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - call s:update_finish() - let s:update.fin = 1 - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = empty(globpath(spec.dir, '.git', 1)) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - if !new - let [error, _] = s:git_validate(spec, 0) - if empty(error) - if pull - let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : '' - call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } - endif - else - call s:spawn(name, - \ printf('git clone %s %s %s %s 2>&1', - \ has_tag ? '' : s:clone_opt, - \ prog, - \ s:shellesc(spec.uri), - \ s:shellesc(s:trim(spec.dir))), { 'new': 1 }) - endif - - if !s:jobs[name].running - call s:reap(name) - endif - if len(s:jobs) >= s:update.threads - break - endif -endwhile -endfunction - -function! s:update_python() -let py_exe = has('python') ? 'python' : 'python3' -execute py_exe "<< EOF" -import datetime -import functools -import os -try: - import queue -except ImportError: - import Queue as queue -import random -import re -import shutil -import signal -import subprocess -import tempfile -import threading as thr -import time -import traceback -import vim - -G_NVIM = vim.eval("has('nvim')") == '1' -G_PULL = vim.eval('s:update.pull') == '1' -G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 -G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) -G_CLONE_OPT = vim.eval('s:clone_opt') -G_PROGRESS = vim.eval('s:progress_opt(1)') -G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) -G_STOP = thr.Event() -G_IS_WIN = vim.eval('s:is_win') == '1' - -class PlugError(Exception): - def __init__(self, msg): - self.msg = msg -class CmdTimedOut(PlugError): - pass -class CmdFailed(PlugError): - pass -class InvalidURI(PlugError): - pass -class Action(object): - INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] - -class Buffer(object): - def __init__(self, lock, num_plugs, is_pull): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.lock = lock - self.maxy = int(vim.eval('winheight(".")')) - self.num_plugs = num_plugs - - def __where(self, name): - """ Find first line with name in current buffer. Return line num. """ - found, lnum = False, 0 - matcher = re.compile('^[-+x*] {0}:'.format(name)) - for line in vim.current.buffer: - if matcher.search(line) is not None: - found = True - break - lnum += 1 - - if not found: - lnum = -1 - return lnum - - def header(self): - curbuf = vim.current.buffer - curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) - - num_spaces = self.num_plugs - len(self.bar) - curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') - - with self.lock: - vim.command('normal! 2G') - vim.command('redraw') - - def write(self, action, name, lines): - first, rest = lines[0], lines[1:] - msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] - msg.extend([' ' + line for line in rest]) - - try: - if action == Action.ERROR: - self.bar += 'x' - vim.command("call add(s:update.errors, '{0}')".format(name)) - elif action == Action.DONE: - self.bar += '=' - - curbuf = vim.current.buffer - lnum = self.__where(name) - if lnum != -1: # Found matching line num - del curbuf[lnum] - if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): - lnum = 3 - else: - lnum = 3 - curbuf.append(msg, lnum) - - self.header() - except vim.error: - pass - -class Command(object): - CD = 'cd /d' if G_IS_WIN else 'cd' - - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - if cmd_dir: - self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) - self.timeout = timeout - self.callback = cb if cb else (lambda msg: None) - self.clean = clean if clean else (lambda: None) - self.proc = None - - @property - def alive(self): - """ Returns true only if command still running. """ - return self.proc and self.proc.poll() is None - - def execute(self, ntries=3): - """ Execute the command with ntries if CmdTimedOut. - Returns the output of the command if no Exception. - """ - attempt, finished, limit = 0, False, self.timeout - - while not finished: - try: - attempt += 1 - result = self.try_command() - finished = True - return result - except CmdTimedOut: - if attempt != ntries: - self.notify_retry() - self.timeout += limit - else: - raise - - def notify_retry(self): - """ Retry required for command, notify user. """ - for count in range(3, 0, -1): - if G_STOP.is_set(): - raise KeyboardInterrupt - msg = 'Timeout. Will retry in {0} second{1} ...'.format( - count, 's' if count != 1 else '') - self.callback([msg]) - time.sleep(1) - self.callback(['Retrying ...']) - - def try_command(self): - """ Execute a cmd & poll for callback. Returns list of output. - Raises CmdFailed -> return code for Popen isn't 0 - Raises CmdTimedOut -> command exceeded timeout without new output - """ - first_line = True - - try: - tfile = tempfile.NamedTemporaryFile(mode='w+b') - preexec_fn = not G_IS_WIN and os.setsid or None - self.proc = subprocess.Popen(self.cmd, stdout=tfile, - stderr=subprocess.STDOUT, - stdin=subprocess.PIPE, shell=True, - preexec_fn=preexec_fn) - thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) - thrd.start() - - thread_not_started = True - while thread_not_started: - try: - thrd.join(0.1) - thread_not_started = False - except RuntimeError: - pass - - while self.alive: - if G_STOP.is_set(): - raise KeyboardInterrupt - - if first_line or random.random() < G_LOG_PROB: - first_line = False - line = '' if G_IS_WIN else nonblock_read(tfile.name) - if line: - self.callback([line]) - - time_diff = time.time() - os.path.getmtime(tfile.name) - if time_diff > self.timeout: - raise CmdTimedOut(['Timeout!']) - - thrd.join(0.5) - - tfile.seek(0) - result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] - - if self.proc.returncode != 0: - raise CmdFailed([''] + result) - - return result - except: - self.terminate() - raise - - def terminate(self): - """ Terminate process and cleanup. """ - if self.alive: - if G_IS_WIN: - os.kill(self.proc.pid, signal.SIGINT) - else: - os.killpg(self.proc.pid, signal.SIGTERM) - self.clean() - -class Plugin(object): - def __init__(self, name, args, buf_q, lock): - self.name = name - self.args = args - self.buf_q = buf_q - self.lock = lock - self.tag = args.get('tag', 0) - - def manage(self): - try: - if os.path.exists(self.args['dir']): - self.update() - else: - self.install() - with self.lock: - thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) - except PlugError as exc: - self.write(Action.ERROR, self.name, exc.msg) - except KeyboardInterrupt: - G_STOP.set() - self.write(Action.ERROR, self.name, ['Interrupted!']) - except: - # Any exception except those above print stack trace - msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) - self.write(Action.ERROR, self.name, msg.split('\n')) - raise - - def install(self): - target = self.args['dir'] - if target[-1] == '\\': - target = target[0:-1] - - def clean(target): - def _clean(): - try: - shutil.rmtree(target) - except OSError: - pass - return _clean - - self.write(Action.INSTALL, self.name, ['Installing ...']) - callback = functools.partial(self.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - esc(target)) - com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - - def repo_uri(self): - cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - actual_uri = self.repo_uri() - expect_uri = self.args['uri'] - regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') - ma = regex.match(actual_uri) - mb = regex.match(expect_uri) - if ma is None or mb is None or ma.groups() != mb.groups(): - msg = ['', - 'Invalid URI: {0}'.format(actual_uri), - 'Expected {0}'.format(expect_uri), - 'PlugClean required.'] - raise InvalidURI(msg) - - if G_PULL: - self.write(Action.UPDATE, self.name, ['Updating ...']) - callback = functools.partial(self.write, Action.UPDATE, self.name) - fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' - cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) - com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - else: - self.write(Action.DONE, self.name, ['Already installed']) - - def write(self, action, name, msg): - self.buf_q.put((action, name, msg)) - -class PlugThread(thr.Thread): - def __init__(self, tname, args): - super(PlugThread, self).__init__() - self.tname = tname - self.args = args - - def run(self): - thr.current_thread().name = self.tname - buf_q, work_q, lock = self.args - - try: - while not G_STOP.is_set(): - name, args = work_q.get_nowait() - plug = Plugin(name, args, buf_q, lock) - plug.manage() - work_q.task_done() - except queue.Empty: - pass - -class RefreshThread(thr.Thread): - def __init__(self, lock): - super(RefreshThread, self).__init__() - self.lock = lock - self.running = True - - def run(self): - while self.running: - with self.lock: - thread_vim_command('noautocmd normal! a') - time.sleep(0.33) - - def stop(self): - self.running = False - -if G_NVIM: - def thread_vim_command(cmd): - vim.session.threadsafe_call(lambda: vim.command(cmd)) -else: - def thread_vim_command(cmd): - vim.command(cmd) - -def esc(name): - return '"' + name.replace('"', '\"') + '"' - -def nonblock_read(fname): - """ Read a file with nonblock flag. Return the last line. """ - fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) - buf = os.read(fread, 100000).decode('utf-8', 'replace') - os.close(fread) - - line = buf.rstrip('\r\n') - left = max(line.rfind('\r'), line.rfind('\n')) - if left != -1: - left += 1 - line = line[left:] - - return line - -def main(): - thr.current_thread().name = 'main' - nthreads = int(vim.eval('s:update.threads')) - plugs = vim.eval('s:update.todo') - mac_gui = vim.eval('s:mac_gui') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - start_cnt = thr.active_count() - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or thr.active_count() != start_cnt: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, ['OK'] if not msg else msg) - buf_q.task_done() - except queue.Empty: - pass - except KeyboardInterrupt: - G_STOP.set() - - if mac_gui: - rthread.stop() - rthread.join() - -main() -EOF -endfunction - -function! s:update_ruby() - ruby << EOF - module PlugStream - SEP = ["\r", "\n", nil] - def get_line - buffer = '' - loop do - char = readchar rescue return - if SEP.include? char.chr - buffer << $/ - break - else - buffer << char - end - end - buffer - end - end unless defined?(PlugStream) - - def esc arg - %["#{arg.gsub('"', '\"')}"] - end - - def killall pid - pids = [pid] - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM - pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } - else - unless `which pgrep 2> /dev/null`.empty? - children = pids - until children.empty? - children = children.map { |pid| - `pgrep -P #{pid}`.lines.map { |l| l.chomp } - }.flatten - pids += children - end - end - pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } - end - end - - def compare_git_uri a, b - regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} - regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) - end - - require 'thread' - require 'fileutils' - require 'timeout' - running = true - iswin = VIM::evaluate('s:is_win').to_i == 1 - pull = VIM::evaluate('s:update.pull').to_i == 1 - base = VIM::evaluate('g:plug_home') - all = VIM::evaluate('s:update.todo') - limit = VIM::evaluate('get(g:, "plug_timeout", 60)') - tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 - nthr = VIM::evaluate('s:update.threads').to_i - maxy = VIM::evaluate('winheight(".")').to_i - vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ - cd = iswin ? 'cd /d' : 'cd' - tot = VIM::evaluate('len(s:update.todo)') || 0 - bar = '' - skip = 'Already installed' - mtx = Mutex.new - take1 = proc { mtx.synchronize { running && all.shift } } - logh = proc { - cnt = bar.length - $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" - $curbuf[2] = '[' + bar.ljust(tot) + ']' - VIM::command('normal! 2G') - VIM::command('redraw') - } - where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } - log = proc { |name, result, type| - mtx.synchronize do - ing = ![true, false].include?(type) - bar += type ? '=' : 'x' unless ing - b = case type - when :install then '+' when :update then '*' - when true, nil then '-' else - VIM::command("call add(s:update.errors, '#{name}')") - 'x' - end - result = - if type || type.nil? - ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] - elsif result =~ /^Interrupted|^Timeout/ - ["#{b} #{name}: #{result}"] - else - ["#{b} #{name}"] + result.lines.map { |l| " " << l } - end - if lnum = where.call(name) - $curbuf.delete lnum - lnum = 4 if ing && lnum > maxy - end - result.each_with_index do |line, offset| - $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) - end - logh.call - end - } - bt = proc { |cmd, name, type, cleanup| - tried = timeout = 0 - begin - tried += 1 - timeout += limit - fd = nil - data = '' - if iswin - Timeout::timeout(timeout) do - tmp = VIM::evaluate('tempname()') - system("(#{cmd}) > #{tmp}") - data = File.read(tmp).chomp - File.unlink tmp rescue nil - end - else - fd = IO.popen(cmd).extend(PlugStream) - first_line = true - log_prob = 1.0 / nthr - while line = Timeout::timeout(timeout) { fd.get_line } - data << line - log.call name, line.chomp, type if name && (first_line || rand < log_prob) - first_line = false - end - fd.close - end - [$? == 0, data.chomp] - rescue Timeout::Error, Interrupt => e - if fd && !fd.closed? - killall fd.pid - fd.close - end - cleanup.call if cleanup - if e.is_a?(Timeout::Error) && tried < tries - 3.downto(1) do |countdown| - s = countdown > 1 ? 's' : '' - log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type - sleep 1 - end - log.call name, 'Retrying ...', type - retry - end - [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] - end - } - main = Thread.current - threads = [] - watcher = Thread.new { - if vim7 - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - else - require 'io/console' # >= Ruby 1.9 - nil until IO.console.getch == 3.chr - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } unless vim7 - end - threads.each { |t| t.join rescue nil } - main.kill - } - refresh = Thread.new { - while true - mtx.synchronize do - break unless running - VIM::command('noautocmd normal! a') - end - sleep 0.2 - end - } if VIM::evaluate('s:mac_gui') == 1 - - clone_opt = VIM::evaluate('s:clone_opt') - progress = VIM::evaluate('s:progress_opt(1)') - nthr.times do - mtx.synchronize do - threads << Thread.new { - while pair = take1.call - name = pair.first - dir, uri, tag = pair.last.values_at *%w[dir uri tag] - exists = File.directory? dir - ok, result = - if exists - chdir = "#{cd} #{iswin ? dir : esc(dir)}" - ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil - current_uri = data.lines.to_a.last - if !ret - if data =~ /^Interrupted|^Timeout/ - [false, data] - else - [false, [data.chomp, "PlugClean required."].join($/)] - end - elsif !compare_git_uri(current_uri, uri) - [false, ["Invalid URI: #{current_uri}", - "Expected: #{uri}", - "PlugClean required."].join($/)] - else - if pull - log.call name, 'Updating ...', :update - fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' - bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil - else - [true, skip] - end - end - else - d = esc dir.sub(%r{[\\/]+$}, '') - log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { - FileUtils.rm_rf dir - } - end - mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok - log.call name, result, ok - end - } if running - end - end - threads.each { |t| t.join rescue nil } - logh.call - refresh.kill if refresh - watcher.kill -EOF -endfunction - -function! s:shellesc_cmd(arg) - let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g') - let escaped = substitute(escaped, '%', '%%', 'g') - let escaped = substitute(escaped, '"', '\\^&', 'g') - let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g') - return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"' -endfunction - -function! s:shellesc(arg) - if &shell =~# 'cmd.exe$' - return s:shellesc_cmd(a:arg) - endif - return shellescape(a:arg) -endfunction - -function! s:glob_dir(path) - return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') -endfunction - -function! s:progress_bar(line, bar, total) - call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') -endfunction - -function! s:compare_git_uri(a, b) - " See `git help clone' - " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] - " [git@] github.com[:port] : junegunn/vim-plug [.git] - " file:// / junegunn/vim-plug [/] - " / junegunn/vim-plug [/] - let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' - let ma = matchlist(a:a, pat) - let mb = matchlist(a:b, pat) - return ma[1:2] ==# mb[1:2] -endfunction - -function! s:format_message(bullet, name, message) - if a:bullet != 'x' - return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] - else - let lines = map(s:lines(a:message), '" ".v:val') - return extend([printf('x %s:', a:name)], lines) - endif -endfunction - -function! s:with_cd(cmd, dir) - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd) -endfunction - -function! s:system(cmd, ...) - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let batchfile = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = batchfile - endif - return system(s:is_win ? '('.cmd.')' : cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win - call delete(batchfile) - endif - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_validate(spec, check_branch) - let err = '' - if isdirectory(a:spec.dir) - let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) - let remote = result[-1] - if v:shell_error - let err = join([remote, 'PlugClean required.'], "\n") - elseif !s:compare_git_uri(remote, a:spec.uri) - let err = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - elseif a:check_branch && has_key(a:spec, 'commit') - let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) - let sha = result[-1] - if v:shell_error - let err = join(add(result, 'PlugClean required.'), "\n") - elseif !s:hash_match(sha, a:spec.commit) - let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', - \ a:spec.commit[:6], sha[:6]), - \ 'PlugUpdate required.'], "\n") - endif - elseif a:check_branch - let branch = result[0] - " Check tag - if has_key(a:spec, 'tag') - let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) - if a:spec.tag !=# tag && a:spec.tag !~ '\*' - let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - endif - " Check branch - elseif a:spec.branch !=# branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ branch, a:spec.branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system(printf( - \ 'git rev-list --count --left-right HEAD...origin/%s', - \ a:spec.branch), a:spec.dir)), '\t') - if !v:shell_error && ahead - if behind - " Only mention PlugClean if diverged, otherwise it's likely to be - " pushable (and probably not that messed up). - let err = printf( - \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ a:spec.branch, ahead) - endif - endif - endif - endif - else - let err = 'Not found' - endif - return [err, err =~# 'PlugClean'] -endfunction - -function! s:rm_rf(dir) - if isdirectory(a:dir) - call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir)) - endif -endfunction - -function! s:clean(force) - call s:prepare() - call append(0, 'Searching for invalid plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let errs = {} - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) - call add(dirs, spec.dir) - else - let [err, clean] = s:git_validate(spec, 1) - if clean - let errs[spec.dir] = s:lines(err)[0] - else - call add(dirs, spec.dir) - endif - endif - let cnt += 1 - call s:progress_bar(2, repeat('=', cnt), total) - normal! 2G - redraw - endfor - - let allowed = {} - for dir in dirs - let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1 - let allowed[dir] = 1 - for child in s:glob_dir(dir) - let allowed[child] = 1 - endfor - endfor - - let todo = [] - let found = sort(s:glob_dir(g:plug_home)) - while !empty(found) - let f = remove(found, 0) - if !has_key(allowed, f) && isdirectory(f) - call add(todo, f) - call append(line('$'), '- ' . f) - if has_key(errs, f) - call append(line('$'), ' ' . errs[f]) - endif - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - 4 - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - let s:clean_count = 0 - call append(3, ['Directories to delete:', '']) - redraw! - if a:force || s:ask_no_interrupt('Delete all directories?') - call s:delete([6, line('$')], 1) - else - call setline(4, 'Cancelled.') - nnoremap d :set opfunc=delete_opg@ - nmap dd d_ - xnoremap d :call delete_op(visualmode(), 1) - echo 'Delete the lines (d{motion}) to delete the corresponding directories' - endif - endif - 4 - setlocal nomodifiable -endfunction - -function! s:delete_op(type, ...) - call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) -endfunction - -function! s:delete(range, force) - let [l1, l2] = a:range - let force = a:force - while l1 <= l2 - let line = getline(l1) - if line =~ '^- ' && isdirectory(line[2:]) - execute l1 - redraw! - let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) - let force = force || answer > 1 - if answer - call s:rm_rf(line[2:]) - setlocal modifiable - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - call setline(4, printf('Removed %d directories.', s:clean_count)) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp)) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - let is_dir = isdirectory(spec.dir) - if has_key(spec, 'uri') - if is_dir - let [err, _] = s:git_validate(spec, 1) - let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if is_dir - let [valid, msg] = [1, 'OK'] - else - let [valid, msg] = [0, 'Not found.'] - endif - endif - let cnt += 1 - let ecnt += !valid - " `s:loaded` entry can be missing if PlugUpgraded - if is_dir && get(s:loaded, name, -1) == 0 - let unloaded = 1 - let msg .= ' (not loaded)' - endif - call s:progress_bar(2, repeat('=', cnt), total) - call append(3, s:format_message(valid ? '-' : 'x', name, msg)) - normal! 2G - redraw - endfor - call setline(1, 'Finished. '.ecnt.' error(s).') - normal! gg - setlocal nomodifiable - if unloaded - echo "Press 'L' on each line to load plugin, or 'U' to update" - nnoremap L :call status_load(line('.')) - xnoremap L :call status_load(line('.')) - end -endfunction - -function! s:extract_name(str, prefix, suffix) - return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') -endfunction - -function! s:status_load(lnum) - let line = getline(a:lnum) - let name = s:extract_name(line, '-', '(not loaded)') - if !empty(name) - call plug#load(name) - setlocal modifiable - call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) - setlocal nomodifiable - endif -endfunction - -function! s:status_update() range - let lines = getline(a:firstline, a:lastline) - let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') - if !empty(names) - echo - execute 'PlugUpdate' join(names) - endif -endfunction - -function! s:is_preview_window_open() - silent! wincmd P - if &previewwindow - wincmd p - return 1 - endif -endfunction - -function! s:find_name(lnum) - for lnum in reverse(range(1, a:lnum)) - let line = getline(lnum) - if empty(line) - return '' - endif - let name = s:extract_name(line, '-', '') - if !empty(name) - return name - endif - endfor - return '' -endfunction - -function! s:preview_commit() - if b:plug_preview < 0 - let b:plug_preview = !s:is_preview_window_open() - endif - - let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') - if empty(sha) - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) - return - endif - - if exists('g:plug_pwindow') && !s:is_preview_window_open() - execute g:plug_pwindow - execute 'e' sha - else - execute 'pedit' sha - wincmd P - endif - setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let batchfile = tempname().'.bat' - call writefile(["@echo off\r", cmd . "\r"], batchfile) - let cmd = batchfile - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win - call delete(batchfile) - endif - endtry - setlocal nomodifiable - nnoremap q :q - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:format_git_log(line) - let indent = ' ' - let tokens = split(a:line, nr2char(1)) - if len(tokens) != 5 - return indent.substitute(a:line, '\s*$', '', '') - endif - let [graph, sha, refs, subject, date] = tokens - let tag = matchstr(refs, 'tag: [^,)]\+') - let tag = empty(tag) ? ' ' : ' ('.tag.') ' - return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) -endfunction - -function! s:append_ul(lnum, text) - call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) -endfunction - -function! s:diff() - call s:prepare() - call append(0, ['Collecting changes ...', '']) - let cnts = [0, 0] - let bar = '' - let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') - call s:progress_bar(2, bar, len(total)) - for origin in [1, 0] - let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) - if empty(plugs) - continue - endif - call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') - for [k, v] in plugs - let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' - let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')) - if has_key(v, 'rtp') - let cmd .= ' -- '.s:shellesc(v.rtp) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 - endif - let bar .= '=' - call s:progress_bar(2, bar, len(total)) - normal! 2G - redraw - endfor - if !cnts[origin] - call append(5, ['', 'N/A']) - endif - endfor - call setline(1, printf('%d plugin(s) updated.', cnts[0]) - \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) - - if cnts[0] || cnts[1] - nnoremap (plug-preview) :silent! call preview_commit() - if empty(maparg("\", 'n')) - nmap (plug-preview) - endif - if empty(maparg('o', 'n')) - nmap o (plug-preview) - endif - endif - if cnts[0] - nnoremap X :call revert() - echo "Press 'X' on each block to revert the update" - endif - normal! gg - setlocal nomodifiable -endfunction - -function! s:revert() - if search('^Pending updates', 'bnW') - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || - \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' - return - endif - - call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch).' --', g:plugs[name].dir) - setlocal modifiable - normal! "_dap - setlocal nomodifiable - echo 'Reverted' -endfunction - -function! s:snapshot(force, ...) abort - call s:prepare() - setf vim - call append(0, ['" Generated by vim-plug', - \ '" '.strftime("%c"), - \ '" :source this file in vim to restore the snapshot', - \ '" or execute: vim -S snapshot.vim', - \ '', '', 'PlugUpdate!']) - 1 - let anchor = line('$') - 3 - let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) - for name in reverse(names) - let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir) - if !empty(sha) - call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = expand(a:1) - if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) - return - endif - call writefile(getline(1, '$'), fn) - echo 'Saved as '.a:1 - silent execute 'e' s:esc(fn) - setf vim - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@ -" https://github.com/tomasr/molokai -" -" Note: Based on the Monokai theme for TextMate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#F8F8F0 -hi iCursor guifg=#000000 guibg=#F8F8F0 -hi Debug guifg=#BCA3A3 gui=bold -hi Define guifg=#66D9EF -hi Delimiter guifg=#8F8F8F -hi DiffAdd guibg=#13354A -hi DiffChange guifg=#89807D guibg=#4C4745 -hi DiffDelete guifg=#960050 guibg=#1E0010 -hi DiffText guibg=#4C4745 gui=italic,bold - -hi Directory guifg=#A6E22E gui=bold -hi Error guifg=#E6DB74 guibg=#1E0010 -hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold -hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi FoldColumn guifg=#465457 guibg=#000000 -hi Folded guifg=#465457 guibg=#000000 -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F -hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 - -hi Keyword guifg=#F92672 gui=bold -hi Label guifg=#E6DB74 gui=none -hi Macro guifg=#C4BE89 gui=italic -hi SpecialKey guifg=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF - -hi PreCondit guifg=#A6E22E gui=bold -hi PreProc guifg=#A6E22E -hi Question guifg=#66D9EF -hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#000000 guibg=#FFE792 -" marks -hi SignColumn guifg=#A6E22E guibg=#232526 -hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#7E8E91 gui=bold -hi Special guifg=#66D9EF guibg=bg gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif -hi Statement guifg=#F92672 gui=bold -hi StatusLine guifg=#455354 guibg=fg -hi StatusLineNC guifg=#808080 guibg=#080808 -hi StorageClass guifg=#FD971F gui=italic -hi Structure guifg=#66D9EF -hi Tag guifg=#F92672 gui=italic -hi Title guifg=#ef5939 -hi Todo guifg=#FFFFFF guibg=bg gui=bold - -hi Typedef guifg=#66D9EF -hi Type guifg=#66D9EF gui=none -hi Underlined guifg=#808080 gui=underline - -hi VertSplit guifg=#808080 guibg=#080808 gui=bold -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D -hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold -hi WildMenu guifg=#66D9EF guibg=#000000 - -hi TabLineFill guifg=#1B1D1E guibg=#1B1D1E -hi TabLine guibg=#1B1D1E guifg=#808080 gui=none - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 - hi Comment guifg=#75715E - hi CursorLine guibg=#3E3D32 - hi CursorLineNr guifg=#FD971F gui=none - hi CursorColumn guibg=#3E3D32 - hi ColorColumn guibg=#3B3A32 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#75715E - hi SpecialKey guifg=#75715E -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#7E8E91 - hi CursorLine guibg=#293739 - hi CursorLineNr guifg=#FD971F gui=none - hi CursorColumn guibg=#293739 - hi ColorColumn guibg=#232526 - hi LineNr guifg=#465457 guibg=#232526 - hi NonText guifg=#465457 - hi SpecialKey guifg=#465457 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - if s:molokai_original == 1 - hi Normal ctermbg=234 - hi CursorLine ctermbg=235 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - else - hi Normal ctermfg=252 ctermbg=233 - hi CursorLine ctermbg=234 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - endif - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - hi String ctermfg=144 - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=253 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=118 cterm=bold - hi Error ctermfg=219 ctermbg=89 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=118 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=118 - hi Identifier ctermfg=208 cterm=none - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=233 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermfg=255 ctermbg=242 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=118 cterm=bold - hi PreProc ctermfg=118 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=0 ctermbg=222 cterm=NONE - - " marks column - hi SignColumn ctermfg=118 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 - if has("spell") - hi SpellBad ctermbg=52 - hi SpellCap ctermbg=17 - hi SpellLocal ctermbg=17 - hi SpellRare ctermfg=none ctermbg=none cterm=reverse - endif - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - hi Comment ctermfg=59 - hi CursorColumn ctermbg=236 - hi ColorColumn ctermbg=236 - hi LineNr ctermfg=250 ctermbg=236 - hi NonText ctermfg=59 - - hi SpecialKey ctermfg=59 - - if exists("g:rehash256") && g:rehash256 == 1 - hi Normal ctermfg=252 ctermbg=234 - hi CursorLine ctermbg=236 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - - hi Boolean ctermfg=141 - hi Character ctermfg=222 - hi Number ctermfg=141 - hi String ctermfg=222 - hi Conditional ctermfg=197 cterm=bold - hi Constant ctermfg=141 cterm=bold - - hi DiffDelete ctermfg=125 ctermbg=233 - - hi Directory ctermfg=154 cterm=bold - hi Error ctermfg=222 ctermbg=233 - hi Exception ctermfg=154 cterm=bold - hi Float ctermfg=141 - hi Function ctermfg=154 - hi Identifier ctermfg=208 - - hi Keyword ctermfg=197 cterm=bold - hi Operator ctermfg=197 - hi PreCondit ctermfg=154 cterm=bold - hi PreProc ctermfg=154 - hi Repeat ctermfg=197 cterm=bold - - hi Statement ctermfg=197 cterm=bold - hi Tag ctermfg=197 - hi Title ctermfg=203 - hi Visual ctermbg=238 - - hi Comment ctermfg=244 - hi LineNr ctermfg=239 ctermbg=235 - hi NonText ctermfg=239 - hi SpecialKey ctermfg=239 - endif -end - -" Must be at the end, because of ctermbg=234 bug. -" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ -set background=dark diff --git a/colors/seoul256-light.vim b/colors/seoul256-light.vim deleted file mode 100644 index e0f3a67..0000000 --- a/colors/seoul256-light.vim +++ /dev/null @@ -1,78 +0,0 @@ -" " _____ _ ___ ___ ___ " -" " | __|___ ___ _ _| |_ | _| _| " -" " |__ | -_| . | | | | _|_ | . | " -" " |_____|___|___|___|_|___|___|___|-light.vim " -" -" " Low-contrast light Vim color scheme using Seoul Colors " -" -" File: seoul256-light.vim -" URL: github.com/junegunn/seoul256.vim -" Author: Junegunn Choi (junegunn.c@gmail.com) -" Version: 1.4.0 -" Last Updated: July 6, 2014 -" License: MIT -" -" Copyright (c) 2013 Junegunn Choi -" -" MIT License -" -" 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. - -let s:master = get(split(globpath(&rtp, 'colors/seoul256.vim'), '\n'), 0, '') -let s:custom_bg = get(g:, 'seoul256_light_background', get(g:, 'seoul256_background', 253)) -let s:light = s:custom_bg >= 252 && s:custom_bg <= 256 -let s:var_found = exists('g:seoul256_background') -let s:light_var_found = exists('g:seoul256_light_background') - -if !empty(s:master) - try - " Backup current g:seoul256_background - if s:var_found - let s:backup = g:seoul256_background - endif - - " Invalid range. Force the default light version. - if !s:light && s:var_found - unlet g:seoul256_background - endif - - " g:seoul256_light_background is found, use it - if s:light && s:light_var_found - let g:seoul256_background = s:custom_bg - endif - - if get(g:, 'colors_name', '') == 'seoul256-light' && &background == 'dark' - set background=dark - else - set background=light - endif - let g:colors_name = 'seoul256' - execute 'silent source' fnameescape(s:master) - let g:colors_name = &background == 'dark' ? 'seoul256' : 'seoul256-light' - finally - " Revert g:seoul256_background - if s:var_found - let g:seoul256_background = s:backup - endif - endtry -else - echom 'seoul256.vim not found' -endif - diff --git a/colors/seoul256.vim b/colors/seoul256.vim deleted file mode 100644 index 2a96a5b..0000000 --- a/colors/seoul256.vim +++ /dev/null @@ -1,425 +0,0 @@ -" " _____ _ ___ ___ ___ " -" " | __|___ ___ _ _| |_ | _| _| " -" " |__ | -_| . | | | | _|_ | . | " -" " |_____|___|___|___|_|___|___|___|.vim " -" -" " Low-contrast dark Vim color scheme using Seoul Colors " -" -" File: seoul256.vim -" URL: github.com/junegunn/seoul256.vim -" Author: Junegunn Choi (junegunn.c@gmail.com) -" Version: 1.5.3 -" Last Updated: Aug 4, 2014 -" License: MIT -" -" Copyright (c) 2013 Junegunn Choi -" -" MIT License -" -" 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. - -if !exists('s:rgb_map') - if get(g:, 'seoul256_srgb', 0) - let s:rgb_map = - \{ 16: '#000000', 17: '#00005f', 18: '#000087', - \ 19: '#0000af', 20: '#0000d7', 21: '#0000ff', - \ 22: '#005f00', 23: '#005f5f', 24: '#005f87', - \ 25: '#005faf', 26: '#005fd7', 27: '#005fff', - \ 28: '#008700', 29: '#00875f', 30: '#008787', - \ 31: '#0087af', 32: '#0087d7', 33: '#0087ff', - \ 34: '#00af00', 35: '#00af5f', 36: '#00af87', - \ 37: '#00afaf', 38: '#00afd7', 39: '#00afff', - \ 40: '#00d700', 41: '#00d75f', 42: '#00d787', - \ 43: '#00d7af', 44: '#00d7d7', 45: '#00d7ff', - \ 46: '#00ff00', 47: '#00ff5f', 48: '#00ff87', - \ 49: '#00ffaf', 50: '#00ffd7', 51: '#00ffff', - \ 52: '#5f0000', 53: '#5f005f', 54: '#5f0087', - \ 55: '#5f00af', 56: '#5f00d7', 57: '#5f00ff', - \ 58: '#5f5f00', 59: '#5f5f5f', 60: '#5f5f87', - \ 61: '#5f5faf', 62: '#5f5fd7', 63: '#5f5fff', - \ 64: '#5f8700', 65: '#5f875f', 66: '#5f8787', - \ 67: '#5f87af', 68: '#5f87d7', 69: '#5f87ff', - \ 70: '#5faf00', 71: '#5faf5f', 72: '#5faf87', - \ 73: '#5fafaf', 74: '#5fafd7', 75: '#5fafff', - \ 76: '#5fd700', 77: '#5fd75f', 78: '#5fd787', - \ 79: '#5fd7af', 80: '#5fd7d7', 81: '#5fd7ff', - \ 82: '#5fff00', 83: '#5fff5f', 84: '#5fff87', - \ 85: '#5fffaf', 86: '#5fffd7', 87: '#5fffff', - \ 88: '#870000', 89: '#87005f', 90: '#870087', - \ 91: '#8700af', 92: '#8700d7', 93: '#8700ff', - \ 94: '#875f00', 95: '#875f5f', 96: '#875f87', - \ 97: '#875faf', 98: '#875fd7', 99: '#875fff', - \ 100: '#878700', 101: '#87875f', 102: '#878787', - \ 103: '#8787af', 104: '#8787d7', 105: '#8787ff', - \ 106: '#87af00', 107: '#87af5f', 108: '#87af87', - \ 109: '#87afaf', 110: '#87afd7', 111: '#87afff', - \ 112: '#87d700', 113: '#87d75f', 114: '#87d787', - \ 115: '#87d7af', 116: '#87d7d7', 117: '#87d7ff', - \ 118: '#87ff00', 119: '#87ff5f', 120: '#87ff87', - \ 121: '#87ffaf', 122: '#87ffd7', 123: '#87ffff', - \ 124: '#af0000', 125: '#af005f', 126: '#af0087', - \ 127: '#af00af', 128: '#af00d7', 129: '#af00ff', - \ 130: '#af5f00', 131: '#af5f5f', 132: '#af5f87', - \ 133: '#af5faf', 134: '#af5fd7', 135: '#af5fff', - \ 136: '#af8700', 137: '#af875f', 138: '#af8787', - \ 139: '#af87af', 140: '#af87d7', 141: '#af87ff', - \ 142: '#afaf00', 143: '#afaf5f', 144: '#afaf87', - \ 145: '#afafaf', 146: '#afafd7', 147: '#afafff', - \ 148: '#afd700', 149: '#afd75f', 150: '#afd787', - \ 151: '#afd7af', 152: '#afd7d7', 153: '#afd7ff', - \ 154: '#afff00', 155: '#afff5f', 156: '#afff87', - \ 157: '#afffaf', 158: '#afffd7', 159: '#afffff', - \ 160: '#d70000', 161: '#d7005f', 162: '#d70087', - \ 163: '#d700af', 164: '#d700d7', 165: '#d700ff', - \ 166: '#d75f00', 167: '#d75f5f', 168: '#d75f87', - \ 169: '#d75faf', 170: '#d75fd7', 171: '#d75fff', - \ 172: '#d78700', 173: '#d7875f', 174: '#d78787', - \ 175: '#d787af', 176: '#d787d7', 177: '#d787ff', - \ 178: '#d7af00', 179: '#d7af5f', 180: '#d7af87', - \ 181: '#d7afaf', 182: '#d7afd7', 183: '#d7afff', - \ 184: '#d7d700', 185: '#d7d75f', 186: '#d7d787', - \ 187: '#d7d7af', 188: '#d7d7d7', 189: '#d7d7ff', - \ 190: '#d7ff00', 191: '#d7ff5f', 192: '#d7ff87', - \ 193: '#d7ffaf', 194: '#d7ffd7', 195: '#d7ffff', - \ 196: '#ff0000', 197: '#ff005f', 198: '#ff0087', - \ 199: '#ff00af', 200: '#ff00d7', 201: '#ff00ff', - \ 202: '#ff5f00', 203: '#ff5f5f', 204: '#ff5f87', - \ 205: '#ff5faf', 206: '#ff5fd7', 207: '#ff5fff', - \ 208: '#ff8700', 209: '#ff875f', 210: '#ff8787', - \ 211: '#ff87af', 212: '#ff87d7', 213: '#ff87ff', - \ 214: '#ffaf00', 215: '#ffaf5f', 216: '#ffaf87', - \ 217: '#ffafaf', 218: '#ffafd7', 219: '#ffafff', - \ 220: '#ffd700', 221: '#ffd75f', 222: '#ffd787', - \ 223: '#ffd7af', 224: '#ffd7d7', 225: '#ffd7ff', - \ 226: '#ffff00', 227: '#ffff5f', 228: '#ffff87', - \ 229: '#ffffaf', 230: '#ffffd7', 231: '#ffffff', - \ 232: '#080808', 233: '#121212', 234: '#1c1c1c', - \ 235: '#262626', 236: '#303030', 237: '#3a3a3a', - \ 238: '#444444', 239: '#4e4e4e', 240: '#585858', - \ 241: '#626262', 242: '#6c6c6c', 243: '#767676', - \ 244: '#808080', 245: '#8a8a8a', 246: '#949494', - \ 247: '#9e9e9e', 248: '#a8a8a8', 249: '#b2b2b2', - \ 250: '#bcbcbc', 251: '#c6c6c6', 252: '#d0d0d0', - \ 253: '#dadada', 254: '#e4e4e4', 255: '#eeeeee' } - else - let s:rgb_map = - \{ 22: '#006F00', 23: '#007173', 24: '#007299', 25: '#0074BE', 30: '#009799', - \ 31: '#0099BD', 38: '#00BDDF', 52: '#730B00', 58: '#727100', 59: '#727272', - \ 65: '#719872', 66: '#719899', 67: '#7299BC', 68: '#719CDF', 73: '#6FBCBD', - \ 74: '#70BDDF', 88: '#9B1300', 89: '#9B1D72', 94: '#9A7200', 95: '#9A7372', - \ 96: '#9A7599', 101: '#999872', 103: '#999ABD', 108: '#98BC99', 109: '#98BCBD', - \ 110: '#98BEDE', 116: '#97DDDF', 125: '#BF2172', 131: '#BE7572', 137: '#BE9873', - \ 143: '#BDBB72', 144: '#BDBC98', 145: '#BDBDBD', 151: '#BCDDBD', 152: '#BCDEDE', - \ 153: '#BCE0FF', 161: '#E12672', 168: '#E17899', 173: '#E19972', 174: '#E09B99', - \ 179: '#DFBC72', 181: '#E0BEBC', 184: '#DEDC00', 186: '#DEDD99', 187: '#DFDEBD', - \ 189: '#DFDFFF', 216: '#FFBD98', 217: '#FFBFBD', 218: '#FFC0DE', 220: '#FFDD00', - \ 222: '#FFDE99', 224: '#FFDFDF', 230: '#FFFFDF', 231: '#FFFFFF', 232: '#060606', - \ 233: '#171717', 234: '#252525', 235: '#333233', 236: '#3F3F3F', 237: '#4B4B4B', - \ 238: '#565656', 239: '#616161', 240: '#6B6B6B', 241: '#757575', 249: '#BFBFBF', - \ 250: '#C8C8C8', 251: '#D1D0D1', 252: '#D9D9D9', 253: '#E1E1E1', 254: '#E9E9E9', - \ 255: '#F1F1F1' } - endif -endif - -let s:background = &background -let s:colors_name = get(g:, 'colors_name', '') - -silent! unlet s:style s:seoul256_background - -" 1. If g:seoul256_background is found -if exists('g:seoul256_background') - let s:seoul256_background = g:seoul256_background - if s:seoul256_background >= 233 && s:seoul256_background <= 239 - let s:style = 'dark' - elseif s:seoul256_background >= 252 && s:seoul256_background <= 256 - let s:style = 'light' - else - unlet s:seoul256_background - endif -endif - -if !exists('s:style') - " 2. If g:colors_name is NOT 'seoul256' -> dark version - if s:colors_name != 'seoul256' - let s:style = 'dark' - " 3. Follow &background setting - else - let s:style = &background - endif -endif -let s:style_idx = s:style == 'light' - -" Background colors -if s:style == 'dark' - let s:dark_bg = get(s:, 'seoul256_background', 237) - let s:light_bg = 253 -else - let s:dark_bg = 237 - let s:light_bg = get(s:, 'seoul256_background', 253) -endif -let s:dark_bg_2 = s:dark_bg > 233 ? s:dark_bg - 2 : 16 -let s:light_bg_1 = min([s:light_bg + 1, 256]) -let s:light_bg_2 = min([s:light_bg + 2, 256]) - -" Foreground colors -let s:dark_fg = 252 -let s:light_fg = 239 - -function! s:hi(item, fg, bg) - let fg = a:fg[s:style_idx] > 255 ? 231 : a:fg[s:style_idx] - let bg = a:bg[s:style_idx] > 255 ? 231 : a:bg[s:style_idx] - - if !empty(fg) - execute printf("highlight %s ctermfg=%s guifg=%s", a:item, fg, get(s:rgb_map, fg, 'NONE')) - endif - if !empty(bg) - execute printf("highlight %s ctermbg=%s guibg=%s", a:item, bg, get(s:rgb_map, bg, 'NONE')) - endif -endfunction - -let s:gui = has('gui_running') -if !s:gui - set t_Co=256 -end - -silent! unlet g:colors_name -hi clear -if exists("syntax_on") - syntax reset -endif - -call s:hi('Normal', [s:dark_fg, s:light_fg], [s:dark_bg, s:light_bg]) - -call s:hi('LineNr', [101, 101], [s:dark_bg + 1, s:light_bg - 2]) -call s:hi('Visual', ['', ''], [23, 152]) -call s:hi('VisualNOS', ['', ''], [23, 152]) - -call s:hi('Comment', [65, 65], ['', '']) -call s:hi('Number', [222, 95], ['', '']) -call s:hi('Float', [222, 95], ['', '']) -call s:hi('Boolean', [103, 168], ['', '']) -call s:hi('String', [109, 30], ['', '']) -call s:hi('Constant', [73, 23], ['', '']) -call s:hi('Character', [174, 168], ['', '']) -call s:hi('Delimiter', [137, 94], ['', '']) -call s:hi('StringDelimiter', [137, 94], ['', '']) -call s:hi('Statement', [108, 66], ['', '']) -" case, default, etc. -" hi Label ctermfg= - -" if else end -call s:hi('Conditional', [110, 31], ['', '']) - -" while end -call s:hi('Repeat', [68, 67], ['', '']) -call s:hi('Todo', [161, 125], [s:dark_bg_2, s:light_bg_2]) -call s:hi('Function', [187, 58], ['', '']) - -" Macros -call s:hi('Define', [173, 131], ['', '']) -call s:hi('Macro', [173, 131], ['', '']) -call s:hi('Include', [173, 131], ['', '']) -call s:hi('PreCondit', [173, 131], ['', '']) - - -" #! -call s:hi('PreProc', [143, 58], ['', '']) - -" @abc -call s:hi('Identifier', [217, 96], ['', '']) - -" AAA Abc -call s:hi('Type', [179, 94], ['', '']) - -" + - * / << -call s:hi('Operator', [186, 131], ['', '']) - -" super yield -call s:hi('Keyword', [168, 168], ['', '']) - -" raise -call s:hi('Exception', [161, 161], ['', '']) -" -" hi StorageClass ctermfg= -call s:hi('Structure', [116, 23], ['', '']) -" hi Typedef ctermfg= - -call s:hi('Error', [s:dark_fg, s:light_bg_1], [52, 174]) -call s:hi('ErrorMsg', [s:dark_fg, s:light_bg_1], [52, 168]) -call s:hi('Underlined', [181, 168], ['', '']) - -" set textwidth=80 -" set colorcolumn=+1 -call s:hi('ColorColumn', ['', ''], [s:dark_bg - 1, s:light_bg - 2]) - -" GVIM only -" hi Cursor ctermfg= -" hi CursorIM ctermfg= - -" set cursorline cursorcolumn -call s:hi('CursorLine', ['', ''], [s:dark_bg - 1, s:light_bg - 1]) -call s:hi('CursorLineNr', [131, 131], [s:dark_bg - 1, s:light_bg - 1]) -call s:hi('CursorColumn', ['', ''], [s:dark_bg - 1, s:light_bg - 1]) - -call s:hi('Directory', [187, 95], ['', '']) - -call s:hi('DiffAdd', ['NONE', 'NONE'], [22, 151]) -call s:hi('DiffDelete', ['NONE', 'NONE'], [95, 181]) -call s:hi('DiffChange', ['NONE', 'NONE'], [s:dark_bg + 3, 189]) -call s:hi('DiffText', ['NONE', 'NONE'], [52, 224]) - -call s:hi('VertSplit', [s:dark_bg_2, s:light_bg - 3], [s:dark_bg_2, s:light_bg - 3]) -call s:hi('Folded', [101, 101], [s:dark_bg + 1, s:light_bg - 2]) - -" set foldcolumn=1 -call s:hi('FoldColumn', [144, 94], [s:dark_bg + 1, s:light_bg - 2]) - -call s:hi('MatchParen', ['', ''], [s:dark_bg + 3, s:light_bg - 3]) - -" -- INSERT -- -call s:hi('ModeMsg', [173, 173], ['', '']) - -" let &showbreak = '> ' -call s:hi('NonText', [101, 101], ['', '']) - -call s:hi('MoreMsg', [173, 173], ['', '']) - -" Popup menu -call s:hi('Pmenu', [s:dark_bg + 1, 238], [224, 224]) -call s:hi('PmenuSel', [s:dark_fg, s:dark_fg], [89, 89]) -call s:hi('PmenuSbar', ['', ''], [65, 65]) -call s:hi('PmenuThumb', ['', ''], [23, 23]) - -call s:hi('Search', [s:dark_fg, 255], [24, 74]) -call s:hi('IncSearch', [220, 220], [s:dark_bg + 1, 238]) - -" String delimiter, interpolation -call s:hi('Special', [216, 173], ['', '']) -" hi SpecialChar ctermfg= -" hi SpecialComment ctermfg= -" hi Tag ctermfg= -" hi Debug ctermfg= - -" :map, listchars -call s:hi('SpecialKey', [59, 145], ['', '']) - -if !s:gui - " Red / Blue / Cyan / Magenta - if s:style_idx == 0 - hi SpellBad ctermbg=NONE cterm=underline ctermfg=168 - hi SpellCap ctermbg=NONE cterm=underline ctermfg=110 - hi SpellLocal ctermbg=NONE cterm=underline ctermfg=153 - hi SpellRare ctermbg=NONE cterm=underline ctermfg=218 - else - hi SpellBad ctermbg=NONE cterm=underline ctermfg=125 - hi SpellCap ctermbg=NONE cterm=underline ctermfg=25 - hi SpellLocal ctermbg=NONE cterm=underline ctermfg=31 - hi SpellRare ctermbg=NONE cterm=underline ctermfg=96 - endif -else - if s:style_idx == 0 - execute 'hi SpellBad gui=undercurl guisp=' . s:rgb_map[168] - execute 'hi SpellCap gui=undercurl guisp=' . s:rgb_map[110] - execute 'hi SpellLocal gui=undercurl guisp=' . s:rgb_map[153] - execute 'hi SpellRare gui=undercurl guisp=' . s:rgb_map[218] - else - execute 'hi SpellBad gui=undercurl guisp=' . s:rgb_map[125] - execute 'hi SpellCap gui=undercurl guisp=' . s:rgb_map[25] - execute 'hi SpellLocal gui=undercurl guisp=' . s:rgb_map[31] - execute 'hi SpellRare gui=undercurl guisp=' . s:rgb_map[96] - endif -endif - -" -call s:hi('StatusLine', [95, 95], [187, 187]) -call s:hi('StatusLineNC', [s:dark_bg + 2, s:light_bg - 2], [187, 238]) -call s:hi('TabLineFill', [s:dark_bg + 2, s:light_bg - 2], ['', '']) -call s:hi('TabLineSel', [187, 187], [23, 66]) -call s:hi('TabLine', [s:dark_bg + 12, s:light_bg - 12], [s:dark_bg + 4, s:light_bg - 4]) -call s:hi('WildMenu', [95, 95], [184, 184]) - -" :set all -call s:hi('Title', [181, 88], ['', '']) - -" TODO -call s:hi('Question', [179, 88], ['', '']) - -" Search hit bottom -call s:hi('WarningMsg', [179, 88], ['', '']) - -" Sign column -call s:hi('SignColumn', [173, 173], [s:dark_bg, s:light_bg]) - -" Diff -call s:hi('diffAdded', [108, 65], ['', '']) -call s:hi('diffRemoved', [174, 131], ['', '']) -hi link diffLine Constant - -call s:hi('Conceal', [s:dark_fg + 2, s:light_fg - 2], [s:dark_bg - 1, s:light_bg + 2]) -call s:hi('Ignore', [s:dark_bg + 3, s:light_bg - 3], [s:dark_bg, s:light_bg]) - -""""""""""""""""""""""""""""""""""""""""""""""""" -" Plugins -""""""""""""""""""""""""""""""""""""""""""""""""" - -" vim-indent-guides -" ----------------- -let g:indent_guides_auto_colors = 0 -call s:hi('IndentGuidesOdd', ['', ''], [s:dark_bg - 1, s:light_bg + 1]) -call s:hi('IndentGuidesEven', ['', ''], [s:dark_bg + 1, s:light_bg - 1]) - -" vim-gitgutter -" ------------- -call s:hi('GitGutterAdd', [108, 65], [s:dark_bg + 1, s:light_bg - 2]) -call s:hi('GitGutterChange', [68, 68], [s:dark_bg + 1, s:light_bg - 2]) -call s:hi('GitGutterDelete', [161, 161], [s:dark_bg + 1, s:light_bg -2 ]) -call s:hi('GitGutterChangeDelete', [168, 168], [s:dark_bg + 1, s:light_bg - 2]) - -" http://vim.wikia.com/wiki/Highlight_unwanted_spaces -" ---------------------------------------------------^^^^^ -call s:hi('ExtraWhitespace', ['', ''], [s:dark_bg - 1, s:light_bg - 2]) - -" vim-ruby -" -------- -" " rubySymbol -let ruby_operators = 1 -call s:hi('rubyClass', [31, 31], ['', '']) -" call s:hi('rubyInstanceVariable', [189, 189], ['', '']) -call s:hi('rubyRegexp', [186, 101], ['', '']) -call s:hi('rubyRegexpDelimiter', [168, 168], ['', '']) -call s:hi('rubyArrayDelimiter', [67, 38], ['', '']) -call s:hi('rubyBlockParameterList', [186, 94], ['', '']) -call s:hi('rubyCurlyBlockDelimiter', [144, 101], ['', '']) - -" ARGV $stdout -call s:hi('rubyPredefinedIdentifier', [230, 52], ['', '']) -" hi rubyRegexpSpecial - -hi CursorLine cterm=NONE -hi CursorLineNr cterm=NONE - -let g:seoul256_current_fg = [s:dark_fg, s:light_fg][s:style_idx] -let g:seoul256_current_bg = [s:dark_bg, s:light_bg][s:style_idx] -let g:colors_name = 'seoul256' -if s:colors_name != g:colors_name || s:background == s:style - let &background = s:style -else - let &background = s:background -endif diff --git a/colors/sourcerer.vim b/colors/sourcerer.vim deleted file mode 100644 index 7a4d9fc..0000000 --- a/colors/sourcerer.vim +++ /dev/null @@ -1,216 +0,0 @@ -" ██████ ██████ ██ ██ ██████ █████ █████ ██████ █████ ██████ -" ██░░░░ ██░░░░██░██ ░██░░██░░████░░░██ ██░░░██░░██░░████░░░██░░██░░██ -" ░░█████ ░██ ░██░██ ░██ ░██ ░░░██ ░░ ░███████ ░██ ░░░███████ ░██ ░░ -" ░░░░░██░██ ░██░██ ░██ ░██ ░██ ██░██░░░░ ░██ ░██░░░░ ░██ -" ██████ ░░██████ ░░██████░███ ░░█████ ░░██████░███ ░░██████░███ -" ░░░░░░ ░░░░░░ ░░░░░░ ░░░ ░░░░░ ░░░░░░ ░░░ ░░░░░░ ░░░ -" r e a d c o d e l i k e a w i z a r d -" -" sourcerer by xero harrison (http://sourcerer.xero.nu) -" ├─ based on sorcerer by Jeet Sukumaran (http://jeetworks.org) -" └─ based on mustang by Henrique C. Alves (hcarvalhoalves@gmail.com) - -set background=dark -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "sourcerer" - - -" █▓▒░ GUI colors -hi Normal guifg=#c2c2b0 guibg=#222222 gui=NONE -hi ColorColumn guifg=NONE guibg=#1c1c1c -hi Cursor guifg=NONE guibg=#626262 gui=NONE -hi CursorColumn guibg=#2d2d2d -hi CursorLine guibg=#2d2d2d -hi DiffAdd guifg=#000000 guibg=#3cb371 gui=NONE -hi DiffDelete guifg=#000000 guibg=#aa4450 gui=NONE -hi DiffChange guifg=#000000 guibg=#4f94cd gui=NONE -hi DiffText guifg=#000000 guibg=#8ee5ee gui=NONE -hi Directory guifg=#1e90ff guibg=NONE gui=NONE -hi ErrorMsg guifg=#ff6a6a guibg=NONE gui=bold -hi FoldColumn guifg=#68838b guibg=#4B4B4B gui=bold -hi Folded guifg=#406060 guibg=#232c2c gui=NONE -hi IncSearch guifg=#ffffff guibg=#ff4500 gui=bold -hi LineNr guifg=#878787 guibg=#3A3A3A gui=NONE -hi MatchParen guifg=#fff000 guibg=NONE gui=bold -hi ModeMsg guifg=#afafaf guibg=#222222 gui=bold -hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold -hi NonText guifg=#404050 guibg=NONE gui=NONE - -" completions -hi Pmenu guifg=#A8A8A8 guibg=#3A3A3A -hi PmenuSel guifg=#000000 guibg=#528B8B -hi PmenuSbar guifg=#000000 guibg=#528B8B -hi PmenuThumb guifg=#000000 guibg=#528B8B - -hi Question guifg=#00ee00 guibg=NONE gui=bold -hi Search guifg=#000000 guibg=#d6e770 gui=bold -hi SignColumn guifg=#ffffff guibg=NONE gui=NONE -hi SpecialKey guifg=#505060 guibg=NONE gui=NONE -hi SpellBad guisp=#ee2c2c gui=undercurl -hi SpellCap guisp=#0000ff gui=undercurl -hi SpellLocal guisp=#008b8b gui=undercurl -hi SpellRare guisp=#ff00ff gui=undercurl -hi StatusLine guifg=#000000 guibg=#808070 gui=bold -hi StatusLineNC guifg=#000000 guibg=#404c4c gui=italic -hi VertSplit guifg=#404c4c guibg=#404c4c gui=NONE -hi TabLine guifg=fg guibg=#d3d3d3 gui=underline -hi TabLineFill guifg=fg guibg=NONE gui=reverse -hi TabLineSel guifg=fg guibg=NONE gui=bold -hi Title guifg=#528b8b guibg=NONE gui=bold -hi Visual guifg=#000000 guibg=#6688aa gui=NONE -hi WarningMsg guifg=#ee9a00 guibg=NONE gui=NONE -hi WildMenu guifg=#000000 guibg=#87ceeb gui=NONE -hi ExtraWhitespace guifg=fg guibg=#528b8b gui=NONE - -" syntax highlighting -hi Comment guifg=#686858 gui=italic -hi Boolean guifg=#ff9800 gui=NONE -hi String guifg=#779b70 gui=NONE -hi Identifier guifg=#9ebac2 gui=NONE -hi Function guifg=#faf4c6 gui=NONE -hi Type guifg=#7e8aa2 gui=NONE -hi Statement guifg=#90b0d1 gui=NONE -hi Keyword guifg=#90b0d1 gui=NONE -hi Constant guifg=#ff9800 gui=NONE -hi Number guifg=#cc8800 gui=NONE -hi Special guifg=#719611 gui=NONE -hi PreProc guifg=#528b8b gui=NONE -hi Todo guifg=#8f6f8f guibg=#202020 gui=italic,underline,bold - -" diff -hi diffOldFile guifg=#88afcb guibg=NONE gui=italic -hi diffNewFile guifg=#88afcb guibg=NONE gui=italic -hi diffFile guifg=#88afcb guibg=NONE gui=italic -hi diffLine guifg=#88afcb guibg=NONE gui=italic -hi link diffSubname diffLine -hi diffAdded guifg=#3cb371 guibg=NONE gui=NONE -hi diffRemoved guifg=#aa4450 guibg=NONE gui=NONE -hi diffChanged guifg=#4f94cd guibg=NONE gui=NONE -hi link diffOnly Constant -hi link diffIdentical Constant -hi link diffDiffer Constant -hi link diffBDiffer Constant -hi link diffIsA Constant -hi link diffNoEOL Constant -hi link diffCommon Constant -hi link diffComment Constant - -" python -hi pythonException guifg=#90b0d1 guibg=NONE gui=NONE -hi pythonExClass guifg=#996666 guibg=NONE gui=NONE -hi pythonDecorator guifg=#888555 guibg=NONE gui=NONE -hi link pythonDecoratorFunction pythonDecorator - -" █▓▒░ 256 colors -hi Normal cterm=NONE ctermbg=NONE ctermfg=145 -hi ColorColumn cterm=NONE ctermbg=16 ctermfg=NONE -hi Cursor cterm=NONE ctermbg=241 ctermfg=fg -hi CursorColumn cterm=NONE ctermbg=16 ctermfg=fg -hi CursorLine cterm=NONE ctermbg=236 ctermfg=fg -hi DiffAdd cterm=NONE ctermbg=71 ctermfg=16 -hi DiffDelete cterm=NONE ctermbg=124 ctermfg=16 -hi DiffChange cterm=NONE ctermbg=68 ctermfg=16 -hi DiffText cterm=NONE ctermbg=117 ctermfg=16 -hi Directory cterm=NONE ctermbg=234 ctermfg=33 -hi ErrorMsg cterm=bold ctermbg=NONE ctermfg=203 -hi FoldColumn cterm=bold ctermbg=239 ctermfg=66 -hi Folded cterm=NONE ctermbg=16 ctermfg=60 -hi IncSearch cterm=bold ctermbg=202 ctermfg=231 -hi LineNr cterm=NONE ctermbg=237 ctermfg=102 -hi MatchParen cterm=bold ctermbg=NONE ctermfg=226 -hi ModeMsg cterm=bold ctermbg=NONE ctermfg=145 -hi MoreMsg cterm=bold ctermbg=234 ctermfg=29 -hi NonText cterm=NONE ctermbg=NONE ctermfg=59 -hi Pmenu cterm=NONE ctermbg=238 ctermfg=231 -hi PmenuSbar cterm=NONE ctermbg=250 ctermfg=fg -hi PmenuSel cterm=NONE ctermbg=149 ctermfg=16 -hi Question cterm=bold ctermbg=NONE ctermfg=46 -hi Search cterm=bold ctermbg=185 ctermfg=16 -hi SignColumn cterm=NONE ctermbg=NONE ctermfg=231 -hi SpecialKey cterm=NONE ctermbg=NONE ctermfg=59 -hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=196 -hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=21 -hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=30 -hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=201 -hi StatusLine cterm=bold ctermbg=101 ctermfg=16 -hi StatusLineNC cterm=NONE ctermbg=102 ctermfg=16 -hi VertSplit cterm=NONE ctermbg=102 ctermfg=102 -hi TabLine cterm=bold ctermbg=102 ctermfg=16 -hi TabLineFill cterm=NONE ctermbg=102 ctermfg=16 -hi TabLineSel cterm=bold ctermbg=16 ctermfg=59 -hi Title cterm=bold ctermbg=NONE ctermfg=66 -hi Visual cterm=NONE ctermbg=67 ctermfg=16 -hi WarningMsg cterm=NONE ctermbg=234 ctermfg=208 -hi WildMenu cterm=NONE ctermbg=116 ctermfg=16 -hi ExtraWhitespace cterm=NONE ctermbg=66 ctermfg=fg - -hi Comment cterm=NONE ctermbg=NONE ctermfg=59 -hi Boolean cterm=NONE ctermbg=NONE ctermfg=208 -hi String cterm=NONE ctermbg=NONE ctermfg=101 -hi Identifier cterm=NONE ctermbg=NONE ctermfg=145 -hi Function cterm=NONE ctermbg=NONE ctermfg=230 -hi Type cterm=NONE ctermbg=NONE ctermfg=103 -hi Statement cterm=NONE ctermbg=NONE ctermfg=110 -hi Keyword cterm=NONE ctermbg=NONE ctermfg=110 -hi Constant cterm=NONE ctermbg=NONE ctermfg=208 -hi Number cterm=NONE ctermbg=NONE ctermfg=172 -hi Special cterm=NONE ctermbg=NONE ctermfg=64 -hi PreProc cterm=NONE ctermbg=NONE ctermfg=66 -hi Todo cterm=bold,underline ctermbg=234 ctermfg=96 - -hi diffOldFile cterm=NONE ctermbg=NONE ctermfg=67 -hi diffNewFile cterm=NONE ctermbg=NONE ctermfg=67 -hi diffFile cterm=NONE ctermbg=NONE ctermfg=67 -hi diffLine cterm=NONE ctermbg=NONE ctermfg=67 -hi diffAdded cterm=NONE ctermfg=NONE ctermfg=71 -hi diffRemoved cterm=NONE ctermfg=NONE ctermfg=124 -hi diffChanged cterm=NONE ctermfg=NONE ctermfg=68 -hi link diffSubname diffLine -hi link diffOnly Constant -hi link diffIdentical Constant -hi link diffDiffer Constant -hi link diffBDiffer Constant -hi link diffIsA Constant -hi link diffNoEOL Constant -hi link diffCommon Constant -hi link diffComment Constant - -hi pythonClass cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonDecorator cterm=NONE ctermbg=NONE ctermfg=101 -hi pythonExClass cterm=NONE ctermbg=NONE ctermfg=95 -hi pythonException cterm=NONE ctermbg=NONE ctermfg=110 -hi pythonFunc cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonFuncParams cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonKeyword cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonParam cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonRawEscape cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonSuperclasses cterm=NONE ctermbg=NONE ctermfg=fg -hi pythonSync cterm=NONE ctermbg=NONE ctermfg=fg - -hi Conceal cterm=NONE ctermbg=248 ctermfg=252 -hi Error cterm=NONE ctermbg=196 ctermfg=231 -hi Ignore cterm=NONE ctermbg=NONE ctermfg=234 -hi InsertModeCursorLine cterm=NONE ctermbg=16 ctermfg=fg -hi NormalModeCursorLine cterm=NONE ctermbg=235 ctermfg=fg -hi PmenuThumb cterm=reverse ctermbg=NONE ctermfg=fg -hi StatusLineAlert cterm=NONE ctermbg=160 ctermfg=231 -hi StatusLineUnalert cterm=NONE ctermbg=238 ctermfg=144 -hi Test cterm=NONE ctermbg=NONE ctermfg=fg -hi Underlined cterm=underline ctermbg=NONE ctermfg=111 -hi VisualNOS cterm=bold,underline ctermbg=NONE ctermfg=fg -hi cCursor cterm=reverse ctermbg=NONE ctermfg=fg -hi iCursor cterm=NONE ctermbg=210 ctermfg=16 -hi lCursor cterm=NONE ctermbg=145 ctermfg=234 -hi nCursor cterm=NONE ctermbg=NONE ctermfg=145 -hi vCursor cterm=NONE ctermbg=201 ctermfg=16 - -hi Pmenu cterm=NONE ctermfg=248 ctermbg=237 -hi PmenuSel cterm=NONE ctermfg=16 ctermbg=66 -hi PmenuSbar cterm=NONE ctermfg=16 ctermbg=66 -hi PmenuThumb cterm=NONE ctermfg=16 ctermbg=66 - diff --git a/ftdetect/c.vim b/ftdetect/c.vim deleted file mode 100644 index 40b7a53..0000000 --- a/ftdetect/c.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.h set filetype=c diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..b83d9af --- /dev/null +++ b/init.lua @@ -0,0 +1,2 @@ +require("valeth") +require("valeth.packer") diff --git a/init.vim b/init.vim deleted file mode 100644 index 7783f01..0000000 --- a/init.vim +++ /dev/null @@ -1,93 +0,0 @@ -" Maintainer: Patrick Auernig -" VIM Version: NVIM v0.2.2 -" Source: https://gitlab.com/valeth/vim-config -" Mirror: https://github.com/valeth/vim-config - -let g:vim_config_home = split(&rtp, ',')[0] - -" SETTINGS {{{ -set autowriteall -set backupdir-=. -set breakindent -set breakindentopt=sbr -set clipboard+=unnamed,unnamedplus -set completeopt=longest,menuone,preview -set confirm -set foldcolumn=0 -set foldlevel=99 -set foldmethod=syntax -set foldtext=myfold#text() -set gdefault -set grepprg=grep\ -nH\ $* -set hidden -set ignorecase -set listchars=tab:»\ ,trail:◆,extends:❯,precedes:❮,eol:↲,nbsp:· -set matchtime=3 -set mouse=a -set noshowmode -set noswapfile -set notimeout -set nowrap -set number -set ruler -set scrolloff=3 -set showmatch -set showbreak=↳ -set shortmess=aoOtTI -set sidescrolloff=5 -set smartcase -set smartindent -set splitbelow -set splitright -set synmaxcol=300 -set timeoutlen=50 -set ttimeout -set undofile -set virtualedit+=block -set visualbell t_vb= -set wildignore+=.git -set wildignore+=*.bak,*.old,*.swp,*~ -set wildignore+=*.o,*.hi -set wildignore+=*.pyc,*.class -set wildignore+=*.pdf,*.aux -set wildignore+=*.png,*.jpg -set wildmode=list:longest,full -" }}} - -let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1 - - -call plug#begin(expand("$XDG_DATA_HOME/nvim/plugins")) -runtime! plugins.vim -call plug#end() - -runtime! keymaps.vim - -augroup ToggleLineNumbers - au! - au VimEnter,WinEnter,InsertLeave * setlocal relativenumber - au WinLeave,InsertEnter * setlocal norelativenumber -augroup END - -augroup CursorHighlight - au! - au VimEnter,WinEnter,BufWinEnter * setlocal cursorline - au WinLeave * setlocal nocursorline - au VimEnter,WinEnter,BufWinEnter * setlocal colorcolumn=+3 - au WinLeave * setlocal colorcolumn=0 -augroup END - -" save automatically -autocmd FocusLost * :silent! wa - -" keep splits equal on terminal resize -autocmd VimResized * :wincmd = - -set termguicolors -colorscheme molokai -let g:airline_theme = 'dark' -" colorscheme breezy -" let g:airline_theme='breezy' - -call matchadd('ColorColumn', '\%81v', 100) - diff --git a/keymaps.vim b/keymaps.vim deleted file mode 100644 index 772c907..0000000 --- a/keymaps.vim +++ /dev/null @@ -1,96 +0,0 @@ -let g:mapleader = "," -let g:maplocalleader = "\\" - -" Commands> -command! Wq wq -command! WQ wq -command! Q q -command! W w - -" Plugins -nnoremap :CtrlPBuffer -inoremap :CtrlPBuffer -nnoremap :CtrlP -inoremap :CtrlP -nnoremap Tex_Help -inoremap Tex_Help -nnoremap IMAP_JumpForward -vnoremap IMAP_JumpForward -noremap nt :NERDTreeToggle -vnoremap nt :NERDTreeToggle -nnoremap syn :SyntasticToggleMode -vnoremap syn :SyntasticToggleMode -nnoremap tag :TagbarToggle -vnoremap tag :TagbarToggle -nnoremap :TmuxNavigateLeft -nnoremap :TmuxNavigateDown -nnoremap :TmuxNavigateUp -nnoremap :TmuxNavigateRight -nnoremap :TmuxNavigatePrevious - -" Disabled -nnoremap -inoremap -nnoremap -noremap -noremap -noremap -noremap -noremap ^ -noremap $ - -" Other -noremap :noh -nnoremap U :redo -nnoremap vl :setlocal cursorline! -nnoremap vc :setlocal cursorcolumn! -nnoremap ve :setlocal colorcolumn=81 -nnoremap vn :setlocal colorcolumn=0 -nnoremap tcs :call ToggleColorscheme() -nnoremap Y y$ -nnoremap j gj -nnoremap k gk -nnoremap fmt gg=G`` -nnoremap gr gd[{V%::s////g -nnoremap gR gD:%s////g -nnoremap th :tabfirst -nnoremap tj :tabnext -nnoremap tk :tabprev -nnoremap tl :tablast -nnoremap tn :tabnew -nnoremap tq :tabclose -nnoremap H ^ -nnoremap L $ -vnoremap L g_ -inoremap I -inoremap A -cnoremap -cnoremap -noremap j gj -noremap k gk -noremap gj j -noremap gk k -nnoremap gC `. -nnoremap n nzzzv -nnoremap N Nzzzv -nnoremap g; g;zz -nnoremap g, g,zz -nnoremap zz -nnoremap il :set invlist -vnoremap il :set invlist -inoremap :w -nnoremap :w -vnoremap :w -nnoremap / /\v -vnoremap / /\v -inoremap jk -inoremap jK -inoremap Jk -inoremap JK -vnoremap < >gv -cnoremap w! w !sudo tee % >/dev/null -tnoremap -tnoremap -noremap :Commentary -vnoremap :Commentary diff --git a/lua/valeth/init.lua b/lua/valeth/init.lua new file mode 100644 index 0000000..195a029 --- /dev/null +++ b/lua/valeth/init.lua @@ -0,0 +1,25 @@ +vim.opt.number = true +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.smartindent = true +vim.opt.wrap = false +vim.opt.incsearch = true +vim.opt.termguicolors = true +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.colorcolumn = "100" + +vim.g.mapleader = "," + +vim.keymap.set("n", "", "noh") +vim.keymap.set("n", "U", "redo") +vim.keymap.set("n", "Y", "y$") +vim.keymap.set("n", "j", "gj") +vim.keymap.set("n", "k", "gk") +vim.keymap.set({"n", "v"}, "H", "^") +vim.keymap.set({"n", "v"}, "L", "$") +vim.keymap.set({"n", "v", "i"}, "", "w") + +vim.keymap.set({"n", "v"}, "", "") +vim.keymap.set("n", "s", "") + diff --git a/lua/valeth/packer.lua b/lua/valeth/packer.lua new file mode 100644 index 0000000..214b758 --- /dev/null +++ b/lua/valeth/packer.lua @@ -0,0 +1,89 @@ +return require("packer").startup(function(use) + use "wbthomason/packer.nvim" + + use { + "nvim-treesitter/nvim-treesitter", + run = function() + require("nvim-treesitter.install").update({ with_sync = true })() + end + } + + use "wakatime/vim-wakatime" + + + ---- LSP Stuff + + use { + "VonHeikemen/lsp-zero.nvim", + branch = "v2.x", + requires = { + {"neovim/nvim-lspconfig"}, + {"hrsh7th/nvim-cmp"}, + {"hrsh7th/cmp-nvim-lsp"}, + {"hrsh7th/cmp-path"}, + {"williamboman/mason.nvim"}, + {"williamboman/mason-lspconfig.nvim"}, + } + } + + use "mhartington/formatter.nvim" + + + ---- Just Visual Stuff + + use { + "CantoroMC/ayu-nvim", + config = function() + vim.cmd("colorscheme ayu") + end + } + + use "nvim-tree/nvim-web-devicons" + + use { + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup() + end + } + + + ---- Shortcuts + + use { + "numToStr/Comment.nvim", + config = function() + require("Comment").setup() + end + } + + use { + "windwp/nvim-autopairs", + config = function() + require("nvim-autopairs").setup() + end + } + + + ---- Navigation + + use { + "nvim-telescope/telescope.nvim", + tag = "0.1.1", + requires = { + {"nvim-lua/plenary.nvim"}, + {"nvim-treesitter/nvim-treesitter"}, + }, + config = function() + require("telescope").load_extension("harpoon") + end + } + + use { + "ThePrimeagen/harpoon", + requires = { + {"nvim-lua/plenary.nvim"}, + } + } + +end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..9975c31 --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,209 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/valeth/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/valeth/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/valeth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/valeth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/valeth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + ["Comment.nvim"] = { + config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0" }, + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/Comment.nvim", + url = "https://github.com/numToStr/Comment.nvim" + }, + ["ayu-nvim"] = { + config = { "\27LJ\2\n3\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\20colorscheme ayu\bcmd\bvim\0" }, + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/ayu-nvim", + url = "https://github.com/CantoroMC/ayu-nvim" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + ["formatter.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/formatter.nvim", + url = "https://github.com/mhartington/formatter.nvim" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0" }, + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, + harpoon = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/harpoon", + url = "https://github.com/ThePrimeagen/harpoon" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + url = "https://github.com/VonHeikemen/lsp-zero.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-autopairs"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" }, + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + url = "https://github.com/windwp/nvim-autopairs" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/nvim-tree/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["vim-wakatime"] = { + loaded = true, + path = "/home/valeth/.local/share/nvim/site/pack/packer/start/vim-wakatime", + url = "https://github.com/wakatime/vim-wakatime" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: ayu-nvim +time([[Config for ayu-nvim]], true) +try_loadstring("\27LJ\2\n3\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\20colorscheme ayu\bcmd\bvim\0", "config", "ayu-nvim") +time([[Config for ayu-nvim]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) +-- Config for: Comment.nvim +time([[Config for Comment.nvim]], true) +try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim") +time([[Config for Comment.nvim]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end diff --git a/plugins.vim b/plugins.vim deleted file mode 100644 index 25132db..0000000 --- a/plugins.vim +++ /dev/null @@ -1,71 +0,0 @@ -Plug 'airblade/vim-gitgutter' -Plug 'bling/vim-airline' -Plug 'cohama/lexima.vim' -Plug 'ctrlpvim/ctrlp.vim' -Plug 'christoomey/vim-tmux-navigator' -Plug 'dag/vim-fish', { 'for': 'fish' } -Plug 'editorconfig/editorconfig-vim' -Plug 'hallison/vim-rdoc', { 'for': 'ruby' } -Plug 'Konfekt/FastFold' -Plug 'Matt-Deacalion/vim-systemd-syntax', { 'for': 'systemd' } -Plug 'majutsushi/tagbar' -Plug 'ngmy/vim-rubocop', { 'for': 'ruby' } -Plug 'rust-lang/rust.vim', { 'for': 'rust' } -Plug 'sheerun/vim-polyglot' -Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -Plug 'tpope/vim-commentary' -Plug 'valeth/breezy', { 'branch': 'swap-bg-color' } -Plug 'vim-ruby/vim-ruby', { 'for': 'ruby' } -Plug 'vim-pandoc/vim-pandoc', { 'for': ['markdown'] } -Plug 'vim-pandoc/vim-pandoc-syntax', { 'for': ['markdown'] } -Plug 'w0rp/ale' -Plug 'wakatime/vim-wakatime' -Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' } -Plug 'Yggdroot/indentLine', { 'for': 'python' } - -" # Configuration - -" ## vim-airline {{{ -let g:airline#extensions#tabline#enabled = 1 -let g:airline_theme = 'dark' -let g:airline_powerline_fonts = 1 -" }}} - -" ## indentLine {{{ -let g:indentLine_char = '┆' -""" }}} - -" ## vim-tmux-navigator {{{ -let g:tmux_navigator_no_mappings = 1 -" }}} - -" ## nerdtree {{{ -autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif -autocmd bufenter * if exists("b:NERDTree") | setlocal nonumber norelativenumber | endif -let g:NERDTreeDirArrowExpandable = '▸' -let g:NERDTreeDirArrowCollapsible = '▾' -let g:NERDTreeIndicatorMapCustom = { - \ "Modified" : "✹", - \ "Staged" : "✚", - \ "Untracked" : "✭", - \ "Renamed" : "➜", - \ "Unmerged" : "═", - \ "Deleted" : "✖", - \ "Dirty" : "✗", - \ "Clean" : "✔︎", - \ "Ignored" : "☒", - \ "Unknown" : "?" - \ } -" }}} - -" ## vim-pandoc {{{ -let g:pandoc#syntax#conceal#use = 0 -let g:pandoc#folding#fdc = &fdc -let g:pandoc#spell#enabled = 0 -" }}} - -" ## deoplete + LanguageClient {{{ -Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh' } -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -let g:deoplete#enable_at_startup = 1 -" }}} diff --git a/pythonx/ultisnips/all.py b/pythonx/ultisnips/all.py deleted file mode 100644 index 2b89782..0000000 --- a/pythonx/ultisnips/all.py +++ /dev/null @@ -1,32 +0,0 @@ -import subprocess -import re -import hashlib -import binascii - -def getUsername(username, gecos = True, passwd = "/etc/passwd"): - content = [x.split(":") for x in open(passwd, "r").readlines()] - - for entry in content: - if len(entry) != 0 and entry[0] == username: - if gecos and len(entry[4]) != 0: - return entry[4] - else: - return username - -def getWPAPassphraseHash(ssid, passphrase): - if len(passphrase) >= 8: - proc = subprocess.Popen(["wpa_passphrase", ssid, passphrase], stdout=subprocess.PIPE) - proc.wait() - for line in proc.stdout.readlines(): - match = re.match("^\s*psk.*$", line.decode("utf-8")) - if match: - return match.string.split("=")[1].strip() - return "" - -def getEAPPassphraseHash(passphrase): - hash = hashlib.new("md4", passphrase.encode("utf-16le")).digest() - return binascii.hexlify(hash).decode("utf-8") - -if __name__ == "__main__": - print(getWPAPassphraseHash("MySSID", "MySecurePassword")) - diff --git a/pythonx/ultisnips/c.py b/pythonx/ultisnips/c.py deleted file mode 100644 index 8a77f99..0000000 --- a/pythonx/ultisnips/c.py +++ /dev/null @@ -1,29 +0,0 @@ -def returnval(rtype, fname): - if rtype == "void": - return "" - - if fname == "main": - return "EXIT_SUCCESS" - - ret = { - "int": "0", - "float": "0.0", - "double": "0.0", - "bool": "false" - } - - if rtype in ret.keys(): - return ret[rtype] - else: - return "NULL" - -def getNoteCandidates(t): - options = ["TODO", "FIXME", "XXX"] - if t: - options = [ x[len(t):] for x in options if x.startswith(t) ] - - if len(options) == 1: - return options[0] - - return "[" + ",".join(options) + "]" - diff --git a/syntax/mips.vim b/syntax/mips.vim deleted file mode 100644 index 325f1dd..0000000 --- a/syntax/mips.vim +++ /dev/null @@ -1,251 +0,0 @@ -" Vim syntax file -" Language: MIPS -" Maintainer: Alex Brick -" Last Change: 2007 Oct 18 - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -setlocal iskeyword+=- -syntax case match - -syntax match mipsComment /#.*/ -syntax match mipsNumber /\<[-]\?\d\+\>/ " Decimal numbers -syntax match mipsNumber /\<-\?0\(x\|X\)[0-9a-fA-F]\+\>/ " Hex numbers -syntax region mipsString start=/"/ skip=/\\"/ end=/"/ -syntax match mipsLabelColon /:/ contained -syntax match mipsLabel /\w\+:/ contains=mipsLabelColon - -" Registers -syntax match mipsRegister "\$zero" -syntax match mipsRegister "\$v0" -syntax match mipsRegister "\$v1" -syntax match mipsRegister "\$a0" -syntax match mipsRegister "\$a1" -syntax match mipsRegister "\$a2" -syntax match mipsRegister "\$a3" -syntax match mipsRegister "\$t0" -syntax match mipsRegister "\$t1" -syntax match mipsRegister "\$t2" -syntax match mipsRegister "\$t3" -syntax match mipsRegister "\$t4" -syntax match mipsRegister "\$t5" -syntax match mipsRegister "\$t6" -syntax match mipsRegister "\$t7" -syntax match mipsRegister "\$t8" -syntax match mipsRegister "\$t9" -syntax match mipsRegister "\$s0" -syntax match mipsRegister "\$s1" -syntax match mipsRegister "\$s2" -syntax match mipsRegister "\$s3" -syntax match mipsRegister "\$s4" -syntax match mipsRegister "\$s5" -syntax match mipsRegister "\$s6" -syntax match mipsRegister "\$s7" -syntax match mipsRegister "\$k0" -syntax match mipsRegister "\$k1" -syntax match mipsRegister "\$gp" -syntax match mipsRegister "\$sp" -syntax match mipsRegister "\$fp" -syntax match mipsRegister "\$ra" - -let i = 0 -while i < 32 - " This is for the regular registers - execute 'syntax match mipsRegister "\$' . i . '\(\d\+\)\@!"' - " And this is for the FP registers - execute 'syntax match mipsRegister "\$f' . i . '\(\d\+\)\@!"' - let i = i + 1 -endwhile - -" Directives -syntax match mipsDirective "\.2byte" -syntax match mipsDirective "\.4byte" -syntax match mipsDirective "\.8byte" -syntax match mipsDirective "\.aent" -syntax match mipsDirective "\.align" -syntax match mipsDirective "\.aascii" -syntax match mipsDirective "\.asciiz" -syntax match mipsDirective "\.byte" -syntax match mipsDirective "\.comm" -syntax match mipsDirective "\.cpadd" -syntax match mipsDirective "\.cpload" -syntax match mipsDirective "\.cplocal" -syntax match mipsDirective "\.cprestore" -syntax match mipsDirective "\.cpreturn" -syntax match mipsDirective "\.cpsetup" -syntax match mipsDirective "\.data" -syntax match mipsDirective "\.double" -syntax match mipsDirective "\.dword" -syntax match mipsDirective "\.dynsym" -syntax match mipsDirective "\.end" -syntax match mipsDirective "\.endr" -syntax match mipsDirective "\.ent" -syntax match mipsDirective "\.extern" -syntax match mipsDirective "\.file" -syntax match mipsDirective "\.float" -syntax match mipsDirective "\.fmask" -syntax match mipsDirective "\.frame" -syntax match mipsDirective "\.globl" -syntax match mipsDirective "\.gpvalue" -syntax match mipsDirective "\.gpword" -syntax match mipsDirective "\.half" -syntax match mipsDirective "\.kdata" -syntax match mipsDirective "\.ktext" -syntax match mipsDirective "\.lab" -syntax match mipsDirective "\.lcomm" -syntax match mipsDirective "\.loc" -syntax match mipsDirective "\.mask" -syntax match mipsDirective "\.nada" -syntax match mipsDirective "\.nop" -syntax match mipsDirective "\.option" -syntax match mipsDirective "\.origin" -syntax match mipsDirective "\.repeat" -syntax match mipsDirective "\.rdata" -syntax match mipsDirective "\.sdata" -syntax match mipsDirective "\.section" -syntax match mipsDirective "\.set" -syntax match mipsDirective "\.size" -syntax match mipsDirective "\.space" -syntax match mipsDirective "\.struct" -syntax match mipsDirective "\.text" -syntax match mipsDirective "\.type" -syntax match mipsDirective "\.verstamp" -syntax match mipsDirective "\.weakext" -syntax match mipsDirective "\.word" - -" Arithmetic and Logical Instructions -syntax keyword mipsInstruction abs -syntax keyword mipsInstruction add addu addi addiu -syntax keyword mipsInstruction and andi -syntax keyword mipsInstruction clo clz -syntax keyword mipsInstruction div divu -syntax keyword mipsInstruction mult multu mul mulo mulou madd maddu msub msubu -syntax keyword mipsInstruction neg negu -syntax keyword mipsInstruction nor -syntax keyword mipsInstruction not -syntax keyword mipsInstruction or ori -syntax keyword mipsInstruction rem remu -syntax keyword mipsInstruction sll sllv sra srav srl srlv -syntax keyword mipsInstruction rol ror -syntax keyword mipsInstruction sub subu -syntax keyword mipsInstruction xor xori - -" Constant-Manipulating Instructions -syntax keyword mipsInstruction lui li -syntax keyword mipsInstruction slt sltu slti sltiu -syntax keyword mipsInstruction seq -syntax keyword mipsInstruction sge sgeu -syntax keyword mipsInstruction sgt sgtu -syntax keyword mipsInstruction sle sleu -syntax keyword mipsInstruction sne - -" Branch Instructions -syntax keyword mipsInstruction b -syntax keyword mipsInstruction bc1f bc1t -syntax keyword mipsInstruction beq beqz -syntax keyword mipsInstruction bgez bgezal bgtz -syntax keyword mipsInstruction blez bltzal bltz -syntax keyword mipsInstruction bne bnez -syntax keyword mipsInstruction bge bgeu -syntax keyword mipsInstruction bgt bgtu -syntax keyword mipsInstruction ble bleu -syntax keyword mipsInstruction blt bltu - -" Jump Instructions -syntax keyword mipsInstruction j jal jalr jr - -" Trap Instructions -syntax keyword mipsInstruction teq teqi -syntax keyword mipsInstruction tne tnei -syntax keyword mipsInstruction tge tgeu tgei tgeiu -syntax keyword mipsInstruction tlt tltu tlti tltiu - -" Load Instructions -syntax keyword mipsInstruction la -syntax keyword mipsInstruction lb lbu lh lhu -syntax keyword mipsInstruction lw lwc1 lwl lwr -syntax keyword mipsInstruction ld -syntax keyword mipsInstruction ulh ulhu ulw -syntax keyword mipsInstruction ll - -" Store Instructions -syntax keyword mipsInstruction sb sh sw swc1 sdc1 swl swr sd ush usw sc - -" Data Movement Instructions -syntax keyword mipsInstruction move -syntax keyword mipsInstruction mfhi mflo -syntax keyword mipsInstruction mthi mtlo -syntax keyword mipsInstruction mfc0 mfc1 -syntax match mipsInstruction "mfc1\.d" -syntax keyword mipsInstruction mtc0 mtc1 -syntax keyword mipsInstruction movn movz movf movt - -" Floating-Point Instructions -syntax match mipsInstruction "abs\.d" -syntax match mipsInstruction "abs\.s" -syntax match mipsInstruction "add\.d" -syntax match mipsInstruction "add\.s" -syntax match mipsInstruction "ceil\.w\.d" -syntax match mipsInstruction "ceil\.w\.s" -syntax match mipsInstruction "c\.eq\.d" -syntax match mipsInstruction "c\.eq\.s" -syntax match mipsInstruction "c\.le\.d" -syntax match mipsInstruction "c\.le\.s" -syntax match mipsInstruction "c\.lt\.d" -syntax match mipsInstruction "c\.lt\.s" -syntax match mipsInstruction "cvt\.d\.s" -syntax match mipsInstruction "cvt\.d\.w" -syntax match mipsInstruction "cvt\.s\.d" -syntax match mipsInstruction "cvt\.s\.w" -syntax match mipsInstruction "cvt\.w\.d" -syntax match mipsInstruction "cvt\.w\.s" -syntax match mipsInstruction "div\.d" -syntax match mipsInstruction "div\.s" -syntax match mipsInstruction "floor\.w\.d" -syntax match mipsInstruction "floor\.w\.s" -syntax match mipsInstruction "l\.d" -syntax match mipsInstruction "l\.s" -syntax match mipsInstruction "mov\.d" -syntax match mipsInstruction "mov\.s" -syntax match mipsInstruction "movf\.d" -syntax match mipsInstruction "movf\.s" -syntax match mipsInstruction "movt\.d" -syntax match mipsInstruction "movt\.s" -syntax match mipsInstruction "movn\.d" -syntax match mipsInstruction "movn\.s" -syntax match mipsInstruction "movz\.d" -syntax match mipsInstruction "movz\.s" -syntax match mipsInstruction "mul\.d" -syntax match mipsInstruction "mul\.s" -syntax match mipsInstruction "neg\.d" -syntax match mipsInstruction "neg\.s" -syntax match mipsInstruction "round\.w\.d" -syntax match mipsInstruction "round\.w\.s" -syntax match mipsInstruction "sqrt\.d" -syntax match mipsInstruction "sqrt\.s" -syntax match mipsInstruction "s\.d" -syntax match mipsInstruction "s\.s" -syntax match mipsInstruction "sub\.d" -syntax match mipsInstruction "sub\.s" -syntax match mipsInstruction "trunc\.w\.d" -syntax match mipsInstruction "trunc\.w\.s" - -" Exception and Interrupt Instructions -syntax keyword mipsInstruction eret -syntax keyword mipsInstruction syscall -syntax keyword mipsInstruction break -syntax keyword mipsInstruction nop - -hi def link mipsComment Comment -hi def link mipsNumber Number -hi def link mipsString String -hi def link mipsLabel Label -hi def link mipsRegister Identifier -hi def link mipsDirective Type -hi def link mipsInstruction Statement - -let b:current_syntax = "mips" diff --git a/syntax/systemd.vim.orig b/syntax/systemd.vim.orig deleted file mode 100644 index d00cf7e..0000000 --- a/syntax/systemd.vim.orig +++ /dev/null @@ -1,277 +0,0 @@ -" Filename: systemd.vim -" Purpose: Vim syntax file -" Language: systemd unit files -" Maintainer: Will Woods -" Last Change: Sep 15, 2011 - -if exists("b:current_syntax") && !exists ("g:syntax_debug") - finish -endif - -syn case match -syntax sync fromstart -setlocal iskeyword+=- - -" special sequences, common data types, comments, includes {{{1 -" hilight errors with this -syn match sdErr contained /\s*\S\+/ nextgroup=sdErr - -" environment args and format strings -syn match sdEnvArg contained /\$\i\+\|\${\i\+}/ -syn match sdFormatStr contained /%[inpINPfcrRt]/ containedin=ALLBUT,sdComment,sdErr - -" common data types -syn match sdUInt contained nextgroup=sdErr /\d\+/ -syn match sdInt contained nextgroup=sdErr /-\=\d\+/ -syn match sdOctal contained nextgroup=sdErr /0\o\{3,4}/ -syn match sdDuration contained nextgroup=sdErr /\d\+/ -syn match sdDuration contained nextgroup=sdErr /\%(\d\+\%(s\|min\|h\|d\|w\|ms\|us\)\s*\)\+/ -syn match sdDatasize contained nextgroup=sdErr /\d\+[KMGT]/ -syn match sdFilename contained nextgroup=sdErr /\/\S*/ -syn keyword sdBool contained nextgroup=sdErr 1 yes true on 0 no false off -syn match sdUnitName contained /\S\+\.\(automount\|mount\|swap\|socket\|service\|target\|path\|timer\|device\)\_s/ - -" .include -syn match sdInclude /^.include/ nextgroup=sdFilename - -" comments -syn match sdComment /^[;#].*/ contains=sdTodo containedin=ALL -syn keyword sdTodo contained TODO XXX FIXME NOTE - -" [Unit] {{{1 -" see systemd.unit(5) -syn region sdUnitBlock matchgroup=sdHeader start=/^\[Unit\]/ end=/^\[/me=e-2 contains=sdUnitKey -syn match sdUnitKey contained /^Description=/ -syn match sdUnitKey contained /^Documentation=/ nextgroup=sdDocURI -syn match sdUnitKey contained /^SourcePath=/ nextgroup=sdFilename,sdErr -syn match sdUnitKey contained /^\%(Requires\|RequiresOverridable\|Requisite\|RequisiteOverridable\|Wants\|BindsTo\|PartOf\|Conflicts\|Before\|After\|OnFailure\|Names|PropagatesReloadTo\|ReloadPropagatedFrom\)=/ nextgroup=sdUnitList -syn match sdUnitKey contained /^\%(OnFailureIsolate\|IgnoreOnIsolate\|IgnoreOnSnapshot\|StopWhenUnneeded\|RefuseManualStart\|RefuseManualStop\|AllowIsolate\|DefaultDependencies\)=/ nextgroup=sdBool,sdErr -syn match sdUnitKey contained /^OnFailureJobMode=/ nextgroup=sdFailJobMode,sdErr -syn match sdUnitKey contained /^JobTimeoutSec=/ nextgroup=sdDuration,sdErr -" ConditionXXX. Note that they all have an optional '|' after the '=' -syn match sdUnitKey contained /^Condition\(PathExists\|PathExistsGlob\|PathIsDirectory\|PathIsMountPoint\|PathIsReadWrite\|PathIsSymbolicLink\|DirectoryNotEmpty\|FileNotEmpty\|FileIsExecutable\)=|\=!\=/ contains=sdConditionFlag nextgroup=sdFilename,sdErr -syn match sdUnitKey contained /^ConditionVirtualization=|\=!\=/ contains=sdConditionFlag nextgroup=sdVirtType,sdErr -syn match sdUnitKey contained /^ConditionSecurity=|\=!\=/ contains=sdConditionFlag nextgroup=sdSecurityType,sdErr -syn match sdUnitKey contained /^ConditionCapability=|\=!\=/ contains=sdConditionFlag nextgroup=sdAnyCapName,sdErr -syn match sdUnitKey contained /^Condition\%(KernelCommandLine\|Host\)=|\=!\=/ contains=sdConditionFlag -syn match sdUnitKey contained /^Condition\%(ACPower\|Null\)=|\=/ contains=sdConditionFlag nextgroup=sdBool,sdErr -" extra bits -syn match sdUnitList contained /.*/ contains=sdUnitName,sdErr -syn match sdConditionFlag contained /[!|]/ -syn keyword sdVirtType contained nextgroup=sdErr vm container qemu kvm vmware microsoft oracle xen bochs chroot openvz lxc lxc-libvirt systemd-nspawn -syn keyword sdSecurityType contained nextgroup=sdErr selinux -syn keyword sdFailJobMode contained nextgroup=sderr fail replace replace-irreversibly -syn match sdDocUri contained /\%(https\=:\/\/\|file:\|info:\|man:\)\S\+\s*/ nextgroup=sdDocUri,sdErr - -" [Install] {{{1 -" see systemd.unit(5) -syn region sdInstallBlock matchgroup=sdHeader start=/^\[Install\]/ end=/^\[/me=e-2 contains=sdInstallKey -syn match sdInstallKey contained /^\%(WantedBy\|Alias\|Also\)=/ nextgroup=sdUnitList - -" Execution options common to [Service|Socket|Mount|Swap] {{{1 -" see systemd.exec(5) -syn match sdExecKey contained /^Exec\%(Start\%(Pre\|Post\|\)\|Reload\|Stop\|StopPost\)=/ nextgroup=sdExecFlag,sdExecFile,sdErr -syn match sdExecKey contained /^\%(WorkingDirectory\|RootDirectory\|TTYPath\)=/ nextgroup=sdFilename,sdErr -" TODO: handle some of these better -" CPUAffinity is: list of uint -" BlockIOWeight is: uint\|filename uint -" BlockIO\%(Read\|Write\)Bandwidth is: filename datasize -syn match sdExecKey contained /^\%(User\|Group\|SupplementaryGroups\|CPUAffinity\|SyslogIdentifier\|PAMName\|TCPWrapName\|ControlGroup\|ControlGroupAttribute\|DeviceAllow\|DeviceDeny\|BlockIOWeight\|BlockIO\%(Read\|Write\)Bandwidth\|UtmpIdentifier\)=/ -syn match sdExecKey contained /^Limit\%(CPU\|FSIZE\|DATA\|STACK\|CORE\|RSS\|NOFILE\|AS\|NPROC\|MEMLOCK\|LOCKS\|SIGPENDING\|MSGQUEUE\|NICE\|RTPRIO\|RTTIME\)=/ nextgroup=sdRlimit -syn match sdExecKey contained /^\%(CPUSchedulingResetOnFork\|TTYReset\|TTYVHangup\|TTYVTDisallocate\|SyslogLevelPrefix\|ControlGroupModify\|PrivateTmp\|PrivateNetwork\)=/ nextgroup=sdBool,sdErr -syn match sdExecKey contained /^\%(Nice\|OOMScoreAdjust\)=/ nextgroup=sdInt,sdErr -syn match sdExecKey contained /^\%(CPUSchedulingPriority\|TimerSlackNSec\|CPUShares\)=/ nextgroup=sdUInt,sdErr -syn match sdExecKey contained /^\%(MemoryLimit\|MemorySoftLimit\)=/ nextgroup=sdDatasize,sdErr -syn match sdExecKey contained /^\%(ReadWrite\|ReadOnly\|Inaccessible\)Directories=/ nextgroup=sdFileList -syn match sdExecKey contained /^Device\%(Allow\|Deny\)=/ nextgroup=sdDevAllow,sdErr -syn match sdExecKey contained /^CapabilityBoundingSet=/ nextgroup=sdCapNameList -syn match sdExecKey contained /^Capabilities=/ nextgroup=sdCapability,sdErr -syn match sdExecKey contained /^UMask=/ nextgroup=sdOctal,sdErr -syn match sdExecKey contained /^StandardInput=/ nextgroup=sdStdin,sdErr -syn match sdExecKey contained /^Standard\%(Output\|Error\)=/ nextgroup=sdStdout,sdErr -syn match sdExecKey contained /^SecureBits=/ nextgroup=sdSecureBitList -syn match sdExecKey contained /^SyslogFacility=/ nextgroup=sdSyslogFacil,sdErr -syn match sdExecKey contained /^SyslogLevel=/ nextgroup=sdSyslogLevel,sdErr -syn match sdExecKey contained /^IOSchedulingClass=/ nextgroup=sdIOSchedClass,sdErr -syn match sdExecKey contained /^IOSchedulingPriority=/ nextgroup=sdIOSchedPrio,sdErr -syn match sdExecKey contained /^CPUSchedulingPolicy=/ nextgroup=sdCPUSchedPol,sdErr -syn match sdExecKey contained /^MountFlags=/ nextgroup=sdMountFlags,sdErr -syn match sdExecKey contained /^IgnoreSIGPIPE=/ nextgroup=sdBool,sdErr -syn match sdExecKey contained /^Environment=/ nextgroup=sdEnvDefs -syn match sdExecKey contained /^EnvironmentFile=-\=/ contains=sdEnvDashFlag nextgroup=sdFilename,sdErr - -syn match sdExecFlag contained /-\=@\=/ nextgroup=sdExecFile,sdErr -syn match sdExecFile contained /\/\S\+/ nextgroup=sdExecArgs -syn match sdExecArgs contained /.*/ contains=sdEnvArg -syn match sdEnvDefs contained /.*/ contains=sdEnvDef -syn match sdEnvDashFlag contained /-/ nextgroup=sdFilename,sdErr -syn match sdEnvDef contained /\i\+=/he=e-1 -syn match sdFileList contained /.*/ contains=sdFilename,sdErr -" CAPABILITIES WOOO {{{ -syn case ignore -syn match sdCapNameList contained /.*/ contains=sdAnyCapName,sdErr -syn match sdAnyCapName contained /CAP_[A-Z_]\+\s*/ contains=sdCapName -syn keyword sdCapName contained CAP_AUDIT_CONTROL CAP_AUDIT_WRITE CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH -syn keyword sdCapName contained CAP_FOWNER CAP_FSETID CAP_IPC_LOCK CAP_IPC_OWNER CAP_KILL CAP_LEASE -syn keyword sdCapName contained CAP_LINUX_IMMUTABLE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_MKNOD -syn keyword sdCapName contained CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW -syn keyword sdCapName contained CAP_SETGID CAP_SETFCAP CAP_SETPCAP CAP_SETUID -syn keyword sdCapName contained CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT -syn keyword sdCapName contained CAP_SYS_PTRACE CAP_SYS_RAWIO CAP_SYS_RESOURCE CAP_SYS_TIME CAP_SYS_TTY_CONFIG -syn case match -syn cluster sdCap contains=sdCapName,sdCapOps,sdCapFlags -syn match sdCapOps contained /[=+-]/ -syn match sdCapFlags contained /\<[eip]\+/ -syn match sdCapability contained /\%(\%([A-Za-z_]\+,\=\)*\|all\)\%(=[eip]*\|[+-][eip]\+\)\s*/ contains=@sdCap nextgroup=sdCapability,sdErr -"}}} -syn match sdDevAllow contained /\/\S\+\s\+/ nextgroup=sdDevAllowPerm -syn match sdDevAllowPerm contained /\S\+/ contains=sdDevAllowErr nextgroup=sdErr -syn match sdDevAllowErr contained /[^rwm]\+/ -syn keyword sdStdin contained nextgroup=sdErr null tty-force tty-fail socket tty -syn match sdStdout contained nextgroup=sdErr /\%(syslog\|kmsg\|journal\)\%(+console\)\=/ -syn keyword sdStdout contained nextgroup=sdErr inherit null tty socket -syn keyword sdSyslogFacil contained nextgroup=sdErr kern user mail daemon auth syslog lpr news uucp cron authpriv ftp -syn match sdSyslogFacil contained nextgroup=sdErr /\/ -syn keyword sdSyslogLevel contained nextgroup=sdErr emerg alert crit err warning notice info debug -syn keyword sdIOSchedClass contained nextgroup=sdErr 0 1 2 3 none realtime best-effort idle -syn keyword sdIOSchedPrio contained nextgroup=sdErr 0 1 2 3 4 5 6 7 -syn keyword sdCPUSchedPol contained nextgroup=sdErr other batch idle fifo rr -syn keyword sdMountFlags contained nextgroup=sdErr shared slave private -syn match sdRlimit contained nextgroup=sdErr /\<\%(\d\+\|infinity\)\>/ -syn keyword sdSecureBits contained nextgroup=sdErr keep-caps keep-caps-locked noroot noroot-locked no-setuid-fixup no-setuid-fixup-locked - -" These are also shared by [Service|Socket|Mount|Swap], although they're not -" listed in systemd.exec(5) -syn match sdExecKey contained /^TimeoutSec=/ nextgroup=sdDuration,sdErr -syn match sdExecKey contained /^KillSignal=/ nextgroup=sdSignal,sdOtherSignal,sdErr -syn match sdExecKey contained /^SendSIGKill=/ nextgroup=sdBool,sdErr -syn match sdExecKey contained /^KillMode=/ nextgroup=sdKillMode,sdErr -syn keyword sdSignal contained nextgroup=sdErr SIGHUP SIGINT SIGQUIT SIGKILL SIGTERM SIGUSR1 SIGUSR2 -syn match sdOtherSignal contained nextgroup=sdErr /\<\%(\d\+\|SIG[A-Z]\{2,6}\)\>/ -syn match sdKillMode contained nextgroup=sdErr /\%(control-group\|process\|none\)/ - -" [Service] {{{1 -syn region sdServiceBlock matchgroup=sdHeader start=/^\[Service\]/ end=/^\[/me=e-2 contains=sdServiceKey,sdExecKey -syn match sdServiceKey contained /^BusName=/ -syn match sdServiceKey contained /^\%(RemainAfterExit\|GuessMainPID\|PermissionsStartOnly\|RootDirectoryStartOnly\|NonBlocking\|ControlGroupModify\)=/ nextgroup=sdBool,sdErr -syn match sdServiceKey contained /^\%(SysVStartPriority\|FsckPassNo\)=/ nextgroup=sdUInt,sdErr -syn match sdServiceKey contained /^\%(Restart\|Timeout\)Sec=/ nextgroup=sdDuration,sdErr -syn match sdServiceKey contained /^Sockets=/ nextgroup=sdUnitList -syn match sdServiceKey contained /^PIDFile=/ nextgroup=sdFilename,sdErr -syn match sdServiceKey contained /^Type=/ nextgroup=sdServiceType,sdErr -syn match sdServiceKey contained /^Restart=/ nextgroup=sdRestartType,sdErr -syn match sdServiceKey contained /^NotifyAccess=/ nextgroup=sdNotifyType,sdErr -syn keyword sdServiceType contained nextgroup=sdErr simple forking dbus oneshot notify idle -syn keyword sdRestartType contained nextgroup=sdErr no on-success on-failure on-abort always -syn keyword sdNotifyType contained nextgroup=sdErr none main all - -" [Socket] {{{1 -syn region sdSocketBlock matchgroup=sdHeader start=/^\[Socket\]/ end=/^\[/me=e-2 contains=sdSocketKey,sdExecKey -syn match sdSocketKey contained /^Listen\%(Stream\|Datagram\|SequentialPacket\|FIFO\|Special\|Netlink\|MessageQueue\)=/ -syn match sdSocketKey contained /^Listen\%(FIFO\|Special\)=/ nextgroup=sdFilename,sdErr -syn match sdSocketKey contained /^\%(Socket\|Directory\)Mode=/ nextgroup=sdOctal,sdErr -syn match sdSocketKey contained /^\%(Backlog\|MaxConnections\|Priority\|ReceiveBuffer\|SendBuffer\|IPTTL\|Mark\|PipeSize\|MessageQueueMaxMessages\|MessageQueueMessageSize\)=/ nextgroup=sdUInt,sdErr -syn match sdSocketKey contained /^\%(Accept\|KeepAlive\|FreeBind\|Transparent\|Broadcast\)=/ nextgroup=sdBool,sdErr -syn match sdSocketKey contained /^BindToDevice=/ -syn match sdSocketKey contained /^Service=/ nextgroup=sdUnitList -syn match sdSocketKey contained /^BindIPv6Only=/ nextgroup=sdBindIPv6,sdErr -syn match sdSocketKey contained /^IPTOS=/ nextgroup=sdIPTOS,sdUInt,sdErr -syn match sdSocketKey contained /^TCPCongestion=/ nextgroup=sdTCPCongest -syn keyword sdBindIPv6 contained nextgroup=sdErr default both ipv6-only -syn keyword sdIPTOS contained nextgroup=sdErr low-delay throughput reliability low-cost -syn keyword sdTCPCongest contained nextgroup=sdErr westwood veno cubic lp - -" [Timer|Automount|Mount|Swap|Path] {{{1 -" [Timer] -syn region sdTimerBlock matchgroup=sdHeader start=/^\[Timer\]/ end=/^\[/me=e-2 contains=sdTimerKey -syn match sdTimerKey contained /^On\%(Active\|Boot\|Startup\|UnitActive\|UnitInactive\)Sec=/ nextgroup=sdDuration,sdErr -syn match sdTimerKey contained /^Unit=/ nextgroup=sdUnitList - -" [Automount] -syn region sdAutoMountBlock matchgroup=sdHeader start=/^\[Automount\]/ end=/^\[/me=e-2 contains=sdAutomountKey -syn match sdAutomountKey contained /^Where=/ nextgroup=sdFilename,sdErr -syn match sdAutomountKey contained /^DirectoryMode=/ nextgroup=sdOctal,sdErr - -" [Mount] -syn region sdMountBlock matchgroup=sdHeader start=/^\[Mount\]/ end=/^\[/me=e-2 contains=sdMountKey,sdAutomountKey,sdExecKey -syn match sdMountKey contained /^\%(What\|Type\|Options\)=/ - -" [Swap] -syn region sdSwapBlock matchgroup=sdHeader start=/^\[Swap\]/ end=/^\[/me=e-2 contains=sdSwapKey,sdExecKey -syn match sdSwapKey contained /^What=/ nextgroup=sdFilename,sdErr -syn match sdSwapKey contained /^Priority=/ nextgroup=sdUInt,sdErr - -" [Path] -syn region sdPathBlock matchgroup=sdHeader start=/^\[Path\]/ end=/^\[/me=e-2 contains=sdPathKey -syn match sdPathKey contained /^\%(PathExists\|PathExistsGlob\|PathChanged\|DirectoryNotEmpty\)=/ nextgroup=sdFilename,sdErr -syn match sdPathKey contained /^MakeDirectory=/ nextgroup=sdBool,sdErr -syn match sdPathKey contained /^DirectoryMode=/ nextgroup=sdOctal,sdErr -syn match sdPathKey contained /^Unit=/ nextgroup=sdUnitList - -" Coloring definitions {{{1 -hi def link sdComment Comment -hi def link sdTodo Todo -hi def link sdInclude PreProc -hi def link sdHeader Type -hi def link sdEnvArg PreProc -hi def link sdFormatStr Special -hi def link sdErr Error -hi def link sdEnvDef Identifier -hi def link sdUnitName PreProc -hi def link sdKey Statement -hi def link sdValue Constant -hi def link sdSymbol Special - -" Coloring links: keys {{{1 - -" It'd be nice if this worked.. -"hi def link sd.\+Key sdKey -hi def link sdUnitKey sdKey -hi def link sdInstallKey sdKey -hi def link sdExecKey sdKey -hi def link sdSocketKey sdKey -hi def link sdServiceKey sdKey -hi def link sdServiceCommonKey sdKey -hi def link sdTimerKey sdKey -hi def link sdMountKey sdKey -hi def link sdAutomountKey sdKey -hi def link sdSwapKey sdKey -hi def link sdPathKey sdKey - -" Coloring links: constant values {{{1 -hi def link sdInt sdValue -hi def link sdUInt sdValue -hi def link sdBool sdValue -hi def link sdOctal sdValue -hi def link sdDuration sdValue -hi def link sdVirtType sdValue -hi def link sdServiceType sdValue -hi def link sdNotifyType sdValue -hi def link sdSecurityType sdValue -hi def link sdSecureBits sdValue -hi def link sdMountFlags sdValue -hi def link sdKillMode sdValue -hi def link sdFailJobMode sdValue -hi def link sdRestartType sdValue -hi def link sdSignal sdValue -hi def link sdStdin sdValue -hi def link sdStdout sdValue -hi def link sdSyslogFacil sdValue -hi def link sdSyslogLevel sdValue -hi def link sdIOSched sdValue -hi def link sdCPUSched sdValue -hi def link sdRlimit sdValue -hi def link sdCapName sdValue -hi def link sdDevAllowPerm sdValue -hi def link sdDevAllowErr Error - -" Coloring links: symbols/flags {{{1 -hi def link sdExecFlag sdSymbol -hi def link sdConditionFlag sdSymbol -hi def link sdEnvDashFlag sdSymbol -hi def link sdCapOps sdSymbol -hi def link sdCapFlags Identifier -"}}} - -let b:current_syntax = "systemd" -" vim: fdm=marker