From 400fc0ae037eda41171e4deaefc8cba905d37a2f Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 28 Mar 2024 21:32:24 +0800 Subject: [PATCH] devices.pi3b: regenerate secrets --- devices/pi3b/secrets.yaml | 30 +++++++++++++++--------------- flake.nix | 2 +- modules/system/kernel/default.nix | 2 ++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/devices/pi3b/secrets.yaml b/devices/pi3b/secrets.yaml index 042eae95..1f2bf1e2 100644 --- a/devices/pi3b/secrets.yaml +++ b/devices/pi3b/secrets.yaml @@ -1,7 +1,7 @@ xray-client: - uuid: ENC[AES256_GCM,data:Ju/bUMmtb0NwiUCAmt73cJY34pZRqrHsX+LB5CCs5NWSoHpj,iv:T+PiKHv057QccSxC9uvFoTahZX+XHFXuVbuRAICbX58=,tag:WnLfP0werjY7vYWP2uGvbg==,type:str] + uuid: ENC[AES256_GCM,data:82Xg9VkmkLrKKcZfojA7dHqqMZh45n+eL4T5qZ1z/xy9k0q5,iv:/2j9flBDwjY6JW2mHYo1S2VE+ruu6gxrw8BzSyoiPcc=,tag:iq8wzfIRyq1T18k3vStVGw==,type:str] wireguard: - privateKey: ENC[AES256_GCM,data:aZY122OUG7zWxoZgTynW4WqYPwmPdGci7NIWO47kszTuGNQAaE9tAqii77o=,iv:mYLvVn5EE4tXF5IVBYZjWNPhS67tQyg2zvKmCgCLTrc=,tag:7iiX8S7/S2Na/sE3ioeV0g==,type:str] + privateKey: ENC[AES256_GCM,data:8whySpY/4WPWx2+t7IOgn+qjKCsv+BgRtaAFLrP8L0fV3TJdLob5vwDplHk=,iv:kXTDwOyJNzbjPtlzQqNsXtuk3EXFdF9CAsYkvImbyDE=,tag:tsK9nCMmwEb0c08rJ3Iwyg==,type:str] sops: kms: [] gcp_kms: [] @@ -11,23 +11,23 @@ sops: - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoV25wc1hPNE9wdnIxc25p - WjBxUHhVOCt0RFlhRlc1SVZnMlgyK1diS2lFCnUvdnVvaS9nTU9mNGMyQXQ2bHJ1 - c0NDWW5HZUpacDBnbnJhZkdVWkNWc0kKLS0tIHR2WHlKYXVybVZmMk9pWERkOGZB - YTlUZGdNT0d5MGEzOWczSTVGeW9DVVUKeQnRRGJYFTnbF6gzxpIKpbvMWt61jliH - phg2S8SRvSty+78mn/n/qs0rol/87E38ToJf7c+1E2PkDDAQ9d76YQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6TzU0U2Facm5yWkYrREgw + a1Fxc1MxaHYwRWUzUHpsbDBHYVoxb1NKVDAwCjNuUFlabzJ0aWtGMFBQb05nSlRP + akwrWDI0QnZBYkFmSUpWZFFnYmQ2aDQKLS0tIGlIQ3lTREN4WXgxV3pNdjdaakF6 + ZnppV1ZRZzZ5Smt2NGsyRndjTFdnV00KaWVPGLWPnqINH6AHKS/84kuYy/v1v4Tb + QdehcMiq5ZF5XLqOX5sMDLu8h96FIklqOSTZNFkzr+s9VYv/UO58rg== -----END AGE ENCRYPTED FILE----- - - recipient: age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw + - recipient: age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNcTZIczFWSHhPMGZ2Kzdu - SnBxV1B4TFV1ckRRM1kvWkJHUG9QbzEwV2drCnRydkRnK1VjUHRHRkh2eFo1UEt1 - cUV1Ymt1SkRnS0JOMkdsWHA2ZXBQNEUKLS0tIFFYeVJoMGd5UmVsN0dKL01peFRM - NE5vNm96MHpTNk5sYTdFTDRyZVFzdE0K7vEfh1wZ5m48joS5lamVcuXWRn6cZh4v - peYqTk5FxepZLycNVdmo9Gl+ZfoTCZd528ABdRxG2jjLw428lU0tzg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyTEZERkRSZUdSN2dySnlI + aDFjdXFCWnlJZlpYQmR1WEE2RzdCaVp1WFEwCjd1N1ZpMUExZ0ZBWmFwSHg3RUs4 + RkRYTjRMWmE5cTA4Z2JJUGgyN05HSmMKLS0tIFpKZmd2Q2k2bnNYK1V2ZnNQNUxH + aDU3Vm95ZkpvSTJDMjJEOFY1ZjhrQlUKLdMYiOj6tlzwLpwZsTQVSQ8hHart0ba3 + NS7+SprzJRb0hQXrvyU6s9zho8dPOw8wiGbscmMXSVS/Kar3eQigmg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-28T10:33:36Z" - mac: ENC[AES256_GCM,data:oVDPouX8bLTJ/UQD4YXZBIub+9Lyy4e6UrVAu0KJhSYVox8NdjeSlLndicZtSeUxC310qNG9WAiWJPbfmDV5yZj9+UQxqFO1D0MCnxozRQQAb/AQfkEX9QV06/rzzcgm1QcQPp+eBnPxC0qjpavpogqVjwtfqHq5//XBjKBrm0A=,iv:yzAiof3knCqH6ZcCH6pAByWuPtUapLuUA2yQpkGwbA0=,tag:QcK8BC8WvG2Cuq9CruZc7w==,type:str] + lastmodified: "2024-03-28T13:31:33Z" + mac: ENC[AES256_GCM,data:fuppF9gFh3O6ZqJRTcVxNqVlz2y5f4xR39JIeInKblh4hNhrdnQg7oh8repoZeXHVRewGeGyxSqzUg+Twy8J+q+d6TSmiDVViD/SHse5rPns2Egt671geF7JmGEB/yKSCbECjGCp0QFgYYEg/vUOaV3v1a0s7LLTE/t2haPIaYc=,iv:f4T7JGxKB3WmEtETuSH7ApKRJ8ptPwZPfspyqc8+vmM=,tag:GF5br+e/p6qHsNCTjfIBCA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/flake.nix b/flake.nix index 3a34d353..945c1e66 100644 --- a/flake.nix +++ b/flake.nix @@ -166,7 +166,7 @@ inputs.self.nixosConfigurations.${node}; }; }) - [ "vps6" "vps7" "nas" "surface" "xmupc1" "xmupc2" ] + [ "vps6" "vps7" "nas" "surface" "xmupc1" "xmupc2" "pi3b" ] ); }; checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 69b56460..d33f600a 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -31,6 +31,8 @@ inputs: "ahci" "ata_piix" "nvme" "sdhci_acpi" "virtio_pci" "xhci_pci" # networking for nas "igb" + # for pi3b to show message over hdmi while boot + "vc4" "bcm2835_dma" "i2c_bcm2835" ] ++ (inputs.lib.optionals (kernel.varient != "nixos") [ "crypto_simd" ]); extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install;