.config directory

This commit is contained in:
Ian Keane 2022-06-07 13:17:40 -04:00
parent 66dffa8efe
commit d9d326eaa1
38 changed files with 5655 additions and 304 deletions

View file

@ -1,99 +1,99 @@
" vim-plug {{{
" Automatic installation
" Automatic installation
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
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
call plug#begin('~/.vim/plugins')
packloadall
Plug 'chriskempson/base16-vim'
Plug 'junegunn/vim-easy-align'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin --all' }
" Plug 'https://gitlab.com/lstwn/broot.vim'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-commentary'
Plug 'w0rp/ale'
Plug 'dense-analysis/ale'
Plug 'airblade/vim-gitgutter'
Plug 'itchyny/lightline.vim'
Plug 'tpope/vim-repeat'
Plug 'haya14busa/incsearch.vim'
Plug 'gorodinskiy/vim-coloresque'
Plug 'sheerun/vim-polyglot'
Plug 'nvie/vim-flake8'
Plug 'KKPMW/sacredforest-vim'
Plug 'wolf-dog/lightline-sceaduhelm.vim'
" Plug 'unblevable/quick-scope'
Plug 'tpope/vim-fugitive'
" Plug 'l04m33/vlime', {'rtp': 'vim/'}
" Plug 'kovisoft/paredit'
Plug 'sainnhe/vim-color-forest-night'
Plug 'justinmk/vim-sneak'
Plug 'jgdavey/tslime.vim'
" Plug 'kovisoft/slimv'
Plug 'tpope/vim-vinegar'
Plug 'preservim/nerdtree'
Plug 'vimwiki/vimwiki'
Plug 'simnalamburt/vim-mundo'
Plug 'tpope/vim-dadbod'
Plug 'junegunn/gv.vim'
Plug 'rbong/vim-flog'
Plug 'tpope/vim-unimpaired'
" Clojure
Plug 'guns/vim-clojure-static' " syntax
Plug 'tpope/vim-fireplace'
Plug 'guns/vim-sexp'
Plug 'tpope/vim-sexp-mappings-for-regular-people'
"Plug 'dylanaraps/wal.vim'
Plug 'alvan/vim-closetag'
Plug 'mattn/emmet-vim'
" Plug 'tpope/vim-salve'
Plug 'chrisbra/colorizer'
" cljfold
Plug 'christoomey/vim-tmux-navigator'
Plug 'tpope/vim-rhubarb'
Plug 'zhaozg/vim-diagram'
Plug 'arcticicestudio/nord-vim'
Plug 'fatih/vim-go'
Plug 'diepm/vim-rest-console'
Plug 'pangloss/vim-javascript'
Plug 'leafgarland/typescript-vim'
Plug 'MaxMEllon/vim-jsx-pretty'
Plug 'peitalin/vim-jsx-typescript'
Plug 'jremmen/vim-ripgrep'
Plug 'francoiscabrol/ranger.vim'
Plug 'https://github.com/moll/vim-bbye'
Plug 'jlanzarotta/bufexplorer'
Plug 'dbeniamine/cheat.sh-vim'
" " Todo:
" "
call plug#end()
"}}}
" appearance {{{
colorscheme zenburn
" colorscheme wal
syntax on " Enable syntax
set encoding=utf-8 " Keep utf-8 encoding
set scrolloff=2 " Keep at least 3 lines above and below cursor
set showmode " Something something buffers
set showcmd " Show command in bottom bar
set wildmenu " Visual autocomplete for command menu
set wildmode=list:longest " Show all completions on tab
set laststatus=2 " Last window will always have statusline
set showmatch " Highlight matching [{()}]
set cursorline " Highlight current line
colorscheme base16-default-dark
let base16colorspace=256
syntax on " Enable syntax
set encoding=utf-8 " Keep utf-8 encoding
set scrolloff=2 " Keep at least 3 lines above and below cursor
set showmode " Something something buffers
set showcmd " Show command in bottom bar
set wildmenu " Visual autocomplete for command menu
set wildmode=list:longest " Show all completions on tab
set laststatus=2 " Last window will always have statusline
set showmatch " Highlight matching [{()}]
set cursorline " Highlight current line
highlight GitGutterAdd ctermbg=black guibg=black
highlight SignColumn guibg=black ctermbg=black
let g:ctrlsf_default_root="project"
" remove underline on current line number
hi CursorLineNr cterm=bold
" remove underline on current line number
hi CursorLineNr cterm=bold
" Lightline
let g:lightline = { 'colorscheme': 'sceaduhelm' }
set fillchars+=vert:│
" Lightline
let g:lightline = { 'colorscheme': 'sceaduhelm' }
set fillchars+=vert:│
command! LightlineReload call LightlineReload()
command! LightlineReload call LightlineReload()
function! LightlineReload()
function! LightlineReload()
call lightline#init()
call lightline#colorscheme()
call lightline#update()
endfunction
" }}}
endfunction
" Movement {{{
" TODO: map alt-j and k to move text lines vertically, maintaining indent
" }}}
" Invisible characters
set list
set listchars=tab:▸\ ,eol
" }}}
" Folding {{{
set foldenable " Enable folding
@ -110,20 +110,26 @@
set ttyfast " Improves smoothness and drawing
set backspace=indent,eol,start " Always allow backspacing
set undofile " Make .un file for persistent undo
" set relativenumber " Make numbers relative to current line
set number
set lazyredraw " Redraw only when necessary
set updatetime=100 " Make updates happen faster (gitgutter)
set splitright " Make split to right by default
set splitbelow
set winheight=30 " Soft minimum window height (active)
"set winminheight=10 " Hard minimum window height (inactive)
set winwidth=85 " Window width for current window
set winminheight=6 " Hard minimum window height (inactive)
set winwidth=90 " Window width for current window
set winminwidth=30 " Hard minimum for window width
set t_vb= " No visual bell ever
let g:sneak#use_ic_scs=1
set virtualedit=block
"}}}
set noswapfile
set undodir=~/.vim/undo
let g:markdown_folding=1
au FileType markdown setlocal foldlevel=99
let g:bufExplorerSplitHorzSize=8 " New split window is n rows high.
let g:bufExplorerDefaultHelp=0 " Do not show default help.
"}}}
" searching {{{
set gdefault " Remove default g flag on search
@ -131,62 +137,18 @@
set smartcase " Case-specific only when uppercase
set hlsearch " Don't continue to highlight searched phrases.
set incsearch " But do search as characters are entered
" Remap tab to jump by brackets
" Nnoremap <tab> %
" Vnoremap <tab> %
" Remap tab to jump by window
"}}}
" tab settings {{{
set tabstop=4 " Number of visual spaces per tab
set tabstop=4 " Number of visual spaces per tab
set softtabstop=4 " Should always = tabstop
set shiftwidth=4 " Indent/outdent by 4 columns
set expandtab " Tabs are spaces
set shiftround " Always indent/outdent to the nearest tabstop
set shiftwidth=4 " Indent/outdent by 4 columns
set expandtab " Tabs are spaces
set shiftround " Always indent/outdent to the nearest tabstop
" Make search terms more visible
highlight Visual ctermbg=DarkGreen ctermfg=Black
set autoindent " Auto indentation
"}}}
" ruler settings {{{
set rulerformat=%l,%-2v\|%4L\ Lines " Display line, column, and total lines
set ruler " Turn on ruler
"}}}
" long line handling {{{
" set textwidth=79
" set fo=t
" set colorcolumn=85
"}}}
" leaders {{{
:let mapleader = ","
" Clear search highlighting with leader-space
nnoremap <leader><space> :noh<cr>
" Underline with line of the same length
nnoremap <leader>- yypv$r-
" Insert date on current line
nnoremap <leader>d k :r !date <cr>
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
" tnoremap <leader><esc> <C-\><C-n>
vmap <leader>s <Plug>SendSelectionToTmux
nmap <leader>s <Plug>NormalModeSendToTmux
"nmap <leader>r <Plug>SetTmuxVars
"}}}
" invisible characters {{{
set list
set listchars=tab:▸\ ,eol
set autoindent " Auto indentation
"}}}
@ -200,113 +162,49 @@
inoremap <down> <nop>
inoremap <left> <nop>
inoremap <right> <nop>
" Disable h and l
" nnoremap h <nop>
" nnoremap l <nop>
" Make j and k move by screen line, not file line
nnoremap j gj
nnoremap k gk
"}}}
" slimv{{{
" let g:slimv_repl_split=2
" let g:slimv_repl_split_size=10
"}}}
" tslime{{{
let g:tslime_always_current_session = 1
let g:tslime_always_current_window = 1
let g:tslime_autoset_pane = 0
vmap <leader>r <Plug>SendSelectionToTmux
nmap <leader>r <Plug>NormalModeSendToTmux
" nmap <C-c>r <Plug>SetTmuxVars
" }}}
" {{{ web dev
autocmd FileType html set softtabstop=2
autocmd FileType html set ts=2
autocmd FileType html set shiftwidth=2
autocmd FileType css set softtabstop=2
autocmd FileType css set ts=2
autocmd FileType html set shiftwidth=2
autocmd FileType html,css,javascript,typescript,typescriptreact
\ set expandtab smarttab softtabstop=2 shiftwidth=2 tabstop=2
" Emmet tab size
let g:user_emmet_settings = {
\ 'indentation' : ' '
\}
" }}}
" clojure {{{
" TODO: make only work in clojure files
nnoremap <leader>e :Eval<CR> " eval form
nnoremap <leader>E :%Eval<CR> " eval file
" }}}
" split pane navigation {{{
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
" TODO: make new window prompt use fzf
" nnoremap <leader>w <C-w>v<C-w>l:e <C-S-d><BS><BS>open
" Switch panes wit ctrl + h/j/k/l
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
" nnoremap <C-h> <C-w>h
" nnoremap <C-j> <C-w>j
" nnoremap <C-k> <C-w>k
" nnoremap <C-l> <C-w>l
nnoremap <C-c> :close <cr>
nnoremap <C-n> :bn <cr>
" Term mode
" tnoremap <C-h> <C-w>h
" tnoremap <C-j> <C-w>j
" tnoremap <C-k> <C-w>k
" tnoremap <C-l> <C-w>l
" tnoremap <C-c> :close <cr>
" tnoremap <C-n> :bn <cr>
" tnoremap <Esc> <C-\><C-n>
" TODO: remap pane resize to something else (leader?)
" quick-scope
" Trigger a highlight in the appropriate direction when pressing these keys:
let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
augroup qs_colors
autocmd!
autocmd ColorScheme * highlight QuickScopePrimary guifg='#afff5f' gui=underline ctermfg=155 cterm=underline
autocmd ColorScheme * highlight QuickScopeSecondary guifg='#5fffff' gui=underline ctermfg=81 cterm=underline
augroup END
nnoremap <c-s> gt
nnoremap <C-p> :bp <cr>
let g:tmux_navigator_disable_when_zoomed = 1
"}}}
" file specific {{{
" In markdown files, when writing add two spaces to each line to fix spacing
" In compiled version
" au BufWritePost *.md silent! %s/[^ ]\zs$/\1 /
" TODO: find a better solution
" Bold something in a markdown file
" :au FileType markdown nmap <leader>b i**<esc>ea**<esc>b
" Python
" au BufNewFile,BufRead *.py
"\ set tabstop=4
"\ set softtabstop=4
"\ set shiftwidth=4
"\ set textwidth=79
"\ set expandtab
"\ set autoindent
"\ set fileformat=unix
"" Webdev
" au BufNewFile,BufRead *.js, *.html, *.css
"\ set tabstop=2
"\ set softtabstop=2
"\ set shiftwidth=2
" git commands {{{
nmap ghv <Plug>(GitGutterPreviewHunk)
nmap ghn <Plug>(GitGutterNextHunk)
nmap ghp <Plug>(GitGutterPrevHunk)
nmap ghf <Plug>(GitGutterFold)
nmap ghs <Plug>(GitGutterStageHunk)
" Controls fugitive diff split direction
set diffopt=vertical
"}}}
" plugin modification {{{
" FZF
map <C-p> :FZF<cr>
map <C-s> :FZF<cr>
" map <C-s> :tabNext<cr>
" This is the default extra key bindings
let g:fzf_action = {
\ 'ctrl-t': 'tab split',
@ -341,114 +239,93 @@
"}}}
" git commands {{{
nmap ghv <Plug>(GitGutterPreviewHunk)
nmap ghn <Plug>(GitGutterNextHunk)
nmap ghp <Plug>(GitGutterPrevHunk)
nmap ghf <Plug>(GitGutterFold)
nmap ghs <Plug>(GitGutterStageHunk)
" Controls fugitive diff split direction
set diffopt=vertical
command! Gundo !git reset --soft HEAD~1
" vimwiki {{{
let g:vimwiki_list = [
\ {'name': 'work', 'path': '~/.vim/work'},
\ {'name': 'home', 'path': '~/.vim/home'},
\ {'name': 'blog', 'path': '~/.vim/blog'},
\ {'name': 'vim', 'path': '~/.vim/vim'},
\ ]
let g:vimwiki_syntax = 'markdown'
let g:vimwiki_ext = '.md'
let g:vimwiki_automatic_nested_syntaxes = 1
let g:vimwiki_links_space_char = '_'
"}}}
" fold search {{{
" diffs {{{
hi DiffAdd cterm=none ctermfg=DarkGray ctermbg=Green
hi DiffChange cterm=none ctermfg=DarkGray ctermbg=Yellow
hi DiffDelete cterm=bold ctermfg=DarkGray ctermbg=Red
hi DiffText cterm=none ctermfg=DarkGray ctermbg=LightBlue
" command to fold everything except what you searched for
command! -nargs=* Fs
\ if <q-args> != '' |
\ exe "normal /".<q-args>."\<CR>" |
\ endif |
\ if @/ != '' |
\ setlocal
\ foldexpr=FoldRegex(v:lnum,@/,2)
\ foldmethod=expr
\ foldlevel=0 |
\ endif
function! FoldRegex(lnum,pat,context)
" get start/end positions for context lines
let startline=a:lnum-a:context
while startline < 1
let startline+=1
endwhile
let endline=a:lnum+a:context
while endline > line('$')
let endline-=1
endwhile
let returnval = 2
let pos=getpos('.')
" search from current line to get matches ON the line
call cursor(a:lnum, 1)
let matchline=search(a:pat,'cW',endline)
if matchline==a:lnum
let returnval = 0
elseif matchline > 0
" if current line didn't match, there could have been a match within
" trailing context lines
let returnval = 1
else
" if no match at current line, search leading context lines for a match
call cursor(startline, 1)
let matchline=search(a:pat,'cW',a:lnum)
if matchline > 0
let returnval = 1
endif
endif
call setpos('.',pos)
return returnval
endfun
" better diffs
set diffopt+=internal,algorithm:patience
" }}}
" copy matches {{{
function! CopyMatches(reg)
let hits = []
%s//\=len(add(hits, submatch(0))) ? submatch(0) : ''/gne
let reg = empty(a:reg) ? '+' : a:reg
execute 'let @'.reg.' = join(hits, "\n") . "\n"'
endfunction
command! -register CopyMatches call CopyMatches(<q-reg>)
" }}}
" vimrc {{{
" source $MYVIMRC reloads the saved $MYVIMRC
:nmap <Leader>s :source $MYVIMRC
" opens $MYVIMRC for editing, or use :tabedit $MYVIMRC
:nmap <Leader>v :e $MYVIMRC
" buffers {{{
let g:bufExplorerDisableDefaultKeyMapping=1 " Disable mapping.
"}}}
" hi DiffAdd ctermfg=NONE ctermbg=darkgreen
" hi DiffChange ctermfg=NONE ctermbg=darkgrey
" hi DiffDelete ctermfg=None ctermbg=Red
" hi Search cterm=NONE ctermfg=black ctermbg=lightgray
" broot {{{
let g:broot_default_conf_path=expand('~/.config/broot/conf.hjson')
let g:broot_replace_netrw=1
let g:loaded_netrwPlugin=1 " use broot for :E/T/V/Hexplore
"}}}
" ALE {{{
let g:ale_linters = {'javascript': ['tsserver'],
\ 'typescript': ['tsserver'],
\ 'typescriptreact': ['tsserver'],
\ 'python': ['flake8'],
\ 'css': ['csslint'],
\ 'dockerfile': ['hadolint'],
\ 'yaml': ['yamllint'] }
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'] }
" let g:ale_set_loclist = 0
" let g:ale_set_quickfix = 1
let g:ale_set_quickfix = 0
let g:ale_set_loclist = 0
let g:ale_fix_on_save = 1
"}}}
" leaders {{{
:let mapleader = ","
" Underline with line of the same length
nnoremap <leader>- yypv$r-
" Insert date on current line
nnoremap <leader>d k :r !date <cr>
nnoremap <leader>se :Explore<cr>
nnoremap <leader>st :Texplore<cr>
nnoremap <leader>sv :Vexplore<cr>
nnoremap <leader>sh :Hexplore<cr>
nmap <leader>h :map <leader><cr>
nnoremap <leader>ad :ALEDetail<cr>
nnoremap <leader>ag :ALEGoToDefinition<cr>
nnoremap <leader>al :ALEPopulateQuickfix<cr>
nnoremap <leader>an :ALENext<cr>
nnoremap <leader>ap :ALEPrevious<cr>
nnoremap <leader>ar :ALERename<cr>
nnoremap <leader>b :BufExplorerHorizontalSplit<cr>
"}}}
"
" highlight DiffAdd cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
" highlight DiffDelete cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
" highlight DiffChange cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
" highlight DiffText cterm=bold ctermfg=10 ctermbg=88 gui=none guifg=bg guibg=Red
hi DiffAdd cterm=none ctermfg=NONE ctermbg=Green
hi DiffChange cterm=none ctermfg=NONE ctermbg=Grey
hi DiffDelete cterm=bold ctermfg=NONE ctermbg=Red
hi DiffText cterm=none ctermfg=NONE ctermbg=Yellow
" better diffs
set diffopt+=internal,algorithm:patience
" TODO: rebind c-n
" TODO: change ,k to ,n and add notes to version control
" folding options, this must be last in file
" vim:foldmethod=marker:foldlevel=0
" folding options {{{
" folding options, this must be last in file
" vim:foldmethod=marker:foldlevel=0
" }}}