From e75d492b6da2543efeae9a1276ed4006c6bad7bf Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Mon, 10 Jul 2023 08:34:27 +0000
Subject: [PATCH] Latest

---
 home/.chezmoi.yaml.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl
index 0a57acd4..32037f6d 100644
--- a/home/.chezmoi.yaml.tmpl
+++ b/home/.chezmoi.yaml.tmpl
@@ -9,8 +9,8 @@
 {{- $githubUsername := (default "ProfessorManhattan" (env "GITHUB_USERNAME")) -}}
 {{- $gmailAddress := (default "blzalewski@gmail.com" (env "GMAIL_ADDRESS")) -}}
 {{- $gpgKeyId := (default "0xF0A300E4199A1C33" (env "KEYID")) -}}
-{{- $hostname := (default (output "echo" "$HOST") (env "HOST")) -}}
-{{- $locale := (default "en_US" (output "echo" "$LANG")) }}
+{{- $hostname := (default "betelgeuse" (env "HOST")) -}}
+{{- $locale := (default "en_US" (env "LANG")) }}
 {{- $name := (default "Brian Zalewski" (env "FULL_NAME")) -}}
 {{- $restricted := (default false (env "WORK_ENVIRONMENT")) -}}
 {{- $snapcraftEmail := (default "brian@megabyte.space" (env "SNAPCRAFT_EMAIL"))}}
@@ -23,7 +23,7 @@
 {{- end -}}
 {{- $softwareGroup := (default "Standard" (env "SOFTWARE_GROUP")) -}}
 {{- if $desktopSession -}}
-{{-   $softwareGroup = list $softwareGroup "-Desktop" | join "" -}}
+{{-   $softwareGroup = replace "-Desktop-Desktop" "-Desktop" (list $softwareGroup "-Desktop" | join "") -}}
 {{- end -}}
 
 {{- $data := . }}
@@ -209,7 +209,7 @@ data:
       username: "{{ $surgeshUsername }}"
     timezone: "{{ $timezone }}"
     tinypngKey: "g355tx7dxG5yJfl0RXJnpQlQqk88dJBv"
-    username: "{{ output "echo" "$USER" }}"
+    username: "{{ default "user" (env "USER") }}"
 diff:
   format: "git"
   pager: "delta"