diff --git a/python-overlay.nix b/python-overlay.nix index 4708ae2..f2fd814 100644 --- a/python-overlay.nix +++ b/python-overlay.nix @@ -1,4 +1,7 @@ final: prev: { + # Without this, we may inadvertedly end up with old versions (if we happen to + # overlay a dependency for other packages) + python3Packages = final.python3.pkgs; python3 = prev.python3.override { packageOverrides = pyFinal: pyPrev: { bench = pyFinal.callPackage ./python/bench.nix {}; diff --git a/secrets/admin-password.age b/secrets/admin-password.age index 9b4139c..0819b3d 100644 Binary files a/secrets/admin-password.age and b/secrets/admin-password.age differ diff --git a/secrets/database-root-password.age b/secrets/database-root-password.age index 598651a..2282928 100644 --- a/secrets/database-root-password.age +++ b/secrets/database-root-password.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 Wp/X/Q J/XqDE9oquq8xyPyMXcYtWVEeIczShbr2WZ6zpXVDFk -qsmZSC59mm8HUG72aqSdaVU2XaNMk5PumaE/r1+5Fzc --> ssh-ed25519 fLYf0Q +zjc/bQDGBgWSd3O2BugQBMx2Iq4UEUG5XauQMqzvmY -9TGVQ02H4Ofdwgju7zbRpfxanAUEbIb44nUZkFESLt4 --> ssh-ed25519 BVsyTA QE7uZCFJjDbhiQqvDgJeJevPqhYSEs6rswLdR/dU/gA -+B37NmGCNFnnDtkLkMbb9mRSvR7/6ohQTRN/VK6HCGE --> ssh-ed25519 BVsyTA QG+2eoqCbQzzQLF8uNX8Oj68SILAeWIUqcK0rtGT8nM -3NUYU+9Bv88r1VNDeZFNMnc3l9lsiWjzsYTczyntRac --> EMr"yt-grease -GNRgoRN98JvtS4Vc1CE1I0RXSwvt5RGiwxwPBVCHtU9NaBNxY7enwQKHN0cRcvku -oiA ---- lAr6xIM5wIjraqiC78485o9Od6N4ky54dCrcVc+ZECE -?bTg5'@v&4\1JZea \ No newline at end of file +-> ssh-ed25519 Wp/X/Q w6xebYlCcO/esVQ1Hlk/lB9bI1c1sJ/fmJg5GTedFxI +wjvnnPeIdw07TBbmI3wGZNDJ4LVTRZdwLAKedWjHK6Y +-> ssh-ed25519 5F0hZA 4Tx3AGXVBytOO0fgPDD8u5fR7E/4b+t8nLb/vKZI2iE +FXEGqrJLD/NiK/dxDUkBovgMP2DFAaUN6mA6dbjviFQ +-> ssh-ed25519 BVsyTA fqBlO0LGTfMJdSXGJOpTkrpv8C+cfUafXLcHYJ3rrBM +4+6LQbFW6mUgJnONmqW185udg7YPUd/GTi9jJQZMwqI +-> ssh-ed25519 BVsyTA Q/uuI7ubybZaVhmH8LMUH/3t2Lp4dNCX4kCzRZFrwRQ +ZqksJZHl76a3Rok6P7VXVjtrMQJ8nhllyzrvMH7KKOU +-> euQd%tA-grease avw` =r|11_w +C4Oiuqcf0SbvPj2zRCIrNdCzk2a4bgUADFr5pe0qv8vcxM6fzpdClKwEGWfO2KTy +LcbeIUnxSXqxCWrJwOAKcxuCm3XfWIhhE5brarYyUlQswDT8rCC2AiMKug +--- jMyBS5fBPH6puv2dAjgTlHlwZI1YUT6yCAwk3otNbgE +P8}U58=f) *m>}F~ ~R \ No newline at end of file diff --git a/secrets/database-user-password.age b/secrets/database-user-password.age index 079a004..313d5e2 100644 --- a/secrets/database-user-password.age +++ b/secrets/database-user-password.age @@ -1,14 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 Wp/X/Q XnUGBSLYyTTUjTiqQg4zZGeVvMqPocTk7uZRBhPguGk -TFf2vCef46WGwSSL9eQoWJw74fiUfymxaUxNf+Ty32Y --> ssh-ed25519 fLYf0Q rtQ/LRlEPw+V/71ptxLfhbjjKUKD3M/FitHxuIfb61I -iWDj8TXCJOf73MUcHZWhnhQjnuKqykxQ8UYYzeFs7FA --> ssh-ed25519 BVsyTA /5BemxhsClGZQAAF4apL2g37qjHjJ0VjPC1352NniFk -LCKyRK+JbZW1YFpZknB+HVCVjS2xxPwsbitJ3pztYO0 --> ssh-ed25519 BVsyTA r0UHDzJx01z6u5tC+KWvp/TrpvFaTAP6Nn2z9vv7kVU -/L+0zAITksGzHkdGneaEWgUGHcBfXUROCS8fQh1fAPg --> [>kC]3-grease -ZAw4x/KwujI8DlxyGsgjk8yu ---- LA8ePveqZ7SKE7WsfrX/dD37bU4VRgivUfSRDOpc14A -p>YxnP׺D>Fv! -~ᨀ:w \ No newline at end of file +-> ssh-ed25519 Wp/X/Q V1GaGyuGD+8WQ3RynjK/skaco/xbfhuNVrsn4TDKCQE +6fWJr03t44OCVUyhyXVV3NWgEsnMWh7BmHcKtEmHsKg +-> ssh-ed25519 5F0hZA fuPnPn6SdFVZLibkvxoAlxSToZjmeyD1ttGaoeOqzgM +gkDapRAvTAoFtSnBpbBPzJM5Iz8tfy77vzIVo3K/JKQ +-> ssh-ed25519 BVsyTA mfeHzD3s9LZ3p/X2B4deyytfGy10lPT7h6esL5kkUTE +tus9H87v9sYOPrVSKQw0m7Sh0a7aJxEFQ+ROOD21jf8 +-> ssh-ed25519 BVsyTA COt9omN4TCPsTXUfhKYB5qZzhp52gw76hUd6Zle7bgw +Z/zb5peHjRgfr49Nn3u++7AWrLOBMIbMUJJ7DVOzRP8 +-> 0}#)[g-grease `( ;BB8{=7F +EFjVeC+FW5uYWl/jSrvPdJBCViEZWY8Z9bhl8V3A6LTit4v4ZoGiDl5Z3Q +--- G5CoW9P0PAjvihQaqXHueWJA/oxp/wguZftuxkA4BPs +_Gn{h8!+ ݿڤ}毈 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e514c6b..5e01ce1 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,7 +2,7 @@ let # set ssh public keys here for your system and user machines = { dumpyourvms = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILDATEWAgDZFfYs1ZPh33Kg4sqQ9tWMVKyk8XqFu3Koe host@dumpyourvms"; - test-vm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB7EsR4wT+bOaC/rafTZUqsR7z9SFM57Oabv+I0ar454 host@test-vm"; + test-vm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH/oRgbesMS5rTPGeP2PYtBC7bYCqrmDJxfWRRAAxN8Z host@test-vm"; }; users = { teutat3s = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcU6KPy4b1MQXd6EJhcYwbJu7E+0IrBZF/IP6T7gbMf teutat3s@dumpyourvms";