From 50f9d4bfd9062d843b61b53893284372b2d507f2 Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Tue, 5 Dec 2023 19:09:40 -0500
Subject: [PATCH] template i3 font and ssh config, clean up shell rc

---
 dot_config/i3/config.tmpl                 |  2 +-
 dot_config/zsh/private_dot_zshrc.tmpl     |  6 ----
 private_dot_ssh/encrypted_config.age      | 39 --------------------
 private_dot_ssh/encrypted_config.tmpl.age | 43 +++++++++++++++++++++++
 4 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 private_dot_ssh/encrypted_config.age
 create mode 100644 private_dot_ssh/encrypted_config.tmpl.age

diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index 69ed3cf556f13dd469450d0281e7a83580b0f8c9..a71a90a0c1919fafc455507bcc0fdbb4649d432c 100644
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -13,7 +13,7 @@ set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Triplicate A 10
+font pango:{{ .font }} 10
 
 # https://github.com/catppuccin/i3
 {{- if eq .theme_variant "light" }}
diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index 377f4ff49c098d59eca051a4b543f227a5e77545..8cc17e32e065fd4a6d3f38e45037928fd4b3a4ea 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -105,7 +105,6 @@ bindkey -M vicmd 'j' history-substring-search-down
 export PATH="$PATH:$HOME/dotfiles/bin"
 export PATH="$PATH:$XDG_CONFIG_HOME/emacs/bin"
 export PATH="$PATH:$HOME/.local/bin"
-export PATH="$PATH:$HOME/.gem/ruby/2.7.0/bin"
 export PATH="$PATH:$HOME/.gem/ruby/3.0.0/bin"
 export PATH="$PATH:$GOPATH/bin"
 export PATH="$PATH:$CACHE/yay/distrobox/pkg/distrobox/usr/bin"
