From b6877b18599818474053422203b66676d141b182 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Tue, 30 Jan 2024 03:59:21 +0000
Subject: [PATCH] Latest

---
 home/.chezmoidata.yaml                         | 12 ++++++------
 home/.chezmoitemplates/darwin/Brewfile         |  1 +
 .../.chezmoitemplates/secrets/CLOUDFLARE_EMAIL |  7 +++++++
 home/.chezmoitemplates/ssh/config              | 18 ------------------
 home/private_dot_ssh/private_config.tmpl       | 15 +++++++++++----
 software.yml                                   | 10 ++++++++--
 6 files changed, 33 insertions(+), 30 deletions(-)
 create mode 100644 home/.chezmoitemplates/secrets/CLOUDFLARE_EMAIL
 delete mode 100644 home/.chezmoitemplates/ssh/config

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index e62fbb44..83bed399 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -85,7 +85,7 @@ chromeExtensions:
   - mailvelope/kajibbejlbohfaggdiogboambcijhkke
   - markdown-here/elifhakcjgalahccnjkneoccemfahfoa
   - metamask/nkbihfbeogaeaoehlefnkodbefgpgknn
-  - notion-web-clipper/knheggckgoiihginacbkhaalnibhilkk
+  # - notion-web-clipper/knheggckgoiihginacbkhaalnibhilkk
   - octohint/hbkpjkfdheainjkkebeoofkpgddnnbpk
   - pieces-save-code-snippets/igbgibhbfonhmjlechmeefimncpekepm
   - rakuten-get-cash-back-for/chhjbpecpncaggjpdakmflnfcopglcmi
@@ -132,7 +132,7 @@ firefoxAddOns:
   - markdown-here
   - medium-unlimited-read-for-free
   - multi-account-containers
-  - notion-web-clipper
+  # - notion-web-clipper
   - pieces-save-code-from-the-web
   - private-relay
   - profile-switcher
@@ -930,7 +930,7 @@ softwareGroups:
     # - fiscript
     - libreoffice
     - microsoft-office
-    - notion
+    # - notion
     - obsidian
     - raycast
     - skhd
@@ -1012,6 +1012,7 @@ softwareGroups:
   Server: &Server
     - cockpit
     - cups
+    - easyengine
     - haproxy
     - netdata
     - samba
@@ -1206,7 +1207,6 @@ softwareGroups:
     - typescript-to-lua
     - web-ext
     - websocat
-    - wordops
     - wordpressify
     - wp-cli
     - wrangler
@@ -1528,8 +1528,6 @@ softwareGroups:
       note: Unnecessary menu bar widget for SoundCloud.
     - pkg: diffsofancy
       note: Deprecated in favor of `delta`
-    - pkg: easyengine
-      note: Deprecated in favor of `wordops` which is the new and improved version of EasyEngine
     - pkg: filezilla
       note: FileZilla has an offensive user-interface. Absolutely atrocious.
     - pkg: gdu
@@ -1614,6 +1612,8 @@ softwareGroups:
       note: The OpenSSH library can now create native keys that integrate with the client.
     - pkg: chef-workstation
       note: Not utilizing Chef and it automatically adds a top bar menu item that causes load delay
+    - pkg: wordops
+      note: Prefer EasyEngine instead
   # Files below need to be reviewed before adding them to the stack. They should include all of the
   # definitions in software.yml that are not included somewhere in the definitions that this file
   # maps out.
diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile
index df134705..0b60dea2 100644
--- a/home/.chezmoitemplates/darwin/Brewfile
+++ b/home/.chezmoitemplates/darwin/Brewfile
@@ -26,6 +26,7 @@ brew "htmlq"
 brew "jq"
 brew "moreutils"
 brew "node"
+brew "openssh"
 brew "pipx"
 brew "pkg-config"
 brew "progress"
