From 2f4b4afc6aaf2644c0c443288c71c6d1c35fa44a Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Sun, 27 Nov 2022 18:27:07 +0000
Subject: [PATCH] Update dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoidata.yamlz,
 dotfiles/.local/share/chezmoi/software.yml

---
 .../share/chezmoi/home/.chezmoi.yaml.tmpl     |  2 +-
 .../share/chezmoi/home/.chezmoidata.yamlz     | 48 +++++++++++++++++++
 .../share/chezmoi/home/.chezmoidata.yml       | 18 -------
 .../{home/.chezmoidata.yaml => software.yml}  |  4 +-
 4 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 dotfiles/.local/share/chezmoi/home/.chezmoidata.yamlz
 delete mode 100644 dotfiles/.local/share/chezmoi/home/.chezmoidata.yml
 rename dotfiles/.local/share/chezmoi/{home/.chezmoidata.yaml => software.yml} (99%)

diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index 29245b89..d50121a9 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -121,7 +121,7 @@
 
 encryption: gpg
 gpg:
-  recipient: "..."
+  recipient: "{{ $gpgKeyId }}"
 data:
   host:
     arch: "{{ .chezmoi.arch }}"
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yamlz b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yamlz
new file mode 100644
index 00000000..33a1e3d3
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yamlz
@@ -0,0 +1,48 @@
+---
+# The original .chezmoidata.yaml was moved one directory up to software.yml
+colors:
+  color1: #000AAA
+  color2: #000AAA
+  color3: #000AAA
+  color4: #000AAA
+  color5: #000AAA
+  color6: #000AAA
+  color7: #000AAA
+  color8: #000AAA
+  color9: #000AAA
+  color10: #000AAA
+  color11: #000AAA
+  color12: #000AAA
+  color13: #000AAA
+  color14: #000AAA
+config:
+  gpg: https://raw.githubusercontent.com/drduh/config/master/gpg.conf
+softwarePlugins:
+  vim:
+    plugins:
+      - https://github.com/dense-analysis/ale.git
+      - https://github.com/pearofducks/ansible-vim.git
+      - https://github.com/neoclide/coc.nvim.git
+      - https://github.com/ekalinin/dockerfile.vim.git
+      - https://github.com/editorconfig/editorconfig-vim.git
+      - https://github.com/junegunn/fzf.git
+      - https://github.com/junegunn/fzf.vim.git
+      - https://github.com/itchyny/lightline.vim.git
+      - https://github.com/scrooloose/nerdtree.git
+      - https://github.com/stanangeloff/php.vim.git
+      - https://github.com/hdima/python-syntax.git
+      - https://github.com/vim-syntastic/syntastic.git
+      - https://github.com/vim-airline/vim-airline.git
+      - https://github.com/kristijanhusak/vim-carbon-now-sh.git
+      - https://github.com/ryanoasis/vim-devicons.git
+      - https://github.com/tpope/vim-fugitive.git
+      - https://github.com/airblade/vim-gitgutter.git
+      - https://github.com/fatih/vim-go.git
+      - https://github.com/pangloss/vim-javascript.git
+      - https://github.com/mxw/vim-jsx.git
+      - https://github.com/plasticboy/vim-markdown.git
+      - https://github.com/terryma/vim-multiple-cursors.git
+      - https://github.com/prettier/vim-prettier.git
+      - https://github.com/tpope/vim-sensible.git
+      - https://github.com/tpope/vim-surround.git
+      - https://github.com/nanotee/zoxide.vim.git
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml
deleted file mode 100644
index 2c867049..00000000
--- a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-colors:
-    color1:
-    color2:
-    color3:
-    color4:
-    color5:
-    color6:
-    color7:
-    color8:
-    color9:
-    color10:
-    color11:
-    color12:
-    color13:
-    color14:
-config:
-    gpg: https://raw.githubusercontent.com/drduh/config/master/gpg.conf
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml b/dotfiles/.local/share/chezmoi/software.yml
similarity index 99%
rename from dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml
rename to dotfiles/.local/share/chezmoi/software.yml
index 9415b215..88242d32 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml
+++ b/dotfiles/.local/share/chezmoi/software.yml
@@ -1733,7 +1733,7 @@ softwarePackages:
   virtualbox:
     _pre:dnf: |
       . /etc/os-release
-      cat <<EOF | sudo tee /etc/yum.repos.d/virtualbox.repo 
+      cat <<EOF | sudo tee /etc/yum.repos.d/virtualbox.repo
       [virtualbox]
       name=Fedora $releasever - $basearch - VirtualBox
       baseurl=http://download.virtualbox.org/virtualbox/rpm/$ID/$VERSION_ID/\$basearch
@@ -2094,7 +2094,7 @@ softwarePlugins:
       - vagrant-vmware-desktop
       - vagrant-vbguest
   vim:
-    cmd: 
+    # cmd: Handled by .chezmoiexternal.toml
     plugins:
       - https://github.com/dense-analysis/ale.git
       - https://github.com/pearofducks/ansible-vim.git