cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move vim to home manager

Browse source
This commit is contained in:
Cyryl Płotnicki 2020-05-02 10:05:10 +01:00
parent 2c1e5715da
commit c6f17de2ce
7 changed files with 185 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.vimrc.plugins
View file

@ -1,40 +0,0 @@
" plugins
if empty(glob('~/.vim/autoload/plug.vim'))
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
call plug#begin('~/.vim/plugged')
Plug 'airblade/vim-gitgutter'
Plug 'cespare/vim-toml'
Plug 'Chiel92/vim-autoformat'
Plug 'drmingdrmer/vim-toggle-quickfix'
Plug 'editorconfig/editorconfig-vim'
Plug 'godlygeek/tabular'
Plug 'https://github.com/cyplo/vim-colors-solarized.git'
Plug 'jremmen/vim-ripgrep'
Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'}
Plug 'neoclide/coc-rls'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim'
Plug 'kien/ctrlp.vim'
Plug 'LnL7/vim-nix'
Plug 'mhinz/vim-startify'
Plug 'mileszs/ack.vim'
Plug 'plasticboy/vim-markdown'
Plug 'rust-lang/rust.vim'
Plug 'scrooloose/nerdtree'
Plug 'timonv/vim-cargo'
Plug 'tpope/vim-cucumber'
Plug 'tpope/vim-dispatch'
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-sensible'
Plug 'tpope/vim-surround'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'will133/vim-dirdiff'
Plug 'Xuyuanp/nerdtree-git-plugin'
call plug#end()

145
.vimrc.plugins-settings
View file

@ -15,12 +15,147 @@ let g:fzf_command_prefix = 'Fzf'
command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
let g:ctrlp_show_hidden = 1
let g:lsp_signs_enabled = 1
let g:lsp_diagnostics_echo_cursor = 1
let g:deoplete#enable_at_startup = 1
" nerdtree startup
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
" coc
set updatetime=300
" Some servers have issues with backup files, see #649.
set nobackup
set nowritebackup
" Give more space for displaying messages.
set cmdheight=2
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
" delays and poor user experience.
set updatetime=300
" Don't pass messages to |ins-completion-menu|.
set shortmess+=c
" Always show the signcolumn, otherwise it would shift the text each time
" diagnostics appear/become resolved.
set signcolumn=yes
" Use tab for trigger completion with characters ahead and navigate.
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config.
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Use <c-space> to trigger completion.
inoremap <silent><expr> <c-space> coc#refresh()
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
" position. Coc only does snippet and additional edit on confirm.
" <cr> could be remapped by other vim plugin, try `:verbose imap <CR>`.
if exists('*complete_info')
inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
else
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
endif
" Use `[g` and `]g` to navigate diagnostics
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
else
call CocAction('doHover')
endif
endfunction
" Highlight the symbol and its references when holding the cursor.
autocmd CursorHold * silent call CocActionAsync('highlight')
" Symbol renaming.
nmap <leader>rn <Plug>(coc-rename)
" Formatting selected code.
xmap <leader>f <Plug>(coc-format-selected)
nmap <leader>f <Plug>(coc-format-selected)
augroup mygroup
autocmd!
" Setup formatexpr specified filetype(s).
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
" Update signature help on jump placeholder.
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
augroup end
" Applying codeAction to the selected region.
" Example: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap keys for applying codeAction to the current line.
nmap <leader>ac <Plug>(coc-codeaction)
" Apply AutoFix to problem on the current line.
nmap <leader>qf <Plug>(coc-fix-current)
" Introduce function text object
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
xmap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
omap if <Plug>(coc-funcobj-i)
omap af <Plug>(coc-funcobj-a)
" Use <TAB> for selections ranges.
" NOTE: Requires 'textDocument/selectionRange' support from the language server.
" coc-tsserver, coc-python are the examples of servers that support it.
nmap <silent> <TAB> <Plug>(coc-range-select)
xmap <silent> <TAB> <Plug>(coc-range-select)
" Add `:Format` command to format current buffer.
command! -nargs=0 Format :call CocAction('format')
" Add `:Fold` command to fold current buffer.
command! -nargs=? Fold :call CocAction('fold', <f-args>)
" Add `:OR` command for organize imports of the current buffer.
command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport')
" Add (Neo)Vim's native statusline support.
" NOTE: Please see `:h coc-status` for integrations with external plugins that
" provide custom statusline: lightline.vim, vim-airline.
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
" Mappings using CoCList:
" Show all diagnostics.
nnoremap <silent> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions.
nnoremap <silent> <space>e :<C-u>CocList extensions<cr>
" Show commands.
nnoremap <silent> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document.
nnoremap <silent> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols.
nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
nnoremap <silent> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
nnoremap <silent> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list.
nnoremap <silent> <space>p :<C-u>CocListResume<CR>

2
nixos/boxes/foureighty.nix
View file

@ -3,7 +3,7 @@
networking.hostName = "foureighty";
boot = {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest_hardened;
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_hardened;
initrd.luks.devices = {
root = {

1
nixos/common.nix
View file

@ -11,7 +11,6 @@ in
./gsconnect.nix
./common-hardware.nix
./common-services.nix
./vim.nix
];
security.allowUserNamespaces = true;

1
nixos/links.nix
View file

@ -1,6 +1,5 @@
{ config, pkgs, ... }:
{
home.file.".vimrc".source = ~/dev/dotfiles/.vimrc.nixos;
home.file.".config/nixpkgs/config.nix".source = ~/dev/dotfiles/nixos/shell-config.nix;
}

86
nixos/programs/vim.nix
View file

@ -1,47 +1,49 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
(
neovim.override {
vimAlias = true;
configure = {
customRC = ''
if filereadable($HOME . "/.vimrc")
home.file.".vimrc".source = ~/dev/dotfiles/.vimrc.nixos;
home.packages = with pkgs; [
unstable.rust-analyzer
nodejs
(
neovim.override {
vimAlias = true;
configure = {
customRC = ''
if filereadable($HOME . "/.vimrc")
source $HOME/.vimrc
endif
'';
endif
'';
vam.knownPlugins = unstable.vimPlugins;
vam.pluginDictionaries = [
{ names = [
"ack-vim"
"ctrlp-vim"
"editorconfig-vim"
"fzf-vim"
"nerdtree"
"nerdtree-git-plugin"
"rust-vim"
"tabular"
"vim-airline"
"vim-airline-themes"
"vim-autoformat"
"vim-colors-solarized"
"vim-dirdiff"
"vim-dispatch"
"vim-fugitive"
"vim-gitgutter"
"vim-markdown"
"vim-nix"
"vim-sensible"
"vim-startify"
"vim-surround"
"vim-toml"
];
}
];
vam.knownPlugins = vimPlugins;
vam.pluginDictionaries = [
{ names = [
"ack-vim"
"coc-highlight"
"coc-nvim"
"coc-tabnine"
"ctrlp-vim"
"editorconfig-vim"
"fzf-vim"
"nerdtree"
"nerdtree-git-plugin"
"rust-vim"
"tabular"
"vim-airline"
"vim-airline-themes"
"vim-autoformat"
"vim-colors-solarized"
"vim-dirdiff"
"vim-dispatch"
"vim-fugitive"
"vim-gitgutter"
"vim-markdown"
"vim-nix"
"vim-sensible"
"vim-startify"
"vim-surround"
"vim-toml"
];}];
};})
};})
];
}
];
}

45
nixos/vim.nix
View file

@ -1,45 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [(
neovim.override {
vimAlias = true;
configure = {
customRC = ''
if filereadable($HOME . "/.vimrc")
source $HOME/.vimrc
endif
'';
vam.knownPlugins = vimPlugins;
vam.pluginDictionaries = [
{ names = [
"ack-vim"
"ctrlp-vim"
"editorconfig-vim"
"fzf-vim"
"nerdtree"
"nerdtree-git-plugin"
"rust-vim"
"tabular"
"vim-airline"
"vim-airline-themes"
"vim-autoformat"
"vim-colors-solarized"
"vim-dirdiff"
"vim-dispatch"
"vim-fugitive"
"vim-gitgutter"
"vim-markdown"
"vim-nix"
"vim-sensible"
"vim-startify"
"vim-surround"
"vim-toml"
];
}
];
};})
];
}