From 3d49ef5ce31103045aa57261d220bcaff37b0971 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Tue, 6 Dec 2022 20:20:27 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim,
 .local/share/chezmoi/home/dot_vim/colors/Betelgeuse.vim,
 .local/share/chezmoi/home/private_dot_config/vim/vimrc,
 .local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl,
 .local/share/chezmoi/home/.chezmoiexternal.toml

---
 .../share/chezmoi/home/.chezmoiexternal.toml  |  2 +-
 .../lightline/colorscheme/Betelgeuse.vim      |  0
 .../vim => dot_vim}/colors/Betelgeuse.vim     |  0
 .../private_dot_config/shell/aliases.sh.tmpl  |  4 +-
 .../chezmoi/home/private_dot_config/vim/vimrc | 55 ++++++++++---------
 5 files changed, 30 insertions(+), 31 deletions(-)
 rename .local/share/chezmoi/home/{private_dot_config/vim => dot_vim}/autoload/lightline/colorscheme/Betelgeuse.vim (100%)
 rename .local/share/chezmoi/home/{private_dot_config/vim => dot_vim}/colors/Betelgeuse.vim (100%)

diff --git a/.local/share/chezmoi/home/.chezmoiexternal.toml b/.local/share/chezmoi/home/.chezmoiexternal.toml
index 4fe05dc1..dc99290b 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)) }}
-[".config/vim/plugged/{{ $folderName }}"]
+[".vim/plugged/{{ $folderName }}"]
     type = "git-repo"
     url = "{{ $vimPlugin }}"
     refreshPeriod = "{{ $refreshPeriod }}"
diff --git a/.local/share/chezmoi/home/private_dot_config/vim/autoload/lightline/colorscheme/Betelgeuse.vim b/.local/share/chezmoi/home/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim
similarity index 100%
rename from .local/share/chezmoi/home/private_dot_config/vim/autoload/lightline/colorscheme/Betelgeuse.vim
rename to .local/share/chezmoi/home/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim
diff --git a/.local/share/chezmoi/home/private_dot_config/vim/colors/Betelgeuse.vim b/.local/share/chezmoi/home/dot_vim/colors/Betelgeuse.vim
similarity index 100%
rename from .local/share/chezmoi/home/private_dot_config/vim/colors/Betelgeuse.vim
rename to .local/share/chezmoi/home/dot_vim/colors/Betelgeuse.vim
diff --git a/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl
index d08a650e..38615442 100644
--- a/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl
+++ b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl
@@ -69,6 +69,7 @@ fi
 
 alias xclip='xclip -selection c'
 command -v vim > /dev/null && alias vi='vim'
+command -v vim > /dev/null && alias v='vim'
 
 ### mitmproxy / mitmweb
 if command -v mitmproxy > /dev/null; then
@@ -211,9 +212,6 @@ else
   fi
 fi
 
-# Sets v as an alias for vim
-alias v='vim'
-
 # Recursively encrypts files using Ansible Vault
 alias vault-dir='find . -type f -printf "%h/\"%f\" " | xargs ansible-vault encrypt'
 
diff --git a/.local/share/chezmoi/home/private_dot_config/vim/vimrc b/.local/share/chezmoi/home/private_dot_config/vim/vimrc
index 89d8000d..5182328f 100644
--- a/.local/share/chezmoi/home/private_dot_config/vim/vimrc
+++ b/.local/share/chezmoi/home/private_dot_config/vim/vimrc
@@ -1,34 +1,35 @@
 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'
+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 '~/.config/vim/plugged/coc.nvim'
+  Plug '~/.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'}
+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()
+" TODO -- add executable checks around plugins
 
 syntax enable
 set background=dark