move away from deprecated configuration command
This commit is contained in:
Haak Saxberg
parent
bb520db65c
commit
f4afc7745e
1 changed files with 117 additions and 122 deletions
239
nix/home.nix
239
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 / <Plug>(easymotion-sn)
|
||||
omap / <Plug>(easymotion-tn)
|
||||
map n <Plug>(easymotion-next)
|
||||
map N <Plug>(easymotion-prev)
|
||||
let g:EasyMotion_landing_highlight = 0
|
||||
" 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
|
||||
" 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"
|
||||
" 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
|
||||
" 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=<F2>
|
||||
set nowrap
|
||||
" 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 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 <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>
|
||||
""" 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
|
||||
""" 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
|
||||
" 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
|
||||
" 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 = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue