From 4877b5ed4417dbbeafde14ff114103e21893aa4b Mon Sep 17 00:00:00 2001
From: QuackeR <qs@quacker.org>
Date: Wed, 12 Jun 2019 00:38:01 -0400
Subject: [PATCH] add gpg

---
 pub.gpg       | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++
 pub.ssh       |   1 +
 setup1_zsh.sh |   9 +++--
 setup2_gpg.sh |  15 +++++++
 setup2_ssh.sh |  14 -------
 5 files changed, 130 insertions(+), 18 deletions(-)
 create mode 100644 pub.gpg
 create mode 100644 pub.ssh
 create mode 100755 setup2_gpg.sh
 delete mode 100755 setup2_ssh.sh

diff --git a/pub.gpg b/pub.gpg
new file mode 100644
index 0000000..2c91844
--- /dev/null
+++ b/pub.gpg
@@ -0,0 +1,109 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF0ATFkBEADxyA2EoS4dASkDYMhRdAX7KEzFgfGX+56gzHilh7Le3zcjCnSd
+O+I/8Ap4IatE2sF99fhWhzkcBn5JpiCTU99ktx+erUZmoO8ZR5tan3YgXGVenpQT
+LEZ6QjlLrOrNxjteRVmK2WW2DM/u9vNWXz5x6YeQ5P2eBAXqlxH4Db84vk7kmxh4
+Nmkg+RUAL6LgabC7C3Xo/P1IqgA6TYKevygP5H/d6K94OB39is4ld5m0i0KlKLfF
+6ixAVkYnoKkAePtXyxzZoEj9Zxvx7p+1BE2az3WZBrUuAjylwEgs9+oJhOMkjwCA
+VSJHDUhzPy2RTKzXS63HZp4NONpF2L8XMcUFyVuX/ICuYdq5pYdxn3mqHfzPIqnk
+9fR3qo9sCAdY/OQrJSx0x8Ul6QQEwGxHswMKCtj2CdFvRgn4Go9uT8pg/crBUGdr
+dGk0nVTzGPCCdsGNYDoB7mbrEh5z7CHMlhQ9pAzj+7Co4rJSNIB129IKO+FO6lbL
+JXZw+LslPcWP0LKW/SIG7e1pDic1ozE+GwUZ8HgCSa3F+4I87Y/yzht63iKVlCc7
+p/W1SQrjVmfQfZ76Y5xPzHKy0p064rxix1fVZyOk3F2aoiYwn4MrXcPFtaS9LInk
+hMRYaYWtMwV4A1OZI1415I+e54gKDBNgSui1+5u+c6q8P6HciUnQej1e/QARAQAB
+tBhxdWFja2VyIDxxc0BxdWFja2VyLm9yZz6JAkgEEwEKADIWIQSm9OUhsDHcMIYr
+CK2VIQO6Z/w4mgUCXQBMWQIbAQILCQIVCgUWAgMBAAIeAQIXgAAKCRCVIQO6Z/w4
+mtGFD/9NiXnxF6ZufeVFG84+9hiHCam+iE3oM7iLtsrwuJH6lT+AZv4i/t4HwlT5
+j1QZo5H39WV4Xp/rl/s41qpQLxyKelFpK9cM+4VaV3B9slVBA2qLOml5HR2JOSd/
+0Vt20x53Dr0B78vSs1poU6jDtOuANZrEJBe11g5zvypFLHt2/JvHj7qn3q3xjxSZ
+NH+IRjV0/mcAgtn6PM0gsQdHUcH2xAYXvH/8K3cdV4Cr1y/fa22i/DxCFlh0kiiK
+fA9MLYt9upvEgKtfWGCdjHeyf3V6ByOibdttgjKuA3PmA85wWxoi4/h6+3jMrKRS
+wfy0F9ixtssxemYwY16JtUNq3FY4uS36jwgYBL6NnmQatQaNoj8PNgkmvpDIvBE1
+cnLHcgDFP9AYo9agFr47y1wOMdeSxRxpQoXfZCGbhiWLH/Jx2tC6/P+4s+QzSzt9
+BWvG8w2QtK8h8R7MT2JZoozlCie8s40uQAHZRa3tW7InydNlwG8GA4ttbHlEO7HT
+Bap5tEX26R8P9IPWFoJwxMwAXigDTSYj7oUp2jh26u9pFbWPLhfwEWBK5klvn7wy
+Wv7EDGZf5+hkIRLDR0nEKcs3npepHAsG1592PYTSeQUbQJ6qk6LS2IRfLc2/S2Eo
+mqkMrP6wDpPQFez3FRt4DElIVNaMNPLdzaPacUz+38qDK10CSbkCDQRdAEyLARAA
+wVEVeXtoH1bViw5MfODPcWXQPoVEIVxB83rz2ldbecRy2e2Sd7NZ44zKrHYg/+bG
++cLthNPANJf5hpXXqbpZ1vcy8ZVlvWtXrfh2lh64lgONud5b2RS7IIchR1saHNuI
+Z6My57gJOTr6ZFJY2iUMOYWK/eSH8SO+iv6zCkatMfQ5vCkZVZYj8mPMomJbdCeE
+ez7WWCB+ZKqkGN3gDw642eg7lBBddcMnvCmUveoO93bv1JY8DPSERijSgc+rb/JZ
+iZsVtF0lu8uwJ/8xsyDct3jhzYNq/6ng1+lmG8iO3aVKZCv4QkiQb/BByc7RzsgB
+lFGV9cstGeV17wc9cMtAMOVKMI0jRTLTcDfF67c1u0EsV23LrposkRpNja3gUUi6
+6IIYm3pYW43TbvOE+CKjV26PMGXtGu0LnERQcXytC+8jRtkY75JqSb44cnTSk7d5
+wPMi4lPDV3T1gNnlzycl2YYuDkVBDq6oXiuvIIgQUlv4X8FB4EBKPS9SqT+pCR1i
+TQXgyMC5thW7A8PsRDwz/tDqCrRLoSz7KcFfVjF3wdnHA/7vobpl8eAAr5kG4hOU
+4UV1wYrb0SQqqtqKh6RdaWyoRvED0t9cG88/KNcik9ZKnbh83JZWxi3+3GnkDZ5M
+YA/GSvzvi4apva3O/aVQjv4gPczDJsNrSq5U28HmHpUAEQEAAYkEcgQYAQoAJhYh
+BKb05SGwMdwwhisIrZUhA7pn/DiaBQJdAEyLAhsCBQkDwmcAAkAJEJUhA7pn/Dia
+wXQgBBkBCgAdFiEERBIy6qolaFC661dnWQoiN00LgZ8FAl0ATIsACgkQWQoiN00L
+gZ8IFw/+Jndyl4wgPaccifgqOdK1rIwAJDUrj++/Wfq7kfCYtnCRyNuiv9x9iAxr
+6U5rhvCBQs228xhV1fsyB0T+TaNxt2tEkAh4w2l7JMwi/xYBBuYrdz/nY9f+qSkf
+XcxjJzfSpXoKwwVGVdoT3NSE0VU/DiU+NXl0IIS6x/XPfS99krC51hoBBpWGI0lv
+X4QRUsmMF82vVSatTCpEr9zDKZVAptogQGX7NobgUMMu1oEB+kSfgJBSYWfctJZX
++toxhEczKWzTcAVTNdlnCGMv6kFS7GvzTTdI89D7mOwk6jWhZI7INvmlivv2AEoh
+L1wMZ4SkmC31Ljg/tl2yk129K26neoWrZL+MYrpHYZYCjDJ7pMbK7sfLXh3jwWGr
+O4PVvdyP7sCuKwpcdZwslgxojwHOZ7dK6gtl8TFn7ZAetkeR31mkufTunLjEXdyT
+7u+CL+j6XiA/rdYm0gjO2DC4hcywZBRBsn1UCGl5EdevxxvnV1nMdNigLDwxyFwA
+f95HCB4xwm7le9doM4tqymbJIqQvRUd77TX1OzoTUKgLF9R5bgFO8ob1AWktqMmQ
+wJVDX/Hjf55A1htyWZ9xGkmnGb9w2wbKtzGD+a7mmX0a5hMHgK+PQnWS+NN2DZqe
+xMiXo9/TFSaE0TP9Eb20iThYcWRUZnfOzbJ6+UgFB4oIfAQ9glLZSg//WEKKCRQb
+G6zWVgIlgxkttsj/k0iSgOxx1PQeUx/tp/TeTFFGgHQ0Lk5Vzaa+3og0mERsVJnS
+Ky1XRdYzJa9EZ2vXNlgQRskJmgb7QZnfq9vZWuvMqsfFkamGUMcBhvD2VJw0d5v6
+iv8V8S/kMcxffasbskQe2C04O+Np7oDeJGnpH4iBHjTfjTOkEmleIac8rkAHdbPo
+cRqZvUtLGE8AG6awlvAa9Cf1R16eoYHQqpWOVa/wsj2/fJuYFL7+t9miHIL5aiAX
+5t8HWm6b+gGgBFXFgvhlBFcWm3pAjcOehVCZ/D/fjGJVWu55qig32G7e2zJyOGMc
++jiGOWFgB0KdDqe08r5oHGUqIWLMOAHKuN7Hvw0P97+W7qahFuiPZOk+mGoflASQ
+25oZLvkOAsqxrkL5RpT8CCror7p0mH+uClBZV0FORrZW0OvhD2l0bwbiI5cL/B8R
+/UFDhbcw8cmLMj1xd8Kn16q+pNNjmvEPJZc+jAkE81M15D6sablUQoxoWTcYfKvD
+Vv1ZfnNogkkrm3PhYn55bakuTIj5nWxdr9nZZk8tJXDHpGiRGW4eCutj9gFp3pZn
+jNUU/L2vsGW6wvYLCvfqmUahlWH8HZyEKywW9CfWLCvC3rZ5PqyVj6bLDlxLqEup
+8PIShBYF6Mz+wSytZNyhR1pd09Ch6le+Nti5Ag0EXQBMpQEQALLvOrosGCVjkzh8
+sZijXLyDWxlzN1GVrKeMMqbPFYWQJENh58LGkdDBP5L/9MZnypgJMQ5hAQbu4uAo
+NmOjebFGd2I2LDAoM3sEnJ2PsDo19RwxBfkdPySIklkE1jPBEZNySzpCqE9ewLuS
+fXhnm9+LyMIxACEBh7kIjUO5zYMfDdEK4Nv0qozCe7zdj8u391KLnmuXUoczc8lH
+e5LhJLTLMIMSxv/6C2Jopy/MJkqb1UkDMPUt+kPD0touau6TYIkFxnAufr/0vK3C
+AXAUTLduwHotRuHrsaDs6B3giCNpKVZIZMWAoMoIwAuLX/WWkxNu16tw6p4odZyi
+iaLzNsWB4eFKVr5WM/rUkfimi06GI9BX1hf/pTU67isA7FfReHLdxIjT89M58c0e
+gP1Hx8bdO9/I+QSL63efptgsDSmLQ02K2psxjY40RfF38QUjf6PP3R9DbmxtKnQu
+tWz8ZYuhhVTuGTwLZbgfFtpoPHvAAbvOYHKbN9FqA5kMt4Fsvz1OSk5wDe74lMEd
+dMGqH+WEIZ086986YXWEBMbLlXjFUrFQWmPodN/gRnAyJPVefbB+lGJjO0p62xIh
+eadUw5Q6eaDOO0U5SSh1PebWCX85PyVhSGfrzbIXEY0tsvgifU9FKrrtVCHd1U1y
+iuqlAFz9Iu07V58YImDuDkFvYzZ5ABEBAAGJAjwEGAEKACYWIQSm9OUhsDHcMIYr
+CK2VIQO6Z/w4mgUCXQBMpQIbDAUJA8JnAAAKCRCVIQO6Z/w4mrS/EACnXK1HeRMc
+j2JHT6nSVqE+zHWzJNetAnp/wEdrAX2KHrrbxzyA1qZVJA9J8CtujPX8aWuSbhAD
+5rnWCPK0us/mABIto/wGFBj/eGPGzxxulHa/3t6hkSOP/6dx4KmDl1M2M3Y4beqg
+xEWlX58AZgp4qrbX9Es+0tm0TaGwD+jiX2nRUDFju3fG60yt+XAd+sD9Imm+RvIW
+LMqdZsH2SjJOvL/v+AE4ujyK5cFqMyaE8CdZUurlLVTJd9SIa8mdJVLKZIY0xSf9
+yR+GHyWE13b164nvKLy+RHagP60EhAoENF1R8KGFjpDC6syZHmgWHHV4B5EwLLSg
+zC/4ezHvoPvu8M/1jvs3OGrzIV9w1TZAHjJIVQ+GatZbJ6bHK8sXS/WzV7LNeXXZ
+x4NwdriT9jFAbgsk0YQVHFhZSsn+23wME0Bnpy0bXIsKQV7jnCQGxWVKdTOzkRZF
+M+ZdKXUOcSqvqeVrIXjQ7KgRag4IcdYGdQUpgMDestyfAnaP0eDSgwt+xSjulXmn
+qISLOg8xWiyYqDvag53XjsstcgCyimApUo8Kmxj7Cs+CXwN+VkX5ybVXkilsW4PK
+SmIX+UJkV4wZ+YhhuP32VTh+SJu+9wrJlU4J6VSGk6hZzIMO8bd5hkcn4v5lRLZM
+/JOpGcMuHBP1Yc3dvyKcg3rEHyfqRbqKPbkCDQRdAEy4ARAAviLMgU3FW3IJPs2m
+7xRFTljwd3hlQ5SUsjYpJdw02EnGD1WCCjE3UPRPU9mw6xmkxt303wE6ognEJjhk
+zrSnKRxsIh8W/WjGJkOn0Bbd68ucwcl9/d/82KB9aMVSjXJ6pADwJgrrp7II7bOW
+7mPl3rOqWnpv7yGOP6lV5/0oGnJK6BodHTdXKDTmRqoUxihfOBnBYq9tE8hU7p1d
+mJcvOmd0Z20eICeQT3MiBqgdCBU+zgbFcCxRQmdnGKyC1LhaeCQm5BFLwXk+SI18
+8iFYBgrM6wP4M5Oa0zA4kmYR9gl269ruk2RqCk/1LkZ5Ebs5j9+r4VjJO7J/XYIr
+vkYTaH9PGdR1B4dvO+QmNATHpMgCuw2WwlE94b2SuQoXcdwP/iRS8CD41aHmCQEN
+qs5QqIxWFz2giXcUVSAXWtd2hyhNFlxC2saqFUFsxD47/r/6eInxJHgXbM6Ppgi0
+e9YrLssg0n0rwiwvzxKvccVhIdfUiUe0STmTqwRHmh/GIqevoAC0geo3isPyEch+
+t+8Cw8d/eNUfuFyggkJbM8nYCDk2bl8EPckzOP+Eu7SDHAFmo5EmtrtHwU75vt45
+dwdPm+Va/+xh3A82xRadpaRUhRf8FkI2Ur6CYFfv3bumwytuGR3W+okueZPw99ld
+Snx+C28ozaaT5dd3PHJYJyi5EfsAEQEAAYkCPAQYAQoAJhYhBKb05SGwMdwwhisI
+rZUhA7pn/DiaBQJdAEy4AhsgBQkDwmcAAAoJEJUhA7pn/Dia03IP/iP/4DHxLbld
+muYEq9aLWtXgfKbuy+CYI1acgLzJoKnPOkkAOcMrGU2cgn+YQzQJZnDKnaxsDoTN
+358sfxfppEVGUpWkd2Rigb7y3ahBMTiZg24IkOPZGWzV3+/X0KHwqziw16M9/u1d
+J8+bIOOrEjm97bDIwTTT+vV7JwG80OXGDqN3jGCa59K7/14qXGjitdhykarQX05R
+MxTHgjIeaPGyzlD9L7Z/MopKSPM9ExEB8sG8bHp+yppRfDpQySiF7k4F2COnOqKr
+oYSrukrQCkty1yS7bgEwXufvdGwYMzfMroHHnFyTTeVa72q9VDtbhzvhYZ+PhIL0
+v6tSQ2/CKdWhmSUiXpxaEvwo+mx5Ljve9iTuDVUMB9HQvLP3uMVsCHHklNaW+ysI
+QP+Ay+xFctARiC0xbeiAPeWlZzt0JBvr2SWOA7lplE3gZ3RDexG5b68Zz7sPcMja
+SndktOd1n7E2/PTckhIOWMUvZXSInyGIBi0xPtofFprr5vR2Sii4oFtFZy8OTLvU
+4T7iqnMN/vEQkxOXXMwcKOkFh+VIPrdzq/XNbd4sCHgeEVySLukPn/bkqy0aInZt
+mvttNNpBzMMF+JCuboMXQ3j4OsBembNkeUAOJhHRe8LFxpvLtW42mE8YOHekW36N
+l9RVkuScyFdD32nrJZ5kc5QCICpzr8p1
+=w1NR
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/pub.ssh b/pub.ssh
new file mode 100644
index 0000000..50d5284
--- /dev/null
+++ b/pub.ssh
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+IsyBTcVbcgk+zabvFEVOWPB3eGVDlJSyNikl3DTYScYPVYIKMTdQ9E9T2bDrGaTG3fTfATqiCcQmOGTOtKcpHGwiHxb9aMYmQ6fQFt3ry5zByX393/zYoH1oxVKNcnqkAPAmCuunsgjts5buY+Xes6paem/vIY4/qVXn/SgackroGh0dN1coNOZGqhTGKF84GcFir20TyFTunV2Yly86Z3RnbR4gJ5BPcyIGqB0IFT7OBsVwLFFCZ2cYrILUuFp4JCbkEUvBeT5IjXzyIVgGCszrA/gzk5rTMDiSZhH2CXbr2u6TZGoKT/UuRnkRuzmP36vhWMk7sn9dgiu+RhNof08Z1HUHh2875CY0BMekyAK7DZbCUT3hvZK5Chdx3A/+JFLwIPjVoeYJAQ2qzlCojFYXPaCJdxRVIBda13aHKE0WXELaxqoVQWzEPjv+v/p4ifEkeBdszo+mCLR71isuyyDSfSvCLC/PEq9xxWEh19SJR7RJOZOrBEeaH8Yip6+gALSB6jeKw/IRyH637wLDx3941R+4XKCCQlszydgIOTZuXwQ9yTM4/4S7tIMcAWajkSa2u0fBTvm+3jl3B0+b5Vr/7GHcDzbFFp2lpFSFF/wWQjZSvoJgV+/du6bDK24ZHdb6iS55k/D32V1KfH4LbyjNppPl13c8clgnKLkR+w==
diff --git a/setup1_zsh.sh b/setup1_zsh.sh
index c561bef..f331ae9 100755
--- a/setup1_zsh.sh
+++ b/setup1_zsh.sh
@@ -6,9 +6,10 @@ sudo dnf install -y zsh git
 echo "Installing omzsh..."
 sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
 
