diff --git a/machines/common/configuration.nix b/machines/common/configuration.nix index 8b77385..3d3fd60 100644 --- a/machines/common/configuration.nix +++ b/machines/common/configuration.nix @@ -66,19 +66,12 @@ generateKey = false; }; secrets = { - "syncthing/luna".owner = "horseman"; - "syncthing/terra".owner = "horseman"; - "syncthing/solis".owner = "horseman"; "syncthing/user".owner = "horseman"; "syncthing/password".owner = "horseman"; }; templates = { - "syncluna".content = ''${config.sops.placeholder."syncthing/luna"}''; - "syncterra".content = ''${config.sops.placeholder."syncthing/terra"}''; - "syncsolis".content = ''${config.sops.placeholder."syncthing/solis"}''; "syncuser".content = ''${config.sops.placeholder."syncthing/user"}''; - "syncpassword".content = ''${config.sops.placeholder."syncthing/password"}''; - + "syncpassword".content = ''${config.sops.placeholder."syncthing/password"}''; }; }; @@ -95,9 +88,9 @@ password = config.sops.templates."syncpassword".content; }; devices = { - "luna" = { id = config.sops.templates."syncluna".content; }; - "terra" = { id = config.sops.templates."syncterra".content; }; - "solis" = { id = config.sops.templates."syncsolis".content; }; + "luna" = { id = "MW4ZTAX-D7KDLRL-YHNGNCF-V6FW5L4-SCKQKES-BO7KV43-L5667GL-JHIYEAA"; }; + "terra" = { id = "2QWRFLY-ZUY5C6C-X36R5CY-PJSGLYY-5HWIWJN-2YYWRPU-T66GJMU-GXTQ6QK"; }; + "solis" = { id = "TI3T3BI-7TPOMUM-CWOL3M5-QBHTBVD-EX2DQVC-62UHHA3-JTUSN5F-5S47JQD"; }; }; folders = { "Documents" = { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 7fc90f4..e738999 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,7 +1,4 @@ syncthing: - luna: ENC[AES256_GCM,data:G6TCKtnGXqt/2TwZUOZ4wl6M0y/frPlKkIRIgA+fHRSEjKV1xjNw9tspqkbEImIRlXOabSJJtij/eRBCZutQ,iv:BV31lU1XCuDFlzXBkaakCOayM21eWFkWvVi3FTCzTB8=,tag:2RT5+Kt+3ow9e1ldkGC76A==,type:str] - terra: ENC[AES256_GCM,data:7oWAcqdqR3+3Nxx8/sQhlNh/6/lAp/Zn5r/qLxKSG7B9bu1vNhxcPxQCpPQWbSeZBTAOBYe+TOuaTTwISRLv,iv:+im6Blyn97xtpdGnUCseTC20+jmu9TX3UZL0ZWX5l7k=,tag:I3W3YSZKoGxnsNTJBaYAiw==,type:str] - solis: ENC[AES256_GCM,data:OmEgJbIsIOws4LeOBLxnxa13ABJ+Sle/EDzANkWCpWwnxs23ehrSzSBQXZKPSm1/51BINADiI0xDq+LHKDLy,iv:9KZ7UQK+wWdDMsMNkq2lB7xyLUWcbr48sxy64xSXjII=,tag:mEZuAEe8oaPCIcy4xIAsVA==,type:str] user: ENC[AES256_GCM,data:DfJyEnHAC74qvy8=,iv:q5A1to6eoBkXF6uRo+OWhVoP5WnkBnEVVd66tWAI7Sc=,tag:hK3OtNXX66BT8hpxtY1a0w==,type:str] password: ENC[AES256_GCM,data:5So/Ay3zszQl58d1ub9PmTPs0wwERa28X0Osh0qSwjaHqOewxQ==,iv:zcRrxgcO+vGnVzuXMY8BXYrc+xFHh3/RZXvC7FBKLcY=,tag:GbPqK447lfS4ME3FXTVZaA==,type:str] sops: @@ -19,8 +16,8 @@ sops: ckJwQ3EzU2JzdGhnWkNnRExRNlprM28KUHkZe8FvLOAt+UVqvgOxBQdApbEXQ44v vXW8UtZuq7GjsP5qD2MK6oKs/ZDfe+PhqiWl4ONNHvpn8rmfbQDcRw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-08T13:38:28Z" - mac: ENC[AES256_GCM,data:86kO6zX68VO8eIia52izDcS7bjQkkOd0RXwR4w19aw/xQ7PWsveBp8dVaiObjLN5+E+tiwintlLWCScsQXEj0SIrOA85TvVeyDNQqCcBKNAFyJROLbHGXxdvAH+YWD+iMZEM1eTIm8dpHP0quq73PBwzYSAprOEgm/dRemDY9OQ=,iv:YkkkNjpElH8QFLbew38LFVlBh3TFFZyt7sx0CIMr3fA=,tag:UZR1wCVqOtD2WTEp5nESQg==,type:str] + lastmodified: "2024-10-08T16:55:41Z" + mac: ENC[AES256_GCM,data:VSOGYnpkU9gD/7JaCdIC84XHI5rHc4PhqSB64YvPehTrA4rgRGynMxSfvb+zRt+rIO8Qyhnt+i9zjsOLa9Z1F8xOx6f23oLRtguvYBNWJIhYaUvmS7lqPryvJGv3aoVvWkRAoSHyizIqXfmHvn0z/QfEst9PS72I4xf1pQu3trs=,iv:GJzYvWn1EOJ++QYW9jYrUfLAwTceAKFD078JWukMhH0=,tag:q62MpyvDneSYXSzu8S3qUQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1