summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2018-09-26 21:24:55 +0200
committerAdrian Kummerlaender2018-09-26 21:24:55 +0200
commit27770f5438d466a153bba2359d46404494df1152 (patch)
tree8a6ce6ca582201a5bd36784357d22cabb52bfdb6
parent41445c6ac98ed646dc42087ddc1f46eafa3c71e3 (diff)
downloadnixos_system-27770f5438d466a153bba2359d46404494df1152.tar
nixos_system-27770f5438d466a153bba2359d46404494df1152.tar.gz
nixos_system-27770f5438d466a153bba2359d46404494df1152.tar.bz2
nixos_system-27770f5438d466a153bba2359d46404494df1152.tar.xz
nixos_system-27770f5438d466a153bba2359d46404494df1152.zip
Use pkgs.kummerlaender.eu's vim derivation
-rw-r--r--configuration.nix11
-rw-r--r--host/software/pkgs/vim/asset/rc.vim128
-rw-r--r--host/software/pkgs/vim/asset/vim-color-akr/autoload/airline/themes/akr.vim86
-rw-r--r--host/software/pkgs/vim/asset/vim-color-akr/colors/akr.vim93
-rw-r--r--host/software/pkgs/vim/custom.nix42
-rw-r--r--host/software/pkgs/vim/default.nix11
-rw-r--r--host/software/pkgs/vim/plugins.nix84
-rw-r--r--host/software/vim.nix9
8 files changed, 8 insertions, 456 deletions
diff --git a/configuration.nix b/configuration.nix
index fda8323..39e604d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,7 +5,6 @@
imports = [
./host/current.nix
- ./host/software/vim.nix
./host/software/fish.nix
./user/common.nix
];
@@ -34,8 +33,14 @@
};
environment = {
- systemPackages = with pkgs; [
- psmisc htop git silver-searcher
+ systemPackages = let
+ mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
+ in [
+ pkgs.psmisc
+ pkgs.htop
+ pkgs.git
+ pkgs.silver-searcher
+ mypkgs.custom-vim
];
shellAliases = {
diff --git a/host/software/pkgs/vim/asset/rc.vim b/host/software/pkgs/vim/asset/rc.vim
deleted file mode 100644
index 81f48e0..0000000
--- a/host/software/pkgs/vim/asset/rc.vim
+++ /dev/null
@@ -1,128 +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=<Tab> wildmenu wildmode=full
-
-let mapleader=","
-
-map <leader>s :let @/=""<CR>
-map <leader>c zz
-map <leader>d <c-]>
-
-nmap <backspace> :e#<CR>
-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 FileType tex set conceallevel=2
-
-nnoremap <C-Tab> :bnext<CR>
-nnoremap <C-S-Tab> :bprev<CR>
-
-" select previous line on file reload, useful when cycling file extensions
-autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g`\" zz" | endif
-nnoremap <Tab> :CounterpointNext<CR>
-nnoremap <S-Tab> :CounterpointPrevious<CR>
-
-nnoremap <C-left> gT
-nnoremap <C-right> gt
-nnoremap <space> @q
-nnoremap J }
-nnoremap K {
-
-nmap <Left> <<
-nmap <Right> >>
-vmap <Left> <gv
-vmap <Right> >gv
-
-nmap <Up> [e
-nmap <Down> ]e
-vmap <Up> [egv
-vmap <Down> ]egv
-
-nnoremap <A-left> <C-W>h
-nnoremap <A-right> <C-W>l
-nnoremap <A-up> <C-W>k
-nnoremap <A-down> <C-W>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 <F5> :MundoToggle<CR>
-nnoremap <F6> :GitGutterToggle<CR>
-nnoremap <F7> :SignatureToggleSigns<CR>
-nnoremap <F8> :Goyo<CR>
-
-nnoremap <c-b> :CtrlPBuffer<CR>
-nnoremap <c-m> :CtrlPMixed<CR>
-nnoremap <c-t> :CtrlPTag<CR>
-nnoremap <a-t> :CtrlPBufTag<CR>
-
-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 = '<Leader>'
diff --git a/host/software/pkgs/vim/asset/vim-color-akr/autoload/airline/themes/akr.vim b/host/software/pkgs/vim/asset/vim-color-akr/autoload/airline/themes/akr.vim
deleted file mode 100644
index 1b847c4..0000000
--- a/host/software/pkgs/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/host/software/pkgs/vim/asset/vim-color-akr/colors/akr.vim b/host/software/pkgs/vim/asset/vim-color-akr/colors/akr.vim
deleted file mode 100644
index 4ffd2ca..0000000
--- a/host/software/pkgs/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/host/software/pkgs/vim/custom.nix b/host/software/pkgs/vim/custom.nix
deleted file mode 100644
index 4719b72..0000000
--- a/host/software/pkgs/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"
- "surround"
- "vim-unimpaired"
- "vim-far"
- # git integration
- "fugitive"
- "vim-gitgutter"
- "vim-gina"
- ];}
- ];
- };
- customRC = vimrc;
-}
diff --git a/host/software/pkgs/vim/default.nix b/host/software/pkgs/vim/default.nix
deleted file mode 100644
index 0b0001d..0000000
--- a/host/software/pkgs/vim/default.nix
+++ /dev/null
@@ -1,11 +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 = false;
- multibyteSupport = true;
-} )
diff --git a/host/software/pkgs/vim/plugins.nix b/host/software/pkgs/vim/plugins.nix
deleted file mode 100644
index 87abea4..0000000
--- a/host/software/pkgs/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-git-commit-viewer" = buildVimPlugin {
- name = "vim-git-commit-viewer";
- src = fetchgit {
- url = "https://github.com/junegunn/gv.vim";
- rev = "7ee1ca8201a0e9f95ba5dd3ec344e3ce71d61d8e";
- sha256 = "0r0j8l0sm3xgb3hgmf0zm48mgj97nlkspg3jgv817nhwsl8pyc44";
- };
- };
-
- "vim-far" = buildVimPlugin {
- name = "vim-far";
- src = fetchgit {
- url = "https://github.com/brooth/far.vim.git";
- rev = "5f8016e1df98b1f806e6347728dc012ae59579ab";
- sha256 = "15pcsd039srfvrj2a6f3ns8zh13vrbdx93pcyxzxd8i0vidshkmb";
- };
- };
-
- "vim-wordmotion" = buildVimPlugin {
- name = "vim-wordmotion";
- src = fetchgit {
- url = "https://github.com/chaoren/vim-wordmotion.git";
- rev = "d8cd124a6e36f38f52a43cb9f144eddbc03d300f";
- sha256 = "04ag0ilv8v5h823p685aic9rm8b1l44cs4j5xx4zv1ljg95fx68n";
- };
- };
-
- "vim-gina" = buildVimPlugin {
- name = "vim-gina";
- src = fetchgit {
- url = "https://github.com/lambdalisue/gina.vim.git";
- rev = "v0.3.2";
- sha256 = "06m9cb04qsk49jri3cyw1gr3q71r048pzym10zlqgzsl1jsnvalv";
- };
- };
-
- "vim-color-akr" = buildVimPlugin {
- name = "vim-color-akr";
- src = ./asset/vim-color-akr;
- };
-
-}
diff --git a/host/software/vim.nix b/host/software/vim.nix
deleted file mode 100644
index 8bd9b7f..0000000
--- a/host/software/vim.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
- environment.systemPackages = let
- custom_vim = import ./pkgs/vim/default.nix pkgs;
- in [
- custom_vim
- ];
-}