From 1996ef15613f2d4773017128bba1a719a1b63a19 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sat, 20 Feb 2021 21:27:26 +0100 Subject: Move to lua based vimrc --- .vim/autoload/alternate.vim | 8 - .vim/autoload/daymode.vim | 27 --- .vim/autoload/fasd.vim | 18 -- .vim/autoload/fuzz.vim | 140 -------------- .../lightline/colorscheme/papercolor_dim.vim | 59 ------ .vim/autoload/numbertoggle.vim | 17 -- .vim/autoload/popup.vim | 215 --------------------- 7 files changed, 484 deletions(-) delete mode 100644 .vim/autoload/alternate.vim delete mode 100644 .vim/autoload/daymode.vim delete mode 100644 .vim/autoload/fasd.vim delete mode 100644 .vim/autoload/fuzz.vim delete mode 100644 .vim/autoload/lightline/colorscheme/papercolor_dim.vim delete mode 100644 .vim/autoload/numbertoggle.vim delete mode 100644 .vim/autoload/popup.vim (limited to '.vim/autoload') diff --git a/.vim/autoload/alternate.vim b/.vim/autoload/alternate.vim deleted file mode 100644 index e179fce..0000000 --- a/.vim/autoload/alternate.vim +++ /dev/null @@ -1,8 +0,0 @@ -function! alternate#alternate() - let l:function_name = 'Alternate_' . &filetype - if exists('*' . l:function_name) - execute l:function_name - else - echo 'no alternate function defined for "' . &filetype . '"' - endif -endfunction diff --git a/.vim/autoload/daymode.vim b/.vim/autoload/daymode.vim deleted file mode 100644 index b2c8cdb..0000000 --- a/.vim/autoload/daymode.vim +++ /dev/null @@ -1,27 +0,0 @@ -function! s:lightline_update(colors) - if exists('g:loaded_lightline') - try - let g:lightline.colorscheme = a:colors - call lightline#init() - call lightline#colorscheme() - call lightline#update() - catch - endtry - endif -endfunction - -function! daymode#switch(bang) - if a:bang - set background=dark - execute 'colorscheme' get(g:, 'daymode_colorscheme_night', 'default') - call s:lightline_update(get(g:, 'daymode_lightline_colorscheme_night', 'PaperColor')) - else - set background=light - execute 'colorscheme' get(g:, 'daymode_colorscheme_day', 'default') - call s:lightline_update(get(g:, 'daymode_lightline_colorscheme_day', 'PaperColor')) - endif - - " if exists("syntax_on") - " syntax reset - " endif -endfunction diff --git a/.vim/autoload/fasd.vim b/.vim/autoload/fasd.vim deleted file mode 100644 index 7ef53bd..0000000 --- a/.vim/autoload/fasd.vim +++ /dev/null @@ -1,18 +0,0 @@ -" not sure if I am using this -finish - -if exists('g:loaded_fasd') - finish -endif -let g:loaded_fasd = 1 -let g:fasd_path = '/home/robert/.dotfiles/zsh/.zplug/repos/sorin-ionescu/prezto/modules/fasd/external/fasd' - -function! fasd#run(args) abort - return system(g:fasd_path . ' -d -0 ' . a:args) -endfunction - -function! fasd#cd(args) abort - execute 'tcd' . fasd#run(a:args) -endfunction - -command! -nargs=1 J :call fasd#cd() diff --git a/.vim/autoload/fuzz.vim b/.vim/autoload/fuzz.vim deleted file mode 100644 index 39d02f1..0000000 --- a/.vim/autoload/fuzz.vim +++ /dev/null @@ -1,140 +0,0 @@ -function! s:prompt(str) - return a:str . g:fuzz_prompt . ' ' -endfunction - -function! s:fuzz(name, opts) - " call skim#run(skim#wrap(a:name, a:opts, 0)) - call fzf#run(fzf#wrap(a:name, a:opts, 0)) -endfunction - -function! s:strip(str) - return substitute(a:str, '^\s*\|\s*$', '', 'g') -endfunction - -function! s:open(cmd, target) - if stridx('edit', a:cmd) == 0 && fnamemodify(a:target, ':p') ==# expand('%:p') - return - endif - execute a:cmd fnameescape(a:target) -endfunction - - -" rg {{{ -function s:map_rg_output(line) - let parts = split(a:line, ':') - return {'filename': &acd ? fnamemodify(parts[0], ':p') : parts[0], 'lnum': parts[1], 'text': join(parts[2:], ':')} -endfunction - -function s:rg_handler(lines) - if len(a:lines) < 1 - return - endif - let first = map(filter(a:lines, 'len(v:val)'), 's:map_rg_output(v:val)')[0] - call s:open('edit', first.filename) - execute first.lnum - normal! zz -endfunction - -function s:rg(prompt, ...) - if !executable('rg') - echoerr 'rg not found' - return - endif - if len(a:000) < 1 || len(a:000[0]) < 1 - echoerr 'no arguments' - return - endif - - call s:fuzz(!empty(a:prompt) ? tolower(a:prompt) : 'rg', { - \ 'source': 'rg --line-number --no-heading --color=always --smart-case '.join(a:000[0], ' '), - \ 'sink*': function('s:rg_handler'), - \ 'options': ['--prompt', s:prompt(!empty(a:prompt) ? a:prompt : 'Rg'), - \ '--ansi', '--multi'] - \ }) -endfunction - -function! fuzz#rg(args) abort - call s:rg('', a:args) -endfunction -" }}} - -" files {{{ -function! fuzz#files() abort - call s:fuzz('files', { - \ 'options': ['--prompt', s:prompt('Fs')] - \ }) -endfunction -" }}} - -" buffers {{{ -function! s:buffers_list() - function! s:buflisted() - return filter(range(1, bufnr('$')), 'buflisted(v:val) && getbufvar(v:val, "&filetype") != "qf"') - endfunction - - function! s:format_buffer(b) - let name = bufname(a:b) - let name = empty(name) ? '[No Name]' : fnamemodify(name, ":p:~:.") - let flag = a:b == bufnr('') ? '%' : - \ (a:b == bufnr('#') ? '#' : ' ') - let modified = getbufvar(a:b, '&modified') ? ' [+]' : '' - let readonly = getbufvar(a:b, '&modifiable') ? '' : ' [RO]' - let extra = join(filter([modified, readonly], '!empty(v:val)'), '') - return s:strip(printf("[%s] %s\t%s\t%s", a:b, flag, name, extra)) - endfunction - - return map(sort(s:buflisted()), 's:format_buffer(v:val)') -endfunction - -function! s:buffers_handler(lines) - if len(a:lines) < 1 - return - endif - let b = matchstr(a:lines[0], '\[\zs[0-9]*\ze\]') - execute 'buffer' b -endfunction - -function! fuzz#buffers() abort - call s:fuzz('buffers', { - \ 'source': s:buffers_list(), - \ 'sink*': function('s:buffers_handler'), - \ 'options': ['--prompt', s:prompt('Buf')] - \ }) -endfunction -" }}} - -" commands {{{ -function! s:command_handler(lines) - if len(a:lines) < 1 - return - endif - call feedkeys(':'.a:lines[0]) -endfunction - -function! fuzz#commands() abort - call s:fuzz('commands', { - \ 'source': sort(getcompletion('', 'command')), - \ 'sink*': function('s:command_handler'), - \ 'options': ['--prompt', s:prompt('Cmd')] - \ }) -endfunction -" }}} - -function! fuzz#cmdoptions(...) abort - let opts = sort(['files', 'buffers', 'commands', 'rg']) - return join(opts, "\n") -endfunction - -function! fuzz#exec(cmd, ...) abort - if a:cmd == 'files' - call fuzz#files() - elseif a:cmd == 'buffers' - call fuzz#buffers() - elseif a:cmd == 'commands' - call fuzz#commands() - elseif a:cmd == 'rg' - call fuzz#rg(a:000) - else - echoerr 'Unknown command ' . a:cmd - endif -endfunction diff --git a/.vim/autoload/lightline/colorscheme/papercolor_dim.vim b/.vim/autoload/lightline/colorscheme/papercolor_dim.vim deleted file mode 100644 index 0ba29f3..0000000 --- a/.vim/autoload/lightline/colorscheme/papercolor_dim.vim +++ /dev/null @@ -1,59 +0,0 @@ -" papercolor_dim : a less flashy statusline -" -" Adapted from the Papercolor_dark theme: -" ============================================================================= -" Filename: autoload/lightline/colorscheme/PaperColor_dark.vim -" Author: TKNGUE -" License: MIT License -" Last Change: 2015-07-27 06:01 -" ============================================================================= - -" colors -let s:color00 = '#1c1c1c' -let s:color01 = '#af005f' -let s:color02 = '#5faf00' -let s:color03 = '#d7af5f' -let s:color04 = '#5fafd7' -let s:color05 = '#808080' -let s:color06 = '#d7875f' -let s:color07 = '#d0d0d0' -let s:color08 = '#585858' -let s:color09 = '#5faf5f' -let s:color10 = '#afd700' -let s:color11 = '#af87d7' -let s:color12 = '#ffaf00' -let s:color13 = '#ff5faf' -let s:color14 = '#00afaf' -let s:color15 = '#5f8787' -let s:color16 = '#5fafd7' -let s:color17 = '#d7af00' - -let s:black = '#1c1c1c' -let s:grey_dim = '#3a3a3a' -let s:grey_dimmer = '#262626' -let s:white = '#d0d0d0' -let s:white_dim = '#bdc0ba' - -" palette -let s:p = {'command': {}, 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} - -let s:p.normal.left = [[ s:white, s:grey_dim ], [ s:white_dim, s:grey_dimmer ], [ s:white_dim, 'none' ]] -let s:p.normal.right = [[ s:white, s:grey_dim ], [ s:white_dim, s:grey_dimmer ], [ s:white_dim, 'none' ]] -let s:p.normal.middle = [[ s:white_dim, 'none' ]] -let s:p.normal.error = [[ s:black, s:color01 ]] - -let s:p.inactive.right = [[ s:white_dim, s:grey_dim ], [ s:white_dim, s:grey_dim ]] -let s:p.inactive.middle = [[ s:white_dim, s:grey_dim ]] -let s:p.inactive.right = [[ s:white_dim, s:grey_dim ], [ s:white_dim, s:grey_dim ]] - -let s:p.insert.left = [[ s:black, s:color04 ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] -let s:p.replace.left = [[ s:black, s:color06 ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] -let s:p.visual.left = [[ s:black, s:color11 ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] -let s:p.command.left = [[ s:color03, s:grey_dim, 'italic' ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] - -let s:p.tabline.tabsel = [[ s:white, s:color08 ]] -let s:p.tabline.left = [[ s:white_dim, s:grey_dimmer ]] -let s:p.tabline.middle = copy(s:p.normal.middle) -let s:p.tabline.right = copy(s:p.normal.right) - -let g:lightline#colorscheme#papercolor_dim#palette = lightline#colorscheme#fill(s:p) diff --git a/.vim/autoload/numbertoggle.vim b/.vim/autoload/numbertoggle.vim deleted file mode 100644 index fe8ddcc..0000000 --- a/.vim/autoload/numbertoggle.vim +++ /dev/null @@ -1,17 +0,0 @@ -function! s:relative_linenumbers() - set number - set relativenumber -endfunc - -function! s:absolute_linenumbers() - set number - set norelativenumber -endfunc - -function! numbertoggle#switch() - if &relativenumber - call s:absolute_linenumbers() - else - call s:relative_linenumbers() - endif -endfunc diff --git a/.vim/autoload/popup.vim b/.vim/autoload/popup.vim deleted file mode 100644 index e9f27d4..0000000 --- a/.vim/autoload/popup.vim +++ /dev/null @@ -1,215 +0,0 @@ -if !(has('nvim') && exists('*nvim_win_set_config')) - echoerr "floating window not supported" - finish -endif - -if exists('g:nvim_popup_loaded') - finish -endif -let g:nvim_popup_loaded = 1 - -let s:popup = {} - -function! s:popup__floating_win_opts(width, height) dict abort - let bottom_line = line('w0') + winheight(0) - 1 - if self.opened_at[1] + a:height <= bottom_line - let vert = 'N' - let row = 1 - else - let vert = 'S' - let row = 0 - endif - if self.opened_at[2] + a:width <= &columns - let hor = 'W' - let col = 0 - else - let hor = 'E' - let col = 1 - endif - return { - \ 'style': 'minimal', - \ 'relative': 'cursor', - \ 'anchor': vert.hor, - \ 'row': row, - \ 'col': col, - \ 'width': a:width, - \ 'height': a:height, - \ } -endfunction -let s:popup.floating_win_opts = funcref('s:popup__floating_win_opts') - -function! s:popup__window_size() dict abort - let max_width = winwidth(0) / 2 - let max_height = winheight(0) / 3 - let width = 0 - let height = 0 - for line in self.contents - let lw = strdisplaywidth(line) - if lw > width - if lw > max_width - let height += lw / popup_max_width + 1 - let width = popup_max_width - continue - endif - let width = lw - endif - let height += 1 - endfor - let width += 1 - - if height > max_height - let height = max_height - endif - - return [width, height] -endfunction -let s:popup.window_size = funcref('s:popup__window_size') - -function! s:popup__get_winnr() dict abort - return win_id2win(self.win_id) -endfunction -let s:popup.get_winnr = funcref('s:popup__get_winnr') - -function! s:popup__get_opener_winnr() dict abort - let winnr = win_id2win(self.opener_winid) - if winnr != 0 - return winnr - endif - let winnr = bufwinnr(self.opener_bufnr) - if winnr > 0 - return winnr - endif - return 0 -endfunction -let s:popup.get_opener_winnr = funcref('s:popup__get_opener_winnr') - -function! s:popup_open() dict abort - let self.opened_at = getpos('.') - let self.opener_bufnr = bufnr('%') - let self.opener_winid = win_getid() - let self.type = 'floating' - - let [w, h] = self.window_size() - - if self.type ==# 'floating' - let opts = self.floating_win_opts(w, h) - let win_id = nvim_open_win(self.opener_bufnr, v:true, opts) - endif - - enew! - let popup_bufnr = bufnr('%') - setlocal - \ buftype=nofile bufhidden=hide nomodified nobuflisted noswapfile nonumber - \ nocursorline wrap nonumber norelativenumber signcolumn=no nofoldenable - \ nospell nolist nomodeline - if has_key(self.opts, 'filetype') - let &l:filetype = self.opts.filetype - endif - - call setline(1, self.contents) - setlocal nomodified nomodifiable - - if has('nvim') - setlocal winhl=Normal:NormalFloat,NormalNC:NormalFloat - endif - - nnoremap :call b:__popup.close() - nnoremap q :call b:__popup.close() - - let b:__popup = self - execute 'autocmd BufWipeout,BufLeave call getbufvar(' . popup_bufnr . ', "__popup").close()' - - if has_key(self.opts, 'enter') && !self.opts.enter - wincmd p - endif - - let self.bufnr = popup_bufnr - let self.win_id = win_id -endfunction -let s:popup.open = funcref('s:popup_open') - -function! s:popup__close() dict abort - if !has_key(self, 'bufnr') - return - endif - - let winnr = self.get_winnr() - if winnr > 0 - noautocmd execute winnr . 'wincmd c' - endif - - unlet self.bufnr - unlet self.win_id -endfunction -let s:popup.close = funcref('s:popup__close') - -function! s:popup__scroll(map) dict abort - let winnr = self.get_winnr() - if winnr == 0 - return - endif - execute winnr . 'wincmd w' - sandbox let input = eval('"\<'.a:map.'>"') - execute 'normal!' input - wincmd p -endfunction -let s:popup.scroll = funcref('s:popup__scroll') - -function! s:popup__update() dict abort - " Note: `:noautocmd` to prevent BufLeave autocmd event (#13) - " It should be ok because the cursor position is finally back to the first - " position. - - let prev_winnr = winnr() - - let popup_winnr = self.get_winnr() - if popup_winnr == 0 - return - endif - let opener_winnr = self.get_opener_winnr() - if opener_winnr == 0 - return - endif - - if opener_winnr != prev_winnr - noautocmd execute opener_winnr . 'wincmd w' - endif - - try - let [width, height] = self.window_size() - - " Window must be configured in opener buffer since the window position - " is relative to cursor - if self.type ==# 'floating' - let id = win_getid(popup_winnr) - if id == 0 - return - endif - let opts = self.floating_win_opts(width, height) - call nvim_win_set_config(id, opts) - endif - - noautocmd execute popup_winnr . 'wincmd w' - - if self.type ==# 'preview' - execute height . 'wincmd _' - endif - - setlocal modifiable - silent %delete _ - call setline(1, self.contents) - setlocal nomodified nomodifiable - finally - if winnr() != prev_winnr - noautocmd execute prev_winnr . 'wincmd w' - endif - endtry -endfunction -let s:popup.update = funcref('s:popup__update') - -function! popup#new(opts) abort - let p = deepcopy(s:popup) - let opts = { 'floating': v:true } - let p.opts = extend(opts, a:opts) - return p -endfunction -- cgit 1.4.1