move all vim config into nix as well
This commit is contained in:
Haak Saxberg
parent
0b1e2bc1c5
commit
fc6e6054dc
7 changed files with 145 additions and 2759 deletions
145
nix/home.nix
145
nix/home.nix
|
|
@ -35,6 +35,7 @@ with lib;
|
||||||
source $HOME/.nix-profile/share/fzf/completion.zsh
|
source $HOME/.nix-profile/share/fzf/completion.zsh
|
||||||
source $HOME/.nix-profile/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
source $HOME/.nix-profile/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
source $HOME/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
source $HOME/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
|
source $HOME/.config/zsh/local.zsh
|
||||||
|
|
||||||
bindkey '^[[A' history-substring-search-up
|
bindkey '^[[A' history-substring-search-up
|
||||||
bindkey '^[[B' history-substring-search-down
|
bindkey '^[[B' history-substring-search-down
|
||||||
|
|
@ -56,6 +57,150 @@ with lib;
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
withPython = true;
|
||||||
|
configure = {
|
||||||
|
packages.nixBundle = with pkgs.vimPlugins; {
|
||||||
|
start = [
|
||||||
|
vim-sensible
|
||||||
|
vim-startify
|
||||||
|
ctrlp
|
||||||
|
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"
|
||||||
|
LanguageClient-neovim
|
||||||
|
"deoplete.nvim"
|
||||||
|
papercolor-theme
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
customRC = ''
|
||||||
|
filetype plugin indent on
|
||||||
|
" CtrlP
|
||||||
|
let g:ctrlp_custom_ignore="node_modules\|\.git\|_build"
|
||||||
|
|
||||||
|
" ALE
|
||||||
|
let g:ale_fix_on_save = 1
|
||||||
|
|
||||||
|
" Easymotion
|
||||||
|
map / <Plug>(easymotion-sn)
|
||||||
|
omap / <Plug>(easymotion-tn)
|
||||||
|
map n <Plug>(easymotion-next)
|
||||||
|
map N <Plug>(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
|
||||||
|
|
||||||
|
" Vim-Test
|
||||||
|
nmap <silent> <leader>t :TestNearest<CR>
|
||||||
|
nmap <silent> <leader>T :TestFile<CR>
|
||||||
|
nmap <silent> <leader>a :TestSuite<CR>
|
||||||
|
nmap <silent> <leader>l :TestLast<CR>
|
||||||
|
nmap <silent> <leader>g :TestVisit<CR>
|
||||||
|
let test#strategy = "neovim"
|
||||||
|
|
||||||
|
" 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
|
||||||
|
|
||||||
|
" let netrw look like NERDTree
|
||||||
|
let g:netrw_liststyle = 3
|
||||||
|
let mapleader=","
|
||||||
|
set nobackup
|
||||||
|
set noswapfile
|
||||||
|
set pastetoggle=<F2>
|
||||||
|
set nowrap
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
colorscheme PaperColor
|
||||||
|
|
||||||
|
set nocompatible
|
||||||
|
set number
|
||||||
|
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
|
||||||
|
|
||||||
|
""" 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
|
||||||
|
|
||||||
|
" strip trailing whitespace
|
||||||
|
autocmd BufWritePre * :%s/\s\+$//e
|
||||||
|
|
||||||
|
""" Handy remaps
|
||||||
|
noremap ; :
|
||||||
|
inoremap jj <Esc>
|
||||||
|
map <silent> <leader>V :source ~/.config/nvim/init.vim<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
|
||||||
|
map \q :q<CR>
|
||||||
|
map \w :w<CR>
|
||||||
|
noremap Q <nop>
|
||||||
|
|
||||||
|
""" Terminal mode remaps
|
||||||
|
tnoremap <Esc> <C-\><C-n>
|
||||||
|
nnoremap <leader>o :below 10sp term://$SHELL<cr>i
|
||||||
|
|
||||||
|
" Quicker window movement
|
||||||
|
nnoremap <C-j> <C-w>j
|
||||||
|
nnoremap <C-k> <C-w>k
|
||||||
|
nnoremap <C-h> <C-w>h
|
||||||
|
nnoremap <C-l> <C-w>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
|
||||||
|
|
||||||
|
" Local overrides?
|
||||||
|
if filereadable($HOME . "/.vimrc.local")
|
||||||
|
source ~/.vimrc.local
|
||||||
|
endif
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +0,0 @@
|
||||||
""" Handy remaps
|
|
||||||
noremap <leader>b Oimport ipdb;ipdb.set_trace()<Esc>
|
|
||||||
|
|
||||||
" Don't use tabs in python files
|
|
||||||
autocmd FileType python setlocal expandtab tabstop=4 shiftwidth=4
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
" Vim-Test
|
|
||||||
let test#ruby#rspec#executable = 'bundle exec rspec'
|
|
||||||
|
|
@ -1,248 +0,0 @@
|
||||||
set nocompatible " required
|
|
||||||
filetype off " required
|
|
||||||
|
|
||||||
"""" VIM-PLUG
|
|
||||||
call plug#begin('~/.vim/plugged')
|
|
||||||
|
|
||||||
Plug 'tpope/vim-sensible'
|
|
||||||
|
|
||||||
Plug 'nanotech/jellybeans.vim'
|
|
||||||
|
|
||||||
Plug 'pangloss/vim-javascript'
|
|
||||||
Plug 'mxw/vim-jsx'
|
|
||||||
Plug 'kchmck/vim-coffee-script'
|
|
||||||
Plug 'mtscout6/vim-cjsx'
|
|
||||||
Plug 'elixir-lang/vim-elixir'
|
|
||||||
Plug 'slashmili/alchemist.vim'
|
|
||||||
Plug 'vim-ruby/vim-ruby'
|
|
||||||
Plug 'tpope/vim-bundler'
|
|
||||||
Plug 'tpope/vim-rails'
|
|
||||||
Plug 'tpope/vim-endwise'
|
|
||||||
Plug 'ElmCast/elm-vim'
|
|
||||||
Plug 'lervag/vimtex'
|
|
||||||
|
|
||||||
Plug 'bling/vim-airline'
|
|
||||||
Plug 'luochen1990/rainbow'
|
|
||||||
Plug 'myusuf3/numbers.vim'
|
|
||||||
Plug 'mhinz/vim-signify'
|
|
||||||
Plug 'nathanaelkane/vim-indent-guides'
|
|
||||||
|
|
||||||
Plug 'danro/rename.vim'
|
|
||||||
Plug 'pbrisbin/vim-mkdir'
|
|
||||||
Plug 'tpope/vim-characterize'
|
|
||||||
Plug 'tpope/vim-surround'
|
|
||||||
Plug 'tpope/vim-commentary'
|
|
||||||
Plug 'tpope/vim-eunuch'
|
|
||||||
Plug 'junegunn/vim-easy-align'
|
|
||||||
|
|
||||||
Plug 'majutsushi/tagbar'
|
|
||||||
Plug 'zhaocai/GoldenView.Vim'
|
|
||||||
|
|
||||||
Plug 'Lokaltog/vim-easymotion'
|
|
||||||
Plug 'tpope/vim-fugitive'
|
|
||||||
Plug 'tpope/vim-vinegar'
|
|
||||||
Plug 'ctrlpvim/ctrlp.vim'
|
|
||||||
Plug 'simnalamburt/vim-mundo'
|
|
||||||
Plug 'janko-m/vim-test'
|
|
||||||
|
|
||||||
Plug 'w0rp/ale'
|
|
||||||
Plug 'SirVer/ultisnips'
|
|
||||||
Plug 'honza/vim-snippets'
|
|
||||||
Plug 'Valloric/YouCompleteMe', { 'do': 'yes \| ./install.py --tern-completer' }
|
|
||||||
|
|
||||||
call plug#end()
|
|
||||||
|
|
||||||
filetype plugin indent on " required
|
|
||||||
""" end vim-plug
|
|
||||||
|
|
||||||
"""" PLUGIN SETTINGS
|
|
||||||
|
|
||||||
" YouCompleteMe
|
|
||||||
nnoremap K :YcmCompleter GoTo<CR>
|
|
||||||
nnoremap ˚ :YcmCompleter GoToDeclaration<CR>
|
|
||||||
let g:ycm_goto_buffer_command = 'horizontal-split'
|
|
||||||
let g:ycm_autoclose_preview_window_after_insertion = 1
|
|
||||||
let g:ycm_semantic_triggers = {
|
|
||||||
\ 'elm' : ['.'],
|
|
||||||
\}
|
|
||||||
|
|
||||||
" Easymotion
|
|
||||||
map / <Plug>(easymotion-sn)
|
|
||||||
omap / <Plug>(easymotion-tn)
|
|
||||||
map n <Plug>(easymotion-next)
|
|
||||||
map N <Plug>(easymotion-prev)
|
|
||||||
let g:EasyMotion_landing_highlight = 0
|
|
||||||
|
|
||||||
" CtrlP
|
|
||||||
" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
|
|
||||||
if executable('ag')
|
|
||||||
" Use Ag over Grep
|
|
||||||
set grepprg=ag\ --nogroup\ --nocolor
|
|
||||||
|
|
||||||
" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
|
|
||||||
let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
|
|
||||||
|
|
||||||
" ag is fast enough that CtrlP doesn't need to cache
|
|
||||||
let g:ctrlp_use_caching = 0
|
|
||||||
endif
|
|
||||||
let g:ctrlp_custom_ignore="node_modules\|\.git\|_build"
|
|
||||||
|
|
||||||
" Mundo
|
|
||||||
map <leader>u :MundoToggle<CR>
|
|
||||||
|
|
||||||
" Indent guides
|
|
||||||
let g:indent_guides_start_level = 2
|
|
||||||
|
|
||||||
" Syntastic
|
|
||||||
let g:syntastic_quiet_messages = {'level': []} " do NOT silence warnings
|
|
||||||
let g:syntastic_aggregate_errors = 1
|
|
||||||
|
|
||||||
" NERDTree / netrw
|
|
||||||
let g:netrw_liststyle = 3 " let netrw look like NERDTree
|
|
||||||
|
|
||||||
" 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 <silent> <leader>t :TestNearest<CR>
|
|
||||||
nmap <silent> <leader>T :TestFile<CR>
|
|
||||||
nmap <silent> <leader>a :TestSuite<CR>
|
|
||||||
nmap <silent> <leader>l :TestLast<CR>
|
|
||||||
nmap <silent> <leader>g :TestVisit<CR>
|
|
||||||
if has('nvim')
|
|
||||||
let test#strategy = "neovim"
|
|
||||||
endif
|
|
||||||
|
|
||||||
" UltiSnips
|
|
||||||
let g:UltiSnipsUsePythonVersion = 3 " required for YCM compat
|
|
||||||
let g:ulti_expand_or_jump_res = 0
|
|
||||||
|
|
||||||
" IndentGuides
|
|
||||||
let g:indent_guides_enable_on_vim_startup = 1
|
|
||||||
|
|
||||||
" GoldenView
|
|
||||||
autocmd BufRead * EnableGoldenViewAutoResize
|
|
||||||
let g:goldenview__enable_default_mapping = 0
|
|
||||||
|
|
||||||
" Easy Align
|
|
||||||
nmap ga <Plug>(EasyAlign)
|
|
||||||
xmap ga <Plug>(EasyAlign)
|
|
||||||
|
|
||||||
"""" END PLUGIN SETTINGS
|
|
||||||
|
|
||||||
let mapleader=","
|
|
||||||
set nobackup
|
|
||||||
set noswapfile
|
|
||||||
set pastetoggle=<F2>
|
|
||||||
set nowrap
|
|
||||||
|
|
||||||
syntax on
|
|
||||||
filetype on
|
|
||||||
filetype plugin indent on
|
|
||||||
|
|
||||||
try
|
|
||||||
colorscheme jellybeans
|
|
||||||
catch
|
|
||||||
" deal with it
|
|
||||||
endtry
|
|
||||||
|
|
||||||
set t_Co=256
|
|
||||||
if &term =~ 'xterm-color'
|
|
||||||
set t_ut=
|
|
||||||
endif
|
|
||||||
set nocompatible
|
|
||||||
set laststatus=2
|
|
||||||
|
|
||||||
if v:version >= 703
|
|
||||||
"undo settings
|
|
||||||
set undodir=~/.vim/undofiles
|
|
||||||
set undofile
|
|
||||||
let &colorcolumn="80,".join(range(120,999), ",")
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
set hidden
|
|
||||||
set showmode
|
|
||||||
set number
|
|
||||||
set numberwidth=1
|
|
||||||
set background=dark
|
|
||||||
set cursorline
|
|
||||||
set cursorcolumn
|
|
||||||
set ruler
|
|
||||||
" do not redraw while macroing
|
|
||||||
set lazyredraw
|
|
||||||
|
|
||||||
set matchpairs+=<:>
|
|
||||||
|
|
||||||
set list
|
|
||||||
set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$
|
|
||||||
set ts=2
|
|
||||||
set shiftwidth=2
|
|
||||||
set expandtab
|
|
||||||
|
|
||||||
" Open new split panes to right and bottom, which feels more natural
|
|
||||||
set splitbelow
|
|
||||||
set splitright
|
|
||||||
|
|
||||||
" Use the OS clipboard by default (on versions compiled with `+clipboard`)
|
|
||||||
set clipboard=unnamed
|
|
||||||
|
|
||||||
""" Searching and Patterns
|
|
||||||
set ignorecase
|
|
||||||
set smartcase
|
|
||||||
set smarttab
|
|
||||||
set hlsearch
|
|
||||||
" Add the g flag to search/replace by default
|
|
||||||
set gdefault
|
|
||||||
|
|
||||||
""" Folding
|
|
||||||
set foldmethod=syntax
|
|
||||||
set foldlevel=1
|
|
||||||
set nofoldenable
|
|
||||||
|
|
||||||
"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
|
|
||||||
|
|
||||||
""" Handy remaps
|
|
||||||
noremap ; :
|
|
||||||
inoremap jj <Esc>
|
|
||||||
map <silent> <leader>V :source ~/.config/nvim/init.vim<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
|
|
||||||
map \q :q<CR>
|
|
||||||
map \w :w<CR>
|
|
||||||
noremap Q <nop>
|
|
||||||
|
|
||||||
"terminal remaps
|
|
||||||
if has('nvim')
|
|
||||||
tnoremap <Esc> <C-\><C-n>
|
|
||||||
nnoremap <leader>o :below 10sp term://$SHELL<cr>i
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Quicker window movement
|
|
||||||
nnoremap <C-j> <C-w>j
|
|
||||||
nnoremap <C-k> <C-w>k
|
|
||||||
nnoremap <C-h> <C-w>h
|
|
||||||
nnoremap <C-l> <C-w>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
|
|
||||||
|
|
||||||
""" Use the mouse
|
|
||||||
set mouse=a
|
|
||||||
|
|
||||||
""" smart path
|
|
||||||
set path=.,,**
|
|
||||||
|
|
||||||
" Local overrides?
|
|
||||||
if filereadable($HOME . "/.vimrc.local")
|
|
||||||
source ~/.vimrc.local
|
|
||||||
endif
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue