From a9ceae32286b080797e92fe4725ea1280fbc85d9 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sun, 3 Mar 2019 20:28:46 +0100 Subject: Restructure vim configuration * Use integrated plugin manager * Switch to nvim instead of continuing to maintain a config for both vims --- pkgs/custom-vim/asset/rc.vim | 130 --------------------- .../vim-color-akr/autoload/airline/themes/akr.vim | 86 -------------- pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim | 93 --------------- 3 files changed, 309 deletions(-) delete mode 100644 pkgs/custom-vim/asset/rc.vim delete mode 100644 pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim delete mode 100644 pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim (limited to 'pkgs/custom-vim/asset') diff --git a/pkgs/custom-vim/asset/rc.vim b/pkgs/custom-vim/asset/rc.vim deleted file mode 100644 index eebe6b4..0000000 --- a/pkgs/custom-vim/asset/rc.vim +++ /dev/null @@ -1,130 +0,0 @@ -syntax enable -filetype plugin indent on - -colorscheme akr - -set encoding=utf-8 -set showcmd -set nocompatible -set nocursorline -set number -set lazyredraw -set ttyfast -set mouse=a -set t_Co=256 -set shell=/bin/sh -set sessionoptions-=options - -set directory=~/.vim/swap//,. - -set undofile -set undodir=~/.vim/undo - -set wrap -set tabstop=4 shiftwidth=4 -set backspace=indent,eol,start -set linebreak - -set hlsearch -set incsearch -set ignorecase -set smartcase - -set wildchar= wildmenu wildmode=full - -let mapleader="," - -map s :let @/="" -map c zz -map d - -nmap :e# -nmap f za -nmap F zA - -" disable to override default on neovim -set noautoread - -autocmd InsertEnter * :setlocal nohlsearch -autocmd InsertLeave * :setlocal hlsearch - -autocmd FileType scheme setlocal shiftwidth=2 tabstop=2 expandtab -autocmd FileType lisp setlocal shiftwidth=2 tabstop=2 expandtab -autocmd FileType racket setlocal shiftwidth=2 tabstop=2 expandtab -autocmd FileType haskell setlocal shiftwidth=2 tabstop=4 softtabstop=2 shiftround expandtab -autocmd FileType pandoc setlocal nonumber autoread -autocmd FileType pandoc let g:airline#extensions#whitespace#checks=['indent', 'trailing', 'long'] - -autocmd BufNewFile,BufRead *.tikz setlocal syntax=tex - -nnoremap :bnext -nnoremap :bprev - -" select previous line on file reload, useful when cycling file extensions -autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g`\" zz" | endif -nnoremap :CounterpointNext -nnoremap :CounterpointPrevious - -nnoremap gT -nnoremap gt -nnoremap @q -nnoremap J } -nnoremap K { - -nmap << -nmap >> -vmap >gv - -nmap [e -nmap ]e -vmap [egv -vmap ]egv - -nnoremap h -nnoremap l -nnoremap k -nnoremap j - -set laststatus=2 -let g:airline_theme = 'akr' -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#show_buffers = 1 -let g:airline#extensions#tabline#show_tab_type = 1 -let g:airline#extensions#tabline#fnamemod = ':t' -let g:airline#extensions#tabline#formatter = 'unique_tail_improved' -let g:airline#extensions#tabline#buffer_idx_mode = 0 -let g:airline#extensions#tabline#show_close_button = 0 -let g:airline#extensions#tabline#show_splits = 0 -let g:airline#extensions#tabline#show_tab_nr = 0 -let g:airline#extensions#whitespace#mixed_indent_algo = 2 - -let g:gitgutter_enabled = 0 -let g:gitgutter_highlight_lines = 1 - -let g:goyo_width = 90 -let g:goyo_margin_top = 1 -let g:goyo_margin_bottom = 0 - -nnoremap :MundoToggle -nnoremap :GitGutterToggle -nnoremap :SignatureToggleSigns -nnoremap :Goyo - -nnoremap :CtrlPBuffer -nnoremap :CtrlPMixed -nnoremap :CtrlPTag -nnoremap :CtrlPBufTag - -let g:ctrlp_custom_ignore = { -\ 'dir': '\.git$', -\ 'file': '\.o$\|\.d$' -\ } - -let g:undotree_SetFocusWhenToggle = 1 - -let g:localvimrc_sandbox = 0 -let g:localvimrc_persistent = 2 - -let g:wordmotion_prefix = '' -nmap w diff --git a/pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim b/pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim deleted file mode 100644 index 1b847c4..0000000 --- a/pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim +++ /dev/null @@ -1,86 +0,0 @@ -" Normal mode -" [ guifg , guibg , ctermfg , ctermbg ] -let s:N1 = [ '#161616' , '#909636' , 0 , 10 ] " mode -let s:N2 = [ '#161616' , '#909636' , 0 , 10 ] " info -let s:N3 = [ '#909636' , '#161616' , 10 , 0 ] " statusline -let s:N4 = [ '#352F6A' , 4 ] " mode modified - -" Insert mode -let s:I1 = [ '#E4E093' , '#352F6A' , 3 , 4 ] -let s:I2 = [ '#E4E093' , '#352F6A' , 3 , 4 ] -let s:I3 = [ '#909636' , '#161616' , 10 , 0 ] -let s:I4 = [ '#352F6A' , 4 ] - -" Visual mode -let s:V1 = [ '#E4E093' , '#8C3346' , 3 , 1 ] -let s:V2 = [ '#E4E093' , '#8C3346' , 3 , 1 ] -let s:V3 = [ '#909636' , '#161616' , 10 , 0 ] -let s:V4 = [ '#352F6A' , 4 ] - -" Replace mode -let s:R1 = [ '#E4E093' , '#352F6A' , 3 , 4 ] -let s:R2 = [ '#E4E093' , '#352F6A' , 3 , 4 ] -let s:R3 = [ '#909636' , '#161616' , 10 , 0 ] -let s:R4 = [ '#352F6A' , 4 ] - -" Paste mode -let s:PA = [ '#352F6A' , 4 ] - -" Info modified -let s:IM = [ '#909636' , 10 ] - -" Inactive mode -let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ] - -let g:airline#themes#akr#palette = {} - -let g:airline#themes#akr#palette.accents = { - \ 'red': [ '#8C3346' , '' , 1 , '' , '' ], - \ } - -let g:airline#themes#akr#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) -let g:airline#themes#akr#palette.normal_modified = { - \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , '' ] , - \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , '' ] , - \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , '' ] } - - -let g:airline#themes#akr#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) -let g:airline#themes#akr#palette.insert_modified = { - \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , '' ] , - \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , '' ] , - \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , '' ] } - - -let g:airline#themes#akr#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) -let g:airline#themes#akr#palette.visual_modified = { - \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , '' ] , - \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , '' ] , - \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , '' ] } - - -let g:airline#themes#akr#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) -let g:airline#themes#akr#palette.replace_modified = { - \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , '' ] , - \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , '' ] , - \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , '' ] } - - -let g:airline#themes#akr#palette.insert_paste = { - \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] , - \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , '' ] , - \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , '' ] } - - -let g:airline#themes#akr#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA) -let g:airline#themes#akr#palette.inactive_modified = { - \ 'airline_c': [ s:N4[0] , '' , s:N4[1] , '' , '' ] } - - -if !get(g:, 'loaded_ctrlp', 0) - finish -endif -let g:airline#themes#akr#palette.ctrlp = airline#extensions#ctrlp#generate_color_map( - \ [ '#909636' , '#161616' , 10 , 0 , '' ] , - \ [ '#909636' , '#161616' , 10 , 0 , '' ] , - \ [ '#161616' , '#909636' , 0 , 10 , 'bold' ] ) diff --git a/pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim b/pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim deleted file mode 100644 index 4ffd2ca..0000000 --- a/pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim +++ /dev/null @@ -1,93 +0,0 @@ -hi clear -syntax reset -let background = "dark" -let g:colors_name = "akr" - -hi Normal cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=0 guibg=#161616 -hi NonText cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=0 guibg=#161616 -hi LineNr cterm=NONE gui=NONE ctermfg=241 guifg=#606060 ctermbg=NONE guibg=NONE - -hi Cursor cterm=reverse gui=reverse ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=235 guibg=#262626 -hi CursorLineNr cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=235 guibg=#262626 -hi CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#F2F2F2 -hi ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=2 guibg=#AADB0F -hi SignColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=2 guibg=#AADB0F - -hi TabLine cterm=NONE gui=NONE ctermfg=10 guifg=#909636 ctermbg=0 guibg=#161616 -hi TabLineFill cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#F2F2F2 -hi TabLineSel cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=10 guibg=#909636 -hi StatusLine cterm=NONE gui=NONE ctermfg=10 guifg=#909636 ctermbg=235 guibg=#262626 -hi StatusLineNC cterm=NONE gui=NONE ctermfg=10 guifg=#909636 ctermbg=0 guibg=#161616 -hi VertSplit cterm=NONE gui=NONE ctermfg=235 guifg=#262626 ctermbg=235 guibg=#262626 -hi Visual cterm=NONE gui=NONE ctermfg=3 guifg=#E4E093 ctermbg=1 guibg=#8C3346 -hi VisualNOS cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE - -hi Pmenu cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=232 guibg=#080808 -hi PmenuSbar cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=235 guibg=#262626 -hi PmenuSel cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=241 guibg=#606060 -hi PmenuThumb cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=247 guibg=#9e9e9e - -hi DiffAdd cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=10 guibg=#909636 -hi DiffChange cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=3 guibg=#E4E093 -hi DiffDelete cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=1 guibg=#8C3346 -hi DiffText cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=4 guibg=#352F6A - -hi Search cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=10 guibg=#909636 -hi IncSearch cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=2 guibg=#AADB0F - -hi Comment cterm=NONE gui=italic ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Type cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi Boolean cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi String cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi Number cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi Title cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi Constant cterm=bold gui=italic ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Identifier cterm=bold gui=bold ctermfg=7 guifg=#F2F2F2 ctermbg=0 guibg=#161616 -hi Statement cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi StorageClass cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi Conditional cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE - -hi MatchParen cterm=bold gui=bold ctermfg=0 guifg=#161616 ctermbg=2 guibg=#AADB0F -hi Special cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Tabs cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=235 guibg=#262626 -hi ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#F2F2F2 -hi Conceal cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Directory cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Error cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=1 guibg=#8C3346 -hi ErrorMsg cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=1 guibg=#8C3346 -hi FoldColumn cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Folded cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi ModeMsg cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi MoreMsg cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi Question cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi SignColumn cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi Underlined cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi WarningMsg cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=9 guibg=#FF0000 -hi WildMenu cterm=NONE gui=NONE ctermfg=0 guifg=#161616 ctermbg=10 guibg=#909636 -hi PreProc cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE - -hi xmlTagName cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi xmlEndTag cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi xmlNamespace cterm=bold gui=bold ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE -hi xmlAttrib cterm=NONE gui=NONE ctermfg=7 guifg=#F2F2F2 ctermbg=NONE guibg=NONE - -hi texSection cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi texMathZoneX cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texMathText cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texMathSymbol cterm=bold gui=bold ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texMathOper cterm=bold gui=bold ctermfg=2 guifg=#AADB0F ctermbg=8 guibg=#000000 -hi texMathMatcher cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texTypeStyle cterm=bold gui=bold ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texStatement cterm=bold gui=bold ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi texGreek cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texBeginEnd cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE -hi texSubscript cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texSuperscript cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 -hi texBeginEndName cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE -hi Conceal cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=8 guibg=#000000 - -hi prologClauseHead cterm=NONE gui=NONE ctermfg=2 guifg=#AADB0F ctermbg=NONE guibg=NONE - -match Tabs /[\t]\+/ -- cgit v1.2.3