diff --git a/home/.chezmoitemplates/secrets/CLOUDFLARE_EMAIL b/home/.chezmoitemplates/secrets/CLOUDFLARE_EMAIL
new file mode 100644
index 00000000..ae3a5542
--- /dev/null
+++ b/home/.chezmoitemplates/secrets/CLOUDFLARE_EMAIL
@@ -0,0 +1,7 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMRncwOVByQ2xVeFREMUdK
+R3JWdlY3dGs2RXQ1SjhGdEtockxwMUh2NWowCkFNZUMzZnhUSEJiYTBVbjV3Wjhm
+UEtsZXVVZTJBc3J2cEVpMEgvVGpmQVkKLS0tIFlZZEZ4bEY0L3VTL0hUQVpINGQ0
+cjhDSmd2WUV5MXJHd21meGlKeXZ3WmMKZJqlESk1FcjMf8gcx6Oe/NxFL1TJ7RUy
+Zoyecv/9IRZ1Y+yNLcbJ4U3xtGXqeaVHqtCrJQ==
+-----END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/.chezmoitemplates/ssh/config b/home/.chezmoitemplates/ssh/config
deleted file mode 100644
index f63b057a..00000000
--- a/home/.chezmoitemplates/ssh/config
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodE5rU1RLQVU4V3JVSGtU
-NWdnRHVzeGg4WUZuZldPaHdpQUV5UkZOY0NrCkZRb3ZlWUpRcEJmQk1COHpsQ0JT
-YUp0Z3NqS1ZkdHNoSmlTWGZXUGZITzAKLS0tIEd2TXo0dTRmUnJXc1pTVkx4aXRm
-bUVBaklYeVQrcS9ZdlVKeDJmQnFHRFUKtLD0ONWRHRmwHx8cm4pQI7ArqJucT9Sl
-/Zx8C0njOFMTRwHVWn4/hfLqIkOFfji2y2SRI243nLgge8tn2uKbZWJIYubxo2A2
-W2xGiIFS1DXCNJwgaEx1sDvK7k4R+f19wrMqkOEohj63VCk7rCK77rhmC5NAXKAm
-n8DSNQJ0ova0E6zGDKi1J56mzZW9D+T4jf4KNU7pBVIedwtCUdWqkgUEA/JXzNre
-aAICkV33xMt6K7zO7GqPf1l0cgt4sYQoBB4HkDvFj/cqMY2pc/WKmAYurGLcw6vM
-PRPnL3It1hr32DBMbBCiIBtG4POHCUia5Jl2Mj/GcDPfNRDqJQyi7CPzWWx3g6ox
-2T/b99mD9Ja7zp3btZhBSl0iIn625rHXagmXWNobTOBlRSJUXdbqMaD0gJPSVBdn
-mzc7oIiwpjoqZpT9+S1v/uMXHzuAniIOehYhy0i/ak0XzIS7RKo/tj1BdnTculn5
-lf/iSFjdosHZfCtiVjNxXB1UY+Pkwfo3lvjYyov0KeMgje1kldNCyH6E6zFGGiW8
-zhJUF//836+pHNVJnz4V3o2TLhMDI2GPq8SLoJYOPgc/074rGMvWGzywzrDuia22
-QpACzQ9u8PKp/gOeqNyeOQeHCoL315etL8/WNjt0GtVMiQSYQHDF9gjzUdx17M70
-D7ZYdlq6JwvnvP7rIpIt/LpSnl4/Ejn6i53XqzhOcVeshblfR4HI+QzGKEA2AWfq
-aAYVDGc=
------END AGE ENCRYPTED FILE-----
\ No newline at end of file
diff --git a/home/private_dot_ssh/private_config.tmpl b/home/private_dot_ssh/private_config.tmpl
index 124cbe85..bc0c961a 100644
--- a/home/private_dot_ssh/private_config.tmpl
+++ b/home/private_dot_ssh/private_config.tmpl
@@ -1,6 +1,3 @@
-{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "ssh" "config")) -}}
-{{   includeTemplate "ssh/config" | decrypt -}}
-{{ else -}}
 Host *
     IgnoreUnknown AddKeysToAgent,UseKeychain
     AddKeysToAgent yes
@@ -15,13 +12,23 @@ Host *
     ServerAliveInterval 60
     ServerAliveCountMax 30
     IdentitiesOnly yes
+    IdentityFile ~/.ssh/ssh-13147527
+    IdentityFile ~/.ssh/ssh-13196452
+    IdentityFile ~/.ssh/ssh-5c-nano-laptop
+    IdentityFile ~/.ssh/ssh-5c-nano-green
+    IdentityFile ~/.ssh/ssh-5c-green
+    IdentityFile ~/.ssh/ssh-5-nano
+    IdentityFile ~/.ssh/ssh-5-nfc-green
+    IdentityFile ~/.ssh/ssh-5-nfc-red
+    IdentityFile ~/.ssh/ssh-5-nfc-yellow
     IdentityFile ~/.ssh/id_rsa
 Host gitlab.com
     UpdateHostKeys no
+    IdentityFile ~/.ssh/id_rsa
 Host github.com
     UpdateHostKeys no
+    IdentityFile ~/.ssh/id_rsa
 {{ if (lookPath "fig") -}}
 Match all
   Include ~/.fig/ssh
-{{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/software.yml b/software.yml
index a63cded8..92773c89 100644
--- a/software.yml
+++ b/software.yml
@@ -3501,8 +3501,14 @@ softwarePackages:
     _github: https://github.com/EasyEngine/easyengine
     _home: https://easyengine.io/
     _name: EasyEngine
-    ansible:darwin: professormanhattan.easyengine
-    ansible:linux: professormanhattan.easyengine
+    _post: |
+      #!/usr/bin/env bash
+      if [ -n "$CLOUDFLARE_EMAIL" ] && [ -n "$CLOUDFLARE_API_KEY" ]; then
+        ee config set le-mail "$CLOUDFLARE_EMAIL"
+        ee config set cloudflare-api-key "$CLOUDFLARE_API_KEY"
+      fi
+    brew: easyengine
+    script:linux: wget -qO ee rt.cx/ee4 && sudo bash ee
   clipboard:
     _bin: cb
     _github: https://github.com/Slackadays/Clipboard.git