diff --git a/machines/buck/configuration.nix b/machines/buck/configuration.nix index 924e592..2c81195 100644 --- a/machines/buck/configuration.nix +++ b/machines/buck/configuration.nix @@ -27,7 +27,7 @@ secrets."spotify/password".owner = "jacob"; secrets."email/gmail/password".owner = "jacob"; secrets."email/jhink/password".owner = "jacob"; - secrets."wifi.env" = {}; + secrets."wifi/env" = {}; }; # Bootloader. @@ -40,10 +40,10 @@ networking.wireless = { enable = true; userControlled.enable = true; - environmentFile = "/run/secrets/wifi.env"; + environmentFile = "/run/secrets/wifi/env"; networks = { "@SSID_HOME@" = { - pskRaw = "@PSK_HOME@"; + pskRaw = "@PSKRAW_HOME@"; }; }; }; diff --git a/machines/pedro/configuration.nix b/machines/pedro/configuration.nix index 8d28ac6..89c44b6 100644 --- a/machines/pedro/configuration.nix +++ b/machines/pedro/configuration.nix @@ -56,7 +56,7 @@ environmentFile = "/run/secrets/wifi.env"; networks = { "@SSID_HOME@" = { - pskRaw = "@PSK_HOME@"; + pskRaw = "@PSKRAW_HOME@"; }; }; }; diff --git a/secrets.yaml b/secrets.yaml index 2216399..324b781 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -11,7 +11,7 @@ spotify: username: ENC[AES256_GCM,data:EXLRJXrHsP+k,iv:5pvHLVnrtG+oZEPZsBY/4/+b9QQEBTT7jiPvmkBHAWY=,tag:gcCJqgBd7b2+e2k0oIVY8w==,type:str] password: ENC[AES256_GCM,data:DHj06DfPU98C,iv:wxinj4sLt8rQ6hW4NtxIHQPnAJ3acXRXQHRsRaoiGR8=,tag:b7ota0m1gpwSZYSDY1Uj+A==,type:str] wifi: - env: ENC[AES256_GCM,data:cgalQMWa9+d3JFozSSbw//hu/8jZPqBhlSSHFAaLxVmEi5xPDSMJwO1Savw=,iv:nmYeB+Ksh7L5g51J7kbrtyPaAosqHtcyMbxyQ2ArfNE=,tag:AvGxOJftp0WU1WyhCdLYiw==,type:str] + env: ENC[AES256_GCM,data:a2m3FI0SmpbM2hhNbEdNhWWxgNyhXRDN9/LFiRMyFEr9Nf3NvkteZCdf/CCc81GAl/aKqqqCt49HQEiSRwzw2wc3XKmbQPxw6tmK4mCd4pP7YmPpg6tacLd8CzjtCG9J248W0qqTYUIU3+kuDcY6Tdp97KxJDINVbA==,iv:kXltdSsKkXwhIaWywFYMUGJCmMgaxv8FqhdBbjuyVSU=,tag:GvkevELXFKU31mmRGsFjDw==,type:str] sops: kms: [] gcp_kms: [] @@ -54,8 +54,8 @@ sops: WVUwaEIwWTFFTExyT3hLSC9wODhJdGcKWsNIUsT06qYA9vUVeFHQrCdcn2MkHt+w Rr7W+4uaNb8Qxo/NUp9kodE9m/fg9XVd8wM7HUP4wJC0rE4GSnFvGg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-08-30T16:00:02Z" - mac: ENC[AES256_GCM,data:P1BZ7ba0yYAYyPWwJRFSJrDiXY+ETAeFIhOTTSC7acZItawZA3n39iAS4hzI4CP/Jse4bOnohmtz+3s83dNWAVhuQvJ6ys9996xayt5KDMkCmaN+53ve5R6ySivXCl31/yWsExo4kF6qF8rptwnF2QpVzZJHQlDmr1mJO4yrxRo=,iv:V6ejyfpOrGTX3wI1KOtqkgcccGNxOT1MJFlAA1DhfuQ=,tag:ShAMQdK+DiGwrrrvBlDiNA==,type:str] + lastmodified: "2022-08-30T16:38:16Z" + mac: ENC[AES256_GCM,data:H2iqTKBhz31ReRy1wFaoE/ZLKBRr0sOnswZirLWlOTS8YDNLfFW0sqWI9a1M4++57OeZd/xu2Ck8nBDsFQqRwL/0MbWci4PQ9+RPqUsELASYz/tRZNOIZ9zsV9m6QVyo79uWkacmZUlU65j5klkcoeIC3dmmdxY3x7b4pCnY2Xg=,iv:lMGdaAkBLWxCIYImipijKn3aD27q5dm66EIdhpFAFhs=,tag:9wsuicYWKyGdOmXHbkvufw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3