From f2dfde23f8157da1532a2b2e236af529fed47713 Mon Sep 17 00:00:00 2001 From: Matt Singleton Date: Thu, 11 Apr 2024 16:21:15 -0500 Subject: replace janky deploy script with stow and make re-orgs all the console oriented dotfiles to be stowable makefile to deploy everything move from vimplug to native vim packages cleanup script for blowing away old symlinks --- stow/vim/.vim/autoload/airline/themes/tempus.vim | 35 +++++++ stow/vim/.vim/pack/my-plugins/start/ale | 1 + .../vim/.vim/pack/my-plugins/start/bufexplorer.zip | 1 + stow/vim/.vim/pack/my-plugins/start/ctrlp.vim | 1 + .../.vim/pack/my-plugins/start/tempus-themes-vim | 1 + stow/vim/.vim/pack/my-plugins/start/vim-airline | 1 + stow/vim/.vim/pack/my-plugins/start/vim-dirvish | 1 + stow/vim/.vim/pack/my-plugins/start/vim-eunuch | 1 + stow/vim/.vim/pack/my-plugins/start/vim-gitgutter | 1 + stow/vim/.vim/pack/my-plugins/start/vim-sensible | 1 + stow/vim/.vimrc | 115 +++++++++++++++++++++ 11 files changed, 159 insertions(+) create mode 100644 stow/vim/.vim/autoload/airline/themes/tempus.vim create mode 160000 stow/vim/.vim/pack/my-plugins/start/ale create mode 160000 stow/vim/.vim/pack/my-plugins/start/bufexplorer.zip create mode 160000 stow/vim/.vim/pack/my-plugins/start/ctrlp.vim create mode 160000 stow/vim/.vim/pack/my-plugins/start/tempus-themes-vim create mode 160000 stow/vim/.vim/pack/my-plugins/start/vim-airline create mode 160000 stow/vim/.vim/pack/my-plugins/start/vim-dirvish create mode 160000 stow/vim/.vim/pack/my-plugins/start/vim-eunuch create mode 160000 stow/vim/.vim/pack/my-plugins/start/vim-gitgutter create mode 160000 stow/vim/.vim/pack/my-plugins/start/vim-sensible create mode 100644 stow/vim/.vimrc (limited to 'stow/vim') diff --git a/stow/vim/.vim/autoload/airline/themes/tempus.vim b/stow/vim/.vim/autoload/airline/themes/tempus.vim new file mode 100644 index 0000000..e24f167 --- /dev/null +++ b/stow/vim/.vim/autoload/airline/themes/tempus.vim @@ -0,0 +1,35 @@ +" Color sets: +" guigfg guibg ctermfg ctermbg +let s:dark = [ '#eff0f2' , '#676364' , 15 , 8 ] +let s:light = [ '#676364' , '#dee2e0' , 0 , 7 ] +let s:blue = [ '#eff0f2' , '#4b529a' , 15 , 12 ] +let s:yellow = [ '#eff0f2' , '#8b590a' , 15 , 11 ] +let s:red = [ '#eff0f2' , '#a64822' , 15 , 9 ] +let s:green = [ '#eff0f2' , '#187408' , 15 , 10 ] + +let g:airline#themes#tempus#palette = {} + +let g:airline#themes#tempus#palette.accents = { + \ 'red': [ '#a64822' , '' , 9 , '' ], + \ } + +" Normal Mode: +let g:airline#themes#tempus#palette.normal = airline#themes#generate_color_map(s:blue, s:dark, s:light) + +" Insert Mode: +let g:airline#themes#tempus#palette.insert = copy(g:airline#themes#tempus#palette.normal) +let g:airline#themes#tempus#palette.insert.airline_a = s:yellow +let g:airline#themes#tempus#palette.insert.airline_z = s:yellow + +" Replace Mode: +let g:airline#themes#tempus#palette.replace = copy(g:airline#themes#tempus#palette.normal) +let g:airline#themes#tempus#palette.replace.airline_a = s:red +let g:airline#themes#tempus#palette.replace.airline_z = s:red + +" Visual Mode: +let g:airline#themes#tempus#palette.visual = copy(g:airline#themes#tempus#palette.normal) +let g:airline#themes#tempus#palette.visual.airline_a = s:green +let g:airline#themes#tempus#palette.visual.airline_z = s:green + +" Inactive: +let g:airline#themes#tempus#palette.inactive = airline#themes#generate_color_map(s:light, s:light, s:light) diff --git a/stow/vim/.vim/pack/my-plugins/start/ale b/stow/vim/.vim/pack/my-plugins/start/ale new file mode 160000 index 0000000..6db58b3 --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/ale @@ -0,0 +1 @@ +Subproject commit 6db58b33795430a6165f27c7f796c420c0e098e4 diff --git a/stow/vim/.vim/pack/my-plugins/start/bufexplorer.zip b/stow/vim/.vim/pack/my-plugins/start/bufexplorer.zip new file mode 160000 index 0000000..08b0100 --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/bufexplorer.zip @@ -0,0 +1 @@ +Subproject commit 08b0100f5242e1de07bce40dc6376a4996791c33 diff --git a/stow/vim/.vim/pack/my-plugins/start/ctrlp.vim b/stow/vim/.vim/pack/my-plugins/start/ctrlp.vim new file mode 160000 index 0000000..7c972cb --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit 7c972cb19c8544c681ca345c64ec39e04f4651cc diff --git a/stow/vim/.vim/pack/my-plugins/start/tempus-themes-vim b/stow/vim/.vim/pack/my-plugins/start/tempus-themes-vim new file mode 160000 index 0000000..b720ee2 --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/tempus-themes-vim @@ -0,0 +1 @@ +Subproject commit b720ee2d4c5588b5a27bb3544d3ded5ee1acab45 diff --git a/stow/vim/.vim/pack/my-plugins/start/vim-airline b/stow/vim/.vim/pack/my-plugins/start/vim-airline new file mode 160000 index 0000000..d9f42cb --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/vim-airline @@ -0,0 +1 @@ +Subproject commit d9f42cb46710e31962a9609939ddfeb0685dd779 diff --git a/stow/vim/.vim/pack/my-plugins/start/vim-dirvish b/stow/vim/.vim/pack/my-plugins/start/vim-dirvish new file mode 160000 index 0000000..3851bed --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/vim-dirvish @@ -0,0 +1 @@ +Subproject commit 3851bedb7f191b9a4a5531000b6fc0a8795cc9bb diff --git a/stow/vim/.vim/pack/my-plugins/start/vim-eunuch b/stow/vim/.vim/pack/my-plugins/start/vim-eunuch new file mode 160000 index 0000000..8fb3904 --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/vim-eunuch @@ -0,0 +1 @@ +Subproject commit 8fb3904be27b6b60d086f87c2570085902414069 diff --git a/stow/vim/.vim/pack/my-plugins/start/vim-gitgutter b/stow/vim/.vim/pack/my-plugins/start/vim-gitgutter new file mode 160000 index 0000000..67ef116 --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/vim-gitgutter @@ -0,0 +1 @@ +Subproject commit 67ef116100b40f9ca128196504a2e0bc0a2753b0 diff --git a/stow/vim/.vim/pack/my-plugins/start/vim-sensible b/stow/vim/.vim/pack/my-plugins/start/vim-sensible new file mode 160000 index 0000000..3e878ab --- /dev/null +++ b/stow/vim/.vim/pack/my-plugins/start/vim-sensible @@ -0,0 +1 @@ +Subproject commit 3e878abfd6ddc6fb5dba48b41f2b72c3a2f8249f diff --git a/stow/vim/.vimrc b/stow/vim/.vimrc new file mode 100644 index 0000000..483adc6 --- /dev/null +++ b/stow/vim/.vimrc @@ -0,0 +1,115 @@ +" +" behavior +" + +set nocompatible " use vim, not vi settings +set wildignore=*.pyc,.git " ignore from autocomplete +set showcmd " display incomplete commands +set ignorecase " ignore case in search +set smartcase " respect case in search if uppercase is used +set nowrap " do not wrap lines +set vb t_vb= " no beeping + +" +" formatting +" + +set tabstop=2 +set softtabstop=2 +set shiftwidth=2 +set expandtab +set shiftround +set listchars=tab:»·,trail:· +set list + +" +" filetype-specific +" + +if has("autocmd") + au! + + " plain text + au FileType text setlocal tw=80 + au FileType markdown setlocal tw=80 + + " python + au FileType python setlocal ts=4 sw=4 sts=4 + + " makefiles + au FileType make setlocal nolist + + " When editing a file, always jump to the last known cursor position. + " Don't do it when the position is invalid or when inside an event handler + au BufReadPost * + \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal g`\"" | + \ endif +endif + +" +" bindings +" + +let mapleader = "," + +" convenience +nnoremap x :source ~/.vimrc +nnoremap +nnoremap j +nnoremap k +nnoremap h +nnoremap l + +" dirvish +nnoremap e :Dirvish + +" bufexplore +nnoremap fe :BufExplorer +nnoremap fs :BufExplorerHorizontalSplit +nnoremap fv :BufExplorerVerticalSplit + +" ctrlp +let g:ctrlp_map ='a' + +" ale +nnoremap r :ALEDetail +let g:ale_linters_ignore = {'python': ['mypy']} " mypy is too slow and doesn't support dmypy + +" +" visual +" + +set background=light +silent! colo tempus_totus +let g:airline_theme='tempus' +set hlsearch +syntax enable + +" don't mess up gutter highlight with gitgutter +highlight clear SignColumn +hi! link SignColumn Background + +" Highlight non-ascii characters as the theme highlights errors +hi clear nonascii +hi link nonascii Error +if has("autocmd") + au BufReadPost * syntax match nonascii /[^\d0-\d127]/ +endif + +" highlight trailing space and tab as the theme highlights errors +hi clear SpecialKey +hi link SpecialKey Error + +let g:airline_powerline_fonts = 1 +let g:airline_left_sep="" +let g:airline_right_sep = "" +let g:airline_skip_empty_sections = 1 + +" +" local additions +" + +if filereadable($HOME."/.vimrc-local") + source ~/.vimrc-local +endif -- cgit v1.2.3