From f4afc7745e2ca62965bf0f0d8bb55932d45b6f7f Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Sun, 8 Sep 2019 16:11:46 -0700 Subject: [PATCH] move away from deprecated configuration command --- nix/home.nix | 239 +++++++++++++++++++++++++-------------------------- 1 file changed, 117 insertions(+), 122 deletions(-) diff --git a/nix/home.nix b/nix/home.nix index 6ef441c..8609519 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -117,147 +117,142 @@ in { enable = true; vimAlias = true; withPython = true; - configure = { - packages.nixBundle = with pkgs.vimPlugins; { - start = [ - vim-sensible - vim-startify - vim-javascript - vim-ruby - vim-nix - elm-vim - vim-elixir - alchemist-vim - haskell-vim - vim-markdown - vimtex - vim-airline - rainbow - vim-signify - vim-indent-guides - vim-surround - fugitive - easymotion - tagbar - vinegar - undotree - vim-test - ale - fzf-vim - fzfWrapper - LanguageClient-neovim - deoplete-nvim - papercolor-theme - ]; - }; + plugins = with pkgs.vimPlugins; [ + vim-sensible + vim-startify + vim-javascript + vim-ruby + vim-nix + vim-elixir + alchemist-vim + haskell-vim + vim-markdown + vimtex + vim-airline + rainbow + vim-signify + vim-indent-guides + vim-surround + fugitive + easymotion + tagbar + vinegar + undotree + vim-test + ale + fzf-vim + fzfWrapper + LanguageClient-neovim + deoplete-nvim + papercolor-theme + ]; - customRC = '' - filetype plugin indent on + extraConfig = '' + filetype plugin indent on - " ALE - let g:ale_fix_on_save = 1 + " ALE + let g:ale_fix_on_save = 1 - " Easymotion - map / (easymotion-sn) - omap / (easymotion-tn) - map n (easymotion-next) - map N (easymotion-prev) - let g:EasyMotion_landing_highlight = 0 + " Easymotion + map / (easymotion-sn) + omap / (easymotion-tn) + map n (easymotion-next) + map N (easymotion-prev) + let g:EasyMotion_landing_highlight = 0 - " Rainbow parentheses - let g:rainbow_conf = { - \ 'guifgs': ['RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3'], - \ 'ctermfgs': ['red', 'brown', 'blue', 'gray', 'green', 'magenta', 'cyan', 'darkred', 'brown', 'darkblue', 'gray', 'darkgreen', 'darkmagenta', 'darkcyan', 'red'], - \ 'parentheses': ['start=/(/ end=/)/ fold', 'start=/\[/ end=/\]/ fold', 'start=/{/ end=/}/ fold'] - \} - let g:rainbow_active = 1 + " Rainbow parentheses + let g:rainbow_conf = { + \ 'guifgs': ['RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3'], + \ 'ctermfgs': ['red', 'brown', 'blue', 'gray', 'green', 'magenta', 'cyan', 'darkred', 'brown', 'darkblue', 'gray', 'darkgreen', 'darkmagenta', 'darkcyan', 'red'], + \ 'parentheses': ['start=/(/ end=/)/ fold', 'start=/\[/ end=/\]/ fold', 'start=/{/ end=/}/ fold'] + \} + let g:rainbow_active = 1 - " Vim-Test - nmap t :TestNearest - nmap T :TestFile - nmap a :TestSuite - nmap l :TestLast - nmap g :TestVisit - let test#strategy = "neovim" + " Vim-Test + nmap t :TestNearest + nmap T :TestFile + nmap a :TestSuite + nmap l :TestLast + nmap g :TestVisit + let test#strategy = "neovim" - " Deoplete - let g:deoplete#enable_at_startup = 1 + " Deoplete + let g:deoplete#enable_at_startup = 1 - " Indent guides - let g:indent_guides_enable_on_vim_startup = 1 - let g:indent_guides_start_level = 2 + " Indent guides + let g:indent_guides_enable_on_vim_startup = 1 + let g:indent_guides_start_level = 2 - " let netrw look like NERDTree - let g:netrw_liststyle = 3 - let mapleader="," - set nobackup - set noswapfile - set pastetoggle= - set nowrap + " let netrw look like NERDTree + let g:netrw_liststyle = 3 + let mapleader="," + set nobackup + set noswapfile + set pastetoggle= + set nowrap - set background=dark - colorscheme PaperColor + set background=dark + colorscheme PaperColor - set nocompatible - set number relativenumber - set numberwidth=1 - set cursorline - set cursorcolumn - set ruler - set list - set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$ - set matchpairs+=<:> - set ts=2 - set shiftwidth=2 - set expandtab + set nocompatible + set number relativenumber + set numberwidth=1 + set cursorline + set cursorcolumn + set ruler + set list + set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$ + set matchpairs+=<:> + set ts=2 + set shiftwidth=2 + set expandtab - " Open new split panes to right and bottom, which feels more natural - set splitbelow - set splitright + " Open new split panes to right and bottom, which feels more natural + set splitbelow + set splitright - """ Searching and Patterns - set ignorecase - set smartcase - set smarttab - set hlsearch - " Add the g flag to search/replace by default - set gdefault + """ Searching and Patterns + set ignorecase + set smartcase + set smarttab + set hlsearch + " Add the g flag to search/replace by default + set gdefault - "recalculate the trailing whitespace warning when idle, and after saving - autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning + "recalculate the trailing whitespace warning when idle, and after saving + autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning - " strip trailing whitespace - autocmd BufWritePre * :%s/\s\+$//e + " strip trailing whitespace + autocmd BufWritePre * :%s/\s\+$//e - """ Handy remaps - noremap ; : - inoremap jj - map V :source ~/.config/nvim/init.vim:filetype detect:exe ":echo 'vimrc reloaded'" - map \q :q - map \w :w - noremap Q + """ Handy remaps + noremap ; : + inoremap jj + map V :source ~/.config/nvim/init.vim:filetype detect:exe ":echo 'vimrc reloaded'" + map \q :q + map \w :w + noremap Q - """ Terminal mode remaps - tnoremap - nnoremap o :below 10sp term://$SHELLi + """ Terminal mode remaps + tnoremap + nnoremap o :below 10sp term://$SHELLi - " Quicker window movement - nnoremap j - nnoremap k - nnoremap h - nnoremap l + " Quicker window movement + nnoremap j + nnoremap k + nnoremap h + nnoremap l - " Don’t reset cursor to start of line when moving around. - set nostartofline - " minimal number of lines to keep above/below cursorline - set scrolloff=10 + " Don’t reset cursor to start of line when moving around. + set nostartofline + " minimal number of lines to keep above/below cursorline + set scrolloff=10 - " Local overrides? - if filereadable($HOME . "/.vimrc.local") - source ~/.vimrc.local - endif - ''; - }; + " Local overrides? + if filereadable($HOME . "/.vimrc.local") + source ~/.vimrc.local + endif + ''; }; programs.tmux = {