From 72ad165bb9d2dd4dc50ebdd923fef8b463ea4823 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 12 Nov 2023 21:29:57 +0900 Subject: [PATCH] Test --- .sops.yaml | 17 +++++++----- home-manager/common/software/gui/firefox.nix | 4 +-- keys/hosts/nixos-framework.asc | 28 ++++++++++++++++++++ keys/ssh/builder-keys.txt | 3 +++ keys/ssh/keys.txt | 3 +++ 5 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 keys/hosts/nixos-framework.asc diff --git a/.sops.yaml b/.sops.yaml index 9f2ec6af..73fdb63c 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,11 +1,12 @@ keys: - - &user_albert D98BBC6C9A27324654C2D8C464F6C4EB46C4543A - - &host_nixos-vm-01 e743e87411bc58cb492d92a5374315aea8a446f1 - - &host_nixos-rpi4-01 b8313b59194b577cb5a0187bbfd686dae3a80e78 - - &host_nixos-rpi4-02 166ed206738ba44b3428629dc1f2ed98cbef1a6a - - &host_nixos-rpi4-03 769021d2a24bf6e4d1c72791fc302f9a3cfb5171 - - &host_osaka-vultr-01 54725007eb252f47efa3b93afb98edf5617c8fc4 - + - &user_albert D98BBC6C9A27324654C2D8C464F6C4EB46C4543A + - &host_nixos-vm-01 e743e87411bc58cb492d92a5374315aea8a446f1 + - &host_nixos-rpi4-01 b8313b59194b577cb5a0187bbfd686dae3a80e78 + - &host_nixos-rpi4-02 166ed206738ba44b3428629dc1f2ed98cbef1a6a + - &host_nixos-rpi4-03 769021d2a24bf6e4d1c72791fc302f9a3cfb5171 + - &host_osaka-vultr-01 54725007eb252f47efa3b93afb98edf5617c8fc4 + - &host_nixos-framework 11727dab3f62daaf7f92fc1143e3f07ef88bd5a4 + creation_rules: - path_regex: secrets\/secrets\.yaml$ key_groups: @@ -16,6 +17,7 @@ creation_rules: - *host_nixos-rpi4-03 - *host_nixos-vm-01 - *host_osaka-vultr-01 + - *host_nixos-framework - path_regex: secrets\/tailscale\.yaml$ key_groups: @@ -26,6 +28,7 @@ creation_rules: - *host_nixos-rpi4-03 - *host_nixos-vm-01 - *host_osaka-vultr-01 + - *host_nixos-framework - path_regex: secrets\/wireguard\.yaml$ key_groups: diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index 3d695321..de728abf 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -241,7 +241,7 @@ /* 0341: disable Normandy/Shield [FF60+] * Shield is a telemetry system that can push and test "recipes" * [1] https://mozilla.github.io/normandy/ ***/ - user_pref("app.normandy.enabled", false); + 015776user_pref("app.normandy.enabled", false); user_pref("app.normandy.api_url", ""); /** CRASH REPORTS ***/ @@ -862,7 +862,7 @@ * [WARNING] DO NOT USE: the dimension pref is only meant for testing * [1] https://bugzilla.mozilla.org/1407366 * [2] https://hg.mozilla.org/mozilla-central/rev/6d2d7856e468#l2.32 ***/ - user_pref("privacy.resistFingerprinting.letterboxing", true); // [HIDDEN PREF] + user_pref("privacy.resistFingerprinting.letterboxing", false); // [HIDDEN PREF] // user_pref("privacy.resistFingerprinting.letterboxing.dimensions", ""); // [HIDDEN PREF] /* 4505: experimental RFP [FF91+] * [WARNING] DO NOT USE unless testing, see [1] comment 12 diff --git a/keys/hosts/nixos-framework.asc b/keys/hosts/nixos-framework.asc new file mode 100644 index 00000000..01d17dd1 --- /dev/null +++ b/keys/hosts/nixos-framework.asc @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsFNBAAAAAABEACegK1XRrzI65CrPKr/ISv7QNV6XiR29oFlGqFqg7WJD8/cJrHP +oiu9iKom4Kj5lsl1IrfvWJoGm2MhnwMQIa58reMSkjqaVuwZ2GR0gPD9LEmUqNRE +92+OXNlq/SDeLoLeyxWtcLe7SdyVY7BQtjg1hbjPqsa0vqd0En3cF+Kw2r7ygier +Z63tb+BATPcmEYztwfaOCvQBBzXWpp+homGuj5uakUB30w+lXBkeKdYW0ns+cZxR +EtcP0/CplWjHJAEGvki4IX3rGGsIM5lP2sV82i9iJCxbBOyk9pUmPbjFkXbW6QAL +Oy17CPQeThEDrbcCqRKQ0QQjMUCGW3bg0sOwwZ/jFzGpsKRPs9q903zI0nWX3nXN +KX65+Fpj13U/ows+riJL6Z9x1oqz3mpXDO2C/ptULii3ugBDRuk2ZEemPKyTfVkO +465l6+iGgKsZu+Bvue/mBXk51pyaB/kCZo3gQZnCu6r6Q/P7wSFT7dVBR/KGASzH +izQD5zp+qxTEQlfITvsGtp+UVG4BcV26MVQRa0uxgopPctYFcbpsb0TFl2E/XHoM +yc2mOzRa0o+AlO6z/uhOfbcLd4eXj8Swl0Iw1nf8cf//fnFNTzfuqxFov8rAfvMK +fISyXH8rqubZTe/6RtSAuFAiF2QDmXCnS7jmGbWIgReql6T/QazrtVsnpwARAQAB +zTJyb290IChHZW5lcmF0ZWQgMjAyMy4xMS4xMikgPHJvb3RAbml4b3MtZnJhbWV3 +b3JrPsLBYgQTAQgAFgUCAAAAAAkQQ+PwfviL1aQCGw8CGQEAANK7EAACk1Xv3658 +1M16Nu6O8MfaBj6yNuvwOabBjJgDEorDR5SwDD864OMhUE+dUsPPBUv//+4k9RHM +x40KHMQpFrqWRgAmfZp3bd0JSUU6Jjcx5DurQDNdrOWptzwAW0VEHjaENE4Mxqz+ +QeKGZzT9EKJ1vuu6FRcuKGVAieFwaJD70msRFOPdJCzUok0jMjdlUJ3NZDkZeLAr +6+vz8SP/awYAgKUgIUSPSCFF7q9TUP6JaEHXpkiAwI7D6N4hihDuByPSRTbZWOKY +D/fXGev4oPGwcr4PjUugvq/8RR5RjcU21F+5dSQRLjz+Bh2AhtXJ439D5LbkhEZW +0GeI9pT7SvoUhoTQ887F0O+lU2/IJa/ug0VT3dMQ4kbRzv4LSHl/ZaKtiVxd6R5h +WJWlWyKO7uLMKApihrKXTRpCGXC2j3RaG73WMb0Mvwzbvkk7WrMs8O/xXxX5Yt2y +WoJkS9djwasLPldottPBXX2baBB2LSLkeDjd3bI9EB0uaKGrPUXC4nvFkD14tIQf +y7ReOCPbj8m6rAISacKDOq/lzZG/4PdE3+USNfp8buZ3LwjF+dxrXy3LrgTQOnBz +2oTFkNYL4sOynsa71mg8jSAsAkuC5fgBH6MzhquNJW93MB2w5mSNc8ZKSvq4q1DW +MImMXLmslPL6ZSUgQw8gyc1NIjxgbrimsw== +=SPn2 +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/keys/ssh/builder-keys.txt b/keys/ssh/builder-keys.txt index 8eaf6727..5bec2575 100644 --- a/keys/ssh/builder-keys.txt +++ b/keys/ssh/builder-keys.txt @@ -9,3 +9,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCi5N50jto4aHKycWTNx9ufGHvb0tcKOrv7ExFZpXoO # root@osaka-vultr-01 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCnWVvX6iHHQ2fFhrKyjdPHQeq9OnGDnVLy4CauHeWk47KrZ6b/QSGw7y+jR7RYUkhviAnLP7b25W0Sl1cPNcfrRc8jGpzVny1bh0dOR9VCgxr/+SWSB2Noiq330eDPerhFm0X9YzOXuocTMUIsziZ06GDGNqAm11hyBWTEF40/xjSnK9IqRPt1+jhtjgta0YnZq9F+m3v1MUV1FKxv8LlxbwOrIEJa8trx8DkNekStK5rbho6TOU0TKzU+tpeRxgyXyqtb+k2CMdSRIMZIaYQ7Dw6Vom71/+/A7YtOH6Plx3gJXNp3ebWXZFoY4bFnLje2jmIxde9402H/t5DsbF7nVhecIC/+4pjkp30/fS8ecI2CG9FNujjTP+hF/81QFo+TQriudpfBI6HAartNfmF0UiDTSztJ8JT2Use9R0KdS9m65SSWHX4qyySBd+gsgTipGpPpOqx9gqLtn163Pxq25XqavsUD/6GFJBAB6yG08+rOFUcZJQELZCbq6DAm44vT6pfTi0S21dN5OP7PmIpyqpZnXl3DSL5vwgKTy49tlmH5vI7aeGmqbwaLtFQecPHflQIHbx7oZJoJeB4PlNAL8w0Kuz6j1XTjbUneQL/xNasfsaa7JsfjLs7QhzC5PCImqCBw3PnpsKxBrb/OMocEKkcCAGs72fFKa2ex5wDeLA71vBNe0zfRIYZyKgEAgiuTnJefYlreV92Cisf9Oh1HEXweNj/VnmkLlLCx62toXRn7HJ2LIN0/J6zXgDW7rVRSHRhWiHqz58F5X2MiD1o+aPxZ9bapjV9cWcfd8Yak7M+ef/80VaSx3gsT3jE3X8mqjJdzCY0EhxQTyq1gqJwNeo9HBCw4z1/nxn+mhzSS3FvaFHH4CETfYrf4A7cfIgPsb0rzA0g/de9lAkhxUiO/b1OJHwHuO4+TaSq4bc4IFhkfASpMtsKv0Ee7hRob3NWWjSdMPvHyd/G4DCjPr8RcTUtzz/99BBdaRMFDjaDVxz0tSQXSgO9eWu4tQ/59DKg1fRdTYLUeiI9XCaMNZjV6AQJUfTt2h7x5VFbROGoeMz/qm16wwUpIaQ/XCnEviMHKPQ7KUavFV5HBQlxPv+HzjGJh+VgywVgrPxEkxHcuOTlIceodvnqfD9wunT1fzXCl5oDf0zEXqEpV9TlczBT0TaBvlKf227hDOsRwjF7HJFUSsW63SgFHnsGPLg2auZZ062zdqIWVBShzuzH4S5e7qHW5Qar/2iudwckZFx5iRMvFllo3MGxhQ77YqQ09WZmiNlDHM0yG/ZSGHjJ/Nf+w3kqIlwVYuW7HFCe0EEIS5bFfIyetfS7ozwPhaMrRy0HZXxOiZa4HGRA+44SZeK6T root@osaka-vultr-01 + +# root@nixos-framework +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDm4Jnyxhc4YEnDVKFjj5OBp4/lAyU2kP1PgkCWTLRzxvw7TWiNH6uyRglFLcDXrunIOmxOrA1tsbMxr7z//rSXWb2w6VQPs8OEIIyv4j/6OI7KGNT6/gNdAvKYaakKYcveE+y2gif8DQvWoKpbMcCIrrliiBac5B8VpvzS+X9iQ+2BQHOjKeios3tHoTGem8MetOjIzPWRP2/sC+Ru2dv8ln8TLoWScQpDDJtSgSkI3XTZNzhCH7toYSmSlnGDZxn687FeYgRGPgA85ndXF1BQp0MYfeYpJi4QSkkk38NgvZSSfP46uKyk3u8KJvG9e6eZ7isSq9jZBNHICil+P3zQsxW3Xc7Wfs5Ttuitkdo6nmU1BYf6VK/nzf4YPgXUWuZFWen6RCKQK3BySQWmMmT2BF+NJzjGI/qy4i7vKfF//fS2Do63cIc0FDKQf/veTDkvB0bep56w2sG9qcPv2YUgJ0Sf/gOJxMuIUcuJ/wfVgwmKLTHt/0tgHKyOWY+4V6w+XdRPm/Fo5cVO+Cjh7h527JuVAlbSCQyKrB4FONg5A2uv3rMPGejY3jO4aTVhsQfU0hAzf0Zw6xJaMjlp3qyJQsZz4pJyg2iS3CbDF9RTCWZ37EDsvK8XcOBatiGL01c/YPecePcSKCohRWJ0My4bsxkjk4mdPWINrl1IKJDD8nqY8DTUGXEFDYx22+rzWg7lnrRJcsJ/IEkptaMVRbp3ThEzJ55czQcQinw3q+K6nwqN4BaXy+yQykftzX23Oxs54dZYuIO/uaoURo9sygOBRZCsjglBoLY7VAG9cO6jDsp2zqS+xIvNEmNjubUeLI+bTLpHn+LVTp2HL/rNvvYUwYVwISWg0ChoViVubipkQ0vTF9HvodcGuDOu3FAqWC+3Xpw1uA/Dw62iTKP/5dqGqV0qzDS2sChoXOpAhLfFn0YFoBlO6WA9Sx7V735MpYs/3ZGRzDJzgpC/0HgAPALoKqFSYkVLwvFvoLRJQ8P8Yw7VPd52oVO9LY99Q9bDqe41v30alO1aqyVLuvBPLdn9Ye6RuyL0c63o0pt+M0Aelu/VMZMWwrBBqjN55PnECwnyiCM+tSK2gmBxcXMXFe5ItZMlqd421MJg83Mo61Q+lqXssUy6zhbBqCJjmIoodflQ+KBW/NRQz9CJmSNB3kt6LG5ipEsneYZqOG6esMCkacSqvw3E2er2F2F655qmzpgunf6YbYVQ7Lbi3O+pLV9L1TxeRsT+Jy3z87ZnhXRIda/POINHJYeJViuniLqhj4EerGFJfEUoVY37lBT1XEPS3HMlPSAkxiAZ0tu8mCi+HrMn0zHqo/RY/xVOBMAgL2sCAufQe5zTlh0wPBxJiHhV root@nixos-framework diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt index 77f6bb56..06b55cad 100644 --- a/keys/ssh/keys.txt +++ b/keys/ssh/keys.txt @@ -30,3 +30,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDTDzvT1cWqDbTKr5Zqt/jyrX+8P3jZUP5KfyG4FdLS # albert@nixos-vm-01 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCkT7gLh5pATYzR4chWNerYt5OcQplgkEVVMgSCNzKpHTjG7vJeA2iSN+rV602rdO9Z9XZ67XpNWsZVKyB8PBxyTk9U/d29OJRnSVhuyKodnxXXQSwAhbOhEYa+PcTqSpRHjJMpFNrww8wCrZ3RJ6tu8MroaUSCl0b1aNB3HD2GDbGOgb8k/3Q722eRCYUe9JHzr2y8/f0ajLp7Z//8DSYTr3I8N+ILZuq+UxXV58S2LmUV4F0omzn6FQKpXpPaeHCEIzI50GoQxXaaInSsiBxauJ4Q0kh4Bu++juIKsNSBN6IU0t1ynk8MGd04dC78APx276Q+KXkm4aIpkUQBoR6HpgZ56Y/XR0/2p0x9Cs8xxhnyR7MKE4dY/j5l7BLVSY6q5uFL1FP7jHFtNC68tLYG2nJ081TsCVaZ7mJfXrdSBS9hy6Tsa4AkAwrTkDGAQF7EV/3WZ+fhQSq1HvB/K/VuqX29hx3C1LyzH9kQNNWBxXzVV0IldLgXFFOzTGwwIHVZQqL0qzDVE5hMa1HQkMCPtpKbUiPXe68GDMcB8hQL9M1bCjFpfkfszFKn2jfv0u+ikY5ZDuMPCOV6lcBtiAS0FB04jhZKDbEqbneKMBYXlF6hYmvPcX0Xhm+OlAitN52Fy3OppgOVmOjci370tOOROk5FTW1wehTfGGRMnm8MCDX7X0omtvIwTSrJw/voJN8R3F7YD4QAd3yPv9y7Om5dMAD+o1a+83segQy8LGS55IITsZ+4hMILjQelJwEmyALpCWDMtfGhL529U44paVqCj4NJKI+EKqJdkajUYDzHhHTe2airUiqpfBHoIXAqB5eKn+MAVtbzVIY5lXc62HOSUAqVjxS/C8ZCsomO54q7cVAkd0tKjAaSPEZBMHGUhrDYXcXrpYA55V72lYzQMMX+RG3IuGkNJjnwJ6GQD4NjtX31MAsHbheu4tx788bnmE7uKmNgnSJW0Lg14CmnJsBSlU4HEbgNixV7o5tltYuIVQHmhjmbk9GGEHmEO/32vriznyHsO6m0lrby836e/vXg2Xsv3T+k7XxkFL8rGG6/b+elGt/8+w4ppfH4nJIFljNnSTBbddrDDMPaOv0qywT4VNLmFKRw2lOT0aL0DKMA1WCs37Sg5eqKLB4/8KBQek5P0wMK1876JHoh1924h4uvHyWhUTogSGFQAAKjMLXqEFKlhySEz8MFPybiCdme8mANMPIVjDyY0uR+FijRxjB72a9OU1M/GvIYNSASOSN7eY0uKgL3SWJntnOsVUF0kvYl0XtAaO+rrKU59imNI0lksngn9DTKiCBDa6VB8WB0wA5caqvZTZtUkD+cKwGBLPe8+0+okDVl/j9FMYOJEw5V albert@nixos-vm-01 + +# albert@nixos-framework +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDI7fJtiVPMYN2xJVdr84r1Vrquvo0abJQKtt1NO/F0umyCRvGBaim33KrgyWi8fFCqV6/26JNXx8TdJ6ekczuolxE6/LGIngJ4KUFrAaU9QDdcC7dkDGGUbsGXBNKcvy1uI2dJPqEA1+VotjwTs00Xa6nl9d5VH3yMo2Qgn3HoZvZKbBj2H+06ZJaFckLp7GT7OoPWOE50VxgH8tUsQOlgt/ZaFx7klI7EJLus7lo8gLsQeZPJVT9DXFDUJwwbUeUA/BwnRVPMTF1YrhKat/mvl7iApjNYojxClcEArj2e/hqV7EQrDv8wuW7ocb1HW/r2RLtytP27wJNc9RkrFL4mhvsRbFX2XmhbCoyCS4a1fZyxBqSS7jPbG8IBiAaMi9R45b1Jg4zE+960BKKpcrKJoU5+JHX23XJM4+1Mz9aCL2elSed5KeQDjCGdiYRL7NaqXzVK1qjgPbNsdEoL2VYuz8lT1yAtAEh7O+zFf/Argj5qaTlcRfSvKSYT3/rIj75MBLu3XKrcxBAl+2GE0WW8Wsk04XPiyR3dvAhpbLlkpQFCzsJvkAAwJr6Nh3ihY9bwBgLX8zY8ry+gkSMEsa5coazINkvJLtlLWOGt3Z5wkRIWXIrWDpGyLQCOKgUekUVIvYqJDYYuYMk/DJUJQ2OOtZMSHjXd/ajAGfRRU6hQoYopJIAPVBsZNAmQkVz1ijqX9L/B3LkPUTB3q4rxveTFFxdwFIv/QZp3Q258Sl/zfki1QPH+11Eezr2mmMLMc/AzPBONRb3T7/fv8aLXWBoI20az0lb+xCJFBkH4iVKWxAdpBD2Ou/Bc8QiEtPD5g59/bVkWnLcx03TrSL1UChcV7BIlBO0/CEcul9DZEPFaZvyAuSypIT7+Te1DSUqPugtFPdx9vnlXcar5JUfsTTgiJkHxWhidpxv36CBiwnCeAEhUhF/O2je8HCg9vkn9/WLu05X8xBFtQto5mH0SR/wAlz6iUEjQ4JvZMOsQnKnQxGRimmsAU2vM4YwO8u3xnJzs1ClJaWwkOwoHR9voBoY1Atzr/LI7o4R1mAw+HX7FtOqSnbeiD5Zv7OTNcP1RFp5rCCHoryp6WA4biVKZc7hrwDNb8jsym67Ji7Xy0VebZ9+/KOEcZMqgW94zqBlLPjL8VjwPRMdcq0yynho0TME84ODlY4Qfj6bIGcaQ+DEIVirwiomHKlWwX9kG/p4d1NByr4gM1kQ2UFGIgiXFcd56cf5mxR+0y9MhX4Wt2TRqqiwo5lEJz+ftikm3eFvCI5R9/nyVe5PPNz/UIuHjeiQ25b+eU1rt/jxQskqZsqUc8yBvfj67yIp+w3m1LHUfzXTjcPbJaNU68TgH1dComy8P albert@nixos-framework