@@ -207,11 +206,6 @@ function noti() {
 function zathura() { devour zathura "$1" }
 function inkscape() { devour inkscape "$1" }
 
-# Necessary for SSH & YubiKey
-export GPG_TTY="$TTY"
-export SSH_AUTH_SOCK="/run/user/1000/gnupg/S.gpg-agent.ssh"
-gpgconf --launch gpg-agent
-
 zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
diff --git a/private_dot_ssh/encrypted_config.age b/private_dot_ssh/encrypted_config.age
deleted file mode 100644
index d03cc13772836c7bebd844f19bea3fc8221521d5..0000000000000000000000000000000000000000
--- a/private_dot_ssh/encrypted_config.age
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBNGl0eVVq
-VGRTMllEbFpOQlFsanlRMnhoYkt5Ym82QWswQlNMVnkvODRpSgpQVFJpRVcvK0Rk
-TVh3NHd1M29KMk1qcU5tUXp3R0c5VGlBSEVLa0k4QjQwCi0+IHBpdi1wMjU2IHBE
-YXpSZyBBcFo5dUR5YmJnZ3BqK0RVSzNaRzZCTFYzVHJBREx4VC9RenJIamVIblhh
-MgpLbkxleWt6TTRpVTczaU5Rd09oakZ6MnFrZHlKcnB4YWFORFZ3V3k2cGlFCi0t
-LSB0b1RiTVFmVlhHK0kxRDFEdDlPWFZ0cDdkeEdWWEtoVXB2N0VDV0VSSWh3Cs7s
-cKGM1etkXlDCsfEzBXP7DBvBETXU8WdXmpOsbF/20DeIaxD80EvBRhjr3GFBO8yl
-hM6GUQ8y40VZcp9+PDwuNKoAHg2G9XZQsKPzhGhbvqzvEnCdBROz1dR2k/tBs+VX
-xzVKH21HutSRxXFAFglPcpq0BaHJp0hnyGsuVqPO8pQU8TO+PKnBONvQptFyPBe2
-lskrh1OPFAI1iEB2FUP8WByDXDgNsgIDAtp0/t7uzUIRHJOqPNbbhl4VqezZfrSf
-FNtvBF39S9usqwbieM1Cgp4kSGXj+RskU7rgi+pqnBVwqBxvCEuAfdeJZU6VJzE3
-58k9qGL0Sps6F/Z4bu/z4i0iVi3ZAqSeDccWC/TlW2Xl3M8mpfdTfnQvxF69WKlD
-vZ8pfEESEzmuYU4BscohYYCsOb6HXjjkBPx36Uk3UabMsWKoLPwI6B9vFNM42lcH
-iegNtYm2u1EyGSO26RuyppimuaX7XD0hDKcAQNg3UGlCm8Cq2Vmc0dvWj97lZAVN
-QmFdHpn5UYlQUQhXEfPQld1tQ6FbTS/29dGXC9Z146wSji6p9ZIrbuS03tKFsf2D
-e86rh860QL88fiPsApZNeZSUesNa/GDQh8oUos1W/9PWPuJMMJZv/hWb7sob3Klb
-27xtkbQqs3/4+3STv3fJFYOUmwl6HdRTRvi/i0mFi7yWzOqDpOwhfD0beglcdkUF
-oWUZYqFZ6fNCqrpxMVvIuND+2zxFz2eGlCyGXBDcjHW6XMVBU/fqgyttaYO//pH9
-D5sK2McJ8TWU6Xwv0TmmwoGkXhh74PI/F34txZVXpmUIhpWS0f61tg75vVqvH8W6
-mEeNExcmjuYeBMjBV5JNlfMc6b91Q18rdRpvo+uhRmF5a2EW8FUBYGY2fx+5XtzJ
-8ToohY4gLPwThUq0odqITodQ5yPdQNmFGLOFHVpurb1kOuOOj95mrsB7JvKQwNGa
-JkVZ7/xqOwcrEwSS4JnOC2xFB1RypMkLY5hvVc3zP4EoZx4+LgSbWiA50Z3jUQ/W
-ysKoojyQbU9qOzEvHu2yxLG09Cay6zETgemuIQh6s+h7CSofBwanvJ34Nsnxk6Ij
-wcH0zHqLwo0uZ9IJ/TKgGPJZj5sj9kay6VfRT0sek5qZvhiZlLL6if4WVaE504sg
-zGOO5n5WNEVx69XxHBfOfWL9gdVFauQ4wDnuzu88pSqZ++tuTOt9rKRaFVEGCcWC
-vLz1I+wbnmTPj5/N8pZDshQH5GwwLSe/dzlnYNmTpSKY6H/t8Kgylgq/EAG9zaQj
-g1nEt73U3l9gwteGgBAxQSY4/vglHqi/nW9JpmuyTWxNl7ruDsrIHAmfubHApKw3
-5kwo7gfglE/1MuHWbbYEffFeXtUE9mSvp5/dFmUYSQPylS6zNlkfAFdKjPUswZZ7
-/986IVJjER9wOFsmxuYCmlb1TJcw1jkPSpyHsf2tZ7BvnyR9GOaZPUU3PE6nfbZs
-tGiGgJF7GQSW93DwFVCqEjvRgijkYdFVrS0aRjAZ4z3L1dNIKGce4/vzuMQDPfkf
-Lg0MnnEzLID/giJXST2TcdA3XCMKCPyu/gVSprjic7c0a1WcGAqWDFn5DJeD7vrJ
-rkALl2Zu8u1vFPpGXBbYOhGbpuOv/LSiFH6LjSHE/AUgcg5CzbmItH15vv8ycHs1
-fGWLys9xHGk/edL7fUvY2K43pxt0EkeuUvUS1IyfcVZfu2U/3Oq9jCgrkw72568/
-XoPauNYGYO6TllaA+lcEgYga9TASJo5SnZzIpxtbEA1RbTO8SkL+KlU95atQAvk3
-AkdXyz2SdopDlBdfVGVSGPADRcH6JaLdlCjSfE84T1Yed9Oye0/5lmT7gz0xJn73
-pKOjZYc2FpLfLXWPKyfJCtIraNuYKXlPCea0zsj9vjX4blYyJAn4BMXbTqR33Eu5
-2fOBDNIColvk0xJJe+39VhwD4YqXB1eXq9avB6HzXg==
------END AGE ENCRYPTED FILE-----
diff --git a/private_dot_ssh/encrypted_config.tmpl.age b/private_dot_ssh/encrypted_config.tmpl.age
new file mode 100644
index 0000000000000000000000000000000000000000..cf48d13743499d4ab8aa41bdb890458386d89a39
--- /dev/null
+++ b/private_dot_ssh/encrypted_config.tmpl.age
@@ -0,0 +1,43 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBc0wrQm16
+cXkyNHpJamtYRXVYVlk2SEpkUDcyS3RlQVBKOVNIdXJ3Y1J6VgpBbFp1MzBWQ1pH
+VUhtTTJ5dE5oeEU1WXRuRTFOSWZrcE1senk4TW1YLzUwCi0+IHBpdi1wMjU2IHBE
+YXpSZyBBOHQ1WVRLRWpwWE1KTWRCcS9laWt1NFd5NERFaGF0YXZFeXpCb3cwOUVq
+MAp2YzhHZjdiRm9JTDRxQnBLNmxQV2hLRlpRNjdkTythYW9jKzgxdUNZUG5JCi0t
+LSBmT2diSzdPWm9kQWd1dk1qU2M2eFNFTXVzVDN6SFh1bkJzQzZwR1Jha2FjCvEf
+CSCW9BPSX3VQs0/FJPtlZpV10mGvMYVu0OE9jg2d1quVesucMaLHym423k6jrAgp
+611SKKpMTZr+d2jsBr4kDnyvzmCvuRlB2MxJ6zyntIieZmsqqAvI+jbF9Fke2D02
+EMyA2dQuYfPxyWNq2M68zC3qs7ejBpK/FVTfXFcLDlX59jdxh72DcrZvj8nCeCyn
+5kV9TvFs8LBXZd/Or1yaIQSE4rVLYEES1zEEm7+H3QO0JZI49r1jGCPAjyBsaWhx
+XyAl2xuv9N5SDLTkQTGSihQfaDhOknn9X1tkIUhzS02PJLI1z9KYMgzVphJa1MPN
+gBDycGdA+LovJUBZDItcEdPyV24+a/xKD9Hr9mLXLm/ipy9d+Hm95M1Qq3nUmh1v
+t0lcxmKpcSaRuff3EqYKz4pLUeMsK446w0Xw4cwrRu/JWSVhhNc/vr1dsDFdJrhD
+Er3dbGL1ptybmwTfvRRRhpNGk+whLqNpZIDoY3lGDVh6r7khjsIBrTuF1EAhS/tY
+Eeq9yD7F6EeZH7J/OeMPvbUCdq4LnsbpKwPMRS8INyU0x9pkRlLORyjC40tZ/X10
+OWVRAS6WgGNYeOGSy9vyhqPoQ3lEK87o63ZNFd0XuCoskilbWcV/QlerXlt/eZiy
+QOcl1EMLjKRnn1bwUS64bpBANLHg9LREHLL9rdCh1VKYhAq6mUxHrK5VN+hwzzVc
+zd7I1nEZe09QU2VwktHaCZ432NDh3LiD67mZRQV7TWDSJz636J+WjAeot7XKSSiN
+wjKkJiBjjmfMkGdchQdJkpOHHnVan5iEWpVCMFBHaSA0mfJ8EwcRO9tNVYDtHvPp
+jMzaKwjxYvBQGuECbgEY/gkMCFOLSSi8Y7+ozHvhGqvjgSM8xjSCHX99ZMU5722B
+HibLikKYoIFWs+NBhzG3LLEEJlBvIRcS/K0hRSm2zPKl1/N+avKAbV/pbLUwGDEj
++I8+EK05asnjQLSWHAXD80XsSwogn4kW71M7nNN4gQHjm5p//8bU0Z9g7QWmeAN6
+ZGjlcM8dNHNzPk45ZuYm3huoyNNj/3LZUeeDQFTwVKELi8bZC1gjVJpPgFmqqwY/
+9MtjQKt/gjVZcLEF7mQ1rU0GEuPXV3wDJf8QeYPRfVWt+UeSaE6dXQMEfVseP5/h
+VEPmZxflKYUzbjB+mstNygU9KkLX1tQzF7A0nQL0XNf1+8+H4OGG34X/9b0SpuEe
+5HQm5cnrjNEaTzH7jbqmrFjVqV5yklvFtAb91+ftGvgN99Gxmt2+Yomx8dVYkWmY
+6vgwE0ufiZYDoss7dDHsekqWM8FVLb2277eiPFKs9MvZNMC5PcU4Te+T06lZU1zG
+dbq3RGjJzuR67ay88OUSQUXVRq6rwuo24R8QN0EZMUSubjYEM8ijBBiwm2EtV7y2
+I5QcpbA95+ciH+4f6fc24dHeuE86gJSE5bXYurao5AqstR/b/4SqweX5P+Gpz+Jr
+UhVGPxHfqjGy+50q41qJOgph4PyeIb+6yHMrD/Gpvi+Zp3T5TC0qbgsiRs3mxRUp
+2aoDLuB7lLbhrjiXIXDJK7ITyTvhfJ5XjyNpy0F/ADMPKlS0+9/jiWf8kbQpRFEq
+c8cWKY7PmolHnYRnSINJ5mT2ySgMQkOBPY5Fl28UVACJUvunZeVQtpDMZ3MEEdNz
+znyPBH2L/+rgIdBafN0Xi7He/GjJVQOLAtCsOrtYD/UD2YbfVPTG3aUKmUXb5e+T
+7uVqLHhlAQLAx6VNVGjbeRaB8y+z40ItsbLYoRghP+KsHshigAYsTSsfZBeaMsBP
+XARoIMj086KP0TQlBQt3AKqFcRr9qiiLqYRB5sjT5yDlAfCPe6kIZgCet8/rH+iV
+jHJf2HR+70fVGAYQvn9tFgV1Z/jrIA/urUNlvSB7Rl/JVOknhf+/i7CXA8ZaKXd8
+Swj8k3rELTGGEodpAO1KdrnFJzqM9shHBgj1RzdEAGFOD/kq3o5xjipIyQffOU4F
+pCryXJnqt25gQYNq5PNl0HU7GDDfTJd49pWk4trD9ZVR1EytICxgPJkEbHUMY6tp
+eVeiQSU2Sq+dDFdbTYIc/h1gsvcl82Gw8iaM5LQ4NN6ec7Oto0y1HPdJzc9+k9Ir
+fyaGA6za7bP9WQVwT5ZH7Z6hQahymPyX9Fud345q4+reFfrAGOltFWy3ZvBzL8Xg
+dlOum/I3kmel6Lnao9aYaYdz0Bq3LXJKPsJgYPG9rrApi/e749ZsvAIU
+-----END AGE ENCRYPTED FILE-----