general: update gpg/ssh keys and remove public_files from repo

home/modules/gpg.nix

@@ -12,7 +12,7 @@ in {
     defaultKey = mkOption {
       type = types.str;
       description = "fingerprint of default public key to be used in gpg, git, email, etc.";
-      example = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
+      example = "A8981D346F8F4130CA16A7775517E687FCCE0BB9";
     };
   };
   config = mkIf cfg.enable {

home/platforms/fabian@posixlycorrect/default.nix

@@ -32,7 +32,7 @@
       deepState.enable = true;
       gpg = {
         enable = true;
-        defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
+        defaultKey = "A8981D346F8F4130CA16A7775517E687FCCE0BB9";
       };
       syncthing.enable = true;
     };

homepage/posixlycorrect/content/about.md

@@ -5,5 +5,4 @@ title = "about"
 - bio: Linux Embedded Engineer  
 - projects: [https://git.posixlycorrect.com/fabian/](https://git.posixlycorrect.com/fabian?tab=activity)  
 - email: fabian [at] posixlycorrect [dot] com  
-- gpg key: [click here](https://posixlycorrect.com/pki/fabian_primary.gpg)  
-- This is the public gpg key for my Yubikey. If you want to make sure your email reaches me, add both keys as recipients: [click here](https://posixlycorrect.com/pki/fabian_yubikey.gpg)  
+- gpg key: [click here](https://public.posixlycorrect.com/pki/A8981D346F8F4130CA16A7775517E687FCCE0BB9.asc)

sys/platforms/vps/default.nix

@@ -32,7 +32,7 @@ with lib; {
 
     users.fabian = {
       enable = true;
-      sshKeyPublicFile = [public_files/pki/fabian.ssh];
+      sshKeyPublicFile = [pki/id_ed25519.pub]; # move this out someday
     };
   };
 

sys/platforms/vps/pki/id_ed25519.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICls/LbyzkIXj5HCp7Qc4eoGcUXzJdQFshNX2caPwgNh openpgp:0x1B7A8CB7

sys/platforms/vps/public_files/pki/fabian.ssh

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHkK2Cg3dozG78AEA2OTzydezcKVnNTTj0MUJZcP/mrN fabian@posixlycorrect.com

sys/platforms/vps/public_files/pki/fabian_primary.gpg

@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZHlROBYJKwYBBAHaRw8BAQdAhzA1JCghQ6KoHOuf6JPQhEmchHLVXFVye4I2
-pRUOUMO0KkZhYmlhbiBNb250ZXJvIDxmYWJpYW5AcG9zaXhseWNvcnJlY3QuY29t
-PoiUBBMWCgA8FiEEeqJ35gSkFzkWu7TpH/rDXheYF08FAmR5UTgCGwMFCQlmAYAE
-CwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEB/6w14XmBdPP2EA/i9ugFxpIFF6oOQs
-clMfr+sNj6Il0OUTJK0dqpp4mGorAP0awa6nfhU8T1Ju7UWr6cfSmnL4bM6M/4Z3
-D+AF/L5PBokCMwQQAQoAHRYhBOd6gIv5qVXWaO7qZHP6nJy18CSbBQJkeVKDAAoJ
-EHP6nJy18CSbzTkP/Reio0ObRrRW+QSw62ZXrUG0mFcNeeoM9amldCToFRyGnSDu
-wtZ9nqwLiTJ01VPBOsEZLsl4VonO3rdadqnMTZ3XqKK9VHBl6UNot3DQ8INDAcko
-GW1zvEdxNkpMxhtAja0JkcBdG7+zxc2aEGeKfEna2qDXA+xtYw5+pssOWYMip7hm
-jQ2NzYMYav2KYRBC7eXTkAIIIJi/l9pR1IwHtY3a0gfbkQymgCyt5wVG6LneYFIR
-+ycNVCObwyP8gFASdId0bWnA23rkilc9ZBOCps/cGfDLM+KQ+sLAWBFBQyQeEjcv
-tU+pLXncAEvWy/SFmprVSLDQMMooFaEJMZChojGcCkwAPG1twsihqIA3E44Q3/+G
-K0gZN57jGMnfvuQiuLuttOMdu27KwEu++t3YUt0P6S4kARpx51zZJ7A2Yj2u22aM
-7EL8qq6KTNdNoS7FgwQkrWbokdDZIl0HV+5TeMQfylPqOPhuFK/1A9qztqknBPVY
-QUx2t6FZUgH9sT7uD+5gXxyeqmEIFo2i6D8G/4TEPbKtWivJfeOqDEBn4QEY2nvE
-zgJLLU5XCv9xPz5rizRCa+h+kg+i4mH6fLCBCCAPXsbAAo0gUlGJvX4slPh7uPOa
-T2r7A/7uezResBzP/L/vostlmjO5c8cOl9Wc6D1kRZq17/AjMUgy6+KR3iVnuDgE
-ZHlROBIKKwYBBAGXVQEFAQEHQPRbCS2p8xpt3fRxfyRnDOdH9pULY4NtGmZUS0ve
-ZGkTAwEIB4h+BBgWCgAmFiEEeqJ35gSkFzkWu7TpH/rDXheYF08FAmR5UTgCGwwF
-CQlmAYAACgkQH/rDXheYF0/65AD+LtDeedCYv9zs+1Ia3DvejVZM256WEH+dRH5h
-Pm3RzQ8A/2+bXRnfsgGqacj/kKEL3spuos95ngRNRkrQ39nc1koP
-=PAxr
------END PGP PUBLIC KEY BLOCK-----

sys/platforms/vps/public_files/pki/fabian_yubikey.gpg

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZukhMBYJKwYBBAHaRw8BAQdAC/Gy2p7RPFw3k+ROFnKpJvCVqQb+BUYboE2u
-CP1kz/C0KkZhYmlhbiBNb250ZXJvIDxmYWJpYW5AcG9zaXhseWNvcnJlY3QuY29t
-PoiTBBMWCgA7FiEEcgbY7iR0898Y6odvDsFpH/jBqB8FAmbpITACGwMFCwkIBwIC
-IgIGFQoJCAsCBBYCAwECHgcCF4AACgkQDsFpH/jBqB+oGwEAhmegCZJAt8Opv/9+
-HBbL51f2035qymHPgkV/SyFM1GEBAOVQY6A5U+NrLNiaQTN5Z7jcfQuBobzk4ksn
-RzROhTcAiHUEEBYKAB0WIQR6onfmBKQXORa7tOkf+sNeF5gXTwUCZutnFQAKCRAf
-+sNeF5gXT1juAQDsH/lDorfMdWxuP87eV9OP8jQvibuTuZ9n2jUllXsLcQEA5gDJ
-05NW5Tw2g9mvlrocWr7N2/PC5UvFct4akwDXtA+4MwRm6SEwFgkrBgEEAdpHDwEB
-B0AHSmncE+krtL9ZGe4eq865vjaLiUAVnZQaVObKm11CBYh4BBgWCgAgFiEEcgbY
-7iR0898Y6odvDsFpH/jBqB8FAmbpITACGyAACgkQDsFpH/jBqB+hBwD/Y9vAcbPG
-CTmZvtgYlZW5Oey5T3hHoANv1THOZwv9G58BALEBZRvDztmYPjRaMyAMonrpc2P0
-GPHYLcqCPVbjkaAKuDgEZukhMBIKKwYBBAGXVQEFAQEHQC2+QJcHEJjdZikBYeMj
-ks53MjfeawAXU31KtAU60KACAwEIB4h4BBgWCgAgFiEEcgbY7iR0898Y6odvDsFp
-H/jBqB8FAmbpITACGwwACgkQDsFpH/jBqB+0TwD+K4IcFstNGLrijlgH2zuQaI+p
-8QT8AInjSpGfC4zcMlEBAIVYvdTYw4IXPSQOs0qPyR0nhfGIeoBMeWrAAfoxQ0oB
-=wpc0
------END PGP PUBLIC KEY BLOCK-----

sys/platforms/vps/srv/net.nix

@@ -37,17 +37,7 @@ in {
           enableACME = true;
           locations = {
             "/".root = "${pkgs.local.homepage}";
-
-            "~ ^/public(?:/(.*))?$" = {
-              # https://serverfault.com/a/476368
-              alias = "${../public_files}/$1";
-              extraConfig = ''
-                autoindex on;
-                autoindex_exact_size on;
-                autoindex_localtime on;
-                autoindex_format html;
-              '';
-            };
+            "/.well-known/openpgpkey/hu/".alias = "/var/public/wkd/";
           };
         };
       };