diff --git a/.local/share/chezmoi/home/.chezmoiexternal.toml b/.local/share/chezmoi/home/.chezmoiexternal.toml index 80c6316e..1581ecf1 100644 --- a/.local/share/chezmoi/home/.chezmoiexternal.toml +++ b/.local/share/chezmoi/home/.chezmoiexternal.toml @@ -3,7 +3,7 @@ {{- $vimPlugins := .softwarePlugins.vim.plugins }} {{- range $vimPlugin := $vimPlugins }} {{- $folderName := trimSuffix ".git" (last (splitList "/" $vimPlugin)) }} -[".vim/plugged/{{ $folderName }}"] +[".config/vim/plugged/{{ $folderName }}"] type = "git-repo" url = "{{ $vimPlugin }}" refreshPeriod = "{{ $refreshPeriod }}" @@ -76,7 +76,7 @@ type = "file" url = "https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh" refreshPeriod = "{{ $refreshPeriod }}" -[".vim/autoload/plug.vim"] +[".config/vim/autoload/plug.vim"] type = "file" url = "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" refreshPeriod = "{{ $refreshPeriod }}" diff --git a/.local/share/chezmoi/home/dot_vim/vimrc b/.local/share/chezmoi/home/dot_vim/vimrc deleted file mode 100644 index 8c73702c..00000000 --- a/.local/share/chezmoi/home/dot_vim/vimrc +++ /dev/null @@ -1,54 +0,0 @@ -silent! call plug#begin() -Plug '~/.vim/plugged/typescript-vim' -Plug '~/.vim/plugged/vim-airline' -Plug '~/.vim/plugged/lightline.vim' -Plug '~/.vim/plugged/vim-javascript' -Plug '~/.vim/plugged/vim-jsx' -Plug '~/.vim/plugged/vim-markdown' -Plug '~/.vim/plugged/dockerfile.vim' -Plug '~/.vim/plugged/php.vim' -Plug '~/.vim/plugged/python-syntax' -Plug '~/.vim/plugged/nerdtree' -Plug '~/.vim/plugged/vim-five' -Plug '~/.vim/plugged/vim-prettier' -Plug '~/.vim/plugged/vim-sensible' -Plug '~/.vim/plugged/editorconfig-vim' -Plug '~/.vim/plugged/vimgutter' -Plug '~/.vim/plugged/vim-surround' -Plug '~/.vim/plugged/vim-carbon-now-sh' -Plug '~/.vim/plugged/vim-multiple-cursors' -Plug '~/.vim/plugged/ale' -Plug '~/.vim/plugged/fzf' -Plug '~/.vim/plugged/fzf.vim' -if executable('node') - Plug '~/.vim/plugged/coc.nvim' -endif -Plug '~/.vim/plugged/syntastic' -Plug '~/.vim/plugged/vim-devicons' -Plug '~/.vim/plugged/zoxide.vim' -Plug '~/.vim/plugged/vim-go' -Plug '~/.vim/plugged/ansible-vim', {'do': './UltiSnips/generate.sh'} -call plug#end() - -syntax enable -set background=dark -colorscheme Betelgeuse -" set g:lightline = { 'colorscheme': 'Betelgeuse' } - -" Settings for plugin https://github.com/neoclide/coc.nvim.git -autocmd FileType json syntax match Comment +\/\/.\+$+ - -" Settings for plugin https://github.com/vim-syntastic/syntastic.git -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 1 -let g:syntastic_check_on_open = 1 -let g:syntastic_check_on_wq = 0 - -" Settings for plugin https://github.com/ryanoasis/vim-devicons.git -set encoding=UTF-8 - -" Automatically apply with Chezmoi anytime a source file is modified -autocmd BufWritePost ~/.local/share/chezmoi/* ! chezmoi apply --source-path "%" diff --git a/.local/share/chezmoi/home/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim b/.local/share/chezmoi/home/private_dot_config/vim/autoload/lightline/colorscheme/Betelgeuse.vim similarity index 100% rename from .local/share/chezmoi/home/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim rename to .local/share/chezmoi/home/private_dot_config/vim/autoload/lightline/colorscheme/Betelgeuse.vim diff --git a/.local/share/chezmoi/home/dot_vim/colors/Betelgeuse.vim b/.local/share/chezmoi/home/private_dot_config/vim/colors/Betelgeuse.vim similarity index 100% rename from .local/share/chezmoi/home/dot_vim/colors/Betelgeuse.vim rename to .local/share/chezmoi/home/private_dot_config/vim/colors/Betelgeuse.vim diff --git a/.local/share/chezmoi/home/private_dot_config/vim/vimrc b/.local/share/chezmoi/home/private_dot_config/vim/vimrc new file mode 100644 index 00000000..89d8000d --- /dev/null +++ b/.local/share/chezmoi/home/private_dot_config/vim/vimrc @@ -0,0 +1,54 @@ +silent! call plug#begin() +Plug '~/.config/vim/plugged/typescript-vim' +Plug '~/.config/vim/plugged/vim-airline' +Plug '~/.config/vim/plugged/lightline.vim' +Plug '~/.config/vim/plugged/vim-javascript' +Plug '~/.config/vim/plugged/vim-jsx' +Plug '~/.config/vim/plugged/vim-markdown' +Plug '~/.config/vim/plugged/dockerfile.vim' +Plug '~/.config/vim/plugged/php.vim' +Plug '~/.config/vim/plugged/python-syntax' +Plug '~/.config/vim/plugged/nerdtree' +Plug '~/.config/vim/plugged/vim-five' +Plug '~/.config/vim/plugged/vim-prettier' +Plug '~/.config/vim/plugged/vim-sensible' +Plug '~/.config/vim/plugged/editorconfig-vim' +Plug '~/.config/vim/plugged/vimgutter' +Plug '~/.config/vim/plugged/vim-surround' +Plug '~/.config/vim/plugged/vim-carbon-now-sh' +Plug '~/.config/vim/plugged/vim-multiple-cursors' +Plug '~/.config/vim/plugged/ale' +Plug '~/.config/vim/plugged/fzf' +Plug '~/.config/vim/plugged/fzf.vim' +if executable('node') + Plug '~/.config/vim/plugged/coc.nvim' +endif +Plug '~/.config/vim/plugged/syntastic' +Plug '~/.config/vim/plugged/vim-devicons' +Plug '~/.config/vim/plugged/zoxide.vim' +Plug '~/.config/vim/plugged/vim-go' +Plug '~/.config/vim/plugged/ansible-vim', {'do': './UltiSnips/generate.sh'} +call plug#end() + +syntax enable +set background=dark +colorscheme Betelgeuse +" set g:lightline = { 'colorscheme': 'Betelgeuse' } + +" Settings for plugin https://github.com/neoclide/coc.nvim.git +autocmd FileType json syntax match Comment +\/\/.\+$+ + +" Settings for plugin https://github.com/vim-syntastic/syntastic.git +set statusline+=%#warningmsg# +set statusline+=%{SyntasticStatuslineFlag()} +set statusline+=%* +let g:syntastic_always_populate_loc_list = 1 +let g:syntastic_auto_loc_list = 1 +let g:syntastic_check_on_open = 1 +let g:syntastic_check_on_wq = 0 + +" Settings for plugin https://github.com/ryanoasis/vim-devicons.git +set encoding=UTF-8 + +" Automatically apply with Chezmoi anytime a source file is modified +autocmd BufWritePost ~/.local/share/chezmoi/* ! chezmoi apply --source-path "%"