From dc6c9ed803a0525a188a6fb2b098da598bc0b383 Mon Sep 17 00:00:00 2001 From: Daniel Thoren Date: Wed, 30 Mar 2022 15:50:10 +0200 Subject: [PATCH] vim -> vimrc --- .vimrc | 64 ---------------------- init.vim | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 64 deletions(-) delete mode 100644 .vimrc create mode 100644 init.vim diff --git a/.vimrc b/.vimrc deleted file mode 100644 index 070ff30..0000000 --- a/.vimrc +++ /dev/null @@ -1,64 +0,0 @@ -" TODO: -" Switch to vim-plug -" [Vim bindings](https://stackoverflow.com/a/5400978/5684214) -" Find more plugins: https://vimawesome.com/ - -" Tested on Ubuntu 21.04 with VIM - Vi IMproved 8.2 -set nocompatible " be iMproved, required -filetype off " required - -" set runtime path and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -Plugin 'VundleVim/Vundle.vim' -Plugin 'tpope/vim-fugitive' " https://dev.to/iggredible/working-with-vim-and-git-4nkh -Plugin 'editorconfig/editorconfig-vim' -Plugin 'tmhedberg/SimpylFold' -Plugin 'vim-scripts/indentpython.vim' -Plugin 'vim-syntastic/syntastic' -Plugin 'nvie/vim-flake8' -Plugin 'scrooloose/nerdtree' -Plugin 'kien/ctrlp.vim' -Plugin 'rrethy/vim-illuminate' " highlight other uses of the current word under the cursor -Plugin 'mileszs/ack.vim' " grep-like source code search tool -Bundle 'Valloric/YouCompleteMe' -" Plugin 'powerline/powerline', {'rtp': 'powerline/bindings/vim/'} - -" remeber to call `:PluginInstall` after changing - -" All of your Plugins must be added before the following line -call vundle#end() " required -filetype plugin indent on " required - -" Enable folding -set foldmethod=indent -set foldlevel=99 - -" flag extranous whitespace -" au BufRead,BufNewFile *.py match BadWhitespace /\s\+$/ - -"python with virtualenv support -python3 << EOF -import os -import sys -if 'VIRTUAL_ENV' in os.environ: - project_base_dir = os.environ['VIRTUAL_ENV'] - activate_this = os.path.join(project_base_dir, 'bin/activate_this.py') - execfile(activate_this, dict(__file__=activate_this)) -EOF - -let python_highlight_all=1 -syntax on - -set backspace=indent,eol,start " more powerful backspacing -set nu " line numbers -set clipboard=unnamed " set clipboard - -" Set splits -set splitbelow -set splitright - -" increase vim-gitgutter update time (also vim swp update time) -" https://github.com/airblade/vim-gitgutter -set updatetime=100 diff --git a/init.vim b/init.vim new file mode 100644 index 0000000..b8711c8 --- /dev/null +++ b/init.vim @@ -0,0 +1,160 @@ +let mapleader ="," + +if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"')) + echo "Downloading junegunn/vim-plug to manage plugins..." + silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim + autocmd VimEnter * PlugInstall +endif + +call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"')) +Plug 'tpope/vim-surround' +Plug 'tpope/vim-fugitive' " git helper +Plug 'preservim/nerdtree' +Plug 'junegunn/goyo.vim' +Plug 'jreybert/vimagit' +Plug 'lukesmithxyz/vimling' +Plug 'vimwiki/vimwiki' +Plug 'vim-airline/vim-airline' +Plug 'tpope/vim-commentary' +Plug 'ap/vim-css-color' +" Plug 'rrethy/vim-illuminate' " highlight other uses of the current word under the cursor +call plug#end() + +set title +set bg=light +set go=a +set mouse=a +set nohlsearch +set clipboard+=unnamedplus +set noshowmode +set noruler +set laststatus=0 +set noshowcmd + +" Some basics: + nnoremap c "_c + set nocompatible + filetype plugin on + syntax on + set encoding=utf-8 + set number relativenumber +" Enable autocompletion: + set wildmode=longest,list,full +" Disables automatic commenting on newline: + autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o +" Perform dot commands over visual blocks: + vnoremap . :normal . +" Goyo plugin makes text more readable when writing prose: + map f :Goyo \| set bg=light \| set linebreak +" Spell-check set to o, 'o' for 'orthography': + map o :setlocal spell! spelllang=en_us +" Splits open at the bottom and right, which is non-retarded, unlike vim defaults. + set splitbelow splitright + +" Nerd tree + map n :NERDTreeToggle + autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif + if has('nvim') + let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks' + else + let NERDTreeBookmarksFile = '~/.vim' . '/NERDTreeBookmarks' + endif + +" vimling: + nm d :call ToggleDeadKeys() + imap d :call ToggleDeadKeys()a + nm i :call ToggleIPA() + imap i :call ToggleIPA()a + nm q :call ToggleProse() + +" Shortcutting split navigation, saving a keypress: + map h + map j + map k + map l + +" Replace ex mode with gq + map Q gq + +" Check file in shellcheck: + map s :!clear && shellcheck -x % + +" Open my bibliography file in split + map b :vsp$BIB + map r :vsp$REFER + +" Replace all is aliased to S. + nnoremap S :%s//g + +" Compile document, be it groff/LaTeX/markdown/etc. + map c :w! \| !compiler "%" + +" Open corresponding .pdf/.html or preview + map p :!opout % + +" Runs a script that cleans out tex build files whenever I close out of a .tex file. + autocmd VimLeave *.tex !texclear % + +" Ensure files are read as what I want: + let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} + map v :VimwikiIndex + let g:vimwiki_list = [{'path': '~/.local/share/nvim/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] + autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown + autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff + autocmd BufRead,BufNewFile *.tex set filetype=tex + +" Save file as sudo on files that require root permission + cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' edit! + +" Enable Goyo by default for mutt writing + autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 + autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light + autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x! + autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q! + +" Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position + autocmd BufWritePre * let currPos = getpos(".") + autocmd BufWritePre * %s/\s\+$//e + autocmd BufWritePre * %s/\n\+\%$//e + autocmd BufWritePre *.[ch] %s/\%$/\r/e + autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) + +" When shortcut files are updated, renew bash and ranger configs with new material: + autocmd BufWritePost bm-files,bm-dirs !shortcuts +" Run xrdb whenever Xdefaults or Xresources are updated. + autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults + autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb % +" Recompile dwmblocks on config edit. + autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks } + +" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable. +if &diff + highlight! link DiffText MatchParen +endif + +" Function for toggling the bottom statusbar: +let s:hidden_all = 0 +function! ToggleHiddenAll() + if s:hidden_all == 0 + let s:hidden_all = 1 + set noshowmode + set noruler + set laststatus=0 + set noshowcmd + else + let s:hidden_all = 0 + set showmode + set ruler + set laststatus=2 + set showcmd + endif +endfunction +nnoremap h :call ToggleHiddenAll() + +" Load command shortcuts generated from bm-dirs and bm-files via shortcuts script. +" Here leader is ";". +" So ":vs ;cfz" will expand into ":vs /home//.config/zsh/.zshrc" +" if typed fast without the timeout. +" source ~/.config/nvim/shortcuts.vim +