haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

move away from deprecated configuration command

Browse source
This commit is contained in:
Haak Saxberg 2019-09-08 16:11:46 -07:00
parent bb520db65c
commit f4afc7745e
1 changed files with 117 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

239
nix/home.nix
View file

@ -117,147 +117,142 @@ in {
enable = true; enable = true;
vimAlias = true; vimAlias = true;
withPython = true; withPython = true;
configure = { plugins = with pkgs.vimPlugins; [
packages.nixBundle = with pkgs.vimPlugins; { vim-sensible
start = [ vim-startify
vim-sensible vim-javascript
vim-startify vim-ruby
vim-javascript vim-nix
vim-ruby vim-elixir
vim-nix alchemist-vim
elm-vim haskell-vim
vim-elixir vim-markdown
alchemist-vim vimtex
haskell-vim vim-airline
vim-markdown rainbow
vimtex vim-signify
vim-airline vim-indent-guides
rainbow vim-surround
vim-signify fugitive
vim-indent-guides easymotion
vim-surround tagbar
fugitive vinegar
easymotion undotree
tagbar vim-test
vinegar ale
undotree fzf-vim
vim-test fzfWrapper
ale LanguageClient-neovim
fzf-vim deoplete-nvim
fzfWrapper papercolor-theme
LanguageClient-neovim ];
deoplete-nvim
papercolor-theme
];
};
customRC = '' extraConfig = ''
filetype plugin indent on filetype plugin indent on
" ALE " ALE
let g:ale_fix_on_save = 1 let g:ale_fix_on_save = 1
" Easymotion " Easymotion
map / <Plug>(easymotion-sn) map / <Plug>(easymotion-sn)
omap / <Plug>(easymotion-tn) omap / <Plug>(easymotion-tn)
map n <Plug>(easymotion-next) map n <Plug>(easymotion-next)
map N <Plug>(easymotion-prev) map N <Plug>(easymotion-prev)
let g:EasyMotion_landing_highlight = 0 let g:EasyMotion_landing_highlight = 0
" Rainbow parentheses " Rainbow parentheses
let g:rainbow_conf = { let g:rainbow_conf = {
\ 'guifgs': ['RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3'], \ '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'], \ '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'] \ 'parentheses': ['start=/(/ end=/)/ fold', 'start=/\[/ end=/\]/ fold', 'start=/{/ end=/}/ fold']
\} \}
let g:rainbow_active = 1 let g:rainbow_active = 1
" Vim-Test " Vim-Test
nmap <silent> <leader>t :TestNearest<CR> nmap <silent> <leader>t :TestNearest<CR>
nmap <silent> <leader>T :TestFile<CR> nmap <silent> <leader>T :TestFile<CR>
nmap <silent> <leader>a :TestSuite<CR> nmap <silent> <leader>a :TestSuite<CR>
nmap <silent> <leader>l :TestLast<CR> nmap <silent> <leader>l :TestLast<CR>
nmap <silent> <leader>g :TestVisit<CR> nmap <silent> <leader>g :TestVisit<CR>
let test#strategy = "neovim" let test#strategy = "neovim"
" Deoplete " Deoplete
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1
" Indent guides " Indent guides
let g:indent_guides_enable_on_vim_startup = 1 let g:indent_guides_enable_on_vim_startup = 1
let g:indent_guides_start_level = 2 let g:indent_guides_start_level = 2
" let netrw look like NERDTree " let netrw look like NERDTree
let g:netrw_liststyle = 3 let g:netrw_liststyle = 3
let mapleader="," let mapleader=","
set nobackup set nobackup
set noswapfile set noswapfile
set pastetoggle=<F2> set pastetoggle=<F2>
set nowrap set nowrap
set background=dark set background=dark
colorscheme PaperColor colorscheme PaperColor
set nocompatible set nocompatible
set number relativenumber set number relativenumber
set numberwidth=1 set numberwidth=1
set cursorline set cursorline
set cursorcolumn set cursorcolumn
set ruler set ruler
set list set list
set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$ set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$
set matchpairs+=<:> set matchpairs+=<:>
set ts=2 set ts=2
set shiftwidth=2 set shiftwidth=2
set expandtab set expandtab
" Open new split panes to right and bottom, which feels more natural " Open new split panes to right and bottom, which feels more natural
set splitbelow set splitbelow
set splitright set splitright
""" Searching and Patterns """ Searching and Patterns
set ignorecase set ignorecase
set smartcase set smartcase
set smarttab set smarttab
set hlsearch set hlsearch
" Add the g flag to search/replace by default " Add the g flag to search/replace by default
set gdefault set gdefault
"recalculate the trailing whitespace warning when idle, and after saving "recalculate the trailing whitespace warning when idle, and after saving
autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning
" strip trailing whitespace " strip trailing whitespace
autocmd BufWritePre * :%s/\s\+$//e autocmd BufWritePre * :%s/\s\+$//e
""" Handy remaps """ Handy remaps
noremap ; : noremap ; :
inoremap jj <Esc> inoremap jj <Esc>
map <silent> <leader>V :source ~/.config/nvim/init.vim<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR> map <silent> <leader>V :source ~/.config/nvim/init.vim<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
map \q :q<CR> map \q :q<CR>
map \w :w<CR> map \w :w<CR>
noremap Q <nop> noremap Q <nop>
""" Terminal mode remaps """ Terminal mode remaps
tnoremap <Esc> <C-\><C-n> tnoremap <Esc> <C-\><C-n>
nnoremap <leader>o :below 10sp term://$SHELL<cr>i nnoremap <leader>o :below 10sp term://$SHELL<cr>i
" Quicker window movement " Quicker window movement
nnoremap <C-j> <C-w>j nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k nnoremap <C-k> <C-w>k
nnoremap <C-h> <C-w>h nnoremap <C-h> <C-w>h
nnoremap <C-l> <C-w>l nnoremap <C-l> <C-w>l
" Don’t reset cursor to start of line when moving around. " Don’t reset cursor to start of line when moving around.
set nostartofline set nostartofline
" minimal number of lines to keep above/below cursorline " minimal number of lines to keep above/below cursorline
set scrolloff=10 set scrolloff=10
" Local overrides? " Local overrides?
if filereadable($HOME . "/.vimrc.local") if filereadable($HOME . "/.vimrc.local")
source ~/.vimrc.local source ~/.vimrc.local
endif endif
''; '';
};
}; };
programs.tmux = { programs.tmux = {