From bc126a70908a051d8556b4b7848d1959c039cac6 Mon Sep 17 00:00:00 2001
From: punkfairie <23287005+punkfairie@users.noreply.github.com>
Date: Sun, 29 Sep 2024 19:39:22 -0700
Subject: [PATCH] Update .chezmoi.toml Update .chezmoiexternals/lazygit.toml
 Update .chezmoiexternals/qt5ct.toml Update .chezmoiexternals/zathura.toml
 Remove .chezmoiscripts/00-backup-id_25519.fish Update
 .chezmoiscripts/00-chaotic-aur.sh

---
 .chezmoi.toml.tmpl                                  |  2 +-
 .chezmoiexternals/lazygit.toml                      |  2 ++
 .chezmoiexternals/qt5ct.toml                        |  2 +-
 .chezmoiexternals/zathura.toml                      |  2 +-
 .../run_once_before_00-backup-id_25519.fish.tmpl    | 13 -------------
 .../run_once_before_00-chaotic-aur.sh.tmpl          |  3 ---
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 .chezmoiscripts/run_once_before_00-backup-id_25519.fish.tmpl

diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index 040c423..ebf34a1 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -33,7 +33,7 @@ gpgKey = {{ output "get-gpg-key" | trim | quote }}
 {{ end -}}
 passphrase = {{ $passphrase | quote }}
 osid = {{ $osid | quote }}
-{{ if eq .chezmoi.hostname "marleycentre" -}}
+{{ if eq $osid "linux-debian" -}}
 isServer = true
 {{ else }}
 isServer = false
diff --git a/.chezmoiexternals/lazygit.toml b/.chezmoiexternals/lazygit.toml
index ef9617c..8ba8f5b 100644
--- a/.chezmoiexternals/lazygit.toml
+++ b/.chezmoiexternals/lazygit.toml
@@ -1,3 +1,4 @@
+{{- if (not .isServer) -}}
 [".config/lazygit/catppuccin/frappe.yml"]
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/lazygit/main/themes-mergable/frappe/pink.yml"
@@ -17,3 +18,4 @@ refreshPeriod = "672h"
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/lazygit/main/themes-mergable/mocha/pink.yml"
 refreshPeriod = "672h"
+{{- end -}}
diff --git a/.chezmoiexternals/qt5ct.toml b/.chezmoiexternals/qt5ct.toml
index 824b93d..706c76c 100644
--- a/.chezmoiexternals/qt5ct.toml
+++ b/.chezmoiexternals/qt5ct.toml
@@ -1,4 +1,4 @@
-{{- if (and (ne .chezmoi.hostname "marleycentre") (eq .chezmoi.os "linux")) -}}
+{{- if (and (not .isServer) (eq .chezmoi.os "linux")) -}}
 [".config/qt5ct/colors/Catppuccin-Frappe.conf"]
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/qt5ct/main/themes/Catppuccin-Frappe.conf"
diff --git a/.chezmoiexternals/zathura.toml b/.chezmoiexternals/zathura.toml
index 6fed049..88ae2e7 100644
--- a/.chezmoiexternals/zathura.toml
+++ b/.chezmoiexternals/zathura.toml
@@ -1,4 +1,4 @@
-{{- if (and (ne .chezmoi.hostname "marleycentre") (eq .chezmoi.os "linux")) -}}
+{{- if (and (not .isServer) (eq .chezmoi.os "linux")) -}}
 [".config/zathura/catppuccin-frappe"]
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-frappe"
diff --git a/.chezmoiscripts/run_once_before_00-backup-id_25519.fish.tmpl b/.chezmoiscripts/run_once_before_00-backup-id_25519.fish.tmpl
deleted file mode 100644
index 2b9dcd1..0000000
--- a/.chezmoiscripts/run_once_before_00-backup-id_25519.fish.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env fish
-
-{{ $sshDir := joinPath .chezmoi.homeDir ".ssh" -}}
-{{ $pubKey := joinPath $sshDir "id_ed25519.pub" -}}
-{{ $privKey := joinPath $sshDir "id_ed25519" -}}
-
-if test -e {{ $pubKey }}
-    mv {{ $pubKey }} {{ printf "%s%s" $pubKey ".bak" }}
-end
-
-if test -e {{ $privKey }}
-    mv {{ $privKey }} {{ printf "%s%s" $privKey ".bak" }}
-end
diff --git a/.chezmoiscripts/run_once_before_00-chaotic-aur.sh.tmpl b/.chezmoiscripts/run_once_before_00-chaotic-aur.sh.tmpl
index f6b6400..bbe3977 100644
--- a/.chezmoiscripts/run_once_before_00-chaotic-aur.sh.tmpl
+++ b/.chezmoiscripts/run_once_before_00-chaotic-aur.sh.tmpl
@@ -5,7 +5,4 @@ sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
 sudo pacman-key --lsign-key 3056513887B78AEB
 sudo pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
 sudo pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
-
-printf '%b' "[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist" | copyq copy -
-echo 'Please paste in /etc/pacman.conf then run sudo pacman -Sy'
 {{- end -}}