diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl index 93375112..9f10cd20 100644 --- a/home/.chezmoiexternal.toml.tmpl +++ b/home/.chezmoiexternal.toml.tmpl @@ -3,7 +3,7 @@ {{- $vimPlugins := .softwarePlugins.vim.plugins }} {{- range $vimPlugin := $vimPlugins }} {{- $folderName := trimSuffix ".git" (last (splitList "/" $vimPlugin)) }} -[".config/vim/plugged/{{ $folderName }}"] +[".local/share/vim/plugged/{{ $folderName }}"] type = "git-repo" url = "{{ $vimPlugin }}" refreshPeriod = "{{ $refreshPeriod }}" @@ -11,7 +11,7 @@ pull.args = ["--ff-only"] {{- end }} ### coc.nvim VIM plugin requires custom branch "release" -[".config/vim/plugged/coc.nvim"] +[".local/share/vim/plugged/coc.nvim"] type = "git-repo" url = "https://github.com/neoclide/coc.nvim.git" refreshPeriod = "{{ $refreshPeriod }}" diff --git a/home/.chezmoiscripts/universal/run_onchange_after_12-install-packages.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_12-install-packages.sh.tmpl index 849f8c54..49310f09 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_12-install-packages.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_12-install-packages.sh.tmpl @@ -38,6 +38,11 @@ if command -v install-program > /dev/null; then export LC_ALL="en_US.UTF-8" logg info 'Printing environment variables for GO' env | grep GO + logg info 'Printing environment variables for Java' + env | grep JAVA + env | grep SDKMAN + env | grep ASDF + env | grep JDK install-program {{ $softwareList }} # TODO - Figure out how to configure no logs to print to ~/.ansible.log -- should be printing to the value specified in the ansible.cfg rm -rf "$HOME/.ansible.log" diff --git a/home/dot_config/vim/vimrc b/home/dot_config/vim/vimrc index bd0deb3f..8685c01b 100644 --- a/home/dot_config/vim/vimrc +++ b/home/dot_config/vim/vimrc @@ -1,65 +1,63 @@ " Install Coc extensions " TODO: Add https://github.com/yuki-yano/fzf-preview.vim " TODO: Add https://github.com/tpope/vim-fugitive -if executable('node') - let g:coc_global_config="$HOME/.config/coc/coc-settings.json" - let g:coc_global_extensions = [ - \ '@yaegassy/coc-ansible', - \ '@yaegassy/coc-nginx', - \ 'coc-angular', - \ 'coc-blade', - \ 'coc-calc', - \ 'coc-clangd', - \ 'coc-copilot', - \ 'coc-css', - \ 'coc-cssmodules', - \ 'coc-deno', - \ 'coc-diagnostic', - \ 'coc-docker', - \ 'coc-emmet', - \ 'coc-eslint', - \ 'coc-explorer', - \ 'coc-flutter', - \ 'coc-git', - \ 'coc-go', - \ 'coc-highlight', - \ 'coc-html-css-support', - \ 'coc-html', - \ 'coc-htmlhint', - \ 'coc-java', - \ 'coc-jedi', - \ 'coc-json', - \ 'coc-ltex', - \ 'coc-lua', - \ 'coc-markdown-preview-enhanced', - \ 'coc-markdownlint', - \ 'coc-markmap', - \ 'coc-phpls', - \ 'coc-powershell', - \ 'coc-prettier', - \ 'coc-prisma', - \ 'coc-pyright', - \ 'coc-rls', - \ 'coc-rust-analyzer', - \ 'coc-sh', - \ 'coc-solargraph', - \ 'coc-solidity', - \ 'coc-spell-checker', - \ 'coc-stylelint', - \ 'coc-sql', - \ 'coc-sqlfluff', - \ 'coc-svelte', - \ 'coc-svg', - \ 'coc-swagger', - \ 'coc-symbol-line', - \ 'coc-tailwindcss', - \ 'coc-toml', - \ 'coc-tsserver', - \ 'coc-xml', - \ 'coc-yaml', - \ 'coc-yank' - \] -endif +let g:coc_global_config="$HOME/.config/coc/coc-settings.json" +let g:coc_global_extensions = [ + '@yaegassy/coc-ansible', + '@yaegassy/coc-nginx', + 'coc-angular', + 'coc-blade', + 'coc-calc', + 'coc-clangd', + 'coc-copilot', + 'coc-css', + 'coc-cssmodules', + 'coc-deno', + 'coc-diagnostic', + 'coc-docker', + 'coc-emmet', + 'coc-eslint', + 'coc-explorer', + 'coc-flutter', + 'coc-git', + 'coc-go', + 'coc-highlight', + 'coc-html-css-support', + 'coc-html', + 'coc-htmlhint', + 'coc-java', + 'coc-jedi', + 'coc-json', + 'coc-ltex', + 'coc-lua', + 'coc-markdown-preview-enhanced', + 'coc-markdownlint', + 'coc-markmap', + 'coc-phpls', + 'coc-powershell', + 'coc-prettier', + 'coc-prisma', + 'coc-pyright', + 'coc-rls', + 'coc-rust-analyzer', + 'coc-sh', + 'coc-solargraph', + 'coc-solidity', + 'coc-spell-checker', + 'coc-stylelint', + 'coc-sql', + 'coc-sqlfluff', + 'coc-svelte', + 'coc-svg', + 'coc-swagger', + 'coc-symbol-line', + 'coc-tailwindcss', + 'coc-toml', + 'coc-tsserver', + 'coc-xml', + 'coc-yaml', + 'coc-yank' +] " Settings for coc-css extension autocmd FileType scss setl iskeyword+=@-@ @@ -70,7 +68,7 @@ autocmd BufWritePre *.go :silent call CocAction('runCommand', 'editor.action.org syntax enable set background=dark colorscheme Betelgeuse -" set g:lightline = { 'colorscheme': 'Betelgeuse' } +set g:lightline = { 'colorscheme': 'Betelgeuse' } " Settings for plugin https://github.com/neoclide/coc.nvim.git autocmd FileType json syntax match Comment +\/\/.\+$+ @@ -88,38 +86,36 @@ let g:syntastic_check_on_wq = 0 set encoding=UTF-8 " Set location of viminfo file -set viminfo+=n~/.config/vim/viminfo +set viminfo="$HOME/.config/vim/viminfo" silent! call plug#begin() -Plug '~/.config/vim/plugged/ale' -Plug '~/.config/vim/plugged/copilot.vim' -Plug '~/.config/vim/plugged/dockerfile.vim' -Plug '~/.config/vim/plugged/editorconfig-vim' -Plug '~/.config/vim/plugged/fzf.vim' -Plug '~/.config/vim/plugged/fzf' -Plug '~/.config/vim/plugged/lightline.vim' -Plug '~/.config/vim/plugged/nerdtree' -Plug '~/.config/vim/plugged/php.vim' -Plug '~/.config/vim/plugged/python-syntax' -Plug '~/.config/vim/plugged/syntastic' -Plug '~/.config/vim/plugged/typescript-vim' -Plug '~/.config/vim/plugged/vim-airline' -Plug '~/.config/vim/plugged/vim-carbon-now-sh' -Plug '~/.config/vim/plugged/vim-devicons' -Plug '~/.config/vim/plugged/vim-five' -Plug '~/.config/vim/plugged/vim-go' -Plug '~/.config/vim/plugged/vim-javascript' -Plug '~/.config/vim/plugged/vim-jsx' -Plug '~/.config/vim/plugged/vim-markdown' -Plug '~/.config/vim/plugged/vim-multiple-cursors' -Plug '~/.config/vim/plugged/vim-prettier' -Plug '~/.config/vim/plugged/vim-sensible' -Plug '~/.config/vim/plugged/vim-surround' -Plug '~/.config/vim/plugged/vimgutter' -Plug '~/.config/vim/plugged/zoxide.vim' -if executable('node') - Plug '~/.config/vim/plugged/coc.nvim' -endif -Plug '~/.config/vim/plugged/ansible-vim', {'do': './UltiSnips/generate.sh'} +Plug '${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/ale' +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/coc.nvim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/copilot.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/dockerfile.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/editorconfig-vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/fzf.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/fzf" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/lightline.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/nerdtree" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/php.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/python-syntax" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/syntastic" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/typescript-vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-airline" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-carbon-now-sh" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-devicons" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-five" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-go" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-javascript" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-jsx" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-markdown" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-multiple-cursors" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-prettier" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-sensible" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vim-surround" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/vimgutter" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/zoxide.vim" +Plug "${XDG_DATA_HOME:-$HOME/.local/share}/vim/plugged/ansible-vim", {"do": "./UltiSnips/generate.sh"} call plug#end()