From b416e5ca58c8c06ad2594b64eafc4cf566330b74 Mon Sep 17 00:00:00 2001 From: Yigit Colakoglu Date: Wed, 27 Dec 2023 18:12:42 +0100 Subject: [PATCH] Nvim config updated --- .config/nvim/TODOS.md | 8 + .config/nvim/autoload/plug.vim | 2797 ----------------- .config/nvim/colors/material.vim | 559 ---- .config/nvim/init.lua | 32 +- .config/nvim/lazy-lock.json | 64 + .config/nvim/lua/config/appearance.lua | 23 + .config/nvim/lua/config/dap.lua | 62 + .config/nvim/lua/config/init.lua | 3 + .config/nvim/lua/config/lsp/cmake.lua | 3 + .config/nvim/lua/config/lsp/init.lua | 109 + .config/nvim/lua/config/lsp/lua_ls.lua | 27 + .config/nvim/lua/config/lsp/rust_analyzer.lua | 9 + .config/nvim/lua/config/plugin/aerial.lua | 11 + .config/nvim/lua/config/plugin/barbar.lua | 32 + .config/nvim/lua/config/plugin/catppuccin.lua | 50 + .config/nvim/lua/config/plugin/copilot.lua | 24 + .config/nvim/lua/config/plugin/harpoon2.lua | 4 + .config/nvim/lua/config/plugin/init.lua | 0 .config/nvim/lua/config/plugin/lualine.lua | 272 ++ .config/nvim/lua/config/plugin/mini.lua | 7 + .config/nvim/lua/config/plugin/neodev.lua | 3 + .config/nvim/lua/config/plugin/noice.lua | 18 + .config/nvim/lua/config/plugin/null-ls.lua | 8 + .config/nvim/lua/config/plugin/nvim-alpha.lua | 127 + .config/nvim/lua/config/plugin/nvim-cmp.lua | 81 + .config/nvim/lua/config/plugin/nvim-tree.lua | 34 + .config/nvim/lua/config/plugin/nvim-ufo.lua | 31 + .config/nvim/lua/config/plugin/persisted.lua | 34 + .config/nvim/lua/config/plugin/telescope.lua | 29 + .config/nvim/lua/config/plugin/treesitter.lua | 13 + .config/nvim/lua/config/plugin/whichkey.lua | 9 + .config/nvim/lua/config/settings.lua | 68 + .config/nvim/lua/config/template.lua | 21 + .config/nvim/lua/keybinds/barbar.lua | 39 + .config/nvim/lua/keybinds/dap.lua | 13 + .config/nvim/lua/keybinds/editor.lua | 31 + .config/nvim/lua/keybinds/init.lua | 7 + .config/nvim/lua/keybinds/plugin.lua | 56 + .config/nvim/lua/keybinds/telescope.lua | 69 + .config/nvim/lua/keybinds/terminal.lua | 17 + .config/nvim/lua/lsp.lua | 57 + .config/nvim/lua/plugins.lua | 276 ++ .config/nvim/plugin/lightline-bufferline.vim | 36 - .config/nvim/plugin/lightline.vim | 53 - .config/nvim/plugin/vim-betterwhitespace.vim | 9 - .config/nvim/plugins.vim | 89 - .config/nvim/syntax/java.vim | 182 -- 47 files changed, 1771 insertions(+), 3735 deletions(-) create mode 100644 .config/nvim/TODOS.md delete mode 100644 .config/nvim/autoload/plug.vim delete mode 100644 .config/nvim/colors/material.vim create mode 100644 .config/nvim/lazy-lock.json create mode 100644 .config/nvim/lua/config/appearance.lua create mode 100644 .config/nvim/lua/config/dap.lua create mode 100644 .config/nvim/lua/config/init.lua create mode 100644 .config/nvim/lua/config/lsp/cmake.lua create mode 100644 .config/nvim/lua/config/lsp/init.lua create mode 100644 .config/nvim/lua/config/lsp/lua_ls.lua create mode 100644 .config/nvim/lua/config/lsp/rust_analyzer.lua create mode 100644 .config/nvim/lua/config/plugin/aerial.lua create mode 100644 .config/nvim/lua/config/plugin/barbar.lua create mode 100644 .config/nvim/lua/config/plugin/catppuccin.lua create mode 100644 .config/nvim/lua/config/plugin/copilot.lua create mode 100644 .config/nvim/lua/config/plugin/harpoon2.lua create mode 100644 .config/nvim/lua/config/plugin/init.lua create mode 100644 .config/nvim/lua/config/plugin/lualine.lua create mode 100644 .config/nvim/lua/config/plugin/mini.lua create mode 100644 .config/nvim/lua/config/plugin/neodev.lua create mode 100644 .config/nvim/lua/config/plugin/noice.lua create mode 100644 .config/nvim/lua/config/plugin/null-ls.lua create mode 100644 .config/nvim/lua/config/plugin/nvim-alpha.lua create mode 100644 .config/nvim/lua/config/plugin/nvim-cmp.lua create mode 100644 .config/nvim/lua/config/plugin/nvim-tree.lua create mode 100644 .config/nvim/lua/config/plugin/nvim-ufo.lua create mode 100644 .config/nvim/lua/config/plugin/persisted.lua create mode 100644 .config/nvim/lua/config/plugin/telescope.lua create mode 100644 .config/nvim/lua/config/plugin/treesitter.lua create mode 100644 .config/nvim/lua/config/plugin/whichkey.lua create mode 100644 .config/nvim/lua/config/settings.lua create mode 100644 .config/nvim/lua/config/template.lua create mode 100644 .config/nvim/lua/keybinds/barbar.lua create mode 100644 .config/nvim/lua/keybinds/dap.lua create mode 100644 .config/nvim/lua/keybinds/editor.lua create mode 100644 .config/nvim/lua/keybinds/init.lua create mode 100644 .config/nvim/lua/keybinds/plugin.lua create mode 100644 .config/nvim/lua/keybinds/telescope.lua create mode 100644 .config/nvim/lua/keybinds/terminal.lua create mode 100644 .config/nvim/lua/lsp.lua create mode 100644 .config/nvim/lua/plugins.lua delete mode 100644 .config/nvim/plugin/lightline-bufferline.vim delete mode 100644 .config/nvim/plugin/lightline.vim delete mode 100644 .config/nvim/plugin/vim-betterwhitespace.vim delete mode 100644 .config/nvim/plugins.vim delete mode 100644 .config/nvim/syntax/java.vim diff --git a/.config/nvim/TODOS.md b/.config/nvim/TODOS.md new file mode 100644 index 00000000..76485390 --- /dev/null +++ b/.config/nvim/TODOS.md @@ -0,0 +1,8 @@ +# TODOs +- specific run keybinds for certain filetypes + - python + - ipython + - bash + - c/c++? + - java? + diff --git a/.config/nvim/autoload/plug.vim b/.config/nvim/autoload/plug.vim deleted file mode 100644 index 2b89b5a6..00000000 --- a/.config/nvim/autoload/plug.vim +++ /dev/null @@ -1,2797 +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-default 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') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand(':p')) - set shellslash -else - let s:me = resolve(expand(':p')) -endif -let s:base_spec = { 'branch': '', '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! s:isabsolute(dir) abort - return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') -endfunction - -function! s:git_dir(dir) abort - let gitdir = s:trim(a:dir) . '/.git' - if isdirectory(gitdir) - return gitdir - endif - if !filereadable(gitdir) - return '' - endif - let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') - if len(gitdir) && !s:isabsolute(gitdir) - let gitdir = a:dir . '/' . gitdir - endif - return isdirectory(gitdir) ? gitdir : '' -endfunction - -function! s:git_origin_url(dir) abort - let gitdir = s:git_dir(a:dir) - let config = gitdir . '/config' - if empty(gitdir) || !filereadable(config) - return '' - endif - return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') -endfunction - -function! s:git_revision(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - - let line = get(readfile(head), 0, '') - let ref = matchstr(line, '^ref: \zs.*') - if empty(ref) - return line - endif - - if filereadable(gitdir . '/' . ref) - return get(readfile(gitdir . '/' . ref), 0, '') - endif - - if filereadable(gitdir . '/packed-refs') - for line in readfile(gitdir . '/packed-refs') - if line =~# ' ' . ref - return matchstr(line, '^[0-9a-f]*') - endif - endfor - endif - - return '' -endfunction - -function! s:git_local_branch(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') - return len(branch) ? branch : 'HEAD' -endfunction - -function! s:git_origin_branch(spec) - if len(a:spec.branch) - return a:spec.branch - endif - - " The file may not be present if this is a local repository - let gitdir = s:git_dir(a:spec.dir) - let origin_head = gitdir.'/refs/remotes/origin/HEAD' - if len(gitdir) && filereadable(origin_head) - return matchstr(get(readfile(origin_head), 0, ''), - \ '^ref: refs/remotes/origin/\zs.*') - endif - - " The command may not return the name of a branch in detached HEAD state - let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) - return v:shell_error ? '' : result[-1] -endfunction - -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_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 s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_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 - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$') - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && !has('multi_byte') - return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') - 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('plug#end() called without calling 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 - -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - -if s:is_win - 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 - - " Copied from fzf - function! s:wrap_cmds(cmds) - let cmds = [ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'] - if has('iconv') - if !exists('s:codepage') - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - endif - return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endif - return map(cmds, 'v:val."\r"') - endfunction - - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if &shell =~# 'powershell\(\.exe\)\?$' - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else - 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', 'after/ftdetect', 'after/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', s:plug_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(repo . ' ' . v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' - if type == s:TYPE.string - if empty(a:arg) - throw printf(opt_errfmt, 'tag', 'string') - endif - let opts.tag = a:arg - elseif type == s:TYPE.dict - for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(a:arg, opt) - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string') - endif - endfor - for opt in ['on', 'for'] - if has_key(a:arg, opt) - \ && type(a:arg[opt]) != s:TYPE.list - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string or list') - endif - endfor - if has_key(a:arg, 'do') - \ && type(a:arg.do) != s:TYPE.funcref - \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) - throw printf(opt_errfmt, 'do', 'string or funcref') - endif - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_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(s:plug_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 /^-\{1}\ / - 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 match plugH2 /^-\{2,}/ - 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(s:plug_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 :call close_pane() - 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:close_pane() - if b:plug_preview == 1 - pc - let b:plug_preview = -1 - else - bd - 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=sh - endif - if a:swap - if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$' - let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' - elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' - set shellredir=>%s\ 2>&1 - endif - endif - return prev -endfunction - -function! s:bang(cmd, ...) - let batchfile = '' - 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, cmd] = s:batchfile(cmd) - 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 && filereadable(batchfile) - 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 - call s:load_plugin(spec) - 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:git_revision(a:spec.dir) - if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) - let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' - let output = s:system( - \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(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 = [] - if get(g:, 'plug_shallow', 1) - call extend(s:clone_opt, ['--depth', '1']) - if s:git_version_requirement(1, 7, 10) - call add(s:clone_opt, '--no-single-branch') - endif - endif - - if has('win32unix') || has('wsl') - call extend(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 '.plug#shellescape(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 '.plug#shellescape(tag).' -- 2>&1', spec.dir) - else - let branch = s:git_origin_branch(spec) - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('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:rm_rf(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' || a:event == 'stderr') ? - \ 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': [''], - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - - if s:nvim - if has_key(a:opts, 'dir') - let job.cwd = a:opts.dir - endif - let argv = a:cmd - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_stderr': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = s:plug_call('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 cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) - if has_key(a:opts, 'dir') - let cmd = s:with_cd(cmd, a:opts.dir, 0) - endif - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'err_mode': 'raw', - \ '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', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a: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() - - 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) - let max = line('$') - for i in range(4, max > 4 ? max : 4) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, max > 5 ? max : 5) - 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 cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] - if has_tag && !empty(globpath(spec.dir, '.git/shallow')) - call extend(cmd, ['--depth', '99999999']) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, cmd, { '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 - let cmd = ['git', 'clone'] - if !has_tag - call extend(cmd, s:clone_opt) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, extend(cmd, [spec.uri, 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 = ' '.join(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').join(' ') - 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, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" -endfunction - -" Escape the shell argument based on the shell. -" Vim and Neovim's shellescape() are insufficient. -" 1. shellslash determines whether to use single/double quotes. -" Double-quote escaping is fragile for cmd.exe. -" 2. It does not work for powershell. -" 3. It does not work for *sh shells if the command is executed -" via cmd.exe (ie. cmd.exe /c sh -c command command_args) -" 4. It does not support batchfile syntax. -" -" Accepts an optional dictionary with the following keys: -" - shell: same as Vim/Neovim 'shell' option. -" If unset, fallback to 'cmd.exe' on Windows or 'sh'. -" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. -function! plug#shellescape(arg, ...) - if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' - return a:arg - endif - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\(\.exe\)\?$' - return s:shellesc_cmd(a:arg, script) - elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$' - return s:shellesc_ps1(a:arg) - endif - return s:shellesc_sh(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, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) -endfunction - -function! s:system(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - if type(a:cmd) == s:TYPE.list - " Neovim's system() supports list argument to bypass the shell - " but it cannot set the working directory for the command. - " Assume that the command does not rely on the shell. - if has('nvim') && a:0 == 0 - return system(a:cmd) - endif - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) - if &shell =~# 'powershell\(\.exe\)\?$' - let cmd = '& ' . cmd - endif - else - let cmd = a:cmd - endif - if a:0 > 0 - let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) - endif - if s:is_win && type(a:cmd) != s:TYPE.list - let [batchfile, cmd] = s:batchfile(cmd) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - 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:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] - let remote = result[-1] - if empty(remote) - 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 sha = s:git_revision(a:spec.dir) - if empty(sha) - 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 current_branch = result[0] - " Check tag - let origin_branch = s:git_origin_branch(a:spec) - 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 origin_branch !=# current_branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ current_branch, origin_branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system([ - \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', origin_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.', origin_branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ origin_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) - return s:system(s:is_win - \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) - \ : ['rm', '-rf', 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(s:plug_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 - let err_count = 0 - 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 - let err = s:rm_rf(line[2:]) - setlocal modifiable - if empty(err) - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - else - delete _ - call append(l1 - 1, s:format_message('x', line[1:], err)) - let l2 += len(s:lines(err)) - let err_count += 1 - endif - let msg = printf('Removed %d directories.', s:clean_count) - if err_count > 0 - let msg .= printf(' Failed to remove %d directories.', err_count) - endif - call setline(4, msg) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = s:plug_tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(['git', 'clone', '--depth', '1', 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 - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - 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 branch = s:git_origin_branch(v) - if len(branch) - let range = origin ? '..origin/'.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', 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 - 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 '.plug#shellescape(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:git_revision(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 = s:plug_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, '\\\@ 0 +end + +local custom_attach = function(client, bufnr) + -- null-ls formatting support + if client.server_capabilities.documentFormattingProvider then + if + client.name == "null-ls" and is_null_ls_formatting_enabled(bufnr) + or client.name ~= "null-ls" + then + vim.bo[bufnr].formatexpr = "v:lua.vim.lsp.formatexpr()" + vim.keymap.set("n", "gq", "lua vim.lsp.buf.format({ async = true })", opts) + else + vim.bo[bufnr].formatexpr = nil + end + end + + vim.api.nvim_create_autocmd("CursorHold", { + buffer=bufnr, + callback = function() + local opts = { + focusable = false, + close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" }, + border = 'rounded', + source = 'always', -- show source in diagnostic popup window + prefix = ' ' + } + + if not vim.b.diagnostics_pos then + vim.b.diagnostics_pos = { nil, nil } + end + + local cursor_pos = vim.api.nvim_win_get_cursor(0) + if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2]) and + #vim.diagnostic.get() > 0 + then + vim.diagnostic.open_float(nil, opts) + end + + vim.b.diagnostics_pos = cursor_pos + end + }) + + -- Make K show hover menu if it is supported + vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = bufnr }) + + -- The blow command will highlight the current variable and its usages in the buffer. + if client.server_capabilities.document_highlight then + vim.cmd([[ + hi! link LspReferenceRead Visual + hi! link LspReferenceText Visual + hi! link LspReferenceWrite Visual + augroup lsp_document_highlight + autocmd CursorHold lua vim.lsp.buf.document_highlight() + autocmd CursorHoldI lua vim.lsp.buf.document_highlight() + autocmd CursorMoved lua vim.lsp.buf.clear_references() + augroup END + ]]) + end + + if vim.g.logging_level == 'debug' then + local msg = string.format("Language server %s started!", client.name) + vim.notify(msg, 'info', {title = 'Nvim-config'}) + end +end + +local lspconfigs = { + clangd = {}, + pyright = {}, + bashls = {}, + html = {}, + tsserver = {}, + lua_ls = require("config.lsp.lua_ls"), + cssls = {}, + asm_lsp = {}, + rust_analyzer = require("config.lsp.rust_analyzer"), + cmake = require("config.lsp.cmake"), +} + +local mason_extras = { + "bash-debug-adapter" +} + +return { + mason_servers = mergeTables(getTableKeys(lspconfigs), mason_extras), + lspconfigs = lspconfigs, + lsp_onattach = custom_attach +} diff --git a/.config/nvim/lua/config/lsp/lua_ls.lua b/.config/nvim/lua/config/lsp/lua_ls.lua new file mode 100644 index 00000000..215abe4c --- /dev/null +++ b/.config/nvim/lua/config/lsp/lua_ls.lua @@ -0,0 +1,27 @@ +return { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';'), + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'}, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, + }, + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { + enable = false, + }, + }, + }, +} diff --git a/.config/nvim/lua/config/lsp/rust_analyzer.lua b/.config/nvim/lua/config/lsp/rust_analyzer.lua new file mode 100644 index 00000000..dfeeb21c --- /dev/null +++ b/.config/nvim/lua/config/lsp/rust_analyzer.lua @@ -0,0 +1,9 @@ +return { + settings = { + ['rust-analyzer'] = { + diagnostics = { + enable = false; + } + } + } +} diff --git a/.config/nvim/lua/config/plugin/aerial.lua b/.config/nvim/lua/config/plugin/aerial.lua new file mode 100644 index 00000000..433ba72b --- /dev/null +++ b/.config/nvim/lua/config/plugin/aerial.lua @@ -0,0 +1,11 @@ +return function () + require('aerial').setup({ + -- Your configuration here + -- To auto-open the aerial window on entering a buffer: + on_attach = function(bufnr) + vim.keymap.set("n", "{", "AerialPrev", { buffer = bufnr }) + vim.keymap.set("n", "}", "AerialNext", { buffer = bufnr }) + require('aerial').open({focus = false}) + end + }) +end diff --git a/.config/nvim/lua/config/plugin/barbar.lua b/.config/nvim/lua/config/plugin/barbar.lua new file mode 100644 index 00000000..5f40703b --- /dev/null +++ b/.config/nvim/lua/config/plugin/barbar.lua @@ -0,0 +1,32 @@ +vim.g.barbar_auto_setup = false -- disable auto-setup + +return { + auto_hide = 1, + clickable = true, + + focus_on_close = 'previous', + + icons = { + button = '', + -- Enables / disables diagnostic symbols + diagnostics = { + [vim.diagnostic.severity.ERROR] = {enabled = true, icon = ''}, + [vim.diagnostic.severity.WARN] = {enabled = false}, + [vim.diagnostic.severity.INFO] = {enabled = false}, + [vim.diagnostic.severity.HINT] = {enabled = true}, + }, + gitsigns = { + added = {enabled = true, icon = '+'}, + changed = {enabled = true, icon = '~'}, + deleted = {enabled = true, icon = '-'}, + }, + + modified = {button = '●'}, + pinned = {button = '', filename = true}, + }, + + -- Set the filetypes which barbar will offset itself for + sidebar_filetypes = { + NvimTree = true, + }, +} diff --git a/.config/nvim/lua/config/plugin/catppuccin.lua b/.config/nvim/lua/config/plugin/catppuccin.lua new file mode 100644 index 00000000..84eb7d13 --- /dev/null +++ b/.config/nvim/lua/config/plugin/catppuccin.lua @@ -0,0 +1,50 @@ +return { + flavour = "mocha", -- latte, frappe, macchiato, mocha + background = { -- :h background + light = "latte", + dark = "mocha", + }, + transparent_background = false, -- disables setting the background color. + show_end_of_buffer = false, -- shows the '~' characters after the end of buffers + term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) + dim_inactive = { + enabled = false, -- dims the background color of inactive window + shade = "dark", + percentage = 0.15, -- percentage of the shade to apply to the inactive window + }, + no_italic = false, -- Force no italic + no_bold = false, -- Force no bold + no_underline = false, -- Force no underline + styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): + comments = { "italic" }, -- Change the style of comments + conditionals = { "italic" }, + loops = {}, functions = {}, + keywords = {}, + strings = {}, + variables = {}, + numbers = {}, + booleans = {}, + properties = {}, + types = {}, + operators = {}, + }, + color_overrides = {}, + custom_highlights = {}, + integrations = { + cmp = true, + gitsigns = true, + treesitter = true, + which_key = true, + alpha=true, + noice = true, + mason = true, + neogit = true, + nvimtree = true, + mini = { + enabled = true, + indentscope_color = "", + }, + -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) + }, +} + diff --git a/.config/nvim/lua/config/plugin/copilot.lua b/.config/nvim/lua/config/plugin/copilot.lua new file mode 100644 index 00000000..11dfcb7c --- /dev/null +++ b/.config/nvim/lua/config/plugin/copilot.lua @@ -0,0 +1,24 @@ +-- Set copilot_no_tab_map to true +vim.g.copilot_no_tab_map = true + +-- Map in insert mode to copilot#Accept("") +vim.api.nvim_set_keymap('i', '', 'v:lua.copilot_accept()', { silent = true, expr = true }) + +-- Function to handle copilot#Accept("") +function copilot_accept() + return vim.fn["copilot#Accept"]("") +end + +-- Disable copilot for certain filetypes +vim.g.copilot_filetypes = { + ["*"] = false, + ["javascript"] = true, + ["typescript"] = true, + ["lua"] = false, + ["rust"] = true, + ["c"] = true, + ["c#"] = true, + ["c++"] = true, + ["go"] = true, + ["python"] = true, +} diff --git a/.config/nvim/lua/config/plugin/harpoon2.lua b/.config/nvim/lua/config/plugin/harpoon2.lua new file mode 100644 index 00000000..e4f9ccb0 --- /dev/null +++ b/.config/nvim/lua/config/plugin/harpoon2.lua @@ -0,0 +1,4 @@ +return function () + local harpoon = require('harpoon') + harpoon:setup({}) +end diff --git a/.config/nvim/lua/config/plugin/init.lua b/.config/nvim/lua/config/plugin/init.lua new file mode 100644 index 00000000..e69de29b diff --git a/.config/nvim/lua/config/plugin/lualine.lua b/.config/nvim/lua/config/plugin/lualine.lua new file mode 100644 index 00000000..d6edeb84 --- /dev/null +++ b/.config/nvim/lua/config/plugin/lualine.lua @@ -0,0 +1,272 @@ +-- Eviline config for lualine +-- Author: shadmansaleh +-- Credit: glepnir + +-- Color table for highlights +-- stylua: ignore +local colors = { + bg = '#202328', + fg = '#bbc2cf', + yellow = '#ECBE7B', + cyan = '#008080', + darkblue = '#081633', + green = '#98be65', + orange = '#FF8800', + violet = '#a9a1e1', + magenta = '#c678dd', + blue = '#51afef', + red = '#ec5f67', +} + +local function show_macro_recording() + local recording_register = vim.fn.reg_recording() + if recording_register == "" then + return "" + else + return "Recording @" .. recording_register + end +end + +local conditions = { + buffer_not_empty = function() + return vim.fn.empty(vim.fn.expand('%:t')) ~= 1 + end, + hide_in_width = function() + return vim.fn.winwidth(0) > 80 + end, + check_git_workspace = function() + local filepath = vim.fn.expand('%:p:h') + local gitdir = vim.fn.finddir('.git', filepath .. ';') + return gitdir and #gitdir > 0 and #gitdir < #filepath + end, +} + +-- Config +local config = function() + local config = { + extensions = {'nvim-tree', 'nvim-dap-ui', 'aerial'}, + options = { + -- Disable lualine in nvim-tree + -- disabled_filetypes = { 'packer', 'NvimTree' }, + -- Disable sections and component separators + component_separators = '', + section_separators = '', + theme = { + -- We are going to use lualine_c an lualine_x as left and + -- right section. Both are highlighted by c theme . So we + -- are just setting default looks o statusline + normal = { c = { fg = colors.fg, bg = colors.bg } }, + inactive = { c = { fg = colors.fg, bg = colors.bg } }, + }, + }, + sections = { + -- these are to remove the defaults + lualine_a = {}, + lualine_b = {}, + lualine_y = {}, + lualine_z = {}, + -- These will be filled later + lualine_c = {}, + lualine_x = {}, + }, + inactive_sections = { + -- these are to remove the defaults + lualine_a = {}, + lualine_b = {}, + lualine_y = {}, + lualine_z = {}, + lualine_c = {}, + lualine_x = {}, + }, + } + + -- Inserts a component in lualine_c at left section + local function ins_left(component) + table.insert(config.sections.lualine_c, component) + end + + -- Inserts a component in lualine_x at right section + local function ins_right(component) + table.insert(config.sections.lualine_x, component) + end + + ins_left { + function() + return '▊' + end, + color = { fg = colors.blue }, -- Sets highlighting of component + padding = { left = 0, right = 1 }, -- We don't need space before this + } + + ins_left { + -- mode component + function() + return '' + end, + color = function() + -- auto change color according to neovims mode + local mode_color = { + n = colors.red, + i = colors.green, + v = colors.blue, + [''] = colors.blue, + V = colors.blue, + c = colors.magenta, + no = colors.red, + s = colors.orange, + S = colors.orange, + [''] = colors.orange, + ic = colors.yellow, + R = colors.violet, + Rv = colors.violet, + cv = colors.red, + ce = colors.red, + r = colors.cyan, + rm = colors.cyan, + ['r?'] = colors.cyan, + ['!'] = colors.red, + t = colors.red, + } + return { fg = mode_color[vim.fn.mode()] } + end, + padding = { right = 1 }, + } + + ins_left { + -- filesize component + 'filesize', + cond = conditions.buffer_not_empty, + } + + ins_left { + 'macro-recording', + fmt = show_macro_recording, + } + + ins_left { + 'filename', + cond = conditions.buffer_not_empty, + color = { fg = colors.magenta, gui = 'bold' }, + } + + ins_left { 'location' } + + ins_left { 'progress', color = { fg = colors.fg, gui = 'bold' } } + + ins_left { + 'diagnostics', + sources = { 'nvim_diagnostic' }, + symbols = { error = ' ', warn = ' ', info = ' ' }, + diagnostics_color = { + color_error = { fg = colors.red }, + color_warn = { fg = colors.yellow }, + color_info = { fg = colors.cyan }, + }, + } + + -- Insert mid section. You can make any number of sections in neovim :) + -- for lualine it's any number greater then 2 + ins_left { + function() + return '%=' + end, + } + + ins_left { + -- Lsp server name . + function() + local msg = 'No Active Lsp' + local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') + local clients = vim.lsp.get_active_clients() + if next(clients) == nil then + return msg + end + for _, client in ipairs(clients) do + local filetypes = client.config.filetypes + if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then + return client.name + end + end + return msg + end, + icon = ' LSP:', + color = { fg = '#ffffff', gui = 'bold' }, + } + + -- Add components to right sections + ins_right { + 'o:encoding', -- option component same as &encoding in viml + fmt = string.upper, -- I'm not sure why it's upper case either ;) + cond = conditions.hide_in_width, + color = { fg = colors.green, gui = 'bold' }, + } + + ins_right { + 'fileformat', + fmt = string.upper, + icons_enabled = false, -- I think icons are cool but Eviline doesn't have them. sigh + color = { fg = colors.green, gui = 'bold' }, + } + + ins_right { + 'branch', + icon = '', + color = { fg = colors.violet, gui = 'bold' }, + } + + ins_right { + 'diff', + -- Is it me or the symbol for modified us really weird + symbols = { added = ' ', modified = '󰝤 ', removed = ' ' }, + diff_color = { + added = { fg = colors.green }, + modified = { fg = colors.orange }, + removed = { fg = colors.red }, + }, + cond = conditions.hide_in_width, + } + + ins_right { + function() + return '▊' + end, + color = { fg = colors.blue }, + padding = { left = 1 }, + } + + local lualine = require("lualine"); + + vim.api.nvim_create_autocmd("RecordingEnter", { + callback = function() + lualine.refresh({ + place = { "statusline" }, + }) + end, + }) + + vim.api.nvim_create_autocmd("RecordingLeave", { + callback = function() + -- This is going to seem really weird! + -- Instead of just calling refresh we need to wait a moment because of the nature of + -- `vim.fn.reg_recording`. If we tell lualine to refresh right now it actually will + -- still show a recording occuring because `vim.fn.reg_recording` hasn't emptied yet. + -- So what we need to do is wait a tiny amount of time (in this instance 50 ms) to + -- ensure `vim.fn.reg_recording` is purged before asking lualine to refresh. + local timer = vim.loop.new_timer() + timer:start( + 50, + 0, + vim.schedule_wrap(function() + lualine.refresh({ + place = { "statusline" }, + }) + end) + ) + end, + }) + + lualine.setup(config) +end + +return config + diff --git a/.config/nvim/lua/config/plugin/mini.lua b/.config/nvim/lua/config/plugin/mini.lua new file mode 100644 index 00000000..1a86ce3e --- /dev/null +++ b/.config/nvim/lua/config/plugin/mini.lua @@ -0,0 +1,7 @@ +return function () + require('mini.surround').setup({}) + require('mini.splitjoin').setup({}) + require('mini.trailspace').setup({}) + require('mini.comment').setup({}) + require('mini.align').setup({}) +end diff --git a/.config/nvim/lua/config/plugin/neodev.lua b/.config/nvim/lua/config/plugin/neodev.lua new file mode 100644 index 00000000..4fa19af8 --- /dev/null +++ b/.config/nvim/lua/config/plugin/neodev.lua @@ -0,0 +1,3 @@ +return { + library = { plugins = { "nvim-dap-ui" }, types = true }, +} diff --git a/.config/nvim/lua/config/plugin/noice.lua b/.config/nvim/lua/config/plugin/noice.lua new file mode 100644 index 00000000..83cb3d98 --- /dev/null +++ b/.config/nvim/lua/config/plugin/noice.lua @@ -0,0 +1,18 @@ +return { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +} diff --git a/.config/nvim/lua/config/plugin/null-ls.lua b/.config/nvim/lua/config/plugin/null-ls.lua new file mode 100644 index 00000000..f27be6f7 --- /dev/null +++ b/.config/nvim/lua/config/plugin/null-ls.lua @@ -0,0 +1,8 @@ +return function() + local null_ls = require("null-ls") + null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + }, + }) +end diff --git a/.config/nvim/lua/config/plugin/nvim-alpha.lua b/.config/nvim/lua/config/plugin/nvim-alpha.lua new file mode 100644 index 00000000..053bd24e --- /dev/null +++ b/.config/nvim/lua/config/plugin/nvim-alpha.lua @@ -0,0 +1,127 @@ +return function() + local if_nil = vim.F.if_nil + + local default_terminal = { + type = "terminal", + command = nil, + width = 69, + height = 8, + opts = { + redraw = true, + window_config = {}, + }, + } + + local default_header = { + type = "text", + val = { + [[ :::!~!!!!!:. ]], + [[ .xUHWH!! !!?M88WHX:. ]], + [[ .X*#M@$!! !X!M$$$$$$WWx:. ]], + [[ :!!!!!!?H! :!$!$$$$$$$$$$8X: ]], + [[ !!~ ~:~!! :~!$!#$$$$$$$$$$8X: ]], + [[ :!~::!H!< ~.U$X!?R$$$$$$$$MM! ]], + [[ ~!~!!!!~~ .:XW$$$U!!?$$$$$$RMM! ]], + [[ !:~~~ .:!M"T#$$$$WX??#MRRMMM! ]], + [[ ~?WuxiW*` `"#$$$$8!!!!??!!! ]], + [[ :X- M$$$$ `"T#$T~!8$WUXU~ ]], + [[ :%` ~#$$$m: ~!~ ?$$$$$$ ]], + [[ :!`.- ~T$$$$8xx. .xWW- ~""##*" ]], + [[..... -~~:<` ! ~?T#$$@@W@*?$$ /` ]], + [[W$@@M!!! .!~~ !! .:XUW$W!~ `"~: : ]], + [[#"~~`.:x%`!! !H: !WM$$$$Ti.: .!WUn+!` ]], + [[:::~:!!`:X~ .: ?H.!u "$$$B$$$!W:U!T$$M~ ]], + [[.~~ :X@!.-~ ?@WTWo("*$$$W$TH$! ` ]], + [[Wi.~!X$?!-~ : ?$$$B$Wu("**$RM! ]], + [[$R@i.~~ ! : ~$$$$$B$$en:`` ]], + [[?MXT@Wx.~ : ~"##*$$$$M~ ]], + }, + opts = { + position = "center", + hl = "Type", + -- wrap = "overflow"; + }, + } + + local footer = { + type = "text", + val = "", + opts = { + position = "center", + hl = "Number", + }, + } + + local leader = "SPC" + + --- @param sc string + --- @param txt string + --- @param keybind string? optional + --- @param keybind_opts table? optional + local function button(sc, txt, keybind, keybind_opts) + local sc_ = sc:gsub("%s", ""):gsub(leader, "") + + local opts = { + position = "center", + shortcut = sc, + cursor = 3, + width = 50, + align_shortcut = "right", + hl_shortcut = "Keyword", + } + if keybind then + keybind_opts = if_nil(keybind_opts, { noremap = true, silent = true, nowait = true }) + opts.keymap = { "n", sc_, keybind, keybind_opts } + end + + local function on_press() + local key = vim.api.nvim_replace_termcodes(keybind or sc_ .. "", true, false, true) + vim.api.nvim_feedkeys(key, "t", false) + end + + return { + type = "button", + val = txt, + on_press = on_press, + opts = opts, + } + end + + local buttons = { + type = "group", + val = { + button("e", " New file", "ene "), + button("SPC f f", "󰈞 Find file"), + button("SPC f h", "󰊄 Recently opened files"), + button("SPC f r", " Frecency/MRU"), + button("SPC f g", "󰈬 Find word"), + button("SPC f m", " Jump to bookmarks"), + button("SPC s l", " Open last session"), + }, + opts = { + spacing = 1, + }, + } + + local section = { + terminal = default_terminal, + header = default_header, + buttons = buttons, + footer = footer, + } + + local config = { + layout = { + { type = "padding", val = 2 }, + section.header, + { type = "padding", val = 2 }, + section.buttons, + section.footer, + }, + opts = { + margin = 5, + }, + } + + require('alpha').setup(config) +end diff --git a/.config/nvim/lua/config/plugin/nvim-cmp.lua b/.config/nvim/lua/config/plugin/nvim-cmp.lua new file mode 100644 index 00000000..58f3ab7d --- /dev/null +++ b/.config/nvim/lua/config/plugin/nvim-cmp.lua @@ -0,0 +1,81 @@ +return function() + local cmp = require'cmp' + local lspkind = require('lspkind') + + cmp.setup({ + snippet = { + expand = function(args) + require('snippy').expand_snippet(args.body) -- For `snippy` users. + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + local entry = cmp.get_selected_entry() + if not entry then + cmp.select_next_item({ behavior = cmp.SelectBehavior.Select }) + else + cmp.confirm() + end + else + fallback() + end + end, {"i","s","c",}), + }), + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'snippy' }, + { name = 'vimtex', } + }, { + { name = 'buffer' }, + { name = 'path' }, + }), + formatting = { + format = lspkind.cmp_format({ + mode = 'symbol_text', + preset = 'codicons', + maxwidth = 50, + ellipsis_char = '...', + before = function (entry, vim_item) + return vim_item + end + }) + } + }) + + cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'git' }, + }, { + { name = 'buffer' }, + }) + }) + + cmp.setup.cmdline({ '/', '?' }, { + mapping = cmp.mapping.preset.cmdline(), + view = { + entries = {name = 'wildmenu', separator = '|' } + }, + sources = { + { name = 'buffer' }, + { name = 'path' } + } + }) + + cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' } + }, { + { name = 'cmdline' } + }) + }) +end diff --git a/.config/nvim/lua/config/plugin/nvim-tree.lua b/.config/nvim/lua/config/plugin/nvim-tree.lua new file mode 100644 index 00000000..49d65874 --- /dev/null +++ b/.config/nvim/lua/config/plugin/nvim-tree.lua @@ -0,0 +1,34 @@ +local function open_nvim_tree(data) + + -- buffer is a real file on the disk + local real_file = vim.fn.filereadable(data.file) == 1 + + if not real_file then + return + end + + -- open the tree, find the file but don't focus it + require("nvim-tree.api").tree.open({ focus = false, find_file = true, }) +end + +vim.api.nvim_create_autocmd({ "BufCreate" }, { callback = open_nvim_tree }) + +return function () + require("nvim-tree").setup({ + sort_by = "case_sensitive", + update_focused_file = { + enable = true, + update_cwd = true, + }, + view = { + adaptive_size = true, + }, + diagnostics = { + enable = true, + show_on_dirs = true + }, + renderer = { + group_empty = false, + }, + }) +end diff --git a/.config/nvim/lua/config/plugin/nvim-ufo.lua b/.config/nvim/lua/config/plugin/nvim-ufo.lua new file mode 100644 index 00000000..e49c0619 --- /dev/null +++ b/.config/nvim/lua/config/plugin/nvim-ufo.lua @@ -0,0 +1,31 @@ +local handler = function(virtText, lnum, endLnum, width, truncate) + local newVirtText = {} + local suffix = (" 󰁂 %d "):format(endLnum - lnum) + local sufWidth = vim.fn.strdisplaywidth(suffix) + local targetWidth = width - sufWidth + local curWidth = 0 + for _, chunk in ipairs(virtText) do + local chunkText = chunk[1] + local chunkWidth = vim.fn.strdisplaywidth(chunkText) + if targetWidth > curWidth + chunkWidth then + table.insert(newVirtText, chunk) + else + chunkText = truncate(chunkText, targetWidth - curWidth) + local hlGroup = chunk[2] + table.insert(newVirtText, { chunkText, hlGroup }) + chunkWidth = vim.fn.strdisplaywidth(chunkText) + -- str width returned from truncate() may less than 2nd argument, need padding + if curWidth + chunkWidth < targetWidth then + suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth) + end + break + end + curWidth = curWidth + chunkWidth + end + table.insert(newVirtText, { suffix, "MoreMsg" }) + return newVirtText +end + +return { + fold_virt_text_handler = handler, +} diff --git a/.config/nvim/lua/config/plugin/persisted.lua b/.config/nvim/lua/config/plugin/persisted.lua new file mode 100644 index 00000000..238b0147 --- /dev/null +++ b/.config/nvim/lua/config/plugin/persisted.lua @@ -0,0 +1,34 @@ + +return function() + require'persisted'.setup { + options = {'globals'}, + pre_save = function() vim.api.nvim_exec_autocmds('User', {pattern = 'SessionSavePre'}) end, + should_autosave = function() + -- do not autosave if the alpha dashboard is the current filetype + if vim.bo.filetype == "alpha" then + return false + end + return true + end, + on_autoload_no_session = function() + vim.notify("No existing session to load.") + end, + ignored_dirs = { + "~/.config", + "~/.local/nvim" + }, + } + local group = vim.api.nvim_create_augroup("PersistedHooks", {}) + + vim.api.nvim_create_autocmd({ "User" }, { + pattern = "PersistedTelescopeLoadPre", + group = group, + callback = function(session) + -- Save the currently loaded session using a global variable + require("persisted").save({ session = vim.g.persisted_loaded_session }) + + -- Delete all of the open buffers + vim.api.nvim_input(":%bd!") + end, + }) +end diff --git a/.config/nvim/lua/config/plugin/telescope.lua b/.config/nvim/lua/config/plugin/telescope.lua new file mode 100644 index 00000000..a3cfcdc8 --- /dev/null +++ b/.config/nvim/lua/config/plugin/telescope.lua @@ -0,0 +1,29 @@ +local options = { + defaults = { + layout_strategy = 'horizontal', + layout_config = { + height = 0.95, + prompt_position = "top" + }, + sorting_strategy = "ascending", + color_devicons = true, + mappings = { + }, + }, + pickers = { + find_files = { + }, + man_pages = { + sections = { "2", "3" } + } + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown { + } + }, + }, + extensions_list = { "ui-select", "persisted" }, +} + +return options diff --git a/.config/nvim/lua/config/plugin/treesitter.lua b/.config/nvim/lua/config/plugin/treesitter.lua new file mode 100644 index 00000000..eb0d6f72 --- /dev/null +++ b/.config/nvim/lua/config/plugin/treesitter.lua @@ -0,0 +1,13 @@ +return { + ensure_installed = { "html", "json", "c", "c++", "css", "bash", "lua", "java", "python", "javascript", "latex", "markdown" }, + sync_install = false, + auto_install = true, + + ignore_install = { }, + + highlight = { + enable = true, + + additional_vim_regex_highlighting = { "markdown" } + }, +} diff --git a/.config/nvim/lua/config/plugin/whichkey.lua b/.config/nvim/lua/config/plugin/whichkey.lua new file mode 100644 index 00000000..7ee8c0d0 --- /dev/null +++ b/.config/nvim/lua/config/plugin/whichkey.lua @@ -0,0 +1,9 @@ +return { + opts = {}, + register = { + ["f"] = { name = "+file" }, + ["s"] = { name = "+search" }, + ["g"] = { name = "+git" }, + ["l"] = { name = "+lsp" }, + } +} diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua new file mode 100644 index 00000000..69347276 --- /dev/null +++ b/.config/nvim/lua/config/settings.lua @@ -0,0 +1,68 @@ +-- Enable syntax highlighting +vim.opt.syntax = "on" + +-- Autocomplete settings in command mode +vim.opt.wildmenu = true +vim.opt.wildmode = "longest,list,full" + +-- Various settings +vim.opt.autoread = true +vim.opt.backspace = { "indent", "eol", "start" } +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.lazyredraw = false +vim.opt.ttyfast = true + +vim.opt.wrap = false +vim.opt.backup = false +vim.opt.writebackup = false +vim.opt.swapfile = false +vim.opt.errorbells = false +vim.opt.visualbell = false +vim.opt.history = 500 +vim.opt.hidden = true +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.incsearch = true +vim.opt.timeoutlen = 500 +vim.opt.ttimeoutlen = 0 +vim.opt.showcmd = true +vim.cmd('nohlsearch') + +vim.opt.scrolloff = 5 +vim.opt.sidescrolloff = 10 + +vim.opt.shortmess:append("c") +vim.opt.updatetime = 300 + +-- Persistent undo settings +vim.opt.undodir = vim.fn.expand('~/.local/share/vim/undo/') +vim.opt.undofile = true +vim.opt.undolevels = 1000 +vim.opt.undoreload = 10000 + +-- Wildignore settings +vim.opt.wildignore:append({"*/tmp/*", "*.so", "*.zip", "*/vendor/bundle/*", "*/node_modules/"}) + +-- Autocommand to disable auto commenting on new lines +vim.api.nvim_create_autocmd("FileType", { + pattern = "*", + callback = function() + vim.opt_local.formatoptions:remove("c") + vim.opt_local.formatoptions:remove("r") + vim.opt_local.formatoptions:remove("o") + end +}) + +-- Filetype settings +vim.cmd('filetype off') +vim.cmd('filetype plugin on') + +-- Autocomplete settings +vim.opt.completeopt = {"menu", "menuone", "noselect"} + +-- Folding settings +vim.o.foldcolumn = '1' -- '0' is not bad +vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value +vim.o.foldlevelstart = 99 +vim.o.foldenable = true diff --git a/.config/nvim/lua/config/template.lua b/.config/nvim/lua/config/template.lua new file mode 100644 index 00000000..661517c8 --- /dev/null +++ b/.config/nvim/lua/config/template.lua @@ -0,0 +1,21 @@ +local function load_skeleton(filetype) + -- do nothing if no filetype + if filetype == "" then return end + + -- glob every directory of 'runtimepath' to search for skeleton/filetype + local skeletons = vim.api.nvim_get_runtime_file('skeleton/' .. filetype, true) + if #skeletons == 0 then return end + + -- read last skeleton into 1st line. + vim.api.nvim_command('0read ' .. skeletons[#skeletons]) +end + +-- augroup setup +vim.api.nvim_create_augroup('aug_skeleton', {clear = true}) +vim.api.nvim_create_autocmd('BufNewFile', { + group = 'aug_skeleton', + pattern = '*', + callback = function() + load_skeleton(vim.bo.filetype) + end, +}) diff --git a/.config/nvim/lua/keybinds/barbar.lua b/.config/nvim/lua/keybinds/barbar.lua new file mode 100644 index 00000000..412474a7 --- /dev/null +++ b/.config/nvim/lua/keybinds/barbar.lua @@ -0,0 +1,39 @@ +local map = vim.api.nvim_set_keymap +local opts = { noremap = true, silent = true } + +-- Move to previous/next +map('n', '', 'BufferPrevious', opts) +map('n', '', 'BufferNext', opts) +-- Re-order to previous/next +map('n', '', 'BufferMovePrevious', opts) +map('n', '>', 'BufferMoveNext', opts) +-- Goto buffer in position... +map('n', '', 'BufferGoto 1', opts) +map('n', '', 'BufferGoto 2', opts) +map('n', '', 'BufferGoto 3', opts) +map('n', '', 'BufferGoto 4', opts) +map('n', '', 'BufferGoto 5', opts) +map('n', '', 'BufferGoto 6', opts) +map('n', '', 'BufferGoto 7', opts) +map('n', '', 'BufferGoto 8', opts) +map('n', '', 'BufferGoto 9', opts) +map('n', '', 'BufferLast', opts) + +-- Pin/unpin buffer +map('n', '', 'BufferPin', opts) + +-- Pin/unpin buffer +map('n', '', 'b#', opts) + +-- Close buffer +map('n', '', 'BufferClose', opts) + +-- Magic buffer-picking mode +map('n', '', 'BufferPick', opts) + +-- Sort automatically by... +map('n', 'bb', 'BufferOrderByBufferNumber', opts) +map('n', 'bd', 'BufferOrderByDirectory', opts) +map('n', 'bl', 'BufferOrderByLanguage', opts) +map('n', 'bw', 'BufferOrderByWindowNumber', opts) + diff --git a/.config/nvim/lua/keybinds/dap.lua b/.config/nvim/lua/keybinds/dap.lua new file mode 100644 index 00000000..f2ee1f86 --- /dev/null +++ b/.config/nvim/lua/keybinds/dap.lua @@ -0,0 +1,13 @@ +local map = vim.api.nvim_set_keymap + +-- Toggle breakpoint with F11 +vim.api.nvim_set_keymap('n', '', "lua require'dap'.toggle_breakpoint()", {noremap = true, silent = true}) + +-- Start debugging with F4 +vim.api.nvim_set_keymap('n', '', "lua require'dap'.continue()", {noremap = true, silent = true}) + +-- Step into with F7 +vim.api.nvim_set_keymap('n', '', "lua require'dap'.step_into()", {noremap = true, silent = true}) + +-- Step over with F8 +vim.api.nvim_set_keymap('n', '', "lua require'dap'.step_over()", {noremap = true, silent = true}) diff --git a/.config/nvim/lua/keybinds/editor.lua b/.config/nvim/lua/keybinds/editor.lua new file mode 100644 index 00000000..e176805f --- /dev/null +++ b/.config/nvim/lua/keybinds/editor.lua @@ -0,0 +1,31 @@ +local map = vim.api.nvim_set_keymap +local opts = {noremap = true} + +-- [,w] SAVE +map('', 'w', ':update', opts) + +-- [Q] REFORMAT TEXT +map('v', 'Q', 'gq', opts) + +-- Clipboard Bindings, Prefixing with leader copies to global +map('n', 'y', '"+y', opts) +map('n', 'p', '"+p', opts) +map('v', 'y', '"+y', opts) +map('v', 'p', '"+p', opts) +map('n', 'Y', '"+Y', opts) +map('n', 'P', '"+P', opts) +map('v', 'd', '"+d', opts) +map('n', 'D', '"+D', opts) + +-- Find and replace with Ctrl-R +map('v', '', '"hy:%s/h//g', opts) + +-- Apply . to all selected lines +map('v', '.', ':normal .', opts) + + +-- Quit window +map('', 'qb', ':q', opts) + +-- Quit all without saving +map('', 'qq', ':qa!', opts) diff --git a/.config/nvim/lua/keybinds/init.lua b/.config/nvim/lua/keybinds/init.lua new file mode 100644 index 00000000..c8e02846 --- /dev/null +++ b/.config/nvim/lua/keybinds/init.lua @@ -0,0 +1,7 @@ +require('keybinds.editor') -- Vim native keybinds + +require('keybinds.telescope') -- Keybinds for use with telescope +require('keybinds.plugin') -- Keybinds for use nvim tree +require('keybinds.barbar') +require('keybinds.terminal') +require('keybinds.dap') diff --git a/.config/nvim/lua/keybinds/plugin.lua b/.config/nvim/lua/keybinds/plugin.lua new file mode 100644 index 00000000..a99cf22e --- /dev/null +++ b/.config/nvim/lua/keybinds/plugin.lua @@ -0,0 +1,56 @@ +local map = vim.api.nvim_set_keymap + +local harpoon = require('harpoon') + +-- basic telescope configuration +local conf = require("telescope.config").values +local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + end + + require("telescope.pickers").new({}, { + prompt_title = "Harpoon", + finder = require("telescope.finders").new_table({ + results = file_paths, + }), + previewer = conf.file_previewer({}), + sorter = conf.generic_sorter({}), + }):find() +end + +-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself +vim.keymap.set('n', 'zR', require('ufo').openAllFolds) +vim.keymap.set('n', 'zM', require('ufo').closeAllFolds) + +vim.keymap.set("n", "", function() toggle_telescope(harpoon:list()) end, + { desc = "Open harpoon window" }) + +map('n', 'tt', " NvimTreeToggle", { + noremap = true, + desc = "Toggle directory tree" +}) + +map('n', 'tf', " NvimTreeFindFile", { + noremap = true, + desc = "Go to current file in dir tree" +}) + +map('n', 'ta', " AerialToggle", { + noremap = true, + desc = "Open aerial sidebar" +}) + +map('n', 'tn', " AerialNavToggle", { + noremap = true, + desc = "Toggle aerial navigator" +}) + +map('n', 'Z', " lua require('zen-mode').toggle({})", { + noremap = true, + desc = "Toggle zen mode" +}) + +vim.keymap.set("n", "", function() toggle_telescope(harpoon:list()) end, + { desc = "Open harpoon window" }) diff --git a/.config/nvim/lua/keybinds/telescope.lua b/.config/nvim/lua/keybinds/telescope.lua new file mode 100644 index 00000000..f8eb3bb0 --- /dev/null +++ b/.config/nvim/lua/keybinds/telescope.lua @@ -0,0 +1,69 @@ +local map = vim.api.nvim_set_keymap + +-- == LSP Pickers == +map('n', 'll', " Telescope ", { + noremap = true, + desc = "Open main telescope picket" +}) + +map('n', '', " Telescope commands ", { + noremap = true, + desc = "Open main telescope picket" +}) + +map('n', '', "lua vim.lsp.buf.code_action()", { + noremap = true, + desc = "Resume last pick action" +}) + +map('n', 'lf', " lua require('telescope.builtin').find_files()", { + noremap = true, + desc = "Open File" +}) + +map('n', 'ld', " lua require('telescope.builtin').lsp_definitions()", { + noremap = true, + desc = "Go to definition" +}) + +map('n', 'lr', " lua require('telescope.builtin').lsp_references()", { + noremap = true, + desc = "List to references to word under cursor" +}) + +map('n', 'lt', "lua require('telescope.builtin').treesitter()", { + noremap = true, + desc = "List symbols in workspace with treesitter" +}) + +map('n', 'lw', "lua require('telescope.builtin').diagnostic()", { + noremap = true, + desc = "List diagnostic items" +}) + +map('n', '', "lua vim.lsp.buf.code_action()", { + noremap = true, + desc = "Pick code action" +}) + +map("v", "", "'<,'>lua vim.lsp.buf.code_action()", { + noremap = true, + desc = "Pick code action for selection" +}) + +map('n', 'ls', "lua require('telescope.builtin').live_grep()", { + noremap = true, + desc = "Live search" +}) + +-- == Misc Keybinds == +map('n', 'b', "lua require('telescope.builtin').buffers()", { + noremap = true, + desc = "List and pick buffers" +}) + + +map('n', 'S', "Telescope persisted", { + noremap = true, + desc = "Select a persisted session" +}) diff --git a/.config/nvim/lua/keybinds/terminal.lua b/.config/nvim/lua/keybinds/terminal.lua new file mode 100644 index 00000000..00391241 --- /dev/null +++ b/.config/nvim/lua/keybinds/terminal.lua @@ -0,0 +1,17 @@ +local map = vim.api.nvim_set_keymap + +map('n', '', "ToggleTerm direction=horizontal", { + noremap = true, + desc = "Create terminal split" +}) + + +map('n', '', "ToggleTerm direction=float", { + noremap = true, + desc = "Toggle terminal floating" +}) + +local trim_spaces = true +vim.keymap.set("v", "s", function() + require("toggleterm").send_lines_to_terminal("visual_selection", trim_spaces, { args = vim.v.count }) +end) diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua new file mode 100644 index 00000000..746d738b --- /dev/null +++ b/.config/nvim/lua/lsp.lua @@ -0,0 +1,57 @@ +local function mergeTables(t1, t2) + for k, v in pairs(t2) do + t1[k] = v + end + return t1 +end + +-- === Initialize LSP Servers === +-- For a list of LSP Servers and documentation: +-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md +local lspconfig = require'lspconfig' +local capabilities = require('cmp_nvim_lsp').default_capabilities() +local configs = require("config.lsp").lspconfigs +local on_attach = require("config.lsp").lsp_onattach + +capabilities.textDocument.completion.completionItem.snippetSupport = true + +capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true +} + +-- LSP diagnostics +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { + underline = true, + signs = true, + virtual_text = false, + severity_sort = true, +}) + +local signs = { + Error = " ", + Warning = " ", + Hint = " ", + Information = " " +} + +for type, icon in pairs(signs) do + local hl = "LspDiagnosticsSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) +end + +-- LSP diagnostics +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { + underline = true, + signs = true, + virtual_text = true, + severity_sort = true, +}) + +for k, v in pairs(configs) do + lspconfig[k].setup( + mergeTables(v, { + on_attach = on_attach, + capabilities = capabilities + })) +end diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua new file mode 100644 index 00000000..fb9b09f4 --- /dev/null +++ b/.config/nvim/lua/plugins.lua @@ -0,0 +1,276 @@ +return { + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = require("config.plugin.catppuccin"), + }, + { + "goolord/alpha-nvim", + cond = vim.g.vscode == nil, + dependencies = { + "nvim-tree/nvim-web-devicons", + "nvim-telescope/telescope.nvim", + "persisted" + }, + event = "VimEnter", + config = require("config.plugin.nvim-alpha"), + }, + { + "romgrk/barbar.nvim", + dependencies = { + "lewis6991/gitsigns.nvim", -- OPTIONAL: for git status + "nvim-tree/nvim-web-devicons", -- OPTIONAL: for file icons + }, + init = function() + vim.g.barbar_auto_setup = false + end, + opts = {}, + version = "^1.0.0", -- optional: only update when a new 1.x version is released + }, + { + "nvim-lualine/lualine.nvim", + dependencies = { + "catppuccin/nvim", + "nvim-tree/nvim-web-devicons", + 'rmagatti/auto-session', + }, + config = require("config.plugin.lualine"), + }, + { + "utilyre/barbecue.nvim", + name = "barbecue", + version = "*", + dependencies = { + "SmiteshP/nvim-navic", + "nvim-tree/nvim-web-devicons", -- optional dependency + }, + opts = {}, + }, + { + "lewis6991/gitsigns.nvim", + opts = {}, + }, + { + "lukas-reineke/headlines.nvim", + dependencies = "nvim-treesitter/nvim-treesitter", + opts = {}, + }, + { + "ThePrimeagen/harpoon", + branch = "harpoon2", + dependencies = { + "nvim-lua/plenary.nvim", + }, + config = require("config.plugin.harpoon2"), + }, + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "romgrk/barbar.nvim", + "nvim-tree/nvim-web-devicons", + }, + config = require("config.plugin.nvim-tree"), + }, + { + "nvim-neotest/neotest", + dependencies = { + "nvim-lua/plenary.nvim", + "antoinemadec/FixCursorHold.nvim", + "nvim-treesitter/nvim-treesitter", + }, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + config = function() + local settings = require("config.plugin.whichkey") + require("which-key").setup(settings.opts) + require("which-key").register(settings.register) + end, + }, + { + "folke/zen-mode.nvim", + opts = {}, + }, + { + "gauteh/vim-cppman", + }, + { + "lervag/vimtex", + }, + { + "christoomey/vim-tmux-navigator", + }, + { + "echasnovski/mini.nvim", + version = '*', + config = require("config.plugin.mini") + }, + { + "tpope/vim-surround", + }, + { + "jose-elias-alvarez/null-ls.nvim", + config = require("config.plugin.null-ls"), + }, + { + "williamboman/mason.nvim", + config = true, + dependencies = { + "neovim/nvim-lspconfig", + }, + }, + { + "neovim/nvim-lspconfig", + dependencies = { + "folke/neodev.nvim" + } + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + ensure_installed = require("config.lsp").mason_servers + }, + dependencies = { + "folke/neodev.nvim" + } + }, + { + "nvim-treesitter/nvim-treesitter", + opts = require("config.plugin.treesitter"), + }, + { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", + "sindrets/diffview.nvim", + "nvim-telescope/telescope.nvim", + }, + config = true, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope-ui-select.nvim", + }, + config = function() + local telescope = require("telescope") + local config = require("config.plugin.telescope") + + for _, ext in ipairs(config.extensions_list) do + telescope.load_extension(ext) + end + + telescope.setup(config) + end, + }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = require("config.plugin.noice"), + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + }, + { + "neomutt/neomutt.vim", + }, + { + "stevearc/aerial.nvim", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + config = require("config.plugin.aerial") + }, + { + "dcampos/nvim-snippy", + dependencies = { + "honza/vim-snippets", + }, + opts = {}, + }, + { + "kevinhwang91/nvim-ufo", + dependencies = { + "kevinhwang91/promise-async", + "neovim/nvim-lspconfig", + }, + opts = require("config.plugin.nvim-ufo"), + }, + { + "rest-nvim/rest.nvim", + dependencies = { { "nvim-lua/plenary.nvim" } }, + config = function() + require("rest-nvim").setup({}) + end, + }, + { + "zbirenbaum/copilot.lua", + cmd = "Copilot", + event = "InsertEnter", + opts = {}, + }, + { + "zbirenbaum/copilot-cmp", + dependencies = { + "zbirenbaum/copilot.lua", + }, + config = true, + }, + { + "hrsh7th/nvim-cmp", + config = require("config.plugin.nvim-cmp"), + dependencies = { + "onsails/lspkind.nvim", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-nvim-lua", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lsp-signature-help", + "dcampos/cmp-snippy", + "micangl/cmp-vimtex", + "dcampos/nvim-snippy", + }, + }, + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = {}, + }, + { + "akinsho/toggleterm.nvim", + version = "*", + config = true, + }, + { + "olimorris/persisted.nvim", + config = require("config.plugin.persisted"), + dependencies = { + "romgrk/barbar.nvim" + } + }, + { + "folke/neodev.nvim", + opts = require("config.plugin.neodev") + }, + { + "rcarriga/nvim-dap-ui", + dependencies = { + "pocco81/dap-buddy.nvim", + "mfussenegger/nvim-dap", + }, + opts = {} + } +} diff --git a/.config/nvim/plugin/lightline-bufferline.vim b/.config/nvim/plugin/lightline-bufferline.vim deleted file mode 100644 index e3246bf3..00000000 --- a/.config/nvim/plugin/lightline-bufferline.vim +++ /dev/null @@ -1,36 +0,0 @@ -set showtabline=2 -set guioptions-=e - -let g:lightline#bufferline#show_number = 2 -let g:lightline#bufferline#shorten_path = 0 -let g:lightline#bufferline#unnamed = '[No Name]' -let g:lightline#bufferline#enable_nerdfont = 1 -let g:lightline#bufferline#modified = ' *' -let g:lightline#bufferline#read_only = ' ' -let g:lightline#bufferline#enable_devicons = 1 - -" Movement bindings -nmap 1 lightline#bufferline#go(1) -nmap 2 lightline#bufferline#go(2) -nmap 3 lightline#bufferline#go(3) -nmap 4 lightline#bufferline#go(4) -nmap 5 lightline#bufferline#go(5) -nmap 6 lightline#bufferline#go(6) -nmap 7 lightline#bufferline#go(7) -nmap 8 lightline#bufferline#go(8) -nmap 9 lightline#bufferline#go(9) -nmap 0 lightline#bufferline#go(10) - -" Deletion Bindings -nmap c1 lightline#bufferline#delete(1) -nmap c2 lightline#bufferline#delete(2) -nmap c3 lightline#bufferline#delete(3) -nmap c4 lightline#bufferline#delete(4) -nmap c5 lightline#bufferline#delete(5) -nmap c6 lightline#bufferline#delete(6) -nmap c7 lightline#bufferline#delete(7) -nmap c8 lightline#bufferline#delete(8) -nmap c9 lightline#bufferline#delete(9) -nmap c0 lightline#bufferline#delete(10) - - diff --git a/.config/nvim/plugin/lightline.vim b/.config/nvim/plugin/lightline.vim deleted file mode 100644 index b8bbfa94..00000000 --- a/.config/nvim/plugin/lightline.vim +++ /dev/null @@ -1,53 +0,0 @@ -let g:lightline = { -\ 'colorscheme': 'material_vim', -\ 'active': { -\ 'right': [ [ 'lineinfo' ], [ 'percent' ], [ 'fileformat', 'fileencoding', 'filetype' ] ], -\ 'left': [ [ 'mode', 'paste' ], [ 'lsp_status' ], [ 'readonly', 'filename' ], [ 'lsp_info', 'lsp_hints', 'lsp_errors', 'lsp_warnings', 'lsp_ok' ] ], -\ }, -\ 'component_function': { }, -\ 'tabline': { -\ 'left': [ ['buffers'] ], -\ 'right': [ ], -\ }, -\ 'component_expand': { -\ 'buffers': 'lightline#bufferline#buffers', -\ }, -\ 'component_type': { -\ 'buffers': 'tabsel', -\ } -\ } - - -function! WordCount() - let currentmode = mode() - if !exists("g:lastmode_wc") - let g:lastmode_wc = currentmode - endif - " if we modify file, open a new buffer, be in visual ever, or switch modes - " since last run, we recompute. - if &modified || !exists("b:wordcount") || currentmode =~? '\c.*v' || currentmode != g:lastmode_wc - let g:lastmode_wc = currentmode - let l:old_position = getpos('.') - let l:old_status = v:statusmsg - execute "silent normal g\" - if v:statusmsg == "--No lines in buffer--" - let b:wordcount = 0 - else - let s:split_wc = split(v:statusmsg) - if index(s:split_wc, "Selected") < 0 - let b:wordcount = str2nr(s:split_wc[11]) - else - let b:wordcount = str2nr(s:split_wc[5]) - endif - let v:statusmsg = l:old_status - endif - call setpos('.', l:old_position) - return b:wordcount - else - return b:wordcount - endif -endfunction - -let g:lightline#trailing_whitespace#indicator = '' - -call lightline#lsp#register() diff --git a/.config/nvim/plugin/vim-betterwhitespace.vim b/.config/nvim/plugin/vim-betterwhitespace.vim deleted file mode 100644 index abd6b0d8..00000000 --- a/.config/nvim/plugin/vim-betterwhitespace.vim +++ /dev/null @@ -1,9 +0,0 @@ -let g:better_whitespace_enabled=0 -let g:better_whitespace_ctermcolor='LightRed' -let g:better_whitespace_guicolor='LightRed' -let g:better_whitespace_operator='_s' -let g:strip_whitespace_on_save=1 -let g:strip_max_file_size=1000 -let g:strip_whitespace_confirm=0 - -let g:better_whitespace_filetypes_blacklist=['md', 'markdown'] diff --git a/.config/nvim/plugins.vim b/.config/nvim/plugins.vim deleted file mode 100644 index 878f97fc..00000000 --- a/.config/nvim/plugins.vim +++ /dev/null @@ -1,89 +0,0 @@ -call plug#begin('~/.local/share/vim/plugged') - -" Look & Feel -Plug 'kaicataldo/material.vim' -Plug 'itchyny/lightline.vim' -Plug 'mengelbrecht/lightline-bufferline' -Plug 'kyazdani42/nvim-tree.lua' - -" Addons -Plug 'mhinz/vim-signify' " Signs - -Plug 'tpope/vim-surround' " Surround pieces of text with symbols -Plug 'jremmen/vim-ripgrep' " Better Grep -" Plug 'blarghmatey/split-expander' -Plug 'sheerun/vim-polyglot' " Language Packs -" Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'neovim/nvim-lspconfig' " LSP!!! -Plug 'junegunn/goyo.vim' " Center writing - -" Autocomplete -Plug 'hrsh7th/cmp-nvim-lsp' -Plug 'hrsh7th/cmp-buffer' -Plug 'hrsh7th/cmp-path' -Plug 'hrsh7th/cmp-cmdline' -Plug 'Dosx001/cmp-commit' -Plug 'hrsh7th/nvim-cmp' -Plug 'hrsh7th/cmp-nvim-lsp-signature-help' - -Plug 'neomutt/neomutt.vim' " Neomuttrc syntex highlighting -Plug 'VebbNix/lf-vim' - -" Tmux integration -Plug 'benmills/vimux' -Plug 'christoomey/vim-tmux-navigator' - -" File system navigation -Plug 'nvim-lua/plenary.nvim' -Plug 'nvim-telescope/telescope.nvim' -Plug 'nvim-telescope/telescope-file-browser.nvim' -Plug 'gnfisher/nvim-telescope-ctags-plus' -Plug 'jreybert/vimagit' - -Plug 'ojroques/vim-oscyank' " OCS Yank PLugin for use with Blink Shell - -Plug 'folke/which-key.nvim' " Emacs like keybind suggestions - -Plug 'ferrine/md-img-paste.vim' - -" === Language Servers === -Plug 'mfussenegger/nvim-jdtls' - -" ==== Syntax highlighting ==== -Plug 'joelbeedle/pseudo-syntax' " Pseudocode -Plug 'rhysd/vim-wasm' " Web Assembly -Plug 'elzr/vim-json' " JSON -Plug 'tpope/vim-markdown' "Markdown -Plug 'pangloss/vim-javascript' "Javascript -Plug 'leafgarland/typescript-vim' "Typescript -Plug 'vim-scripts/cool.vim' "COOL, Stanford Compiler Course -Plug 'justinmk/vim-syntax-extra' " A bunch of extra languages -Plug 'arrufat/vala.vim' " Vala -Plug 'Shirk/vim-gas' "GAS Assembly - -Plug 'nvim-treesitter/nvim-treesitter' -Plug 'kyazdani42/nvim-web-devicons' " optional, for file icons -Plug 'nicwest/vim-http' - -" === Snippets === -Plug 'hrsh7th/cmp-vsnip' -Plug 'hrsh7th/vim-vsnip' - -Plug 'rafamadriz/friendly-snippets' " Some snippets for ultisnips -Plug 'folke/zen-mode.nvim' - -Plug 'goolord/alpha-nvim' " Welcome screen -Plug 'onsails/lspkind.nvim' " Completion icons - -" Telescope extensions -Plug 'nvim-telescope/telescope-ui-select.nvim' -Plug 'mickael-menu/zk-nvim' -Plug 'folke/trouble.nvim' -Plug 'josa42/nvim-lightline-lsp' -Plug 'willchao612/vim-diagon' -Plug 'tpope/vim-fugitive' -Plug 'lervag/vimtex' - -Plug 'mfussenegger/nvim-dap' -call plug#end() - diff --git a/.config/nvim/syntax/java.vim b/.config/nvim/syntax/java.vim deleted file mode 100644 index 8a08493c..00000000 --- a/.config/nvim/syntax/java.vim +++ /dev/null @@ -1,182 +0,0 @@ - -" note do not change the order... -" some of them are overridding privous regrex - -"this code made with build-in syntax regrex(and key words), and with some custome regrex(and -"key words) - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""" - - -" gruvbox (dark) -"let orange = "#d65d0e" "special color for numbers -"let black = "#282828" -"let red = "#cc241d" -"let green = "#98971a" -"let yellow = "#d79921" -"let blue = "#458588" -"let purple = "#b16286" -"let cyan = "#689d6a" -"let white = "#a89984" - - -" one dark -let orange = "#d19a66" "special color for numbers -let black = "#282c34" -let red = "#E06C75" -let green = "#98c379" -let yellow = "#E5C07B" -let blue = "#61AFEF" -let purple = "#C678DD" -let cyan = "#56B6C2" -let white = "#ABB2BF" - - - -" you may chage the color according to your will :) - - -" main color (for left over words) -syn match main "\w" -execute "highlight main ctermfg=4 guifg=".red - -" numbers -syn match posNum "\d" -execute "highlight posNum ctermfg=4 guifg=".orange - -" method names() -syn match class ".\w*\((\)\@=" -execute "highlight class ctermfg=4 guifg=".blue - -"execute "highlight names which contains numbers -syn match main "\v(\a)\w*\d" -execute "highlight main ctermfg=4 guifg=".red - - -"all regrex works -" /^import (+);$/mg -" import \zs.*\ze -" \v(^import\s+)@<=.*; - -" imported packages -syn match importName "\v(^import\s+)@<=.*;" -execute "highlight importName ctermfg=4 guifg=".yellow - -" import -syn match importWord "import " -execute "highlight importWord ctermfg=4 guifg=".purple - -" package name -syn match packageName "\v(^package\s+)@<=.*;" -execute "highlight packageName ctermfg=4 guifg=".yellow - -" package -syn match packageWord "package " -execute "highlight packageWord ctermfg=4 guifg=".purple - -"ex: int, double, char -execute "highlight javaType ctermfg=4 guifg=".purple - -"ex: static, throws -execute "highlight javaStorageClass ctermfg=4 guifg=".purple - - -"class name... basically starts with caps letter -syntax match ClassName display '\<\([A-Z][a-z0-9]*\)\+\>' -syntax match ClassName display '\.\@<=\*' -highlight link ClassName Identifier -execute "highlight ClassName ctermfg=4 guifg=".yellow - -" Just some special color, why not? -syn match print " System.out." -execute "highlight print ctermfg=4 guifg=".yellow - -"objects (ex: String) -execute "highlight Constant ctermfg=4 guifg=".yellow - -" class -syn match javaClassDecl2 " class\> " -execute "highlight javaClassDecl2 ctermfg=4 guifg=".purple - -" package -execute "highlight javaExternal ctermfg=4 guifg=".purple - -"if else switch -execute "highlight javaConditional ctermfg=4 guifg=".purple - -"while for do -execute "highlight javaRepeat ctermfg=4 guifg=".purple - -"true flase -execute "highlight javaBoolean ctermfg=4 guifg=".orange - - -" null -syn match null "\v[ =]null[; ]" -execute "highlight null ctermfg=4 guifg=".orange - - -" this super -execute "highlight javaTypedef ctermfg=4 guifg=".purple - -" var new instanceof -execute "highlight javaOperator ctermfg=4 guifg=".purple - -" return -execute "highlight javaStatement ctermfg=4 guifg=".purple - -" static synchronized transient volatile final strictfp serializable -execute "highlight javaStorageClass ctermfg=4 guifg=".purple - -"throw try catch finally -execute "highlight javaExceptions ctermfg=4 guifg=".purple - -" assert -execute "highlight javaAssert ctermfg=4 guifg=".purple - -" synchronized throws -execute "highlight javaMethodDecl ctermfg=4 guifg=".red - -" extends implements interface -execute "highlight javaClassDecl ctermfg=4 guifg=".red - -" interface -execute "highlight javaClassDecl ctermfg=4 guifg=".purple - -" break continue skipwhite -execute "highlight javaBranch ctermfg=4 guifg=".purple - -" public protected private abstract -execute "highlight javaScopeDecl ctermfg=4 guifg=".purple - - -""""""""""""""""""""""""""""""""""""""' -" java 9... -" module transitive -execute "highlight javaModuleStorageClass ctermfg=4 guifg=".purple - - -" open requires exports opens uses provides -execute "highlight javaModuleStmt ctermfg=4 guifg=".yellow - - -" to with -execute "highlight javaModuleExternal ctermfg=4 guifg=".red - - -""""""""""""""""""""""""""""""""""""""""" -" lambda -execute "highlight javaLambdaDef ctermfg=4 guifg=".cyan - - -"""""""""""""""""""""""""""""""""""""""""" -" clone equals finalize getClass hashCode -" notify notifyAll toString wait -execute "highlight javaLangObject ctermfg=4 guifg=".yellow - - - - - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -