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 --- default.nix | 5 +- pkgs/custom-neovim/asset/rc.vim | 130 +++++++++++++++++++++ .../vim-color-akr/autoload/airline/themes/akr.vim | 86 ++++++++++++++ .../asset/vim-color-akr/colors/akr.vim | 93 +++++++++++++++ pkgs/custom-neovim/default.nix | 51 +++++++- pkgs/custom-neovim/plugins.nix | 84 +++++++++++++ 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 --------------- pkgs/custom-vim/custom.nix | 42 ------- pkgs/custom-vim/default.nix | 10 -- pkgs/custom-vim/plugins.nix | 84 ------------- web/tree/info.md | 2 +- 13 files changed, 443 insertions(+), 453 deletions(-) create mode 100644 pkgs/custom-neovim/asset/rc.vim create mode 100644 pkgs/custom-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim create mode 100644 pkgs/custom-neovim/asset/vim-color-akr/colors/akr.vim create mode 100644 pkgs/custom-neovim/plugins.nix 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 delete mode 100644 pkgs/custom-vim/custom.nix delete mode 100644 pkgs/custom-vim/default.nix delete mode 100644 pkgs/custom-vim/plugins.nix diff --git a/default.nix b/default.nix index ff1439b..1552309 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,9 @@ -{ system ? builtins.currentSystem }: +{ system ? builtins.currentSystem, pkgs ? import { inherit system; }, ... }: let - pkgs = import { inherit system; }; - callPackage = pkgs.lib.callPackageWith (pkgs // custom); custom = { - custom-vim = callPackage ./pkgs/custom-vim { }; custom-neovim = callPackage ./pkgs/custom-neovim { }; oomox-gtk-theme = t : callPackage ./pkgs/oomox-gtk-theme { theme = t; }; diff --git a/pkgs/custom-neovim/asset/rc.vim b/pkgs/custom-neovim/asset/rc.vim new file mode 100644 index 0000000..eebe6b4 --- /dev/null +++ b/pkgs/custom-neovim/asset/rc.vim @@ -0,0 +1,130 @@ +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-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim b/pkgs/custom-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim new file mode 100644 index 0000000..1b847c4 --- /dev/null +++ b/pkgs/custom-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim @@ -0,0 +1,86 @@ +" 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-neovim/asset/vim-color-akr/colors/akr.vim b/pkgs/custom-neovim/asset/vim-color-akr/colors/akr.vim new file mode 100644 index 0000000..4ffd2ca --- /dev/null +++ b/pkgs/custom-neovim/asset/vim-color-akr/colors/akr.vim @@ -0,0 +1,93 @@ +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]\+/ diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 34e2fcd..8568c08 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -1,6 +1,51 @@ { pkgs, ... }: -pkgs.neovim.override { - vimAlias = false; - configure = import ../custom-vim/custom.nix { pkgs = pkgs; }; +let + plugins = pkgs.callPackage ./plugins.nix {}; + +in pkgs.neovim.override { + vimAlias = true; + configure = { + customRC = builtins.readFile ./asset/rc.vim; + + packages.myVimPackage = with pkgs.vimPlugins // plugins; { + start = [ + # UI enhancements + airline + goyo + + # autocomplete + LanguageClient-neovim + deoplete-nvim + + # load project specific config + vim-localvimrc + + # colors, syntax highlighting + vim-color-akr + vim-polyglot + vim-addon-nix + + # file, buffer management + ctrlp + vim-counterpoint + vim-signature + + # undo history tree + vim-mundo + + # editing enhancements + vim-unimpaired + vim-wordmotion + vim-autoformat + vim-sandwich + far + + # git integration + vim-gitgutter + gina + + ]; + }; + }; } diff --git a/pkgs/custom-neovim/plugins.nix b/pkgs/custom-neovim/plugins.nix new file mode 100644 index 0000000..9ff92f2 --- /dev/null +++ b/pkgs/custom-neovim/plugins.nix @@ -0,0 +1,84 @@ +{ pkgs, fetchgit }: + +let + buildVimPlugin = pkgs.vimUtils.buildVimPluginFrom2Nix; +in { + + vim-unimpaired = buildVimPlugin { + name = "vim-unimpaired"; + src = fetchgit { + url = "https://github.com/tpope/vim-unimpaired"; + rev = "bacf1543cc957d47aa70c1dc0bcf99392925b008"; + sha256 = "0jx9xybjswnaa6v7hhfqm2nyd5v54xjd02ikw56wm7h6sfgchllx"; + }; + }; + + vim-counterpoint = buildVimPlugin { + name = "vim-counterpoint"; + src = fetchgit { + url = "https://github.com/jpetrie/vim-counterpoint"; + rev = "93d8fd9d18a378ab3db39411300716129358211c"; + sha256 = "02spr4mhj2035q45j8bf502jgpq76a518nv913zx46byfbl69lps"; + }; + }; + + vim-mundo = buildVimPlugin { + name = "vim-mundo"; + src = fetchgit { + url = "https://github.com/simnalamburt/vim-mundo"; + rev = "v3.0.1"; + sha256 = "052ywnd5r6ksiz1lsyqya9b94fdb0gr7krkdpc1gw1fx11qk5x2v"; + }; + }; + + vim-toggle-ui-elements = buildVimPlugin { + name = "vim-toggle-ui-elements"; + src = fetchgit { + url = "https://github.com/muellan/vim-toggle-ui-elements"; + rev = "325f60fe8030cc2a2312d67191f214c5c39ef283"; + sha256 = "0fl9kvp799l3nzy8lnjcb0y1hr3g1ba8n9v2mx83yaqdma0rvhi1"; + }; + }; + + far = buildVimPlugin { + name = "far"; + src = fetchgit { + url = "https://github.com/brooth/far.vim.git"; + rev = "0382845a87abd89d169a2fd8eb88c5a2241d496c"; + sha256 = "1sk5hz73fglhn7g8p9m2a6gx49l2zndv9hav1zna903adsz8abfp"; + }; + }; + + vim-wordmotion = buildVimPlugin { + name = "vim-wordmotion"; + src = fetchgit { + url = "https://github.com/chaoren/vim-wordmotion.git"; + rev = "e0a7bc3a27802803788741802113ff2781235951"; + sha256 = "1k1mlhy9z96wx3l4ijvndm3d9il82qg8xgawck4sc0hr7yxvg4ap"; + }; + }; + + gina = buildVimPlugin { + name = "gina"; + src = fetchgit { + url = "https://github.com/lambdalisue/gina.vim.git"; + rev = "v1.0.0"; + sha256 = "0dd8kn54a17qi73namkbdw0gaskddy9krhrzcqp6x9cjinvjyrhv"; + }; + }; + + vim-sandwich = buildVimPlugin { + name = "vim-sandwich"; + src = fetchgit { + url = "https://github.com/machakann/vim-sandwich.git"; + rev = "d441cf5a450f65dbf95eca3fa1138806884a7d58"; + sha256 = "1qkadkisfw21834848rphliry5h6h9mj010n2p3y27wp6xkq9phj"; + }; + }; + + vim-color-akr = buildVimPlugin { + name = "vim-color-akr"; + src = ./asset/vim-color-akr; + }; + +} 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]\+/ diff --git a/pkgs/custom-vim/custom.nix b/pkgs/custom-vim/custom.nix deleted file mode 100644 index 4c0c72c..0000000 --- a/pkgs/custom-vim/custom.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs }: - -let - vimrc = builtins.readFile ./asset/rc.vim; - plugins = pkgs.callPackage ./plugins.nix {}; -in -{ - vam = { - knownPlugins = pkgs.vimPlugins // plugins; - pluginDictionaries = [ - { names = [ - # UI enhancements - "vim-airline" - "goyo" - "vim-toggle-ui-elements" - # load project specific config - "vim-localvimrc" - # colors, syntax highlighting - "vim-color-akr" - "vim-polyglot" - "vim-addon-nix" - # file, buffer management - "ctrlp" - "vim-counterpoint" - "vim-signature" - # undo history tree - "vim-mundo" - # editing enhancements - "vim-wordmotion" - "vim-autoformat" - "vim-sandwich" - "vim-unimpaired" - "vim-far" - # git integration - "fugitive" - "vim-gitgutter" - "vim-gina" - ];} - ]; - }; - customRC = vimrc; -} diff --git a/pkgs/custom-vim/default.nix b/pkgs/custom-vim/default.nix deleted file mode 100644 index 7faa9c1..0000000 --- a/pkgs/custom-vim/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: - -let - custom-vim = pkgs.vim_configurable.customize { - name = "vim"; - vimrcConfig = (import ./custom.nix { pkgs = pkgs; }); - }; -in pkgs.lib.overrideDerivation custom-vim ( o: { - gui = "gtk3"; -} ) diff --git a/pkgs/custom-vim/plugins.nix b/pkgs/custom-vim/plugins.nix deleted file mode 100644 index fb22acb..0000000 --- a/pkgs/custom-vim/plugins.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ pkgs, fetchgit }: - -let - buildVimPlugin = pkgs.vimUtils.buildVimPluginFrom2Nix; -in { - - "vim-unimpaired" = buildVimPlugin { - name = "vim-unimpaired"; - src = fetchgit { - url = "https://github.com/tpope/vim-unimpaired"; - rev = "bacf1543cc957d47aa70c1dc0bcf99392925b008"; - sha256 = "0jx9xybjswnaa6v7hhfqm2nyd5v54xjd02ikw56wm7h6sfgchllx"; - }; - }; - - "vim-counterpoint" = buildVimPlugin { - name = "vim-counterpoint"; - src = fetchgit { - url = "https://github.com/jpetrie/vim-counterpoint"; - rev = "93d8fd9d18a378ab3db39411300716129358211c"; - sha256 = "02spr4mhj2035q45j8bf502jgpq76a518nv913zx46byfbl69lps"; - }; - }; - - "vim-mundo" = buildVimPlugin { - name = "vim-mundo"; - src = fetchgit { - url = "https://github.com/simnalamburt/vim-mundo"; - rev = "v3.0.1"; - sha256 = "052ywnd5r6ksiz1lsyqya9b94fdb0gr7krkdpc1gw1fx11qk5x2v"; - }; - }; - - "vim-toggle-ui-elements" = buildVimPlugin { - name = "vim-toggle-ui-elements"; - src = fetchgit { - url = "https://github.com/muellan/vim-toggle-ui-elements"; - rev = "325f60fe8030cc2a2312d67191f214c5c39ef283"; - sha256 = "0fl9kvp799l3nzy8lnjcb0y1hr3g1ba8n9v2mx83yaqdma0rvhi1"; - }; - }; - - "vim-far" = buildVimPlugin { - name = "vim-far"; - src = fetchgit { - url = "https://github.com/brooth/far.vim.git"; - rev = "0382845a87abd89d169a2fd8eb88c5a2241d496c"; - sha256 = "1sk5hz73fglhn7g8p9m2a6gx49l2zndv9hav1zna903adsz8abfp"; - }; - }; - - "vim-wordmotion" = buildVimPlugin { - name = "vim-wordmotion"; - src = fetchgit { - url = "https://github.com/chaoren/vim-wordmotion.git"; - rev = "e0a7bc3a27802803788741802113ff2781235951"; - sha256 = "1k1mlhy9z96wx3l4ijvndm3d9il82qg8xgawck4sc0hr7yxvg4ap"; - }; - }; - - "vim-gina" = buildVimPlugin { - name = "vim-gina"; - src = fetchgit { - url = "https://github.com/lambdalisue/gina.vim.git"; - rev = "v1.0.0"; - sha256 = "0dd8kn54a17qi73namkbdw0gaskddy9krhrzcqp6x9cjinvjyrhv"; - }; - }; - - "vim-sandwich" = buildVimPlugin { - name = "vim-sandwich"; - src = fetchgit { - url = "https://github.com/machakann/vim-sandwich.git"; - rev = "d441cf5a450f65dbf95eca3fa1138806884a7d58"; - sha256 = "1qkadkisfw21834848rphliry5h6h9mj010n2p3y27wp6xkq9phj"; - }; - }; - - "vim-color-akr" = buildVimPlugin { - name = "vim-color-akr"; - src = ./asset/vim-color-akr; - }; - -} diff --git a/web/tree/info.md b/web/tree/info.md index 9e6df3e..cd1d773 100644 --- a/web/tree/info.md +++ b/web/tree/info.md @@ -31,7 +31,7 @@ Projects of my own: Configurations of my own: -* [custom-vim](https://code.kummerlaender.eu/pkgs/tree/pkgs/custom-vim) +* [custom-neovim](https://code.kummerlaender.eu/pkgs/tree/pkgs/custom-neovim) Projects neither of my own nor of my configuration: -- cgit v1.2.3