Add NAS YYP credentials and update filesystem configurations for new …

…NAS paths
yousiki · Dec 4, 2024 · 6bdfb0d · 6bdfb0d
1 parent dccb90e
commit 6bdfb0d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/modules/nixos/system/secrets/default.nix b/modules/nixos/system/secrets/default.nix
@@ -35,6 +35,11 @@ in {
           format = "dotenv";
           key = "";
         };
+        "nas-yyp-credentials.env" = {
+          sopsFile = lib.snowfall.fs.get-file "secrets/nas-yyp-credentials.env";
+          format = "dotenv";
+          key = "";
+        };
       };
     };
   };

diff --git a/secrets/nas-satoshi-credentials.env b/secrets/nas-satoshi-credentials.env
@@ -0,0 +1,14 @@
+username=ENC[AES256_GCM,data:CNsO19OFIQ==,iv:adj1twU8bRnbxuz2Br41w3usK45RvLPicJYL3c73gEE=,tag:QGz/BJ8aqMFQ3w2G2GSONQ==,type:str]
+password=ENC[AES256_GCM,data:lfe/BURxSuWqfw==,iv:SCYiWQxRpbvP08fD7Karw7wtKJbIVOAfb6KgYhmz6fw=,tag:RBpHhHPhJ+R6LZMKsK0k6g==,type:str]
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBanF5VjNnd2phZTRtTENI\nZHNzT0RVc3Z2eGVYOUlZNUQrZ0NZdXdyY0YwCm9hanhnQnc2OU11WTNzY3NzaWxF\nNzBSYW5HeHdnRTR3bjUrU2podTdqQ2cKLS0tIGxmM04vRW1NQ2prT3dzb1Z6RHIv\nc2R0cGZWVXZLZWV5bmNrRnBZWjJQVlkK0hnQDw8WP0hJr43QjMWYXdkOjG6UaiNA\nMU/L0An46NwT60/1su5mFQJ3x+hX2HQ58TrmfyWULf0RHH1jRsIMfg==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_recipient=age1v2f38zx3fyn789lemwf8jm2wcx2d7krjc82z74t2qwcrk6hsjsqs8xsjhh
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4V1VXc0dsTm4yWVV0TVdO\nOW5QRmpYK2p6cjFYWTNsZUNweEN2RkIwdmtzCks3bGt4VGNCMDdxOC9wT1pGUW1h\nQkRXc0lIeElGeU5YSzcySFRkUzgxaDQKLS0tIGU4b3JGWkNOTDlZekN4QXlTVXlZ\nRFZmYWFCTkx1S3o5MVNEUUZVZWZQazgKvH5A51hGB8qCtEPHIqkBqlTuWkTboe9H\nVxT2hq2KM5TXbtZNgsqvmuP75YfPuOzLlPopJuNojAdJ7jIKKyxx6g==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_recipient=age1c8nt6m2vv9mcy50vgkvvgag2kl0x4fysdtjuevptxwh9gv54mgqqtzl8zn
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIWnJUYzJtb3JtQVpFcEx5\nRmdUdXR6K1BlT3F2eFpvbzRsdlBpWlVIcm1jCkRJSXoxRnhEV21TbHQ0WnV4b3lV\ndHBlQTVKRE52WWtHYnJqUjNnTmgzMTQKLS0tIHRQSmdONVg0MTlSRUg4OUtkWCt5\nTWZWcFlnU2dqY3EzS3JNNzUwTEtzVkUKmEzcIL82dDUMTppKOOQHsu5T2jhXqUPS\ndemR4hEbIxHptTfHRCFZiUnCMcPGNIdtj/ChaVl9sT0S7TwKK/08rQ==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1yznykzrsa65lg50rtku2yaqq4mln4lk2u8hkyz4r4hy28tlvug8s3p88uh
+sops_age__list_3__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSHJNS3orWEdSOEdVdDU4\nZ2RJT2pTd1owaGdaQkFyZ0RIdDBZdjNCUEhFCjNxSVlDYTJnUDFDTFlFQ3MwWHFl\nK1pobW9lWEUzaE1pY2EzdXZhblI1dWsKLS0tIE1KbTdBTkpZbExDdXJyQ29CWmpj\nOThvbjY2SS9TOFY0ZnB1WTVBS1IvV2MKpPNATIYCeE6R6f/O7O/Zy9q2e2Svd530\ncjUGNXQ3rmX/h3nosW/h6ERyXbvbhaov2C47QeoRAAUeyA2naeH0RA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_3__map_recipient=age13m8rakh7w2zkawjuqgd29sp7wtceqt4mkw38mcg9fsrurs5x2urq9dgqg0
+sops_lastmodified=2024-12-04T08:22:33Z
+sops_mac=ENC[AES256_GCM,data:aRfC8jdHylObjSwrScnvCFxh6xqvlo2anAW4XWG2eb0aRA60iOqZeHG+HvZ5r32ixe8zwuEAhLLWwa/7oxMwTSEPyyIe4GiZ02LljyWsyej0pjBA431eaKaktxpcxZo5MhfCQC8BmFqKF5aUnK63fQepY+JChm2DLI8Muc1vufo=,iv:i/fNUWV9S8kiERbGzPEmag7CnZM2v3VbHpYQ2ODoHNE=,tag:aHXdZwipNfIMwegYHmVDjg==,type:str]
+sops_unencrypted_suffix=_unencrypted
+sops_version=3.9.1
diff --git a/secrets/nas-yyp-credentials.env b/secrets/nas-yyp-credentials.env
@@ -0,0 +1,14 @@
+username=ENC[AES256_GCM,data:agFuOz+apg==,iv:SJOUyEkJmOEyobc+TYXdUYQzDKCPTt6COdBnHWItvEI=,tag:eoFf2JNqkHRO8HeTko088A==,type:str]
+password=ENC[AES256_GCM,data:Hbkbp9F6B04VQKaO,iv:yuaSUnvlDTWxrOF+J0ZIIrjOBFEAIwD5rUMheJc1Vu4=,tag:BlM2Z8g3oSgBZZcuiII5rQ==,type:str]
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqTHFSNlFPK24rMTBWMGh4\nUmdmQzFsdnJ2U0pvcEE2VUJHeWhxVGMrNlhjCnZIZ25vdGZwWXVhV2J4WmZhbjV3\nRUlkeWFQYXZUQ3VObzIxcnc3aCtvd00KLS0tIEhGd0NiZG5GeG9VeHJ2K0NoRXA0\nMDVOaE5MclhYaFhielg5T2xyR0dwcTAK1AE7u+B/quneVa/KsP6bXaHZutXOWBco\n4cKMgXK98fCA9T1VsP6bvmwyT83qLQqfJJ0giyU9ABRQx6nOPRU8Xw==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_recipient=age1v2f38zx3fyn789lemwf8jm2wcx2d7krjc82z74t2qwcrk6hsjsqs8xsjhh
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBENzBwUWNlOUs5a1ZidHdt\nRVlxanVYRnFNSnZJTC9mVlFRbGFuc2hQOURjCjJsZXQ2dENnWDVqQnJaZ2Zyalgy\nem0zSmVQL2llUlFQNVp3NWxFdS9hUncKLS0tIEI2MzdyNkJSL0ZzMXJpS05UL3VM\nbVIzek1HQ0hHb3U4bWIwVDFCZW1TaFEKpnNMtQqaerBVbm7bfBY5JPhNxVzykMwS\nqFGGfgxOC+YNpnaqu11rn/SSbBa+fSFlVwwoFtVSACkAW8nzz0yjJg==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_recipient=age1c8nt6m2vv9mcy50vgkvvgag2kl0x4fysdtjuevptxwh9gv54mgqqtzl8zn
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIVFZPRGpscmVnejUxZmY4\nUGZ5Ym44UUkwc3RyUmVGTG1xS0xzQnlhRHd3CkNsTklwazBuN2dFeTVoQUNrR01Z\nOXBjSGJ0MDFxTlV4aHduUWV2Skc1NmsKLS0tICtETEJkUjhSK2lMSklZV0tFNWU3\na3JtV0Q3S1M0THh4T2pQL1lFbEZVYncKwIekYN9h9aYRyAt9BJTWzbcNiuzqrGiZ\n+K6UerOauVypUVIcJQvCb0XB7juSOS30r7hvM5HHCGl7TXrsWR+fyQ==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1yznykzrsa65lg50rtku2yaqq4mln4lk2u8hkyz4r4hy28tlvug8s3p88uh
+sops_age__list_3__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXc3poaDNhUVA3N2xUT1dm\naDFiWXhHNFZ2RnpvL2J2Q29JNEN4azF6ZHpFClZNSllnYjErRWVkTno2c2k3Z3dk\nQS9LckRPd2NKN24wUEVXRDE5MU5UQUkKLS0tIFljVjQ2L3VwdEp1U2V2a25rYWtu\na29YcTkzZElrbEtjZ2tSSDZ4STg2MXcKx5eX+2ADyxLnNUXPauP9rKyRwNfIFW7v\nA4kVh01k3BNbZKz5wGkierAneNUQFBBqyY84p8MofpI4hEzXvct7gA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_3__map_recipient=age13m8rakh7w2zkawjuqgd29sp7wtceqt4mkw38mcg9fsrurs5x2urq9dgqg0
+sops_lastmodified=2024-12-04T08:20:29Z
+sops_mac=ENC[AES256_GCM,data:i6wf6ESIK5xbV3Vc2LZJEFL/lkiO8OxVuAYTJ3KCdNm79MoiCf+/3NQ3X1T7LaZduPmxWIgqH7d4edLmL+tPUqAZElI5fLvNeVVyHzW0pZlLcDtj/gG+Crfg/SzxkMarY5Zo7p2zY0g6G89Mi9cet1SHsAd5Zf6vsx9/tc+kjIg=,iv:6e9en/I2O7uSGx5yJD1Ua4AXXTAEOjkidSgccURrsbw=,tag:c3VYYOWEP0dFeyS46qUVYA==,type:str]
+sops_unencrypted_suffix=_unencrypted
+sops_version=3.9.1
diff --git a/systems/x86_64-linux/hakase/default.nix b/systems/x86_64-linux/hakase/default.nix
@@ -55,13 +55,21 @@
           enable = true;
           fileSystems = {
             "/mnt/mck/home" = {
-              device = "//nas-changping-4.ybh1998.space/home";
+              device = "//nas-mck-v4.siki.moe/home";
               credentials = config.sops.secrets."nas-mck-credentials.env".path;
             };
             "/mnt/mck/share" = {
-              device = "//nas-changping-4.ybh1998.space/share";
+              device = "//nas-mck-v4.siki.moe/share";
               credentials = config.sops.secrets."nas-mck-credentials.env".path;
             };
+            "/mnt/yyp/home" = {
+              device = "//nas-yyp-v4.siki.moe/home";
+              credentials = config.sops.secrets."nas-yyp-credentials.env".path;
+            };
+            "/mnt/yyp/share" = {
+              device = "//nas-yyp-v4.siki.moe/share";
+              credentials = config.sops.secrets."nas-yyp-credentials.env".path;
+            };
           };
         };
       };