kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

feat(vim): simplify

Browse Source
This commit is contained in:
Kierán Meinhardt
2022-01-04 21:42:39 +01:00
parent 8b605d31a3
commit 508ed2f573
2 changed files with 36 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configs/neovim.nix
View File

@@ -31,7 +31,7 @@
supertab supertab
undotree undotree
tabular tabular
vimwiki # vimwiki
vim-colors-paramount vim-colors-paramount
vim-commentary vim-commentary
vim-css-color vim-css-color
@@ -45,26 +45,19 @@
]; ];
opt = [ opt = [
csv csv
dhall-vim
elm-vim elm-vim
emmet-vim emmet-vim
haskell-vim haskell-vim
icalendar-vim icalendar-vim
idris-vim
nim-vim
jq-vim jq-vim
purescript-vim
rust-vim rust-vim
typescript-vim typescript-vim
vim-fsharp
vim-javascript vim-javascript
vim-ledger vim-ledger
vim-nix vim-nix
vim-reason-plus
vim-toml
vimtex vimtex
vim-pandoc vim-pandoc
vim-pandoc-syntax # vim-pandoc-after vim-pandoc-syntax
vim-256noir vim-256noir
]; ];
}; };

121
lib/vim/init.vim
View File

@@ -17,16 +17,14 @@ let maplocalleader="\\"
" noremap <Leader>h :<C-u>split<CR> " noremap <Leader>h :<C-u>split<CR>
" noremap <Leader>v :<C-u>vsplit<CR> " noremap <Leader>v :<C-u>vsplit<CR>
noremap <Leader>gs :Gstatus<CR> noremap <Leader>gs :Git status<CR>
noremap <Leader>gc :Gcommit<CR> noremap <Leader>gc :Git commit<CR>
noremap <leader>n :bn<CR> noremap <leader>n :bn<CR>
noremap <leader>p :bp<CR> noremap <leader>p :bp<CR>
noremap <leader>c :bd<CR> noremap <leader>c :bd<CR>
noremap <leader>b :Buffers<CR> noremap <leader>b :Buffers<CR>
noremap <leader>t :Tags<CR> noremap <leader>t :Tags<CR>
noremap <leader>f :Goyo<CR>
" reindent whole file " reindent whole file
noremap <leader>i mzgg=G`z noremap <leader>i mzgg=G`z
@@ -62,18 +60,17 @@ set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbrea
set foldlevelstart=30 set foldlevelstart=30
iabbrev ddate <C-R>=strftime("%F")<CR> iabbrev ddate <C-R>=strftime("%F")<CR>
iabbrev dtime <C-R>=strftime("%F %T")<CR>
" if exists("g:loaded_netrwPlugin")
let g:netrw_banner=0 let g:netrw_banner=0
let g:netrw_browse_split=4 let g:netrw_browse_split=4
let g:netrw_altv=1 " open splits to the right let g:netrw_altv=1 " open splits to the right
let g:netrw_liststyle=3 " tree view let g:netrw_liststyle=3 " tree view
let g:netrw_list_hide=netrw_gitignore#Hide() let g:netrw_list_hide=netrw_gitignore#Hide()
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
" endif
" call matchadd('colorcolumn', '\%101v', 100) call matchadd('colorcolumn', '\%101v', 100)
" highlight colorcolumn ctermbg=red highlight colorcolumn ctermbg=red
" undofile - This allows you to use undos after exiting and restarting " undofile - This allows you to use undos after exiting and restarting
" This, like swap and backups, uses .vim-undo first, then ~/.vim/undo " This, like swap and backups, uses .vim-undo first, then ~/.vim/undo
@@ -82,8 +79,7 @@ if exists("+undofile")
if isdirectory($HOME . '/.vim/undo') == 0 if isdirectory($HOME . '/.vim/undo') == 0
:silent !mkdir -p ~/.vim/undo > /dev/null 2>&1 :silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
endif endif
set undodir=./.vim-undo// set undodir=~/.vim/undo/
set undodir+=~/.vim/undo//
set undofile set undofile
endif endif
@@ -113,61 +109,37 @@ command! ToggleBackground call s:toggle_background()
inoremap <F12> <C-O>:ToggleBackground<CR> inoremap <F12> <C-O>:ToggleBackground<CR>
nnoremap <F12> :ToggleBackground<CR> nnoremap <F12> :ToggleBackground<CR>
if has("autocmd") autocmd bufnewfile,bufread *.4th set filetype=forth
autocmd bufnewfile,bufread *.4th set filetype=forth autocmd bufnewfile,bufread *.asm set filetype=nasm
autocmd bufnewfile,bufread *.asm set filetype=nasm autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
autocmd bufnewfile,bufread *.c set keywordprg=man\ 3 autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
autocmd bufnewfile,bufread *.conf set filetype=conf autocmd bufnewfile,bufread *.conf set filetype=conf
autocmd bufnewfile,bufread *.fs packadd vim-fsharp | set filetype=fsharp autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
autocmd bufnewfile,bufread *.h set keywordprg=man\ 3 autocmd bufnewfile,bufread *.rust packadd rust-vim
autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
autocmd bufnewfile,bufread *.rust packadd rust-vim " | packadd deoplete-rust autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
autocmd bufnewfile,bufread *.toml packadd vim-toml | set filetype=toml autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
autocmd bufnewfile,bufread *.nim packadd nim-vim | set filetype=nim autocmd bufnewfile,bufread *.jq packadd jq.vim
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar autocmd bufnewfile,bufread urls,config set filetype=conf
autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
autocmd bufnewfile,bufread *.purs packadd purescript-vim | set filetype=purescript autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
autocmd bufnewfile,bufread *.jq packadd jq.vim autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
autocmd bufnewfile,bufread *.re packadd vim-reason-plus | set filetype=reason autocmd filetype javascript packadd vim-javascript
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4 autocmd filetype make setlocal noexpandtab
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax
autocmd bufnewfile,bufread urls,config set filetype=conf
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
autocmd filetype javascript packadd vim-javascript
autocmd filetype make setlocal noexpandtab
autocmd filetype html packadd emmet-vim
autocmd filetype gitcommit setlocal spell spelllang=en
autocmd filetype mail setlocal spell spelllang=de textwidth=0 | command Send %! mail-send
autocmd bufreadpost *
\ if line("'\"") > 0 && line("'\"") <= line("$") |
\ exe "normal! g`\"" |
\ endif
autocmd bufreadpre * setlocal foldmethod=indent
" autocmd bufwritepre * :call <SID>StripTrailingWhitespaces()
" autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
autocmd VimEnter * UpdateRemotePlugins autocmd filetype html packadd emmet-vim
endif autocmd filetype gitcommit setlocal spell spelllang=en
autocmd filetype mail setlocal spell spelllang=de textwidth=0
autocmd bufreadpost *
\ if line("'\"") > 0 && line("'\"") <= line("$") |
\ exe "normal! g`\"" |
\ endif
autocmd bufreadpre * setlocal foldmethod=indent
let g:startify_custom_header = ''
" let g:deoplete#enable_at_startup = 1
set completeopt=noinsert,menuone,noselect set completeopt=noinsert,menuone,noselect
set complete+=kspell set complete+=kspell
" let g:deoplete#sources = {}
" let g:deoplete#sources._ = ['ale', 'file', 'omni', 'buffer']
"
" let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
" let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
inoremap ^] ^X^]
inoremap ^F ^X^F
inoremap ^D ^X^D
inoremap ^L ^X^L
let g:SuperTabDefaultCompletionType = 'context' let g:SuperTabDefaultCompletionType = 'context'
@@ -197,7 +169,6 @@ let g:ale_fixers = {
\ 'typescript': ['prettier'], \ 'typescript': ['prettier'],
\ 'css': ['prettier'], \ 'css': ['prettier'],
\ 'html': ['prettier'], \ 'html': ['prettier'],
\ 'markdown': ['prettier'],
\ 'json': ['jq'], \ 'json': ['jq'],
\ 'python': ['black'], \ 'python': ['black'],
\ 'rust': ['rustfmt'] \ 'rust': ['rustfmt']
@@ -209,29 +180,5 @@ autocmd bufnewfile,bufread elm.json let g:ale_fix_on_save = 0
let g:ale_completion_enabled = 1 let g:ale_completion_enabled = 1
"if exists("g:loaded_airline")
" set noshowmode laststatus=0 noruler
let g:airline#extensions#tabline#close_symbol = 'X'
let g:airline#extensions#tabline#enabled = 0
"let g:airline#extensions#tabline#left_alt_sep = ''
"let g:airline#extensions#tabline#left_sep = ''
"let g:airline#extensions#tabline#right_alt_sep = ''
"let g:airline#extensions#tabline#right_sep = ''
let g:airline#extensions#tabline#show_close_button = 1
let g:airline#extensions#tabline#show_tab_type = 0
let g:airline#extensions#tabline#tab_min_count = 2
let g:airline#extensions#tabline#tab_nr_type = 0
let g:airline#extensions#tmuxline#enabled = 0
"let g:airline#extensions#wordcount#enabled = 1
"let g:airline_left_alt_sep = ''
"let g:airline_left_sep = ''
"let g:airline_right_alt_sep = ''
"let g:airline_right_sep = ''
let g:airline_section_z = '%{line(".")}/%{line("$")} %{col(".")}'
"endif
"if exists("g:loaded_airline_themes")
let g:airline_theme='base16'
"endif
let g:vimwiki_list = [{'path': '~/notes/', let g:vimwiki_list = [{'path': '~/notes/',
\ 'syntax': 'markdown', 'ext': '.md'}] \ 'syntax': 'markdown', 'ext': '.md'}]