-echo "Configuring zsh..."
-cat ~/.zshrc | sed 's/SSH_KEY_PATH=.*/SSH_KEY_PATH=\"~\/.ssh\/id_ed25519\"/g' | sed 's/plugins=.*/plugins=\(git ssh-agent zsh-autosuggestions zsh-syntax-highlighting\)/g' | sed 's/ZSH_THEME=.*/ZSH_THEME=\"gentoo\"/g' > ~/.zshrc
-
-echo "Adding custom plugins..."
+echo "Installing custom plugins..."
 git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
 git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+
+echo "Configuring zsh..."
+cat ~/.zshrc | sed 's/plugins=.*/plugins=\(git zsh-autosuggestions zsh-syntax-highlighting\)/g' | sed 's/ZSH_THEME=.*/ZSH_THEME=\"gentoo\"/g' > ~/.zshrc
+
diff --git a/setup2_gpg.sh b/setup2_gpg.sh
new file mode 100755
index 0000000..0924a8f
--- /dev/null
+++ b/setup2_gpg.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+KEYID=0x952103BA67FC389A
+
+# gpg-agent Plugin
+echo "Configuring zsh..."
+cat ~/.zshrc | sed 's/plugins=(\(.*\))/plugins=(gpg-agent \1)/g' > ~/.zshrc
+echo "# Workaround for gpg" >> ~/.zshrc
+echo "gpg-connect-agent updatestartuptty /bye > /dev/null" >> ~/.zshrc
+
+echo "Importing public keys..."
+gpg --recv $KEYID
+
+echo "Please trust the imported key."
+gpg --edit-key $KEYID
diff --git a/setup2_ssh.sh b/setup2_ssh.sh
deleted file mode 100755
index 6147598..0000000
--- a/setup2_ssh.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "Setting up GnuPG..."
-sudo dnf install -y gnupg
-gpg -d id_ed25519.gpg > id_ed25519
-
-echo "Copying private key..."
-mkdir -p ~/.ssh
-chmod 700 ~/.ssh
-cp id_ed25519 ~/.ssh/
-cp id_ed25519.pub ~/.ssh/
-chmod 600 ~/.ssh/id_ed25519
-chmod 644 ~/.ssh/id_ed25519.pub
-