From e4faee946e6c7e2dc933083f1fbceca8df2905df Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Fri, 2 Dec 2022 14:08:15 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl,
 .local/share/chezmoi/home/.chezmoidata.yaml

---
 .local/share/chezmoi/home/.chezmoidata.yaml          | 12 ++++++++----
 .../run_onchange_before_90-install-packages.tmpl     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.local/share/chezmoi/home/.chezmoidata.yaml b/.local/share/chezmoi/home/.chezmoidata.yaml
index 2cf36ce0..e4d42854 100644
--- a/.local/share/chezmoi/home/.chezmoidata.yaml
+++ b/.local/share/chezmoi/home/.chezmoidata.yaml
@@ -1,5 +1,4 @@
 ---
-# The original .chezmoidata.yaml was moved one directory up to software.yml
 colors:
   background: '#161925'
   color0: '#161925'
@@ -59,13 +58,13 @@ softwareGroups:
     - zoxide
     - zx
   basicDesktop: &basicDesktop
-    << :*basic
+    - *basic
     - brave
     - firefox
     - fonts
     - tabby
     - vscode
-  networkEnabled: &networkEnabled
+  networkEnabled:
     - cloudflared
     - cockpit
     - cups
@@ -73,7 +72,7 @@ softwareGroups:
     # - maas
     - ngxtop
   standard: &standard
-    << :*basic
+    - *basic
     - ansible
     - ansibleconnect
     - aria2
@@ -174,6 +173,7 @@ softwareGroups:
     - yubikey-manager
     - zsh
   standardDesktop: &standardDesktop
+    - *basicDesktop
     - autokey
     - balenaetcher
     - bitwarden-cli
@@ -225,6 +225,7 @@ softwareGroups:
     - yubikey-manager-qt
     - zoom
   development: &development
+    - *standard
     - act
     - allure
     - angular-cli
@@ -407,6 +408,7 @@ softwareGroups:
     - yank
     - yarn
   developmentDesktop: &developmentDesktop
+    - *standardDesktop
     - altair
     - android-studio
     - appium
@@ -432,6 +434,7 @@ softwareGroups:
     - sqlectron
     - visual-studio
   experimental: &experimental
+    - *development
     - asciicinema
     - assh
     - astronvim
@@ -481,6 +484,7 @@ softwareGroups:
     - tilt
     - vector
   experimentalDesktop: &experimentalDesktop
+    - *developmentDesktop
     - betwixt
     - lens
     - manta
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl
index 86079a8e..abfdc322 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl
@@ -3,7 +3,7 @@
 {{- includeTemplate "universal/profile" }}
 {{- includeTemplate "universal/logg" }}
 
-# software: {{ fromYaml (toYaml (index .softwareGroups .host.softwareGroup)) | join " " }}
+# software: {{ index .softwareGroups .host.softwareGroup | join " " }}
 
 if command -v install-program > /dev/null; then
   if command -v zx > /dev/null; then