From 7875765e836f68b5d92d95ac645d6e30d25bda4a Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 31 Aug 2024 16:11:51 -0400 Subject: [PATCH 01/52] Torch vim setup. --- .gitmodules | 96 ------------ vim/autoload/pathogen.vim | 245 ----------------------------- vim/bundle/ag-vim | 1 - vim/bundle/coc | 1 - vim/bundle/ctrlp.vim | 1 - vim/bundle/editorconfig-vim | 1 - vim/bundle/gruvbox | 1 - vim/bundle/nerdtree | 1 - vim/bundle/syntastic | 1 - vim/bundle/tabular | 1 - vim/bundle/typescript-vim | 1 - vim/bundle/vdebug | 1 - vim/bundle/vim-airline | 1 - vim/bundle/vim-blade | 1 - vim/bundle/vim-coffee-script | 1 - vim/bundle/vim-fugitive | 1 - vim/bundle/vim-gitgutter | 1 - vim/bundle/vim-javascript | 1 - vim/bundle/vim-json | 1 - vim/bundle/vim-jsonnet | 1 - vim/bundle/vim-jsx-pretty | 1 - vim/bundle/vim-jsx-typescript | 1 - vim/bundle/vim-less | 1 - vim/bundle/vim-markdown | 1 - vim/bundle/vim-mdx-js | 1 - vim/bundle/vim-node | 1 - vim/bundle/vim-numbers | 1 - vim/bundle/vim-php | 1 - vim/bundle/vim-rhubarb | 1 - vim/bundle/vim-stylus | 1 - vim/bundle/vim-surround | 1 - vim/bundle/vim-terraform | 1 - vim/bundle/vim-typescript | 1 - vim/bundle/vim-vue | 1 - vim/coc-settings.json | 3 - vim/colors/bjornenki.vim | 184 ---------------------- vim/colors/delek.vim | 55 ------- vim/colors/deleklocal.vim | 58 ------- vim/colors/ir_black.vim | 212 -------------------------- vim/colors/pablo.vim | 26 ---- vim/colors/slate.vim | 56 ------- vim/colors/wombat.vim | 51 ------- vim/ftdetect/handlebars.vim | 3 - vim/ftdetect/json.vim | 1 - vim/ftdetect/mustache.vim | 3 - vim/ftdetect/scala.vim | 2 - vim/ftplugin/handlebars.vim | 10 -- vim/ftplugin/mustache.vim | 8 - vim/indent/handlebars.vim | 10 -- vim/indent/mustache.vim | 13 -- vim/indent/scala.vim | 83 ---------- vim/init.vim | 1 - vim/syntax/handlebars.vim | 86 ----------- vim/syntax/mustache.vim | 75 --------- vim/syntax/scala.vim | 151 ------------------ vim/syntax/smarty.vim | 279 ---------------------------------- vim2nvim | 3 - vimrc | 198 ------------------------ 58 files changed, 1944 deletions(-) delete mode 100644 vim/autoload/pathogen.vim delete mode 160000 vim/bundle/ag-vim delete mode 160000 vim/bundle/coc delete mode 160000 vim/bundle/ctrlp.vim delete mode 160000 vim/bundle/editorconfig-vim delete mode 160000 vim/bundle/gruvbox delete mode 160000 vim/bundle/nerdtree delete mode 160000 vim/bundle/syntastic delete mode 160000 vim/bundle/tabular delete mode 160000 vim/bundle/typescript-vim delete mode 160000 vim/bundle/vdebug delete mode 160000 vim/bundle/vim-airline delete mode 160000 vim/bundle/vim-blade delete mode 160000 vim/bundle/vim-coffee-script delete mode 160000 vim/bundle/vim-fugitive delete mode 160000 vim/bundle/vim-gitgutter delete mode 160000 vim/bundle/vim-javascript delete mode 160000 vim/bundle/vim-json delete mode 160000 vim/bundle/vim-jsonnet delete mode 160000 vim/bundle/vim-jsx-pretty delete mode 160000 vim/bundle/vim-jsx-typescript delete mode 160000 vim/bundle/vim-less delete mode 160000 vim/bundle/vim-markdown delete mode 160000 vim/bundle/vim-mdx-js delete mode 160000 vim/bundle/vim-node delete mode 160000 vim/bundle/vim-numbers delete mode 160000 vim/bundle/vim-php delete mode 160000 vim/bundle/vim-rhubarb delete mode 160000 vim/bundle/vim-stylus delete mode 160000 vim/bundle/vim-surround delete mode 160000 vim/bundle/vim-terraform delete mode 160000 vim/bundle/vim-typescript delete mode 160000 vim/bundle/vim-vue delete mode 100644 vim/coc-settings.json delete mode 100644 vim/colors/bjornenki.vim delete mode 100644 vim/colors/delek.vim delete mode 100644 vim/colors/deleklocal.vim delete mode 100644 vim/colors/ir_black.vim delete mode 100644 vim/colors/pablo.vim delete mode 100644 vim/colors/slate.vim delete mode 100644 vim/colors/wombat.vim delete mode 100644 vim/ftdetect/handlebars.vim delete mode 100644 vim/ftdetect/json.vim delete mode 100644 vim/ftdetect/mustache.vim delete mode 100644 vim/ftdetect/scala.vim delete mode 100644 vim/ftplugin/handlebars.vim delete mode 100644 vim/ftplugin/mustache.vim delete mode 100644 vim/indent/handlebars.vim delete mode 100644 vim/indent/mustache.vim delete mode 100644 vim/indent/scala.vim delete mode 120000 vim/init.vim delete mode 100644 vim/syntax/handlebars.vim delete mode 100644 vim/syntax/mustache.vim delete mode 100644 vim/syntax/scala.vim delete mode 100644 vim/syntax/smarty.vim delete mode 100755 vim2nvim delete mode 100644 vimrc diff --git a/.gitmodules b/.gitmodules index bd0856a..b0068e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,99 +1,3 @@ -[submodule "vim/bundle/vim-fugitive"] - path = vim/bundle/vim-fugitive - url = git://github.com/tpope/vim-fugitive.git -[submodule "vim/bundle/vim-coffee-script"] - path = vim/bundle/vim-coffee-script - url = git://github.com/kchmck/vim-coffee-script.git -[submodule "vim/bundle/vim-stylus"] - path = vim/bundle/vim-stylus - url = git://github.com/wavded/vim-stylus.git -[submodule "vim/bundle/vim-less"] - path = vim/bundle/vim-less - url = https://github.com/groenewege/vim-less.git -[submodule "vim/bundle/vim-numbers"] - path = vim/bundle/vim-numbers - url = git://github.com/myusuf3/numbers.vim.git -[submodule "vim/bundle/vim-javascript"] - path = vim/bundle/vim-javascript - url = https://github.com/pangloss/vim-javascript.git -[submodule "vim/bundle/vim-json"] - path = vim/bundle/vim-json - url = https://github.com/elzr/vim-json.git -[submodule "vim/bundle/editorconfig-vim"] - path = vim/bundle/editorconfig-vim - url = https://github.com/editorconfig/editorconfig-vim.git -[submodule "vim/bundle/syntastic"] - path = vim/bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "vim/bundle/ctrlp.vim"] - path = vim/bundle/ctrlp.vim - url = git@github.com:ctrlpvim/ctrlp.vim.git -[submodule "vim/bundle/vim-php"] - path = vim/bundle/vim-php - url = git@github.com:StanAngeloff/php.vim.git -[submodule "vim/bundle/tabular"] - path = vim/bundle/tabular - url = git://github.com/godlygeek/tabular.git -[submodule "vim/bundle/vim-vue"] - path = vim/bundle/vim-vue - url = https://github.com/posva/vim-vue.git -[submodule "vim/bundle/vim-rhubarb"] - path = vim/bundle/vim-rhubarb - url = git@github.com:tpope/vim-rhubarb.git -[submodule "vim/bundle/vim-blade"] - path = vim/bundle/vim-blade - url = git://github.com/jwalton512/vim-blade.git -[submodule "vim/bundle/typescript-vim"] - path = vim/bundle/typescript-vim - url = git@github.com:leafgarland/typescript-vim.git -[submodule "vim/bundle/vim-jsx-typescript"] - path = vim/bundle/vim-jsx-typescript - url = git@github.com:peitalin/vim-jsx-typescript.git -[submodule "vim/bundle/vim-gitgutter"] - path = vim/bundle/vim-gitgutter - url = git@github.com:airblade/vim-gitgutter.git [submodule "Pictures"] path = Pictures url = git@github.com:cesutherland/Pictures.git -[submodule "vim/bundle/coc"] - path = vim/bundle/coc - url = git@github.com:neoclide/coc.nvim.git -[submodule "vim/bundle/nerdtree"] - path = vim/bundle/nerdtree - url = git@github.com:preservim/nerdtree.git -[submodule "vim/bundle/gruvbox"] - path = vim/bundle/gruvbox - url = git@github.com:gruvbox-community/gruvbox.git -[submodule "vim/bundle/vim-airline"] - path = vim/bundle/vim-airline - url = git@github.com:vim-airline/vim-airline.git -[submodule "vim/bundle/vim-typescript"] - path = vim/bundle/vim-typescript - url = git@github.com:leafgarland/typescript-vim.git -[submodule "vim/bundle/vim-jsx-pretty"] - path = vim/bundle/vim-jsx-pretty - url = git@github.com:MaxMEllon/vim-jsx-pretty.git -[submodule "vim/bundle/ag-vim"] - path = vim/bundle/ag-vim - url = git@github.com:rking/ag.vim.git -[submodule "vim/bundle/vim-mdx-js"] - path = vim/bundle/vim-mdx-js - url = git@github.com:jxnblk/vim-mdx-js.git -[submodule "vim/bundle/vim-node"] - path = vim/bundle/vim-node - url = https://github.com/moll/vim-node -[submodule "vim/bundle/vim-surround"] - path = vim/bundle/vim-surround - url = git@github.com:tpope/vim-surround.git -[submodule "vim/bundle/vim-markdown"] - path = vim/bundle/vim-markdown - url = git@github.com:plasticboy/vim-markdown.git -[submodule "vim/bundle/vim-terraform"] - path = vim/bundle/vim-terraform - url = https://github.com/hashivim/vim-terraform.git -[submodule "vim/bundle/vdebug"] - path = vim/bundle/vdebug - url = git@github.com:vim-vdebug/vdebug.git -[submodule "vim/bundle/vim-jsonnet"] - path = vim/bundle/vim-jsonnet - url = git@github.com:google/vim-jsonnet.git diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 3accbe6..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,245 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.0 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc -" prior to `filetype plugin indent on` is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a directory name to invoke -" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path -" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards, -" pathogen#cycle_filetype() is invoked. -function! pathogen#infect(...) abort " {{{1 - let source_path = a:0 ? a:1 : 'bundle' - if source_path =~# '[\\/]' - call pathogen#runtime_prepend_subdirectories(source_path) - else - call pathogen#runtime_append_all_bundles(source_path) - endif - call pathogen#cycle_filetype() -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - helptags `=dir.'/doc'` - endif - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) "{{{1 - let rtp = pathogen#join(1,pathogen#split(&rtp)) - return fnamemodify(findfile(a:file,rtp,a:count),':p') -endfunction " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - elseif a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) - else - return a:cmd.' '.pathogen#fnameescape(file) - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set ft=vim ts=8 sw=2 sts=2: diff --git a/vim/bundle/ag-vim b/vim/bundle/ag-vim deleted file mode 160000 index 4a0dd6e..0000000 --- a/vim/bundle/ag-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a0dd6e190f446e5a016b44fdaa2feafc582918e diff --git a/vim/bundle/coc b/vim/bundle/coc deleted file mode 160000 index 1d3c525..0000000 --- a/vim/bundle/coc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d3c525e2d6af0c07ed19fa7a5016ffc6a9e8421 diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim deleted file mode 160000 index e953ee7..0000000 --- a/vim/bundle/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e953ee7a80dc96cd00c20ed6fe82e0e817d977ff diff --git a/vim/bundle/editorconfig-vim b/vim/bundle/editorconfig-vim deleted file mode 160000 index 0956bc2..0000000 --- a/vim/bundle/editorconfig-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0956bc257ca4eaa3e087e0ba2253a3e980805820 diff --git a/vim/bundle/gruvbox b/vim/bundle/gruvbox deleted file mode 160000 index 933b6cc..0000000 --- a/vim/bundle/gruvbox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 933b6cc35a0f180ff488ef20c7b534c9c3b6701a diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree deleted file mode 160000 index 577ddc7..0000000 --- a/vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 577ddc73f0a1d2fd6166ed3268ab8536111037e0 diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic deleted file mode 160000 index 6374164..0000000 --- a/vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63741646a9e87bbe105674747555aded6f52c490 diff --git a/vim/bundle/tabular b/vim/bundle/tabular deleted file mode 160000 index 60f2564..0000000 --- a/vim/bundle/tabular +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb diff --git a/vim/bundle/typescript-vim b/vim/bundle/typescript-vim deleted file mode 160000 index 17d85d8..0000000 --- a/vim/bundle/typescript-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 17d85d8051ba21283e62a9101734981e10b732fd diff --git a/vim/bundle/vdebug b/vim/bundle/vdebug deleted file mode 160000 index f979cc0..0000000 --- a/vim/bundle/vdebug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f979cc065e63796bdf60f014ae2280ce8e72cded diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline deleted file mode 160000 index 9614105..0000000 --- a/vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9614105d09ff0d6e1043ab33028615f107fe94a5 diff --git a/vim/bundle/vim-blade b/vim/bundle/vim-blade deleted file mode 160000 index fb4239a..0000000 --- a/vim/bundle/vim-blade +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb4239a7828dbc0eeaeabc8d426b64955be7b712 diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script deleted file mode 160000 index abac188..0000000 --- a/vim/bundle/vim-coffee-script +++ /dev/null @@ -1 +0,0 @@ -Subproject commit abac188893e615b5cbb7137ada691abd597be975 diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive deleted file mode 160000 index c0b03f1..0000000 --- a/vim/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0b03f1cac242d96837326d300f42a660306fc1a diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter deleted file mode 160000 index 8005f71..0000000 --- a/vim/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8005f71aabef13f5872b3ef4802f36503a16c451 diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript deleted file mode 160000 index c470ce1..0000000 --- a/vim/bundle/vim-javascript +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c470ce1399a544fe587eab950f571c83cccfbbdc diff --git a/vim/bundle/vim-json b/vim/bundle/vim-json deleted file mode 160000 index 239332a..0000000 --- a/vim/bundle/vim-json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 239332a65b24cea376ae68a8a3727d82e9f88b05 diff --git a/vim/bundle/vim-jsonnet b/vim/bundle/vim-jsonnet deleted file mode 160000 index 4ebc661..0000000 --- a/vim/bundle/vim-jsonnet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4ebc6619ddce5d032a985b42a9864154c3d20e4a diff --git a/vim/bundle/vim-jsx-pretty b/vim/bundle/vim-jsx-pretty deleted file mode 160000 index 6989f16..0000000 --- a/vim/bundle/vim-jsx-pretty +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6989f1663cc03d7da72b5ef1c03f87e6ddb70b41 diff --git a/vim/bundle/vim-jsx-typescript b/vim/bundle/vim-jsx-typescript deleted file mode 160000 index 07370d4..0000000 --- a/vim/bundle/vim-jsx-typescript +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 07370d48c605ec027543b52762930165b1b27779 diff --git a/vim/bundle/vim-less b/vim/bundle/vim-less deleted file mode 160000 index aaf0c28..0000000 --- a/vim/bundle/vim-less +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aaf0c284adbda66e3b3c590615a6b6bde3870e43 diff --git a/vim/bundle/vim-markdown b/vim/bundle/vim-markdown deleted file mode 160000 index 8e5d86f..0000000 --- a/vim/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e5d86f7b85234d3d1b4207dceebc43a768ed5d4 diff --git a/vim/bundle/vim-mdx-js b/vim/bundle/vim-mdx-js deleted file mode 160000 index 17179d7..0000000 --- a/vim/bundle/vim-mdx-js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 17179d7f2a73172af5f9a8d65b01a3acf12ddd50 diff --git a/vim/bundle/vim-node b/vim/bundle/vim-node deleted file mode 160000 index ede0477..0000000 --- a/vim/bundle/vim-node +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ede047791792b9530ba1ae73ed86e9671cdd96b8 diff --git a/vim/bundle/vim-numbers b/vim/bundle/vim-numbers deleted file mode 160000 index d1e9dac..0000000 --- a/vim/bundle/vim-numbers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d1e9dace93a628f22f159254f3754b5041f5602a diff --git a/vim/bundle/vim-php b/vim/bundle/vim-php deleted file mode 160000 index 930aec5..0000000 --- a/vim/bundle/vim-php +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 930aec5c7026297a6630bd2940c08c5ff552cf2a diff --git a/vim/bundle/vim-rhubarb b/vim/bundle/vim-rhubarb deleted file mode 160000 index e57ed3b..0000000 --- a/vim/bundle/vim-rhubarb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e57ed3b6be2c4a49656f1a816919f0af22fae324 diff --git a/vim/bundle/vim-stylus b/vim/bundle/vim-stylus deleted file mode 160000 index 9ab38f0..0000000 --- a/vim/bundle/vim-stylus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ab38f066ff2b726eb1680da489b184fd17dee50 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround deleted file mode 160000 index f51a26d..0000000 --- a/vim/bundle/vim-surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f51a26d3710629d031806305b6c8727189cd1935 diff --git a/vim/bundle/vim-terraform b/vim/bundle/vim-terraform deleted file mode 160000 index f0b17ac..0000000 --- a/vim/bundle/vim-terraform +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443 diff --git a/vim/bundle/vim-typescript b/vim/bundle/vim-typescript deleted file mode 160000 index 52f3ca3..0000000 --- a/vim/bundle/vim-typescript +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 52f3ca3474d51f5021696ffb7297d989e49121ac diff --git a/vim/bundle/vim-vue b/vim/bundle/vim-vue deleted file mode 160000 index c424294..0000000 --- a/vim/bundle/vim-vue +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c424294e769b26659176065f9713c395731f7b3a diff --git a/vim/coc-settings.json b/vim/coc-settings.json deleted file mode 100644 index c74cd08..0000000 --- a/vim/coc-settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.home": "/usr/lib/jvm/java-11-openjdk-amd64/" -} diff --git a/vim/colors/bjornenki.vim b/vim/colors/bjornenki.vim deleted file mode 100644 index 0503243..0000000 --- a/vim/colors/bjornenki.vim +++ /dev/null @@ -1,184 +0,0 @@ -" bjorn's PHP/MySQL/JavaScript/HTML/CSS color scheme - -" ******************************************************************************** -" The following are the preferred 16 colors for your terminal -" Colors Bright Colors -" Black #4E4E4E #7C7C7C -" Red #FF6C60 #FFB6B0 -" Green #254bb8 #CEFFAB -" Yellow #000000 #FFFFCB -" Blue #00ff00 #FFFFCB -" Magenta #FF73FD #FF9CFE -" Cyan #FFFFFF #DFDFFE -" White #EEEEEE #FFFFFF - - -" ******************************************************************************** -set background=dark -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "bjorn" - - -"hi Example guifg=NONE guibg=#ff0000 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -" General colors -hi Normal guifg=lightblue guibg=black gui=NONE ctermfg=blue ctermbg=black cterm=NONE -hi NonText guifg=#22ea43 guibg=black gui=NONE ctermfg=green ctermbg=black cterm=NONE - -hi Cursor guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=reverse -hi LineNr guifg=#22ea43 guibg=black gui=NONE ctermfg=green ctermbg=black cterm=NONE - -hi VertSplit guifg=#202020 guibg=#202020 gui=NONE ctermfg=darkgray ctermbg=darkgray cterm=NONE -hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=white ctermbg=darkgray cterm=NONE -hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE - -hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - - -hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE - -hi SpecialKey guifg=#808080 guibg=#343434 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi WildMenu guifg=#22ea43 guibg=cyan gui=NONE ctermfg=black ctermbg=yellow cterm=NONE -hi PmenuSbar guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=NONE -"hi Ignore guifg=gray guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi Error guifg=NONE guibg=NONE gui=undercurl ctermfg=white ctermbg=red cterm=NONE guisp=#FF6C60 " undercurl color -hi ErrorMsg guifg=white guibg=#FF6C60 gui=NONE ctermfg=white ctermbg=red cterm=NONE -hi WarningMsg guifg=white guibg=#FF6C60 gui=NONE ctermfg=white ctermbg=red cterm=NONE - -" Message displayed in lower left, such as --INSERT-- -hi ModeMsg guifg=black guibg=#8e31c9 gui=NONE ctermfg=black ctermbg=cyan cterm=NONE - -if version >= 700 " Vim 7.x specific colors - hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE - hi CursorColumn guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi MatchParen guifg=#ffffff guibg=#857b6f gui=NONE ctermfg=white ctermbg=darkgray cterm=NONE - hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel guifg=#000000 guibg=#cae682 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Search guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -endif - -" Syntax highlighting - - -" HTML titles (in header tags) -hi Title guifg=white guibg=NONE gui=bold ctermfg=white ctermbg=NONE cterm=bold - -" Comments for all languages -hi Comment guifg=white guibg=#2263c3 gui=NONE ctermfg=white ctermbg=darkgray cterm=NONE - -" NON-css hex colors and all numbers for PHP, JS, and CSS #53bcff is TURQOIS -hi Number guifg=#53bcff guibg=NONE gui=underline ctermfg=cyan ctermbg=NONE cterm=NONE -" CSS #hexdec color codes -hi Constant guifg=#53bcff guibg=NONE gui=underline ctermfg=cyan ctermbg=NONE cterm=NONE -" JS numbers only -hi javaScriptNumber guifg=#53bcff guibg=NONE gui=underline ctermfg=cyan ctermbg=NONE cterm=NONE - -" PHP variables, JS 'var' and 'this' -hi Identifier guifg=#53bcff guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE - -" JS, event, null, window, location, etc. -hi Keyword guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - -" if, else, etc. for JS and PHP -hi Conditional guifg=white guibg=NONE gui=BOLD ctermfg=white ctermbg=NONE cterm=NONE -" PHP and JS loops for/while loops, etc -hi Repeat guifg=white guibg=NONE gui=BOLD ctermfg=white ctermbg=NONE cterm=NONE -" PHP {} [] -hi Delimiter guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - -" all PHP/MySQL functions, JS 'function' {} and [], CSS #div and .class and {} #22ea43 is GREEN -hi Function guifg=#22ea43 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE -" PHP include function only -hi Include guifg=#22ea43 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE -" PHP echo function only -hi Define guifg=#22ea43 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE -" CSS :hover, HTML tab whitespace, -hi PreProc guifg=#22ea43 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE - - -" PHP == < > != -hi Statement guifg=white guibg=NONE gui=BOLD ctermfg=white ctermbg=NONE cterm=BOLD - -" CSS !important, JS text and background in HTML pages that isn't a variable, string, etc. -hi Special guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - -" PHP $ = . ++ empty !, JS 'new' #8e31c9 is PURPLE -hi Operator guifg=#8e31c9 guibg=NONE gui=NONE ctermfg=magenta ctermbg=NONE cterm=NONE -" CSS ATTRIBUTES -hi StorageClass guifg=#8e31c9 guibg=NONE gui=NONE ctermfg=magenta ctermbg=NONE cterm=NONE -" HTML tags (rel, title, etc.), JS 'Date' 'Array', CSS attribute values (relative, absolute, etc.) -hi Type guifg=#8e31c9 guibg=NONE gui=bold ctermfg=magenta ctermbg=NONE cterm=NONE - -" All strings -hi String guifg=blue guibg=NONE gui=italic ctermfg=blue ctermbg=NONE cterm=italic - -" Special for HTML #d2ff1c is YELLOW -hi htmlTag guifg=white guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE -hi htmlEndTag guifg=white guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE -hi htmlTagName guifg=#d2ff1c guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE -" JS only -hi Exception guifg=#d2ff1c guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE - -" JAVASCRIPT FALSE/TRUE statement -hi Boolean guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - - - - -" COLOR DEFINITIONS BY ME - -hi Blue_bg guifg=#000000 guibg=#0000ff gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE -hi Green_bg guifg=#000000 guibg=#00FF00 gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE -hi Red_bg guifg=#000000 guibg=#FF0000 gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE -" END COLOR DEFS - - - - -" Special for XML -hi link xmlTag Red_bg -hi link xmlTagName Green_bg -"hi link xmlEndTag Blue_bg - - - - -" Special for Java -" hi link javaClassDecl Type -hi link javaScopeDecl Red_bg -hi link javaCommentTitle Green_bg -"hi link javaDocTags Blue_bg -hi link javaDocParam Red_bg -hi link javaDocSeeTagParam Green_bg - -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -"hi javaClassDecl guifg=#CCFFCC guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - - - -" SEEMINGLY NOTHING -" hi link Character Red_bg -" hi link Label Green_bg -" hi link Macro Blue_bg -"hi link Float Green_bg -"hi link PreCondit Blue_bg -"hi link Structure Green_bg -"hi link Typedef Blue_bg -"hi link Tag Red_bg -"hi link SpecialChar Red_bg -"hi link SpecialComment Green_bg -"hi link Debug Blue_bg - -hi Todo guifg=#ff0000 guibg=#ff0000 gui=NONE ctermfg=red ctermbg=NONE cterm=NONE diff --git a/vim/colors/delek.vim b/vim/colors/delek.vim deleted file mode 100644 index 78c09ad..0000000 --- a/vim/colors/delek.vim +++ /dev/null @@ -1,55 +0,0 @@ -" Vim color file -" Maintainer: David Schweikert -" Last Change: 2006 Apr 30 - -hi clear - -let colors_name = "delek" - -" Normal should come first -hi Normal guifg=Black guibg=White -hi Cursor guifg=bg guibg=fg -hi lCursor guifg=NONE guibg=Cyan -hi TabLine ctermfg=Grey ctermbg=Black -hi TabLineFill ctermfg=Black ctermbg=Black -hi TabLineSel ctermfg=White ctermbg=Black - - -" Note: we never set 'term' because the defaults for B&W terminals are OK -hi DiffAdd ctermbg=LightBlue guibg=LightBlue -hi DiffChange ctermbg=LightMagenta guibg=LightMagenta -hi DiffDelete ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan -hi DiffText ctermbg=Red cterm=bold gui=bold guibg=Red -hi Directory ctermfg=DarkBlue guifg=Blue -hi ErrorMsg ctermfg=White ctermbg=DarkRed guibg=Red guifg=White -hi FoldColumn ctermfg=DarkBlue ctermbg=Grey guibg=Grey guifg=DarkBlue -hi Folded ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue -hi IncSearch cterm=reverse gui=reverse -hi LineNr ctermfg=Brown guifg=Brown -hi ModeMsg cterm=bold gui=bold -hi MoreMsg ctermfg=DarkGreen gui=bold guifg=SeaGreen -hi NonText ctermfg=Blue gui=bold guifg=gray guibg=white -hi Pmenu guibg=LightBlue -hi PmenuSel ctermfg=White ctermbg=DarkBlue guifg=White guibg=DarkBlue -hi Question ctermfg=DarkGreen gui=bold guifg=SeaGreen -hi Search ctermfg=NONE ctermbg=Yellow guibg=Yellow guifg=NONE -hi SpecialKey ctermfg=DarkBlue guifg=Blue -hi StatusLine cterm=bold ctermbg=blue ctermfg=yellow guibg=gold guifg=blue -hi StatusLineNC cterm=bold ctermbg=blue ctermfg=black guibg=gold guifg=blue -hi Title ctermfg=DarkMagenta gui=bold guifg=Magenta -hi VertSplit cterm=reverse gui=reverse -hi Visual ctermbg=NONE cterm=reverse gui=reverse guifg=Grey guibg=fg -hi VisualNOS cterm=underline,bold gui=underline,bold -hi WarningMsg ctermfg=DarkRed guifg=Red -hi WildMenu ctermfg=Black ctermbg=Yellow guibg=Yellow guifg=Black - -" syntax highlighting -hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2 -hi Constant cterm=NONE ctermfg=DarkGreen gui=NONE guifg=green3 -hi Identifier cterm=NONE ctermfg=DarkCyan gui=NONE guifg=cyan4 -hi PreProc cterm=NONE ctermfg=DarkMagenta gui=NONE guifg=magenta3 -hi Special cterm=NONE ctermfg=LightRed gui=NONE guifg=deeppink -hi Statement cterm=bold ctermfg=Blue gui=bold guifg=blue -hi Type cterm=NONE ctermfg=Blue gui=bold guifg=blue - -" vim: sw=2 diff --git a/vim/colors/deleklocal.vim b/vim/colors/deleklocal.vim deleted file mode 100644 index 368a137..0000000 --- a/vim/colors/deleklocal.vim +++ /dev/null @@ -1,58 +0,0 @@ -" Vim color file -" Maintainer: David Schweikert -" Last Change: 2006 Apr 30 - -hi clear - -let colors_name = "delek" - -" Normal should come first -hi Normal guifg=Black guibg=White -hi Cursor guifg=bg guibg=fg -hi lCursor guifg=NONE guibg=Cyan -hi TabLine ctermfg=7 ctermbg=NONE -hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE -hi TabLineSel ctermfg=NONE ctermbg=NONE - - -" Note: we never set 'term' because the defaults for B&W terminals are OK -hi DiffAdd ctermbg=LightBlue guibg=LightBlue -hi DiffChange ctermbg=LightMagenta guibg=LightMagenta -hi DiffDelete ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan -hi DiffText ctermbg=Red cterm=bold gui=bold guibg=Red -hi Directory ctermfg=DarkBlue guifg=Blue -hi ErrorMsg ctermfg=White ctermbg=DarkRed guibg=Red guifg=White -hi FoldColumn ctermfg=DarkBlue ctermbg=Grey guibg=Grey guifg=DarkBlue -hi Folded ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue -hi IncSearch cterm=reverse gui=reverse -hi LineNr ctermfg=58 guifg=Brown -hi ModeMsg cterm=bold gui=bold -hi MoreMsg ctermfg=DarkGreen gui=bold guifg=SeaGreen -hi NonText ctermfg=Blue gui=bold guifg=gray guibg=white -hi Pmenu ctermfg=Black ctermbg=LightGrey guibg=LightBlue -hi PmenuSel ctermfg=White ctermbg=Grey guifg=White guibg=DarkBlue -hi Question ctermfg=DarkGreen gui=bold guifg=SeaGreen -hi Search ctermfg=NONE ctermbg=Yellow guibg=Yellow guifg=NONE -hi SpecialKey ctermfg=DarkBlue guifg=Blue -hi StatusLine cterm=bold ctermbg=NONE guibg=gold guifg=blue cterm=underline -hi StatusLineNC cterm=bold ctermbg=NONE ctermfg=8 guibg=gold guifg=blue cterm=underline -hi Title ctermfg=DarkMagenta gui=bold guifg=Magenta -hi VertSplit cterm=NONE ctermbg=NONE gui=reverse -hi Visual ctermbg=NONE cterm=reverse gui=reverse guifg=Grey guibg=fg -hi VisualNOS cterm=underline,bold gui=underline,bold -hi WarningMsg ctermfg=DarkRed guifg=Red -hi WildMenu ctermfg=Black ctermbg=Yellow guibg=Yellow guifg=Black - -" syntax highlighting -hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2 -hi Constant cterm=NONE ctermfg=DarkGreen gui=NONE guifg=green3 -hi Identifier cterm=NONE ctermfg=DarkCyan gui=NONE guifg=cyan4 -hi PreProc cterm=NONE ctermfg=DarkMagenta gui=NONE guifg=magenta3 -hi Special cterm=NONE ctermfg=LightRed gui=NONE guifg=deeppink -hi Statement cterm=bold ctermfg=Blue gui=bold guifg=blue -hi Type cterm=NONE ctermfg=Blue gui=bold guifg=blue - -" Syntastic: -hi SignColumn ctermbg=NONE - -" vim: sw=2 diff --git a/vim/colors/ir_black.vim b/vim/colors/ir_black.vim deleted file mode 100644 index 2e151d8..0000000 --- a/vim/colors/ir_black.vim +++ /dev/null @@ -1,212 +0,0 @@ -" ir_black color scheme -" More at: http://blog.infinitered.com/entries/show/8 - - -" ******************************************************************************** -" Standard colors used in all ir_black themes: -" Note, x:x:x are RGB values -" -" normal: #f6f3e8 -" -" string: #A8FF60 168:255:96 -" string inner (punc, code, etc): #00A0A0 0:160:160 -" number: #FF73FD 255:115:253 -" comments: #7C7C7C 124:124:124 -" keywords: #96CBFE 150:203:254 -" operators: white -" class: #FFFFB6 255:255:182 -" method declaration name: #FFD2A7 255:210:167 -" regular expression: #E9C062 233:192:98 -" regexp alternate: #FF8000 255:128:0 -" regexp alternate 2: #B18A3D 177:138:61 -" variable: #C6C5FE 198:197:254 -" -" Misc colors: -" red color (used for whatever): #FF6C60 255:108:96 -" light red: #FFB6B0 255:182:176 -" -" brown: #E18964 good for special -" -" lightpurpleish: #FFCCFF -" -" Interface colors: -" background color: black -" cursor (where underscore is used): #FFA560 255:165:96 -" cursor (where block is used): white -" visual selection: #1D1E2C -" current line: #151515 21:21:21 -" search selection: #07281C 7:40:28 -" line number: #3D3D3D 61:61:61 - - -" ******************************************************************************** -" The following are the preferred 16 colors for your terminal -" Colors Bright Colors -" Black #4E4E4E #7C7C7C -" Red #FF6C60 #FFB6B0 -" Green #A8FF60 #CEFFAB -" Yellow #FFFFB6 #FFFFCB -" Blue #96CBFE #FFFFCB -" Magenta #FF73FD #FF9CFE -" Cyan #C6C5FE #DFDFFE -" White #EEEEEE #FFFFFF - - -" ******************************************************************************** -set background=dark -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "ir_black" - - -"hi Example guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -" General colors -hi Normal guifg=#f6f3e8 guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi NonText guifg=#070707 guibg=black gui=NONE ctermfg=black ctermbg=NONE cterm=NONE - -hi Cursor guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=reverse -hi LineNr guifg=#3D3D3D guibg=black gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE - -hi VertSplit guifg=#202020 guibg=#202020 gui=NONE ctermfg=darkgray ctermbg=darkgray cterm=NONE -hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=white ctermbg=darkgray cterm=NONE -hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE - -hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE -hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE - -hi SpecialKey guifg=#808080 guibg=#343434 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi WildMenu guifg=green guibg=yellow gui=NONE ctermfg=black ctermbg=yellow cterm=NONE -hi PmenuSbar guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=NONE -"hi Ignore guifg=gray guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi Error guifg=NONE guibg=NONE gui=undercurl ctermfg=white ctermbg=red cterm=NONE guisp=#FF6C60 " undercurl color -hi ErrorMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE -hi WarningMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE - -" Message displayed in lower left, such as --INSERT-- -hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD - -if version >= 700 " Vim 7.x specific colors - hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD - hi CursorColumn guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=BOLD ctermfg=white ctermbg=darkgray cterm=NONE - hi Pmenu guifg=#f6f3e8 guibg=#444444 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel guifg=#000000 guibg=#cae682 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Search guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -endif - -" Syntax highlighting -hi Comment guifg=#7C7C7C guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -hi String guifg=#A8FF60 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE -hi Number guifg=#FF73FD guibg=NONE gui=NONE ctermfg=magenta ctermbg=NONE cterm=NONE - -hi Keyword guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi PreProc guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi Conditional guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE " if else end - -hi Todo guifg=#8f8f8f guibg=NONE gui=NONE ctermfg=red ctermbg=NONE cterm=NONE -hi Constant guifg=#99CC99 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE - -hi Identifier guifg=#C6C5FE guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi Function guifg=#FFD2A7 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi Type guifg=#FFFFB6 guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE -hi Statement guifg=#6699CC guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE - -hi Special guifg=#E18964 guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE -hi Delimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi Operator guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - -hi link Character Constant -hi link Boolean Constant -hi link Float Number -hi link Repeat Statement -hi link Label Statement -hi link Exception Statement -hi link Include PreProc -hi link Define PreProc -hi link Macro PreProc -hi link PreCondit PreProc -hi link StorageClass Type -hi link Structure Type -hi link Typedef Type -hi link Tag Special -hi link SpecialChar Special -hi link SpecialComment Special -hi link Debug Special - - -" Special for Ruby -hi rubyRegexp guifg=#B18A3D guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi rubyRegexpDelimiter guifg=#FF8000 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi rubyEscape guifg=white guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi rubyInterpolationDelimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi rubyControl guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE "and break, etc -"hi rubyGlobalVariable guifg=#FFCCFF guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE "yield -hi rubyStringDelimiter guifg=#336633 guibg=NONE gui=NONE ctermfg=lightgreen ctermbg=NONE cterm=NONE -"rubyInclude -"rubySharpBang -"rubyAccess -"rubyPredefinedVariable -"rubyBoolean -"rubyClassVariable -"rubyBeginEnd -"rubyRepeatModifier -"hi link rubyArrayDelimiter Special " [ , , ] -"rubyCurlyBlock { , , } - -hi link rubyClass Keyword -hi link rubyModule Keyword -hi link rubyKeyword Keyword -hi link rubyOperator Operator -hi link rubyIdentifier Identifier -hi link rubyInstanceVariable Identifier -hi link rubyGlobalVariable Identifier -hi link rubyClassVariable Identifier -hi link rubyConstant Type - - -" Special for Java -" hi link javaClassDecl Type -hi link javaScopeDecl Identifier -hi link javaCommentTitle javaDocSeeTag -hi link javaDocTags javaDocSeeTag -hi link javaDocParam javaDocSeeTag -hi link javaDocSeeTagParam javaDocSeeTag - -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -"hi javaClassDecl guifg=#CCFFCC guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - -" Special for XML -hi link xmlTag Keyword -hi link xmlTagName Conditional -hi link xmlEndTag Identifier - - -" Special for HTML -hi link htmlTag Keyword -hi link htmlTagName Conditional -hi link htmlEndTag Identifier - - -" Special for Javascript -hi link javaScriptNumber Number - - -" Special for Python -"hi link pythonEscape Keyword - - -" Special for CSharp -hi link csXmlTag Keyword - - -" Special for PHP diff --git a/vim/colors/pablo.vim b/vim/colors/pablo.vim deleted file mode 100644 index e6bf737..0000000 --- a/vim/colors/pablo.vim +++ /dev/null @@ -1,26 +0,0 @@ -" local syntax file - set colors on a per-machine basis: -" vim: tw=0 ts=4 sw=4 -" Vim color file -" Maintainer: Ron Aaron -" Last Change: 2003 May 02 - -hi clear -set background=dark -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "pablo" - -highlight Comment ctermfg=8 guifg=#808080 -highlight Constant ctermfg=14 cterm=none guifg=#00ffff gui=none -highlight Identifier ctermfg=6 guifg=#00c0c0 -highlight Statement ctermfg=3 cterm=bold guifg=#c0c000 gui=bold -highlight PreProc ctermfg=10 guifg=#00ff00 -highlight Type ctermfg=2 guifg=#00c000 -highlight Special ctermfg=12 guifg=#0000ff -highlight Error ctermbg=9 guibg=#ff0000 -highlight Todo ctermfg=4 ctermbg=3 guifg=#000080 guibg=#c0c000 -highlight Directory ctermfg=2 guifg=#00c000 -highlight StatusLine ctermfg=11 ctermbg=12 cterm=none guifg=#ffff00 guibg=#0000ff gui=none -highlight Normal guifg=#ffffff guibg=#000000 -highlight Search ctermbg=3 guibg=#c0c000 diff --git a/vim/colors/slate.vim b/vim/colors/slate.vim deleted file mode 100644 index f9a70b8..0000000 --- a/vim/colors/slate.vim +++ /dev/null @@ -1,56 +0,0 @@ -"%% SiSU Vim color file -" Slate Maintainer: Ralph Amissah -" (originally looked at desert Hans Fugal http://hans.fugal.net/vim/colors/desert.vim (2003/05/06) -:set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let colors_name = "slate" -:hi Normal guifg=White guibg=grey15 -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse -:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey -:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7 -:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green -:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown -:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen -:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue -:hi Question guifg=springgreen ctermfg=green -:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue -:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen -:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse -:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse -:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow -:hi Statement guifg=CornflowerBlue ctermfg=lightblue -:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse -:hi WarningMsg guifg=salmon ctermfg=1 -:hi String guifg=SkyBlue ctermfg=darkcyan -:hi Comment term=bold ctermfg=11 guifg=grey40 -:hi Constant guifg=#ffa0a0 ctermfg=brown -:hi Special guifg=darkkhaki ctermfg=brown -:hi Identifier guifg=salmon ctermfg=red -:hi Include guifg=red ctermfg=red -:hi PreProc guifg=red guibg=white ctermfg=red -:hi Operator guifg=Red ctermfg=Red -:hi Define guifg=gold gui=bold ctermfg=yellow -:hi Type guifg=CornflowerBlue ctermfg=2 -:hi Function guifg=navajowhite ctermfg=brown -:hi Structure guifg=green ctermfg=green -:hi LineNr guifg=grey50 ctermfg=3 -:hi Ignore guifg=grey40 cterm=bold ctermfg=7 -:hi Todo guifg=orangered guibg=yellow2 -:hi Directory ctermfg=darkcyan -:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermfg=0 ctermbg=3 -:hi DiffAdd ctermbg=4 -:hi DiffChange ctermbg=5 -:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 -:hi DiffText cterm=bold ctermbg=1 -:hi Underlined cterm=underline ctermfg=5 -:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 -:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1 diff --git a/vim/colors/wombat.vim b/vim/colors/wombat.vim deleted file mode 100644 index 9ad1e56..0000000 --- a/vim/colors/wombat.vim +++ /dev/null @@ -1,51 +0,0 @@ -" Maintainer: Lars H. Nielsen (dengmao@gmail.com) -" Last Change: January 22 2007 - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "wombat" - - -" Vim >= 7.0 specific colors -if version >= 700 - hi CursorLine guibg=#2d2d2d - hi CursorColumn guibg=#2d2d2d - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold - hi Pmenu guifg=#f6f3e8 guibg=#444444 - hi PmenuSel guifg=#000000 guibg=#cae682 -endif - -" General colors -hi Cursor guifg=NONE guibg=#656565 gui=none -hi Normal guifg=#f6f3e8 guibg=#242424 gui=none -hi NonText guifg=#808080 guibg=#303030 gui=none -hi LineNr guifg=#857b6f guibg=#000000 gui=none -hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic -hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none -hi VertSplit guifg=#444444 guibg=#444444 gui=none -hi Folded guibg=#384048 guifg=#a0a8b0 gui=none -hi Title guifg=#f6f3e8 guibg=NONE gui=bold -hi Visual guifg=#f6f3e8 guibg=#444444 gui=none -hi SpecialKey guifg=#808080 guibg=#343434 gui=none - -" Syntax highlighting -hi Comment guifg=#99968b gui=italic -hi Todo guifg=#8f8f8f gui=italic -hi Constant guifg=#e5786d gui=none -hi String guifg=#95e454 gui=italic -hi Identifier guifg=#cae682 gui=none -hi Function guifg=#cae682 gui=none -hi Type guifg=#cae682 gui=none -hi Statement guifg=#8ac6f2 gui=none -hi Keyword guifg=#8ac6f2 gui=none -hi PreProc guifg=#e5786d gui=none -hi Number guifg=#e5786d gui=none -hi Special guifg=#e7f6da gui=none - - diff --git a/vim/ftdetect/handlebars.vim b/vim/ftdetect/handlebars.vim deleted file mode 100644 index 0a387f3..0000000 --- a/vim/ftdetect/handlebars.vim +++ /dev/null @@ -1,3 +0,0 @@ -if has("autocmd") - au BufNewFile,BufRead *.handlebars,*.hbs set filetype=handlebars -endif diff --git a/vim/ftdetect/json.vim b/vim/ftdetect/json.vim deleted file mode 100644 index 15e157d..0000000 --- a/vim/ftdetect/json.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead *.json setf json diff --git a/vim/ftdetect/mustache.vim b/vim/ftdetect/mustache.vim deleted file mode 100644 index 4ea160d..0000000 --- a/vim/ftdetect/mustache.vim +++ /dev/null @@ -1,3 +0,0 @@ -if has("autocmd") - au BufNewFile,BufRead *.mustache,*.handlebars,*.hbs,*.hogan,*.hulk set filetype=mustache -endif diff --git a/vim/ftdetect/scala.vim b/vim/ftdetect/scala.vim deleted file mode 100644 index 660f1a2..0000000 --- a/vim/ftdetect/scala.vim +++ /dev/null @@ -1,2 +0,0 @@ - -au BufRead,BufNewFile *.scala set filetype=scala diff --git a/vim/ftplugin/handlebars.vim b/vim/ftplugin/handlebars.vim deleted file mode 100644 index 41543da..0000000 --- a/vim/ftplugin/handlebars.vim +++ /dev/null @@ -1,10 +0,0 @@ -" Taken from https://github.com/juvenn/mustache.vim/blob/master/ftplugin/mustache.vim - -if exists("loaded_matchit") - let b:match_ignorecase = 0 - - let b:match_words = '{:},[:],(:),' - \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\)\s*}}' - \ . ':' - \ . '\%({{\)\@<=/\s*\1\s*}}' -endif diff --git a/vim/ftplugin/mustache.vim b/vim/ftplugin/mustache.vim deleted file mode 100644 index f73df77..0000000 --- a/vim/ftplugin/mustache.vim +++ /dev/null @@ -1,8 +0,0 @@ -if exists("loaded_matchit") - let b:match_ignorecase = 0 - - let b:match_words = '{:},[:],(:),' - \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\)\s*}}' - \ . ':' - \ . '\%({{\)\@<=/\s*\1\s*}}' -endif diff --git a/vim/indent/handlebars.vim b/vim/indent/handlebars.vim deleted file mode 100644 index 09c0def..0000000 --- a/vim/indent/handlebars.vim +++ /dev/null @@ -1,10 +0,0 @@ -" Handlebars indent -" Taken from https://github.com/juvenn/mustache.vim/blob/master/indent/mustache.vim - -" Only load this indent file when no other was loaded. -if exists("b:did_indent") - finish -endif - -" Use HTML formatting rules. -runtime! indent/html.vim diff --git a/vim/indent/mustache.vim b/vim/indent/mustache.vim deleted file mode 100644 index 686e1a6..0000000 --- a/vim/indent/mustache.vim +++ /dev/null @@ -1,13 +0,0 @@ -" Mustache indent -" Language: Mustache -" Maintainer: Juvenn Woo -" Version: 2 -" Last Change: Jan. 16th 2011 - -" Only load this indent file when no other was loaded. -if exists("b:did_indent") - finish -endif - -" Use HTML formatting rules. -runtime! indent/html.vim diff --git a/vim/indent/scala.vim b/vim/indent/scala.vim deleted file mode 100644 index 45266a0..0000000 --- a/vim/indent/scala.vim +++ /dev/null @@ -1,83 +0,0 @@ -" Vim indent file -" Language : Scala (http://scala-lang.org/) -" Maintainer : Stefan Matthias Aust -" Last Change: 2006 Apr 13 - -if exists("b:did_indent") - finish -endif -let b:did_indent = 1 - -setlocal indentexpr=GetScalaIndent() - -setlocal indentkeys=0{,0},0),!^F,<>>, - -setlocal autoindent sw=2 et - -if exists("*GetScalaIndent") - finish -endif - -function! CountParens(line) - let line = substitute(a:line, '"\(.\|\\"\)*"', '', 'g') - let open = substitute(line, '[^(]', '', 'g') - let close = substitute(line, '[^)]', '', 'g') - return strlen(open) - strlen(close) -endfunction - -function! GetScalaIndent() - " Find a non-blank line above the current line. - let lnum = prevnonblank(v:lnum - 1) - - " Hit the start of the file, use zero indent. - if lnum == 0 - return 0 - endif - - let ind = indent(lnum) - let prevline = getline(lnum) - - "Indent html literals - if prevline !~ '/>\s*$' && prevline =~ '^\s*<[a-zA-Z][^>]*>\s*$' - return ind + &shiftwidth - endif - - " Add a 'shiftwidth' after lines that start a block - " If if, for or while end with ), this is a one-line block - " If val, var, def end with =, this is a one-line block - if prevline =~ '^\s*\<\(\(else\s\+\)\?if\|for\|while\|va[lr]\|def\)\>.*[)=]\s*$' - \ || prevline =~ '^\s*\\s*$' - \ || prevline =~ '{\s*$' - let ind = ind + &shiftwidth - endif - - " If parenthesis are unbalanced, indent or dedent - let c = CountParens(prevline) - echo c - if c > 0 - let ind = ind + &shiftwidth - elseif c < 0 - let ind = ind - &shiftwidth - endif - - " Dedent after if, for, while and val, var, def without block - let pprevline = getline(prevnonblank(lnum - 1)) - if pprevline =~ '^\s*\<\(\(else\s\+\)\?if\|for\|while\|va[lr]\|def\)\>.*[)=]\s*$' - \ || pprevline =~ '^\s*\\s*$' - let ind = ind - &shiftwidth - endif - - " Align 'for' clauses nicely - if prevline =~ '^\s*\ (.*;\s*$' - let ind = ind - &shiftwidth + 5 - endif - - " Subtract a 'shiftwidth' on '}' or html - let thisline = getline(v:lnum) - if thisline =~ '^\s*[})]' - \ || thisline =~ '^\s*]*>' - let ind = ind - &shiftwidth - endif - - return ind -endfunction diff --git a/vim/init.vim b/vim/init.vim deleted file mode 120000 index 5615dc5..0000000 --- a/vim/init.vim +++ /dev/null @@ -1 +0,0 @@ -../vimrc \ No newline at end of file diff --git a/vim/syntax/handlebars.vim b/vim/syntax/handlebars.vim deleted file mode 100644 index d3a317b..0000000 --- a/vim/syntax/handlebars.vim +++ /dev/null @@ -1,86 +0,0 @@ -" Handlebars syntax -" Language: Handlebars -" Maintainer: Bruno Michel -" Last Change: Jun 23th, 2011 -" Version: 0.1 -" URL: https://github.com/nono/vim-handlebars - - -" Read the HTML syntax to start with -if version < 600 - so :p:h/html.vim -else - runtime! syntax/html.vim - unlet b:current_syntax -endif - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Standard HiLink will not work with included syntax files -if version < 508 - command! -nargs=+ HtmlHiLink hi link -else - command! -nargs=+ HtmlHiLink hi def link -endif - - -syn match hbsError /}}}\?/ -syn match hbsInsideError /{{[{#<>=!\/]\?/ containedin=@hbsInside - -syn cluster htmlHbsContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6 -syn region hbsInside start=/{{/ end=/}}/ keepend transparent containedin=@htmlHbsContainer - -syn match hbsHandlebars "{{\|}}" containedin=hbsInside -syn match hbsUnescape "{{{\|}}}" containedin=hbsInside -syn match hbsOperators "=\|\.\|/" containedin=hbsInside - -syn region hbsSection start="{{[#/]"lc=2 end=/}}/me=e-2 containedin=hbsInside -syn region hbsPartial start=/{{[<>]/lc=2 end=/}}/me=e-2 containedin=hbsInside -syn region hbsMarkerSet start=/{{=/lc=2 end=/=}}/me=e-2 containedin=hbsInside - -syn region hbsComment start=/!/ end=/}}/me=e-2 containedin=htmlHead contains=Todo -syn region hbsQString start=/'/ skip=/\\'/ end=/'/ containedin=hbsInside -syn region hbsDQString start=/"/ skip=/\\"/ end=/"/ containedin=hbsInside - -syn match hbsConditionals "\([/#]\(if\|unless\)\|else\)" containedin=hbsInside -syn match hbsHelpers "[/#]\(with\|each\)" containedin=hbsInside - - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_lisp_syntax_inits") - if version < 508 - let did_lisp_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HtmlHiLink hbsError Error - HtmlHiLink hbsInsideError Error - - HtmlHiLink hbsHandlebars Identifier - HtmlHiLink hbsUnescape Special - HtmlHiLink hbsOperators Operator - - HtmlHiLink hbsConditionals Conditional - HtmlHiLink hbsHelpers Repeat - - HtmlHiLink hbsSection Number - HtmlHiLink hbsPartial Include - HtmlHiLink hbsMarkerSet Number - - HtmlHiLink hbsComment Comment - HtmlHiLink hbsQString String - HtmlHiLink hbsDQString String - - delcommand HiLink -endif - - -let b:current_syntax = 'handlebars' diff --git a/vim/syntax/mustache.vim b/vim/syntax/mustache.vim deleted file mode 100644 index d19446e..0000000 --- a/vim/syntax/mustache.vim +++ /dev/null @@ -1,75 +0,0 @@ -" Mustache syntax -" Language: Mustache -" Maintainer: Juvenn Woo -" Screenshot: http://imgur.com/6F408 -" Version: 2 -" Last Change: Jan 16th 2011 -" Remark: -" It lexically hilights embedded mustaches (exclusively) in html file. -" While it was written for Ruby-based Mustache template system, it should -" work for Google's C-based *ctemplate* as well as Erlang-based *et*. All -" of them are, AFAIK, based on the idea of ctemplate. -" References: -" [Mustache](http://github.com/defunkt/mustache) -" [ctemplate](http://code.google.com/p/google-ctemplate/) -" [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html) -" [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html) -" TODO: Feedback is welcomed. - - -" Read the HTML syntax to start with -if version < 600 - so :p:h/html.vim -else - runtime! syntax/html.vim - unlet b:current_syntax -endif - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Standard HiLink will not work with included syntax files -if version < 508 - command! -nargs=+ HtmlHiLink hi link -else - command! -nargs=+ HtmlHiLink hi def link -endif - -syntax match mustacheError '}}}\?' -syntax match mustacheInsideError '{{[{#<>=!\/]\?' containedin=@mustacheInside -syntax region mustacheVariable matchgroup=mustacheMarker start=/{{/ end=/}}/ containedin=@htmlMustacheContainer -syntax region mustacheVariableUnescape matchgroup=mustacheMarker start=/{{{/ end=/}}}/ containedin=@htmlMustacheContainer -syntax region mustacheSection matchgroup=mustacheMarker start='{{[#/]' end=/}}/ containedin=@htmlMustacheContainer -syntax region mustachePartial matchgroup=mustacheMarker start=/{{[<>]/ end=/}}/ -syntax region mustacheMarkerSet matchgroup=mustacheMarker start=/{{=/ end=/=}}/ -syntax region mustacheComment start=/{{!/ end=/}}/ contains=Todo containedin=htmlHead - - -" Clustering -syntax cluster mustacheInside add=mustacheVariable,mustacheVariableUnescape,mustacheSection,mustachePartial,mustacheMarkerSet -syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6 - - -" Hilighting -" mustacheInside hilighted as Number, which is rarely used in html -" you might like change it to Function or Identifier -HtmlHiLink mustacheVariable Number -HtmlHiLink mustacheVariableUnescape Number -HtmlHiLink mustachePartial Number -HtmlHiLink mustacheSection Number -HtmlHiLink mustacheMarkerSet Number - -HtmlHiLink mustacheComment Comment -HtmlHiLink mustacheMarker Identifier -HtmlHiLink mustacheError Error -HtmlHiLink mustacheInsideError Error - -syn region mustacheScriptTemplate start=++me=s-1 keepend -\ contains=mustacheError,mustacheInsideError,mustacheVariable,mustacheVariableUnescape,mustacheSection,mustachePartial,mustacheMarkerSet,mustacheComment,htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlTag,htmlEndTag,htmlTagName,htmlSpecialChar,htmlLink - -let b:current_syntax = "mustache" -delcommand HtmlHiLink diff --git a/vim/syntax/scala.vim b/vim/syntax/scala.vim deleted file mode 100644 index 36605ab..0000000 --- a/vim/syntax/scala.vim +++ /dev/null @@ -1,151 +0,0 @@ -" Vim syntax file -" Language : Scala (http://scala-lang.org/) -" Maintainers: Stefan Matthias Aust, Julien Wetterwald -" Last Change: 2007 June 13 - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syn case match -syn sync minlines=50 - -" most Scala keywords -syn keyword scalaKeyword abstract case catch do else extends final finally for forSome if implicit lazy match new null override private protected requires return sealed super this throw try type while with yield -syn match scalaKeyword "=>" -syn match scalaKeyword "<-" -syn match scalaKeyword "\<_\>" - -syn match scalaOperator ":\{2,\}" "this is not a type - -" package and import statements -syn keyword scalaPackage package nextgroup=scalaFqn skipwhite -syn keyword scalaImport import nextgroup=scalaFqn skipwhite -syn match scalaFqn "\<[._$a-zA-Z0-9,]*" contained nextgroup=scalaFqnSet -syn region scalaFqnSet start="{" end="}" contained - -" boolean literals -syn keyword scalaBoolean true false - -" definitions -syn keyword scalaDef def nextgroup=scalaDefName skipwhite -syn keyword scalaVal val nextgroup=scalaValName skipwhite -syn keyword scalaVar var nextgroup=scalaVarName skipwhite -syn keyword scalaClass class nextgroup=scalaClassName skipwhite -syn keyword scalaObject object nextgroup=scalaClassName skipwhite -syn keyword scalaTrait trait nextgroup=scalaClassName skipwhite -syn match scalaDefName "[^ =:;([]\+" contained nextgroup=scalaDefSpecializer skipwhite -syn match scalaValName "[^ =:;([]\+" contained -syn match scalaVarName "[^ =:;([]\+" contained -syn match scalaClassName "[^ =:;(\[]\+" contained nextgroup=scalaClassSpecializer skipwhite -syn region scalaDefSpecializer start="\[" end="\]" contained contains=scalaDefSpecializer -syn region scalaClassSpecializer start="\[" end="\]" contained contains=scalaClassSpecializer - -" type constructor (actually anything with an uppercase letter) -syn match scalaConstructor "\<[A-Z][_$a-zA-Z0-9]*\>" nextgroup=scalaConstructorSpecializer -syn region scalaConstructorSpecializer start="\[" end="\]" contained contains=scalaConstructorSpecializer - -" method call -syn match scalaRoot "\<[a-zA-Z][_$a-zA-Z0-9]*\."me=e-1 -syn match scalaMethodCall "\.[a-z][_$a-zA-Z0-9]*"ms=s+1 - -" type declarations in val/var/def -syn match scalaType ":\s*\(=>\s*\)\?[._$a-zA-Z0-9]\+\(\[[^]]*\]\+\)\?\(\s*\(<:\|>:\|#\|=>\)\s*[._$a-zA-Z0-9]\+\(\[[^]]*\]\+\)*\)*"ms=s+1 - -" comments -syn match scalaTodo "[tT][oO][dD][oO]" contained -syn match scalaLineComment "//.*" contains=scalaTodo -syn region scalaComment start="/\*" end="\*/" contains=scalaTodo -syn case ignore -syn include @scalaHtml syntax/html.vim -unlet b:current_syntax -syn case match -syn region scalaDocComment start="/\*\*" end="\*/" contains=scalaDocTags,scalaTodo,@scalaHtml keepend -syn region scalaDocTags start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}" contained -syn match scalaDocTags "@[a-z]\+" contained - -syn match scalaEmptyString "\"\"" - -" multi-line string literals -syn region scalaMultiLineString start="\"\"\"" end="\"\"\"" contains=scalaUnicode -syn match scalaUnicode "\\u[0-9a-fA-F]\{4}" contained - -" string literals with escapes -syn region scalaString start="\"[^"]" skip="\\\"" end="\"" contains=scalaStringEscape " TODO end \n or not? -syn match scalaStringEscape "\\u[0-9a-fA-F]\{4}" contained -syn match scalaStringEscape "\\[nrfvb\\\"]" contained - -" symbol and character literals -syn match scalaSymbol "'[_a-zA-Z0-9][_a-zA-Z0-9]*\>" -syn match scalaChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'" - -" number literals -syn match scalaNumber "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>" -syn match scalaNumber "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\=" -syn match scalaNumber "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" -syn match scalaNumber "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>" - -" xml literals -syn match scalaXmlTag "<[a-zA-Z]\_[^>]*/>" contains=scalaXmlQuote,scalaXmlEscape,scalaXmlString -syn region scalaXmlString start="\"" end="\"" contained -syn match scalaXmlStart "<[a-zA-Z]\_[^>]*>" contained contains=scalaXmlQuote,scalaXmlEscape,scalaXmlString -syn region scalaXml start="<\([a-zA-Z]\_[^>]*\_[^/]\|[a-zA-Z]\)>" matchgroup=scalaXmlStart end="]\+>" contains=scalaXmlEscape,scalaXmlQuote,scalaXml,scalaXmlStart,scalaXmlComment -syn region scalaXmlEscape matchgroup=scalaXmlEscapeSpecial start="{" matchgroup=scalaXmlEscapeSpecial end="}" contained contains=TOP -syn match scalaXmlQuote "&[^;]\+;" contained -syn match scalaXmlComment "" contained - -syn sync fromstart - -" map Scala groups to standard groups -hi link scalaKeyword Keyword -hi link scalaPackage Include -hi link scalaImport Include -hi link scalaBoolean Boolean -hi link scalaOperator Normal -hi link scalaNumber Number -hi link scalaEmptyString String -hi link scalaString String -hi link scalaChar String -hi link scalaMultiLineString String -hi link scalaStringEscape Special -hi link scalaSymbol Special -hi link scalaUnicode Special -hi link scalaComment Comment -hi link scalaLineComment Comment -hi link scalaDocComment Comment -hi link scalaDocTags Special -hi link scalaTodo Todo -hi link scalaType Type -hi link scalaTypeSpecializer scalaType -hi link scalaXml String -hi link scalaXmlTag Include -hi link scalaXmlString String -hi link scalaXmlStart Include -hi link scalaXmlEscape Normal -hi link scalaXmlEscapeSpecial Special -hi link scalaXmlQuote Special -hi link scalaXmlComment Comment -hi link scalaDef Keyword -hi link scalaVar Keyword -hi link scalaVal Keyword -hi link scalaClass Keyword -hi link scalaObject Keyword -hi link scalaTrait Keyword -hi link scalaDefName Function -hi link scalaDefSpecializer Function -hi link scalaClassName Special -hi link scalaClassSpecializer Special -hi link scalaConstructor Special -hi link scalaConstructorSpecializer scalaConstructor - -let b:current_syntax = "scala" - -" you might like to put these lines in your .vimrc -" -" customize colors a little bit (should be a different file) -" hi scalaNew gui=underline -" hi scalaMethodCall gui=italic -" hi scalaValName gui=underline -" hi scalaVarName gui=underline diff --git a/vim/syntax/smarty.vim b/vim/syntax/smarty.vim deleted file mode 100644 index 5c64b9b..0000000 --- a/vim/syntax/smarty.vim +++ /dev/null @@ -1,279 +0,0 @@ -" Vim syntax file -" Language: Smarty Templates -" Maintainer: Daniel Hahler, original: Manfred Stienstra manfred.stienstra@dwerg.net -" Last Change: Di 10 Jun 2014 15:09:10 CEST -" Filenames: *.tpl -" URL: https://github.com/blueyed/smarty.vim - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") - finish -endif - let main_syntax = 'smarty' -endif - -syn case ignore - -runtime! syntax/html.vim -unlet b:current_syntax -syn cluster htmlPreproc add=smartyZone add=smartyComment add=smartyEndTag - -syn keyword smartyTagName contained capture config_load include include_php -syn keyword smartyTagName contained insert ldelim rdelim literal -syn keyword smartyTagName contained php -syn keyword smartyTagName contained strip config_load assign debug -syn keyword smartyTagName contained eval fetch html_checkboxes html_image -syn keyword smartyTagName contained html_options html_radios html_select_date -syn keyword smartyTagName contained html_select_time html_table mailto -syn keyword smartyTagName contained math popup popup_init textformat - -syn keyword smartyConditional contained if elseif else -syn keyword smartyRepeat contained section sectionelse foreach foreachelse cycle counter - -syn cluster smartyTags add=smartyTagName add=smartyConditional add=smartyRepeat - -syn keyword smartyInFunc ne eq == != > < >= <= === ! % - -syn match smartyProperty contained "file=" -syn match smartyProperty contained "loop=" -syn match smartyProperty contained "name=" -syn match smartyProperty contained "include=" -syn match smartyProperty contained "skip=" -syn match smartyProperty contained "section=" -syn match smartyProperty contained "from=" -syn match smartyProperty contained "item=" -syn match smartyProperty contained "key=" -syn match smartyProperty contained "once=" -syn match smartyProperty contained "global=" -syn match smartyProperty contained "scope=" -syn match smartyProperty contained "script=" -syn match smartyProperty contained "assign=" -syn match smartyProperty contained "start=" -syn match smartyProperty contained "stop=" -syn match smartyProperty contained "max=" -syn match smartyProperty contained "show=" -syn match smartyProperty contained "step=" -syn match smartyProperty contained "var=" -syn match smartyProperty contained "value=" -syn match smartyProperty contained "skip=" -syn match smartyProperty contained "direction=" -syn match smartyProperty contained "print=" -syn match smartyProperty contained "advance=" -syn match smartyProperty contained "delimiter=" -syn match smartyProperty contained "reset=" -syn match smartyProperty contained "output=" -syn match smartyProperty contained "selected=" -syn match smartyProperty contained "options=" -syn match smartyProperty contained "separator=" -syn match smartyProperty contained "labels=" -syn match smartyProperty contained "height=" -syn match smartyProperty contained "width=" -syn match smartyProperty contained "basedir=" -syn match smartyProperty contained "alt=" -syn match smartyProperty contained "href=" -syn match smartyProperty contained "path_prefix=" -syn match smartyProperty contained "values=" -syn match smartyProperty contained "prefix=" -syn match smartyProperty contained "time=" -syn match smartyProperty contained "start_year=" -syn match smartyProperty contained "end_year=" -syn match smartyProperty contained "display_days=" -syn match smartyProperty contained "display_months=" -syn match smartyProperty contained "display_years=" -syn match smartyProperty contained "month_format=" -syn match smartyProperty contained "day_format=" -syn match smartyProperty contained "day_value_format=" -syn match smartyProperty contained "year_as_text=" -syn match smartyProperty contained "reverse_years=" -syn match smartyProperty contained "day_size=" -syn match smartyProperty contained "month_size=" -syn match smartyProperty contained "year_size=" -syn match smartyProperty contained "day_extra=" -syn match smartyProperty contained "month_extra=" -syn match smartyProperty contained "year_extra=" -syn match smartyProperty contained "field_order=" -syn match smartyProperty contained "field_separator=" -syn match smartyProperty contained "month_value_format=" -syn match smartyProperty contained "year_empty=" -syn match smartyProperty contained "month_empty=" -syn match smartyProperty contained "day_empty=" -syn match smartyProperty contained "display_hours=" -syn match smartyProperty contained "display_minutes=" -syn match smartyProperty contained "display_seconds=" -syn match smartyProperty contained "minute_interval=" -syn match smartyProperty contained "second_interval=" -syn match smartyProperty contained "field_array=" -syn match smartyProperty contained "all_extra=" -syn match smartyProperty contained "hour_extra=" -syn match smartyProperty contained "minute_extra=" -syn match smartyProperty contained "second_extra=" -syn match smartyProperty contained "meridian_extra=" -syn match smartyProperty contained "display_meridian=" -syn match smartyProperty contained "use_24_hours=" -syn match smartyProperty contained "cols=" -syn match smartyProperty contained "rows=" -syn match smartyProperty contained "inner=" -syn match smartyProperty contained "caption=" -syn match smartyProperty contained "table_attr=" -syn match smartyProperty contained "th_attr=" -syn match smartyProperty contained "tr_attr=" -syn match smartyProperty contained "td_attr=" -syn match smartyProperty contained "trailpad=" -syn match smartyProperty contained "hdir=" -syn match smartyProperty contained "vdir=" -syn match smartyProperty contained "address=" -syn match smartyProperty contained "text=" -syn match smartyProperty contained "encode=" -syn match smartyProperty contained "cc=" -syn match smartyProperty contained "bcc=" -syn match smartyProperty contained "subject=" -syn match smartyProperty contained "newsgroups=" -syn match smartyProperty contained "followupto=" -syn match smartyProperty contained "extra=" -syn match smartyProperty contained "equation=" -syn match smartyProperty contained "format=" -syn match smartyProperty contained "trigger=" -syn match smartyProperty contained "sticky=" -syn match smartyProperty contained "caption=" -syn match smartyProperty contained "fgcolor=" -syn match smartyProperty contained "bgcolor=" -syn match smartyProperty contained "textcolor=" -syn match smartyProperty contained "capcolor=" -syn match smartyProperty contained "closecolor=" -syn match smartyProperty contained "textfont=" -syn match smartyProperty contained "captionfont=" -syn match smartyProperty contained "closefont=" -syn match smartyProperty contained "textsize=" -syn match smartyProperty contained "captionsize=" -syn match smartyProperty contained "closesize=" -syn match smartyProperty contained "width=" -syn match smartyProperty contained "height=" -syn match smartyProperty contained "left=" -syn match smartyProperty contained "right=" -syn match smartyProperty contained "center=" -syn match smartyProperty contained "above=" -syn match smartyProperty contained "below=" -syn match smartyProperty contained "border=" -syn match smartyProperty contained "offsetx=" -syn match smartyProperty contained "offsety=" -syn match smartyProperty contained "fgbackground=" -syn match smartyProperty contained "bgbackground=" -syn match smartyProperty contained "closetext=" -syn match smartyProperty contained "noclose=" -syn match smartyProperty contained "status=" -syn match smartyProperty contained "autostatus=" -syn match smartyProperty contained "autostatuscap=" -syn match smartyProperty contained "inarray=" -syn match smartyProperty contained "caparray=" -syn match smartyProperty contained "capicon=" -syn match smartyProperty contained "snapx=" -syn match smartyProperty contained "snapy=" -syn match smartyProperty contained "fixx=" -syn match smartyProperty contained "fixy=" -syn match smartyProperty contained "background=" -syn match smartyProperty contained "padx=" -syn match smartyProperty contained "pady=" -syn match smartyProperty contained "fullhtml=" -syn match smartyProperty contained "frame=" -syn match smartyProperty contained "function=" -syn match smartyProperty contained "delay=" -syn match smartyProperty contained "hauto=" -syn match smartyProperty contained "indent=" -syn match smartyProperty contained "indent_first=" -syn match smartyProperty contained "indent_char=" -syn match smartyProperty contained "wrap=" -syn match smartyProperty contained "wrap_char=" -syn match smartyProperty contained "vauto=" -syn match smartyProperty contained "wrap_cut=" - - -" Number -syn match smartyNumber "-\=\<\d\+\>" contained display -syn match smartyNumber "\<0x\x\{1,8}\>" contained display - -" Boolean -syn keyword smartyBoolean contained true false - -" Operator -syn match smartyOperator contained "||\|&&" - - -syn match smartyConstant contained "\$smarty" - -syn match smartyDollarSign contained "\$" " nextgroup=smartyVariable -syn match smartyMaybeDollarSign contained "\([^\\]\|\\\\\)\@<=\$" - -syn match smartyVariable contained "\$\@<=\(\h\w\{-}\(\.\|\->\|\[\w\{-}\]\(\.\|\->\)\)\)*\w*" contains=smartyGlue nextgroup=smartyFunctionArgs - -syn region smartyFunctionArgs contained matchgroup=Delimiter start="(" end=")" contains=@phpClConst -syn match smartyMaybeVariable contained "\(\(^\|[^\\]\|\\\\\)\$\)\@<=\h\w*" - -syn match smartyEscapedVariable contained "\\$\h\w*" - -syn region smartyInBracket contained matchgroup=Constant start=+\[+ end=+\]+ contains=smartyVariable -syn region smartyInBacktick contained matchgroup=Constant start=+\`+ end=+\`+ contains=smartyVariable -syn region smartyStringDouble contained matchgroup=Constant start=+"+ end=+"+ contains=smartyMaybeVariable, smartyInBacktick, smartyMaybeDollarSign keepend - -syn match smartyGlue contained "\.\|\->" - - -syn region smartyModifier contained matchgroup=Statement start=+||\@!+ end=+\ze:\|\>+ -syn region smartyParameter contained matchgroup=Statement start=+:+ end=+\ze\(}\||\)+ contains=smartyVariable, smartyDollarSign, smartyGlue, smartyInBracket, smartyStringDouble contained -syn region smartyZone matchgroup=Statement start="{\s\{-}[a-z$]\@=" end="}" contains=smartyParameter, smartyProperty, smartyGlue, smartyModifier, smartyDollarSign, smartyInBracket, smartyStringDouble, smartyVariable, smartyString, smartyBlock, smartyTagName, smartyConstant, smartyInFunc, @smartyTags, smartyRepeat, smartyNumber, smartyBoolean, smartyOperator, smartyTodo -syn region smartyEndTag matchgroup=Statement start="{/" end="}" contains=@smartyTags -syn region smartyComment matchgroup=Comment start="{\*" end="\*}" contains=smartyTodo - -syn keyword smartyTodo contained FIXME NOTE TODO OPTIMIZE XXX - -syn region htmlString contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,smartyZone -syn region htmlString contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,smartyZone - " syn region htmlLink start="\_[^>]*\" end=""me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone - - -if version >= 508 || !exists("did_smarty_syn_inits") - if version < 508 - let did_smarty_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink smartyTagName Function - HiLink smartyProperty Type - HiLink smartyComment Comment - HiLink smartyInFunc Function - HiLink smartyBlock Constant - HiLink smartyGlue Statement - HiLink smartyVariable Identifier - HiLink smartyDollarSign Statement - HiLink smartyMaybeVariable Identifier - HiLink smartyMaybeDollarSign Statement - HiLink smartyStringDouble Special - HiLink smartyInBracket PreProc - HiLink smartyInBacktick Statement - HiLink smartyModifier Special - HiLink smartyConditional Conditional - HiLink smartyRepeat Repeat - HiLink smartyBoolean Boolean - HiLink smartyNumber Number - HiLink smartyOperator Operator - HiLink smartyTodo Todo - delcommand HiLink -endif - - -" Match/delegate {php}..{/php} blocks. -syn include syntax/php.vim -syn region phpRegion matchgroup=Delimiter start="{php}" end="{/php}" contains=@phpClTop - -let b:current_syntax = "smarty" - -if main_syntax == 'smarty' - unlet main_syntax -endif - -" vim: ts=8 diff --git a/vim2nvim b/vim2nvim deleted file mode 100755 index 52e3eec..0000000 --- a/vim2nvim +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ln -s ~/.vim ~/.config/nvim diff --git a/vimrc b/vimrc deleted file mode 100644 index 6cb90f0..0000000 --- a/vimrc +++ /dev/null @@ -1,198 +0,0 @@ -set formatoptions=tcroqw -set updatetime=200 -set number -set titlestring=%f -set title -set cindent -set autoindent -set smartindent -set tabstop=2 -set softtabstop=2 -set shiftwidth=2 -set expandtab -set nowrap - -" disable modelines for security -set modelines=0 -set nomodeline - -set wildmode=longest,list,full -set wildmenu - -" always show status line: - -set pastetoggle= - -map :NERDTreeToggle - -map :set nowrap! -map :set nonumber! -map :set tabstop=2 softtabstop=2 shiftwidth=2 -map :set tabstop=4 softtabstop=4 shiftwidth=4 - -map :GitDiff -map :GitCommit - -" Tabbed editing -nmap ,, :tabnew -nmap ,. :tabnext -nmap ., :tabpre - -" Code folding -set foldmethod=indent " fold based on indent -set foldnestmax=10 " deepest fold is 10 levels -set nofoldenable " dont fold by default -set foldlevel=3 " this is just what i use - -filetype plugin indent on -autocmd FileType cpp setlocal expandtab shiftwidth=2 tabstop=2 - -set listchars=tab:☆\ ,eol:¬ " Set hidden display characters - -" pathogen -call pathogen#infect() - -" window movement -map h -map j -map k -map l - -" mouse -set mouse=a -if exists('+ttymouse') " not used in nvim - set ttymouse=sgr -endif - -map gs :Git status -map gc :Git commit -map ga :Git add -map gd :Git diff - -" highlight column 80 -" set colorcolumn=81 -" highlight ColorColumn ctermbg=7 - -set backupdir=~/tmp -set directory=~/tmp - -"no backup files -set nobackup -"only in case you don't want a backup file while editing -set nowritebackup -"no swap files -set noswapfile - -" statusline -set laststatus=2 -set statusline=\ %f\ %m\ %y\ %{strlen(&fenc)?&fenc:'none'},\ %{&ff} -set statusline+=%=%l,%c/%L\ \ \ \ \ %P\ - -" splits -set fillchars=vert:\│ - -" syntax -syntax on - -" color scheme -set termguicolors -let g:gruvbox_contrast_dark = 'hard' -let g:gruvbox_contrast_light = 'hard' -colorscheme gruvbox -set background=dark - -" fix backspace -set backspace=indent,eol,start - -" don't fix end of line -set nofixendofline - -" case insensitive completion -set ignorecase -set infercase - -" format JSON -function! FormatJSON() - :%! python -m json.tool - :%s/\ \ \ \ / /g -endfunction -command JSON call FormatJSON() - -" CtrlP -let g:ctrlp_map = 't' -let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git\|vendor' -let g:ctrlp_switch_buffer = 0 -map ; :CtrlPBuffer - -" Syntastic -"let g:syntastic_javascript_jshint_exec = '/home/carl/local/bin/jshint' -" let g:syntastic_jshint_exec = '/home/carl/local/bin/jshint' -let g:syntastic_javascript_checkers = ['eslint'] -let g:syntastic_php_checkers = ['php'] - -" php: -let php_sql_heredoc = 0 -let php_html_in_heredoc = 0 -autocmd FileType php set omnifunc=phpcomplete#CompletePHP -let g:pdv_template_dir = $HOME ."/.vim/bundle/pdv/templates_snip" -nnoremap h :call pdv#DocumentWithSnip() -" autocmd FileType php setlocal binary noeol omnifunc=phpcomplete#CompletePHP -" autocmd FileType php setlocal omnifunc=phpcomplete#CompletePHP - -augroup SmartyHTML - autocmd! - autocmd Filetype smarty set filetype=smarty.html -augroup END - -" MDX/markdown -let g:vim_markdown_math = 1 - -" vim-ack: -if executable('ag') - let g:ackprg = 'ag --vimgrep' -endif - -" coc -function InstallCompletion() - :CocInstall coc-json coc-tsserver coc-java -endfunction -command InstallCompletion call InstallCompletion() - -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: There's always complete item selected by default, you may want to enable -" no select by `"suggest.noselect": true` in your configuration file. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -inoremap - \ coc#pum#visible() ? coc#pum#next(1) : - \ CheckBackspace() ? "\" : - \ coc#refresh() -inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" - -" Make to accept selected completion item or notify coc.nvim to format -" u breaks current undo, please make your own choice. -inoremap coc#pum#visible() ? coc#pum#confirm() - \: "\u\\=coc#on_enter()\" -function! CheckBackspace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -" Use to trigger completion. -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - - -" coc-renaming -nmap rn (coc-rename) - -nmap gd (coc-definition) -" nmap gds :call CocAction('jumpDefinition', 'vsplit') - -" airline -let g:airline_section_a='' -let g:airline_powerline_fonts = 1 - From 15e74c210655ea1249ca11d4acfa2cba3fea46d4 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 19 Oct 2024 08:45:06 -0400 Subject: [PATCH 02/52] Init lazy.vim. --- config/nvim/init.lua | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 config/nvim/init.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua new file mode 100644 index 0000000..8df75bd --- /dev/null +++ b/config/nvim/init.lua @@ -0,0 +1,34 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- add your plugins here + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "delek" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) From c085f2657bddc188dde9bf4b437c79abd8fa9695 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 19 Oct 2024 08:45:47 -0400 Subject: [PATCH 03/52] Disable update notification. --- config/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 8df75bd..f72d5c9 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -30,5 +30,5 @@ require("lazy").setup({ -- colorscheme that will be used when installing plugins. install = { colorscheme = { "delek" } }, -- automatically check for plugin updates - checker = { enabled = true }, + checker = { enabled = true, notify = false }, }) From 08c2693aa53afdc41ace58795cc21a2266cd981d Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 19 Oct 2024 09:55:01 -0400 Subject: [PATCH 04/52] Added fugitive. --- config/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index f72d5c9..0ea4c56 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -25,6 +25,9 @@ vim.g.maplocalleader = "\\" require("lazy").setup({ spec = { -- add your plugins here + { + "tpope/vim-fugitive" + } }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. From 6925cf1f270973e89118da2ce8c04786e17378b4 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 20:08:33 -0400 Subject: [PATCH 05/52] Add nvim.lazy lockfile. --- config/nvim/lazy-lock.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config/nvim/lazy-lock.json diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json new file mode 100644 index 0000000..a064187 --- /dev/null +++ b/config/nvim/lazy-lock.json @@ -0,0 +1,4 @@ +{ + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } +} From 92db057f454df4d88edea093dbe83386809263f7 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 20:35:26 -0400 Subject: [PATCH 06/52] Add tabular. --- config/nvim/init.lua | 3 +++ config/nvim/lazy-lock.json | 1 + 2 files changed, 4 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 0ea4c56..49142e3 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -27,6 +27,9 @@ require("lazy").setup({ -- add your plugins here { "tpope/vim-fugitive" + }, + { + "godlygeek/tabular" } }, -- Configure any other settings here. See the documentation for more details. diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a064187..e6dc3ec 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,4 +1,5 @@ { "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } } From a39a1ed994c5edd41045ed71e4761bfdad7de923 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 21:04:25 -0400 Subject: [PATCH 07/52] Add initial git mappings. --- config/nvim/init.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 49142e3..9009383 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,3 +1,12 @@ +-- Mappings +local map = vim.api.nvim_set_keymap +local options = { noremap = true } + +map('n', 'gs', ':Git status ', options) +map('n', 'gc', ':Git commit ', options) +map('n', 'ga', ':Git add ', options) +map('n', 'gd', ':Git diff ', options) + -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then @@ -30,7 +39,7 @@ require("lazy").setup({ }, { "godlygeek/tabular" - } + }, }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. From 0d3c6d8dcdf6094deae50738c1e575bd4b687cf6 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 21:05:04 -0400 Subject: [PATCH 08/52] Add indentation. --- config/nvim/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 9009383..57cf907 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,3 +1,12 @@ +-- Local config +local o = vim.opt; + +o.autoindent = true -- uses the indent from the previous line +o.tabstop = 2 -- number of columns occupied by a tab +o.softtabstop = 2 -- see multiple spaces as tabstops +o.shiftwidth = 2 -- width for autoindents +o.expandtab = true -- converts tabs to white space + -- Mappings local map = vim.api.nvim_set_keymap local options = { noremap = true } From 7ca589087418d9239a34e422bb2b8e5d8ba4c46f Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 21:06:25 -0400 Subject: [PATCH 09/52] Add relative line numbering. --- config/nvim/init.lua | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 57cf907..909eef6 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,20 +1,33 @@ --- Local config local o = vim.opt; +local autocmd = vim.api.nvim_create_autocmd; +local map = vim.api.nvim_set_keymap +-- Local config o.autoindent = true -- uses the indent from the previous line o.tabstop = 2 -- number of columns occupied by a tab o.softtabstop = 2 -- see multiple spaces as tabstops o.shiftwidth = 2 -- width for autoindents o.expandtab = true -- converts tabs to white space +-- Line numbers +o.number = true +o.relativenumber = true; +autocmd("InsertEnter", { + pattern = {"*"}, + command = "set norelativenumber" +}); +autocmd("InsertLeave", { + pattern = {"*"}, + command = "set relativenumber" +}); + -- Mappings -local map = vim.api.nvim_set_keymap -local options = { noremap = true } +local mapOptions = { noremap = true } -map('n', 'gs', ':Git status ', options) -map('n', 'gc', ':Git commit ', options) -map('n', 'ga', ':Git add ', options) -map('n', 'gd', ':Git diff ', options) +map('n', 'gs', ':Git status ', mapOptions) +map('n', 'gc', ':Git commit ', mapOptions) +map('n', 'ga', ':Git add ', mapOptions) +map('n', 'gd', ':Git diff ', mapOptions) -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" From 841122ffe87d94ba338003ea216a2b7c6f2d14d6 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 21:15:55 -0400 Subject: [PATCH 10/52] =?UTF-8?q?Tabs=20over=20buffers=20=F0=9F=AB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/nvim/init.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 909eef6..ce0fa0f 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,6 +1,7 @@ local o = vim.opt; local autocmd = vim.api.nvim_create_autocmd; local map = vim.api.nvim_set_keymap +local mapOptions = { noremap = true } -- Local config o.autoindent = true -- uses the indent from the previous line @@ -21,14 +22,17 @@ autocmd("InsertLeave", { command = "set relativenumber" }); --- Mappings -local mapOptions = { noremap = true } - +-- Git Mappings map('n', 'gs', ':Git status ', mapOptions) map('n', 'gc', ':Git commit ', mapOptions) map('n', 'ga', ':Git add ', mapOptions) map('n', 'gd', ':Git diff ', mapOptions) +-- Tabbed editing mappings +map('n', ',,', ':tabnew', mapOptions) +map('n', ',.', ':tabnext', mapOptions) +map('n', '.,', ':tabpre', mapOptions) + -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then From ef718d970b1281c02b5d791c398dd22f7b6f2f0d Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 21:31:19 -0400 Subject: [PATCH 11/52] Set up gruvbox colorscheme. --- config/nvim/init.lua | 11 ++++++++++- config/nvim/lazy-lock.json | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ce0fa0f..3945dcb 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -66,10 +66,19 @@ require("lazy").setup({ { "godlygeek/tabular" }, + { + "ellisonleao/gruvbox.nvim", opts = { + italic = { + strings = false + } + } + } }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "delek" } }, + install = { }, -- automatically check for plugin updates checker = { enabled = true, notify = false }, }) + +vim.cmd("colorscheme gruvbox") diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index e6dc3ec..497af9c 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,4 +1,5 @@ { + "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } From ecf0f01bfa98daa859b120a5818cc3fc3e29c04c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 22:13:41 -0400 Subject: [PATCH 12/52] Add lualine for statusline. --- config/nvim/init.lua | 11 +++++++++++ config/nvim/lazy-lock.json | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 3945dcb..2e551ab 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -72,6 +72,10 @@ require("lazy").setup({ strings = false } } + }, + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' } } }, -- Configure any other settings here. See the documentation for more details. @@ -82,3 +86,10 @@ require("lazy").setup({ }) vim.cmd("colorscheme gruvbox") + +-- statusline +require('lualine').setup({ + sections = { + lualine_a = {} + } +}) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 497af9c..35e1949 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,6 +1,8 @@ { "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } } From 566bbb500d5c39221efa9964eb9c2b90a648cd4c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 23 Oct 2024 22:32:43 -0400 Subject: [PATCH 13/52] Add fuzzy file completion with telescope. --- config/nvim/init.lua | 11 ++++++++++- config/nvim/lazy-lock.json | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 2e551ab..4d0148a 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -22,7 +22,7 @@ autocmd("InsertLeave", { command = "set relativenumber" }); --- Git Mappings +-- Git mappings map('n', 'gs', ':Git status ', mapOptions) map('n', 'gc', ':Git commit ', mapOptions) map('n', 'ga', ':Git add ', mapOptions) @@ -33,6 +33,11 @@ map('n', ',,', ':tabnew', mapOptions) map('n', ',.', ':tabnext', mapOptions) map('n', '.,', ':tabpre', mapOptions) +-- Fuzzy file completion mappings +map('n', 'ff', ':Telescope find_files', mapOptions) +map('n', 'fg', ':Telescope live_grep', mapOptions) +map('n', ';', ':Telescope buffers', mapOptions) + -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then @@ -76,6 +81,10 @@ require("lazy").setup({ { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' } + }, + { + 'nvim-telescope/telescope.nvim', branch = '0.1.x', + dependencies = { 'nvim-lua/plenary.nvim' } } }, -- Configure any other settings here. See the documentation for more details. diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 35e1949..e2fa023 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -3,6 +3,8 @@ "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } } From 7ffd8f59fba8ddd9438a27b56c862ad026e4f05c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Thu, 24 Oct 2024 10:32:41 -0400 Subject: [PATCH 14/52] Add coc for language server. --- config/nvim/init.lua | 6 ++ config/nvim/lazy-lock.json | 3 +- config/nvim/lua/coc.lua | 184 +++++++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 config/nvim/lua/coc.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 4d0148a..e08c005 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -85,6 +85,10 @@ require("lazy").setup({ { 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } + }, + { + 'neoclide/coc.nvim', + build = 'npm ci' } }, -- Configure any other settings here. See the documentation for more details. @@ -102,3 +106,5 @@ require('lualine').setup({ lualine_a = {} } }) + +require 'coc' diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index e2fa023..a0788b3 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { + "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/config/nvim/lua/coc.lua b/config/nvim/lua/coc.lua new file mode 100644 index 0000000..f34bd2f --- /dev/null +++ b/config/nvim/lua/coc.lua @@ -0,0 +1,184 @@ +-- Some servers have issues with backup files, see #649 +vim.opt.backup = false +vim.opt.writebackup = false + +-- Having longer updatetime (default is 4000 ms = 4s) leads to noticeable +-- delays and poor user experience +vim.opt.updatetime = 300 + +-- Always show the signcolumn, otherwise it would shift the text each time +-- diagnostics appeared/became resolved +vim.opt.signcolumn = "yes" + +local keyset = vim.keymap.set +-- Autocomplete +function _G.check_back_space() + local col = vim.fn.col('.') - 1 + return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil +end + +-- Use Tab for trigger completion with characters ahead and navigate +-- NOTE: There's always a completion item selected by default, you may want to enable +-- no select by setting `"suggest.noselect": true` in your configuration file +-- NOTE: Use command ':verbose imap ' to make sure Tab is not mapped by +-- other plugins before putting this into your config +local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} +keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) +keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) + +-- Make to accept selected completion item or notify coc.nvim to format +-- u breaks current undo, please make your own choice +keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) + +-- Use to trigger snippets +keyset("i", "", "(coc-snippets-expand-jump)") +-- Use to trigger completion +keyset("i", "", "coc#refresh()", {silent = true, expr = true}) + +-- Use `[g` and `]g` to navigate diagnostics +-- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list +keyset("n", "[g", "(coc-diagnostic-prev)", {silent = true}) +keyset("n", "]g", "(coc-diagnostic-next)", {silent = true}) + +-- GoTo code navigation +keyset("n", "gd", "(coc-definition)", {silent = true}) +keyset("n", "gy", "(coc-type-definition)", {silent = true}) +keyset("n", "gi", "(coc-implementation)", {silent = true}) +keyset("n", "gr", "(coc-references)", {silent = true}) + + +-- Use K to show documentation in preview window +function _G.show_docs() + local cw = vim.fn.expand('') + if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then + vim.api.nvim_command('h ' .. cw) + elseif vim.api.nvim_eval('coc#rpc#ready()') then + vim.fn.CocActionAsync('doHover') + else + vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) + end +end +keyset("n", "K", 'lua _G.show_docs()', {silent = true}) + + +-- Highlight the symbol and its references on a CursorHold event(cursor is idle) +vim.api.nvim_create_augroup("CocGroup", {}) +vim.api.nvim_create_autocmd("CursorHold", { + group = "CocGroup", + command = "silent call CocActionAsync('highlight')", + desc = "Highlight symbol under cursor on CursorHold" +}) + + +-- Symbol renaming +keyset("n", "rn", "(coc-rename)", {silent = true}) + + +-- Formatting selected code +keyset("x", "f", "(coc-format-selected)", {silent = true}) +keyset("n", "f", "(coc-format-selected)", {silent = true}) + + +-- Setup formatexpr specified filetype(s) +vim.api.nvim_create_autocmd("FileType", { + group = "CocGroup", + pattern = "typescript,json", + command = "setl formatexpr=CocAction('formatSelected')", + desc = "Setup formatexpr specified filetype(s)." +}) + +-- Update signature help on jump placeholder +vim.api.nvim_create_autocmd("User", { + group = "CocGroup", + pattern = "CocJumpPlaceholder", + command = "call CocActionAsync('showSignatureHelp')", + desc = "Update signature help on jump placeholder" +}) + +-- Apply codeAction to the selected region +-- Example: `aap` for current paragraph +local opts = {silent = true, nowait = true} +keyset("x", "a", "(coc-codeaction-selected)", opts) +keyset("n", "a", "(coc-codeaction-selected)", opts) + +-- Remap keys for apply code actions at the cursor position. +keyset("n", "ac", "(coc-codeaction-cursor)", opts) +-- Remap keys for apply source code actions for current file. +keyset("n", "as", "(coc-codeaction-source)", opts) +-- Apply the most preferred quickfix action on the current line. +keyset("n", "qf", "(coc-fix-current)", opts) + +-- Remap keys for apply refactor code actions. +keyset("n", "re", "(coc-codeaction-refactor)", { silent = true }) +keyset("x", "r", "(coc-codeaction-refactor-selected)", { silent = true }) +keyset("n", "r", "(coc-codeaction-refactor-selected)", { silent = true }) + +-- Run the Code Lens actions on the current line +keyset("n", "cl", "(coc-codelens-action)", opts) + + +-- Map function and class text objects +-- NOTE: Requires 'textDocument.documentSymbol' support from the language server +keyset("x", "if", "(coc-funcobj-i)", opts) +keyset("o", "if", "(coc-funcobj-i)", opts) +keyset("x", "af", "(coc-funcobj-a)", opts) +keyset("o", "af", "(coc-funcobj-a)", opts) +keyset("x", "ic", "(coc-classobj-i)", opts) +keyset("o", "ic", "(coc-classobj-i)", opts) +keyset("x", "ac", "(coc-classobj-a)", opts) +keyset("o", "ac", "(coc-classobj-a)", opts) + + +-- Remap and to scroll float windows/popups +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true, expr = true} +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(1)" : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(0)" : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) + + +-- Use CTRL-S for selections ranges +-- Requires 'textDocument/selectionRange' support of language server +keyset("n", "", "(coc-range-select)", {silent = true}) +keyset("x", "", "(coc-range-select)", {silent = true}) + + +-- Add `:Format` command to format current buffer +vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) + +-- " Add `:Fold` command to fold current buffer +vim.api.nvim_create_user_command("Fold", "call CocAction('fold', )", {nargs = '?'}) + +-- Add `:OR` command for organize imports of the current buffer +vim.api.nvim_create_user_command("OR", "call CocActionAsync('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 +vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") + +-- Mappings for CoCList +-- code actions and coc stuff +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true} +-- Show all diagnostics +keyset("n", "a", ":CocList diagnostics", opts) +-- Manage extensions +keyset("n", "e", ":CocList extensions", opts) +-- Show commands +keyset("n", "c", ":CocList commands", opts) +-- Find symbol of current document +keyset("n", "o", ":CocList outline", opts) +-- Search workspace symbols +keyset("n", "s", ":CocList -I symbols", opts) +-- Do default action for next item +keyset("n", "j", ":CocNext", opts) +-- Do default action for previous item +keyset("n", "k", ":CocPrev", opts) +-- Resume latest coc list +keyset("n", "p", ":CocListResume", opts) From 2e3fcc39afff198751988d1721182a9ec429c6c7 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Fri, 25 Oct 2024 08:38:56 -0400 Subject: [PATCH 15/52] Add language server install helper. --- config/nvim/init.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index e08c005..c0bd142 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,5 +1,6 @@ local o = vim.opt; -local autocmd = vim.api.nvim_create_autocmd; +local autocmd = vim.api.nvim_create_autocmd +local command = vim.api.nvim_create_user_command local map = vim.api.nvim_set_keymap local mapOptions = { noremap = true } @@ -107,4 +108,8 @@ require('lualine').setup({ } }) +-- lsp require 'coc' +command('InstallCompletion', function() + vim.cmd('CocInstall coc-phpls coc-go coc-json coc-tsserver coc-java coc-lua') +end, {}) From 849fd1a663c23a312280454df595351d0467ac08 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 26 Oct 2024 13:38:49 -0400 Subject: [PATCH 16/52] Add quickfix list mappings. --- config/nvim/init.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index c0bd142..5259f1f 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -35,9 +35,14 @@ map('n', ',.', ':tabnext', mapOptions) map('n', '.,', ':tabpre', mapOptions) -- Fuzzy file completion mappings -map('n', 'ff', ':Telescope find_files', mapOptions) -map('n', 'fg', ':Telescope live_grep', mapOptions) -map('n', ';', ':Telescope buffers', mapOptions) +map('n', 'ff', ':Telescope find_files', mapOptions) +map('n', 'fg', ':Telescope live_grep', mapOptions) +map('n', ';', ':Telescope buffers', mapOptions) + +-- Quickfix list mappings +map('n', '', ':cprevious', mapOptions); +map('n', '', ':cnext', mapOptions); +map('n', '', ':cclose', mapOptions); -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" From 1eae3edadc27cac80c34291eeb944564615affbe Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 26 Oct 2024 14:40:14 -0400 Subject: [PATCH 17/52] Add vim-go. --- config/nvim/init.lua | 3 +++ config/nvim/lazy-lock.json | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 5259f1f..40ecda3 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -95,6 +95,9 @@ require("lazy").setup({ { 'neoclide/coc.nvim', build = 'npm ci' + }, + { + 'fatih/vim-go' } }, -- Configure any other settings here. See the documentation for more details. diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a0788b3..46240f8 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,11 +1,12 @@ { "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" } + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" } } From f65964093425d673fdb1b10e53c1f1f30bda90dc Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 29 Oct 2024 06:25:42 -0400 Subject: [PATCH 18/52] Add ctrlp for GoDecls. --- config/nvim/init.lua | 3 +++ config/nvim/lazy-lock.json | 1 + 2 files changed, 4 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 40ecda3..b80338b 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -98,6 +98,9 @@ require("lazy").setup({ }, { 'fatih/vim-go' + }, + { + 'kien/ctrlp.vim' } }, -- Configure any other settings here. See the documentation for more details. diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 46240f8..9cebe0f 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,5 +1,6 @@ { "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, + "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, From 43869a432d3ed56bc94ca2dd4d49a883b1b71008 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 29 Oct 2024 06:36:53 -0400 Subject: [PATCH 19/52] =?UTF-8?q?Switch=20leaders=20=F0=9F=98=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/nvim/init.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index b80338b..18cdd7d 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -4,6 +4,10 @@ local command = vim.api.nvim_create_user_command local map = vim.api.nvim_set_keymap local mapOptions = { noremap = true } +-- Leaders +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + -- Local config o.autoindent = true -- uses the indent from the previous line o.tabstop = 2 -- number of columns occupied by a tab @@ -61,12 +65,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) --- Make sure to setup `mapleader` and `maplocalleader` before --- loading lazy.nvim so that mappings are correct. --- This is also a good place to setup other settings (vim.opt) -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - -- Setup lazy.nvim require("lazy").setup({ spec = { From fd0ad04fbdb1877a4c8ad39d6a86d18a434aeed0 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Thu, 31 Oct 2024 06:28:59 -0400 Subject: [PATCH 20/52] Add vim-go mappings. --- config/nvim/init.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 18cdd7d..9470c9c 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -15,6 +15,7 @@ o.softtabstop = 2 -- see multiple spaces as tabstops o.shiftwidth = 2 -- width for autoindents o.expandtab = true -- converts tabs to white space + -- Line numbers o.number = true o.relativenumber = true; @@ -48,6 +49,21 @@ map('n', '', ':cprevious', mapOptions); map('n', '', ':cnext', mapOptions); map('n', '', ':cclose', mapOptions); +-- Vim-go mappings +local function mapgo (mode, key, command, options) + autocmd('FileType', { + pattern = 'go', + callback = function() + map(mode, key, command, options) + end + }) +end +mapgo('n', 'b', '(go-build)', mapOptions); +mapgo('n', 'r', '(go-run)', mapOptions); +mapgo('n', 't', '(go-test)', mapOptions); +mapgo('n', 'c', '(go-coverage-toggle)', mapOptions); +mapgo('n', 'd', ':GoDecls', mapOptions); + -- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then From 19b0b963f8e2307a970a9c042123ffe03f2af1ff Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Thu, 31 Oct 2024 07:04:54 -0400 Subject: [PATCH 21/52] Add go/bin to path. --- bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index 8bd40e8..9946517 100644 --- a/bashrc +++ b/bashrc @@ -266,7 +266,7 @@ export VOLTA_HOME="$HOME/.volta" export PATH="$VOLTA_HOME/bin:$PATH" # Rust -. "$HOME/.cargo/env" +[[ -s "$HOME/.cargo/env" ]] && source "$HOME/.cargo/env" # go -export PATH=$PATH:/usr/local/go/bin +export PATH=$PATH:/usr/local/go/bin:~/go/bin From fe87dc7f28f6d85bb3cfcb0c79d5b30693261752 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 5 Nov 2024 06:47:35 -0500 Subject: [PATCH 22/52] Add vim-rhubarb for GBrowse links. --- config/nvim/init.lua | 3 +++ config/nvim/lazy-lock.json | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 9470c9c..ea10b1a 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -88,6 +88,9 @@ require("lazy").setup({ { "tpope/vim-fugitive" }, + { + 'tpope/vim-rhubarb' + }, { "godlygeek/tabular" }, diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 9cebe0f..e90a5cc 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -2,12 +2,13 @@ "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, - "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" } + "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" }, + "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" } } From 18e2d7b4a54cb2e1ebb0924148681efc851f8c17 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 27 Nov 2024 06:32:59 -0800 Subject: [PATCH 23/52] Update battery line for osx. --- bin/tmux_status | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/tmux_status b/bin/tmux_status index 45e2107..0549af8 100755 --- a/bin/tmux_status +++ b/bin/tmux_status @@ -76,8 +76,8 @@ sub print_battery_ioreg { #gather battery info my @info = split(/%?;?\s+/, $battery); - my $state = $info[3]; - my $percent = $info[2]; + my $state = $info[4]; + my $percent = $info[3]; #print a lightning when charging: my $decoration = ''; @@ -98,7 +98,7 @@ sub print_battery_status { my $spark = $sparks[POSIX::floor(0.0799 * $percent)]; # color text when battery low - if ($state eq 'Discharging') { + if ($state eq 'discharging') { if ($percent <= 40) { print $colors{'yellow'}; } From 6b75f36b68afec1661eed2bb98998a6c34968e6c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 27 Nov 2024 06:45:05 -0800 Subject: [PATCH 24/52] Add initial zshrc. * oh-my-zsh * pull over some aliases * vim keybindings --- zshrc | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 zshrc diff --git a/zshrc b/zshrc new file mode 100644 index 0000000..c90977c --- /dev/null +++ b/zshrc @@ -0,0 +1,117 @@ +alias vi=nvim +alias vim=nvim +alias gits='git status' +alias gc='git commit' +alias gd='git diff' +alias ga='git add' +alias gp='git push' +alias tma='tmux attach -d -t' + +bindkey -v + +export GPG_TTY=$(tty) + +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH + +# Path to your Oh My Zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time Oh My Zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="robbyrussell" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch $(uname -m)" + +# Set personal aliases, overriding those provided by Oh My Zsh libs, +# plugins, and themes. Aliases can be placed here, though Oh My Zsh +# users are encouraged to define aliases within a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" From 4bd6047a12795c2662f98b1d83c9bb787e157954 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 27 Nov 2024 17:54:48 -0800 Subject: [PATCH 25/52] Configure nvim for git. --- gitconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitconfig b/gitconfig index 9284f17..9d81ed7 100644 --- a/gitconfig +++ b/gitconfig @@ -1,7 +1,6 @@ [core] - editor = vim + editor = nvim excludesfile = /home/carl/.gitignore_global - pager = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less [user] name = Carl Sutherland email = carl@humblesoftware.com From fc472b5eab10c75b28b253742aa289f799ed0951 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 27 Nov 2024 18:03:30 -0800 Subject: [PATCH 26/52] Fix config ordering (for vim bindings). --- zshrc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/zshrc b/zshrc index c90977c..8b9c594 100644 --- a/zshrc +++ b/zshrc @@ -1,16 +1,3 @@ -alias vi=nvim -alias vim=nvim -alias gits='git status' -alias gc='git commit' -alias gd='git diff' -alias ga='git add' -alias gp='git push' -alias tma='tmux attach -d -t' - -bindkey -v - -export GPG_TTY=$(tty) - # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH @@ -115,3 +102,17 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" + +alias vi=nvim +alias vim=nvim +alias gits='git status' +alias gc='git commit' +alias gd='git diff' +alias ga='git add' +alias gp='git push' +alias tma='tmux attach -d -t' + +bindkey -v + +export GPG_TTY=$(tty) + From 870e7c10fe5cc19a72b2074a234c295e978a1826 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Thu, 28 Nov 2024 08:57:38 -0800 Subject: [PATCH 27/52] Update lockfile. --- config/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index e90a5cc..dedfeee 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, + "coc.nvim": { "branch": "master", "commit": "aacbbcad23b62dd4b4f992ab716a222e7d3a21eb" }, "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, From 27cf5bcf5c987cf789bea2ba2c5df1f2065f6a59 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 11 Dec 2024 10:32:31 -0500 Subject: [PATCH 28/52] Add techdocs cli. --- bin/run-techdocs-local.sh | 128 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100755 bin/run-techdocs-local.sh diff --git a/bin/run-techdocs-local.sh b/bin/run-techdocs-local.sh new file mode 100755 index 0000000..97597c6 --- /dev/null +++ b/bin/run-techdocs-local.sh @@ -0,0 +1,128 @@ +#!/bin/bash + +# NAME +# run-techdocs-local.sh - invokes the techdocs-preview-local docker image to generate a site from Backstage documentation and +# serve it +# +# SYNOPSIS +# run-techdocs-local.sh --verbose --catalog-file=PATH --port=NUMBER --entity-directory=PATH +# +# DESCRIPTION +# Parses command line arguments and runs the techdocs-preview-local docker image to generate a site from Backstage documentation and +# serve it + +# bash strict mode +set -euo pipefail + +# constants +IMAGE_NAME=artifactory.squarespace.net/squarespace/backstage/backstage-techdocs-preview-local +IMAGE_TAG=latest + +# flag default values +VERBOSE=false +PORT=7007 +CATALOG_FILE="" +ENTITY_DIRECTORY=$(pwd) + +# check_prerequisites ensures that all programs needed to run this script are +# installed. It will fatally exit the script if one of the prerequites are not +# found. +check_prerequisites() { + reqs=("basename" "readlink" "docker") + for req in "${reqs[@]}"; do + command -v "$req" &>/dev/null || { + echo "Requirement $req not found. Install it and try again" + exit 1 + } + done +} + +# help provides usage information +help() { + echo "Usage: $(basename $0) [OPTIONS]" + echo + echo "Options:" + echo "--verbose Enable verbose mode" + echo "--port=[NUMBER] Set port to [NUMBER]. Default: 7007" + echo "--catalog-file=[PATH] Set path of the catalog file to [PATH]. Script will search if none provided" + echo "--entity-directory=[PATH] Set path of the entity directory to [PATH]. Default: Current directory ($(pwd))" +} + +# parse_flags parses command line flags. Prints the help output if an invalid flag is passed +parse_flags() { + while (( "$#" )); do + case "$1" in + --verbose) + VERBOSE=true + shift + ;; + --verbose=*) + VERBOSE="${1#*=}" + shift + ;; + --port=*) + PORT="${1#*=}" + shift + ;; + --catalog-file=*) + CATALOG_FILE="${1#*=}" + shift + ;; + --entity-directory=*) + ENTITY_DIRECTORY="${1#*=}" + shift + ;; + --help) + help + exit 0 + shift + ;; + --) # end argument parsing + shift + break + ;; + -*|--*=) # unsupported flags + echo "Error: Unsupported flag $1" >&2 + help + exit 1 + ;; + esac + done +} + +# resolve_relative_links resolves any relative links passed as command line flags +# and turns them into absolute links +resolve_relative_links() { + CATALOG_FILE_VOLUME="" + MOUNTED_CATALOG_FILE="" + if [ ! -z "${CATALOG_FILE}" ]; then + CATALOG_FILE=$(readlink -f $CATALOG_FILE) + CATALOG_FILE_VOLUME="-v ${CATALOG_FILE}:/usr/src/catalog/catalog-info.yml:ro" + MOUNTED_CATALOG_FILE="/usr/src/catalog/catalog-info.yml" + fi + ENTITY_DIRECTORY=$(readlink -f $ENTITY_DIRECTORY) +} + +# invoke_docker runs the docker image to build and display techdocs +invoke_docker() { + docker run \ + --pull always \ + --platform linux/amd64 \ + -v ${ENTITY_DIRECTORY}:/usr/src/entity/:ro ${CATALOG_FILE_VOLUME} \ + --name techdocs-preview \ + -p ${PORT}:7007 \ + -e CATALOG_FILE=${MOUNTED_CATALOG_FILE} \ + -e VERBOSE=${VERBOSE} \ + -e HOST_PORT=${PORT} \ + --rm -it \ + ${IMAGE_NAME}:${IMAGE_TAG} +} + +main() { + parse_flags "$@" + check_prerequisites + resolve_relative_links + invoke_docker +} + +main "$@" From a12e910611ef8940e3cc016a0ec14642f336c116 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 11 Dec 2024 10:23:05 -0500 Subject: [PATCH 29/52] Minor updates for moving into new computer. --- bin/setup | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/setup b/bin/setup index 564583b..0b9b07f 100755 --- a/bin/setup +++ b/bin/setup @@ -7,11 +7,10 @@ sudo add-apt-repository multiverse sudo apt-get install \ aptitude \ git \ - ack-grep \ + ack \ silversearcher-ag \ neovim \ vim \ - vim-gtk \ tmux \ tmuxinator \ firefox \ @@ -22,7 +21,6 @@ sudo apt-get install \ g++ \ redshift \ libnotify-bin \ - sqlite \ postgresql \ steam \ vlc \ From b5aaeadb88f898c9b7ae3b9911606670abb62129 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 11 Dec 2024 10:23:56 -0500 Subject: [PATCH 30/52] Add vim-jsonnet. --- config/nvim/init.lua | 3 +++ config/nvim/lazy-lock.json | 1 + vim/bundle/vim-go | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 160000 vim/bundle/vim-go diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ea10b1a..47fb275 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -118,6 +118,9 @@ require("lazy").setup({ }, { 'kien/ctrlp.vim' + }, + { + 'google/vim-jsonnet' } }, -- Configure any other settings here. See the documentation for more details. diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index dedfeee..a548c5e 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -10,5 +10,6 @@ "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" }, + "vim-jsonnet": { "branch": "master", "commit": "4ebc6619ddce5d032a985b42a9864154c3d20e4a" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" } } diff --git a/vim/bundle/vim-go b/vim/bundle/vim-go deleted file mode 160000 index f365d96..0000000 --- a/vim/bundle/vim-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f365d961e540579e413acb092c8f18d62153cbaf From 74a0e280736de2a047b72ea0fece5edec8955de1 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 11 Dec 2024 10:24:19 -0500 Subject: [PATCH 31/52] Configure php-ls. --- config/nvim/coc-settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/nvim/coc-settings.json diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json new file mode 100644 index 0000000..38d783d --- /dev/null +++ b/config/nvim/coc-settings.json @@ -0,0 +1,3 @@ +{ + "intelephense.environment.phpVersion": "8.3.0" +} From 4f7537718802131431e3d0c63a06560e49e6ab71 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Fri, 13 Dec 2024 05:28:03 -0500 Subject: [PATCH 32/52] Custom zsh theme... in progress. --- config/zsh-custom/themes/custom.zsh-theme | 39 ++++++++++++++++++++++ config/zsh-custom/themes/example.zsh-theme | 6 ++++ zshrc | 3 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 config/zsh-custom/themes/custom.zsh-theme create mode 100644 config/zsh-custom/themes/example.zsh-theme diff --git a/config/zsh-custom/themes/custom.zsh-theme b/config/zsh-custom/themes/custom.zsh-theme new file mode 100644 index 0000000..fcff04d --- /dev/null +++ b/config/zsh-custom/themes/custom.zsh-theme @@ -0,0 +1,39 @@ +# ZSH Theme - Preview: https://cl.ly/f701d00760f8059e06dc +# Thanks to gallifrey, upon whose theme this is based + +local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" + +function my_git_prompt_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + GIT_STATUS=$(git_prompt_status) + [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS" + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +my_host() { + if [[ -n "$SSH_CLIENT" ]]; then + print -n "@%m" + fi +} + +PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B +$%b ' +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" +ZSH_THEME_GIT_PROMPT_ADDED="+" +ZSH_THEME_GIT_PROMPT_MODIFIED="*" +ZSH_THEME_GIT_PROMPT_RENAMED="~" +ZSH_THEME_GIT_PROMPT_DELETED="!" +ZSH_THEME_GIT_PROMPT_UNMERGED="?" + + +# PROMPT="%(?:%{$fg_bold[green]%}%1{➜%} :%{$fg_bold[red]%}%1{➜%} ) %{$fg[cyan]%}%c%{$reset_color%}" +# PROMPT+=' $(git_prompt_info)' + +ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[blue]%}%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%}] %{$fg[yellow]%}%1{✗%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}%{$reset_color%}]" diff --git a/config/zsh-custom/themes/example.zsh-theme b/config/zsh-custom/themes/example.zsh-theme new file mode 100644 index 0000000..5551207 --- /dev/null +++ b/config/zsh-custom/themes/example.zsh-theme @@ -0,0 +1,6 @@ +# Put your custom themes in this folder. +# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes +# +# Example: + +PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% " diff --git a/zshrc b/zshrc index 8b9c594..a9b1308 100644 --- a/zshrc +++ b/zshrc @@ -63,7 +63,8 @@ ZSH_THEME="robbyrussell" # HIST_STAMPS="mm/dd/yyyy" # Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder +ZSH_CUSTOM=~/.config/zsh-custom +ZSH_THEME="custom" # Which plugins would you like to load? # Standard plugins can be found in $ZSH/plugins/ From 6a1e370e875a17caa7cf4563398d4b85601fa74a Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Fri, 13 Dec 2024 09:10:39 -0500 Subject: [PATCH 33/52] Switch to custom theme. --- config/zsh-custom/themes/custom.zsh-theme | 33 ++++++++++++++--------- zshrc | 1 - 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/config/zsh-custom/themes/custom.zsh-theme b/config/zsh-custom/themes/custom.zsh-theme index fcff04d..bf4bd35 100644 --- a/config/zsh-custom/themes/custom.zsh-theme +++ b/config/zsh-custom/themes/custom.zsh-theme @@ -3,11 +3,22 @@ local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" +function get_git_branch { + echo $(git rev-parse --abbrev-ref HEAD 2> /dev/null); + # echo $(git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'}) +} + +function get_git_remote { + # echo $(git remote) + echo $(git config --get branch.$branch.remote) +} + + function my_git_prompt_info() { ref=$(git symbolic-ref HEAD 2> /dev/null) || return GIT_STATUS=$(git_prompt_status) [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS" - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/} $ZSH_THEME_GIT_PROMPT_SUFFIX" } my_host() { @@ -16,24 +27,22 @@ my_host() { fi } -PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B -$%b ' -RPS1="${return_code}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" -ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" +ZSH_THEME_GIT_PROMPT_UNTRACKED=":" ZSH_THEME_GIT_PROMPT_ADDED="+" ZSH_THEME_GIT_PROMPT_MODIFIED="*" ZSH_THEME_GIT_PROMPT_RENAMED="~" ZSH_THEME_GIT_PROMPT_DELETED="!" ZSH_THEME_GIT_PROMPT_UNMERGED="?" +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%  " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg[yellow]%}%1{✗%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg_bold[red]%}%1{✗%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}" -# PROMPT="%(?:%{$fg_bold[green]%}%1{➜%} :%{$fg_bold[red]%}%1{➜%} ) %{$fg[cyan]%}%c%{$reset_color%}" -# PROMPT+=' $(git_prompt_info)' - -ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[blue]%}%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%}] %{$fg[yellow]%}%1{✗%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}%{$reset_color%}]" +PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)%{$reset_color%} +$ ' +RPS1="${return_code}" diff --git a/zshrc b/zshrc index a9b1308..a1631d6 100644 --- a/zshrc +++ b/zshrc @@ -8,7 +8,6 @@ export ZSH="$HOME/.oh-my-zsh" # load a random theme each time Oh My Zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="robbyrussell" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load From 6cfe3622e38446e70f3e178877d84f39887c942f Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Fri, 13 Dec 2024 09:17:41 -0500 Subject: [PATCH 34/52] Flower power. --- config/zsh-custom/themes/custom.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/zsh-custom/themes/custom.zsh-theme b/config/zsh-custom/themes/custom.zsh-theme index bf4bd35..7bd495f 100644 --- a/config/zsh-custom/themes/custom.zsh-theme +++ b/config/zsh-custom/themes/custom.zsh-theme @@ -41,7 +41,7 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%  " ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" # ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg[yellow]%}%1{✗%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg_bold[red]%}%1{✗%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%} 🌼" PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)%{$reset_color%} $ ' From 8afdc5d7e2e9aa4b29dc52fec22510173a64f378 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 10:04:19 -0500 Subject: [PATCH 35/52] Add rancher. --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index a1631d6..86f7d66 100644 --- a/zshrc +++ b/zshrc @@ -116,3 +116,6 @@ bindkey -v export GPG_TTY=$(tty) +### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT) +export PATH="/Users/csutherland/.rd/bin:$PATH" +### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT) From 17ff4fc8c4d977df335497ad496a965581ad005c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 10:05:44 -0500 Subject: [PATCH 36/52] Extract secerts. --- zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zshrc b/zshrc index 86f7d66..b80c065 100644 --- a/zshrc +++ b/zshrc @@ -116,6 +116,8 @@ bindkey -v export GPG_TTY=$(tty) +source ~/.secret + ### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT) export PATH="/Users/csutherland/.rd/bin:$PATH" ### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT) From e5a490caab60c40590a1ea2280d4527b34e863bd Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 10:11:23 -0500 Subject: [PATCH 37/52] Include path in lualine. --- config/nvim/init.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 47fb275..0e157da 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -136,6 +136,14 @@ vim.cmd("colorscheme gruvbox") require('lualine').setup({ sections = { lualine_a = {} + }, + inactive_sections = { + lualine_c = { + { + 'filename', + path = 1 + } + } } }) From 0bfa408233d17171e3c6ac98b85ea65b41191e1f Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 10:11:41 -0500 Subject: [PATCH 38/52] Fix support for build tags e2e & integration. --- config/nvim/coc-settings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json index 38d783d..b4683a2 100644 --- a/config/nvim/coc-settings.json +++ b/config/nvim/coc-settings.json @@ -1,3 +1,6 @@ { - "intelephense.environment.phpVersion": "8.3.0" + "intelephense.environment.phpVersion": "8.3.0", + "go.goplsEnv": { + "GOFLAGS": "-tags=e2e,integration" + } } From bc2df38135310941675001650bb68f46399c4e44 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 10:46:03 -0500 Subject: [PATCH 39/52] Fix the git status line. --- config/zsh-custom/themes/custom.zsh-theme | 45 ++++++++--------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/config/zsh-custom/themes/custom.zsh-theme b/config/zsh-custom/themes/custom.zsh-theme index 7bd495f..63dfe19 100644 --- a/config/zsh-custom/themes/custom.zsh-theme +++ b/config/zsh-custom/themes/custom.zsh-theme @@ -3,17 +3,13 @@ local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" -function get_git_branch { - echo $(git rev-parse --abbrev-ref HEAD 2> /dev/null); - # echo $(git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'}) -} - -function get_git_remote { - # echo $(git remote) - echo $(git config --get branch.$branch.remote) +my_host() { + if [[ -n "$SSH_CLIENT" ]]; then + print -n "@%m" + fi } - +# Unused – function my_git_prompt_info() { ref=$(git symbolic-ref HEAD 2> /dev/null) || return GIT_STATUS=$(git_prompt_status) @@ -21,28 +17,19 @@ function my_git_prompt_info() { echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/} $ZSH_THEME_GIT_PROMPT_SUFFIX" } -my_host() { - if [[ -n "$SSH_CLIENT" ]]; then - print -n "@%m" - fi -} +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}  " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" -ZSH_THEME_GIT_PROMPT_UNTRACKED=":" -ZSH_THEME_GIT_PROMPT_ADDED="+" -ZSH_THEME_GIT_PROMPT_MODIFIED="*" -ZSH_THEME_GIT_PROMPT_RENAMED="~" -ZSH_THEME_GIT_PROMPT_DELETED="!" -ZSH_THEME_GIT_PROMPT_UNMERGED="?" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%  " -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg[yellow]%}%1{✗%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}%{$reset_color%} %{$fg_bold[red]%}%1{✗%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[red]%}✗" ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%} 🌼" -PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)%{$reset_color%} +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[red]%}✚%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[red]%}✹%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}✖%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[red]%}➜%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}═%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}✭%{$reset_color%}" + +PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)$(git_prompt_status)%{$reset_color%} $ ' RPS1="${return_code}" From bade7c8a1b1ad6d6570df9d469a09ac2a40a27a0 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 31 Dec 2024 11:02:57 -0500 Subject: [PATCH 40/52] Add unpushed status. --- config/zsh-custom/themes/custom.zsh-theme | 36 ++++++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/config/zsh-custom/themes/custom.zsh-theme b/config/zsh-custom/themes/custom.zsh-theme index 63dfe19..4e2fac6 100644 --- a/config/zsh-custom/themes/custom.zsh-theme +++ b/config/zsh-custom/themes/custom.zsh-theme @@ -10,18 +10,38 @@ my_host() { } # Unused – -function my_git_prompt_info() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - GIT_STATUS=$(git_prompt_status) - [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS" - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/} $ZSH_THEME_GIT_PROMPT_SUFFIX" +function get_git_branch { + echo $(git rev-parse --abbrev-ref HEAD 2> /dev/null); +} + +function get_git_remote { + echo $(git config --get branch.$branch.remote) +} + +function parse_git_unpushed { + local branch=`get_git_branch` + local remote=`get_git_remote` + if [[ "$remote" == "" ]]; then + # No remote + echo -e "❌" + else + local pushed=$(git branch -v | grep "^* $branch") + if [[ $pushed =~ "\[ahead [0-9]*" ]] + then + # Unpushed + echo -e "🌱" + else + # Pushed + echo -e "🌼" + fi + fi } ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}  " -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[red]%}✗" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%} 🌼" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$reset_color%}" ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[red]%}✚%{$reset_color%}" ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[red]%}✹%{$reset_color%}" @@ -30,6 +50,6 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[red]%}➜%{$reset_color%}" ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}═%{$reset_color%}" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}✭%{$reset_color%}" -PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)$(git_prompt_status)%{$reset_color%} +PROMPT='%{$fg[white]%}%n$(my_host)%{$reset_color%} %{$fg_bold[blue]%}%4~%{$reset_color%} $(git_prompt_info)$(git_prompt_status)$(parse_git_unpushed)%{$reset_color%} $ ' RPS1="${return_code}" From 0d441f85d69f149767f68b2b38e1cadc3f193a59 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Fri, 3 Jan 2025 12:21:52 -0500 Subject: [PATCH 41/52] Add wildmode. --- config/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 0e157da..714d8f0 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -15,6 +15,8 @@ o.softtabstop = 2 -- see multiple spaces as tabstops o.shiftwidth = 2 -- width for autoindents o.expandtab = true -- converts tabs to white space +-- Autocomplete menu +vim.g.wildmode = "longest:full" -- Line numbers o.number = true From a0551b56fd8c90399c30cd5c2fc7e72bedb1e9d4 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Mon, 24 Feb 2025 20:29:23 -0500 Subject: [PATCH 42/52] Lose docker, gain tools. --- bin/setup | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bin/setup b/bin/setup index 0b9b07f..9030752 100755 --- a/bin/setup +++ b/bin/setup @@ -28,6 +28,7 @@ sudo apt-get install \ mpv \ usb-creator-kde \ python-is-python3 \ + python3-venv \ build-essential \ libssl-dev \ jq \ @@ -37,16 +38,9 @@ sudo apt-get install \ fonts-powerline \ shellcheck \ watchman \ - acpi - -# Docker: -sudo apt install \ - docker \ - docker-compose \ -sudo groupadd docker -sudo usermod -aG docker $USER -newgrp docker - + acpi \ + mkcert \ + gnupg2 # Laptop: # sudo apt-get install powertop a2ps acpi From 9246df31cc3f11b837ac56677f19bb991d53c83d Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 12 Apr 2025 07:54:26 -0400 Subject: [PATCH 43/52] Add autoread. --- config/nvim/init.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 714d8f0..fcd1055 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -18,6 +18,13 @@ o.expandtab = true -- converts tabs to white space -- Autocomplete menu vim.g.wildmode = "longest:full" +-- Autoread +o.autoread = true +vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "CursorHoldI", "FocusGained" }, { + command = "if mode() != 'c' | checktime | endif", + pattern = { "*" }, +}) + -- Line numbers o.number = true o.relativenumber = true; From 960757c2c9b8c2e341151eea9bc8a2025939cc3c Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 12 Apr 2025 07:59:02 -0400 Subject: [PATCH 44/52] Ignore packages. --- config/nvim/init.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index fcd1055..9f9507c 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -116,7 +116,12 @@ require("lazy").setup({ }, { 'nvim-telescope/telescope.nvim', branch = '0.1.x', - dependencies = { 'nvim-lua/plenary.nvim' } + dependencies = { 'nvim-lua/plenary.nvim' }, + opts = { + defaults = { + file_ignore_patterns = { "/vendor/", "/node_modules/" }, + } + } }, { 'neoclide/coc.nvim', From 4960200bc7072d4f28a0d28dfd458e6ea55d3243 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Sat, 12 Apr 2025 07:59:39 -0400 Subject: [PATCH 45/52] Diff. --- config/nvim/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 9f9507c..bde45b1 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -149,7 +149,8 @@ vim.cmd("colorscheme gruvbox") -- statusline require('lualine').setup({ sections = { - lualine_a = {} + lualine_a = {}, + lualine_b = {'diff', 'diagnostics'}, }, inactive_sections = { lualine_c = { From 7dbba057ca52447819bf7dda64c15df77a0916cc Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Mon, 14 Apr 2025 13:10:59 -0400 Subject: [PATCH 46/52] Disable swap. --- config/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index bde45b1..8d7a2af 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -14,6 +14,7 @@ o.tabstop = 2 -- number of columns occupied by a tab o.softtabstop = 2 -- see multiple spaces as tabstops o.shiftwidth = 2 -- width for autoindents o.expandtab = true -- converts tabs to white space +o.swapfile = false -- Autocomplete menu vim.g.wildmode = "longest:full" From dfcd63486359143a4a0692dca21657c25ae41825 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Mon, 14 Apr 2025 13:11:46 -0400 Subject: [PATCH 47/52] Add docker lib to ignores. --- config/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 8d7a2af..c662e76 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -120,7 +120,7 @@ require("lazy").setup({ dependencies = { 'nvim-lua/plenary.nvim' }, opts = { defaults = { - file_ignore_patterns = { "/vendor/", "/node_modules/" }, + file_ignore_patterns = { "/vendor/", "/node_modules/", "docker/var/lib" }, } } }, From 5e2adeb95412c1bc79eb48aebcf7d9331401786b Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Mon, 14 Apr 2025 13:12:03 -0400 Subject: [PATCH 48/52] Add terraform. --- config/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index c662e76..1b55757 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -136,6 +136,9 @@ require("lazy").setup({ }, { 'google/vim-jsonnet' + }, + { + 'hashivim/vim-terraform' } }, -- Configure any other settings here. See the documentation for more details. From 41b0562d4d62d723ff6f52579fd83de78f6dd536 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Mon, 14 Apr 2025 13:12:42 -0400 Subject: [PATCH 49/52] Update lock. --- config/nvim/lazy-lock.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a548c5e..85bf63d 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "coc.nvim": { "branch": "master", "commit": "aacbbcad23b62dd4b4f992ab716a222e7d3a21eb" }, + "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, @@ -11,5 +11,6 @@ "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" }, "vim-jsonnet": { "branch": "master", "commit": "4ebc6619ddce5d032a985b42a9864154c3d20e4a" }, - "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" } + "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, + "vim-terraform": { "branch": "master", "commit": "8912ca1be3025a1c9fab193618f3b99517e01973" } } From b6394528f5079163b5ffad504004d079c703b81d Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 11 Jun 2025 05:14:59 -0400 Subject: [PATCH 50/52] Config updates for zshrc. - goproxy - sdkman - python3 - nvm --- zshrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/zshrc b/zshrc index b80c065..7b15c96 100644 --- a/zshrc +++ b/zshrc @@ -111,13 +111,25 @@ alias gd='git diff' alias ga='git add' alias gp='git push' alias tma='tmux attach -d -t' +alias python3='python3.12' bindkey -v export GPG_TTY=$(tty) source ~/.secret +export GOPROXY="https://$ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD@artifactory.squarespace.net/artifactory/api/go/go/" +export PATH=$PATH:/usr/local/go/bin:~/go/bin + +# NVM +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion ### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT) export PATH="/Users/csutherland/.rd/bin:$PATH" ### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT) + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" From 1e4dcba3b593fba59ad607836bda814db9443e42 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Tue, 19 Aug 2025 20:51:20 -0400 Subject: [PATCH 51/52] Update lazy lock. --- config/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 85bf63d..383c91d 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,16 +1,16 @@ { - "coc.nvim": { "branch": "master", "commit": "9fd857818977ce9f9f6f7271034fc917dede7035" }, + "coc.nvim": { "branch": "master", "commit": "1e46b27cec68bdbf07aed96842c3da01203b37f4" }, "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, - "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, - "vim-go": { "branch": "master", "commit": "ac1fb9611de435d80a6badcf8482cb1428449b10" }, + "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, + "vim-go": { "branch": "master", "commit": "e6788d124a564b049f3d80bef984e8bd5281286d" }, "vim-jsonnet": { "branch": "master", "commit": "4ebc6619ddce5d032a985b42a9864154c3d20e4a" }, - "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, - "vim-terraform": { "branch": "master", "commit": "8912ca1be3025a1c9fab193618f3b99517e01973" } + "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, + "vim-terraform": { "branch": "master", "commit": "520498fab16a3a11f2ae1b8cb65e0a1684bc317a" } } From bca12e106b90ee7e3ebce33ea6f8bea78e2baa72 Mon Sep 17 00:00:00 2001 From: Carl Sutherland Date: Wed, 27 Aug 2025 20:38:49 -0400 Subject: [PATCH 52/52] Disable jsonnet format on save. --- config/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 1b55757..2366464 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -150,6 +150,9 @@ require("lazy").setup({ vim.cmd("colorscheme gruvbox") +-- jsonnet +vim.g.jsonnet_fmt_on_save = 0 + -- statusline require('lualine').setup({ sections = {