diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl index 5aafde3..6d5c81b 100644 --- a/home/.chezmoi.toml.tmpl +++ b/home/.chezmoi.toml.tmpl @@ -16,7 +16,7 @@ vim:ft=gotmpl {{- $wheel := false -}} {{- $diffCmd := "diff" -}} {{- $encryptionProvider := "age" -}} -{{- $defaultIdentityPath := joinPath .chezmoi.homeDir ".ssh" "agekey.txt" -}} +{{- $defaultIdentityPath := joinPath .chezmoi.homeDir ".config" "age" "key.txt" -}} {{- $manageSecret := false -}} {{- if stat $defaultIdentityPath -}} {{- $manageSecret = true -}} @@ -143,4 +143,7 @@ encryption = {{ $encryptionProvider | quote }} identities = [ {{ $defaultIdentityPath | quote }} ] - recipients = ["age1mcvqpg39t32ll684r4m2l8j0l9zag6endg0h6zjw8svkgdwc4pjqkk5fvj"] + recipients = [ + "age1mcvqpg39t32ll684r4m2l8j0l9zag6endg0h6zjw8svkgdwc4pjqkk5fvj", + "age1z2km2vu3mw6usw8p2rhjzkugddmsvk0ypwjw76cscyy3ar3tnufqtrv3nu", + ] diff --git a/home/secrets/OPENROUTER_API_KEY.age b/home/secrets/OPENROUTER_API_KEY.age index c6a9ffa..0fe3b11 100644 Binary files a/home/secrets/OPENROUTER_API_KEY.age and b/home/secrets/OPENROUTER_API_KEY.age differ diff --git a/home/secrets/data.json.age b/home/secrets/data.json.age index d52787f..0b71365 100644 Binary files a/home/secrets/data.json.age and b/home/secrets/data.json.age differ diff --git a/home/secrets/wakatime_api_key.age b/home/secrets/wakatime_api_key.age index 9a69ef9..17dad08 100644 --- a/home/secrets/wakatime_api_key.age +++ b/home/secrets/wakatime_api_key.age @@ -1,8 +1,7 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVcXg3U2JzZmZBKzY3b216 -bnY4UFlqbjcwMWRNYU9ORS82NmhJUVo1WmhJCndwUVZpYmVwUGRES1hFNlB4cHJB -Z01BZWdONEVFR3JsdFBsV2wyM3FXeHMKLS0tIE55WGNSMk0rYUVibzM3RXE4dFhr -Y2krUWx6RVhaMWVRSWJlY2Y2b2krNHMKAAcsxyH6rCIohp4UOeOHq2PLwjNuTH2Z -LkwG9TFMd7ogeAXepz7h0za/fFKJt9pPQzrckBxHQ6ru0+lQBJZk/tdP6tcGjfxi -N8I= ------END AGE ENCRYPTED FILE----- +age-encryption.org/v1 +-> X25519 s42mQ9FmYUTQ+s0hTmqtgPFg5ktcfJ5KTUiUxk8TdhY +9IE/9EW7R91n1kA3EC2nL33BCcM7+XwUh/YVdRvawVc +-> X25519 F40JrrE+j2j+poS75mDDux6K7ts/ew2GhFO0Fnq9P3M +QxClhwpum7GSnRDV5k+BVDWIdjEKTS3iwKyV1+JTFzo +--- fO006ex5Uykj7JE9XySzq+n6iYRaJPGFax8DSM6zelA +1L姘,^'*wd@KV-XIr40|Z^K[};tEKH_ \ No newline at end of file diff --git a/nixcfgs/.sops.yaml b/nixcfgs/.sops.yaml index a62964c..548373f 100644 --- a/nixcfgs/.sops.yaml +++ b/nixcfgs/.sops.yaml @@ -1,10 +1,10 @@ keys: - - &host_zephyrus age1amkejw3q2aqf8yvh9mkqw8ad4g89mkuudyhv5k6k7s722fa85d6skem8vc - - &user_js0ny age1mcvqpg39t32ll684r4m2l8j0l9zag6endg0h6zjw8svkgdwc4pjqkk5fvj + - &host_zephyrus age1z2km2vu3mw6usw8p2rhjzkugddmsvk0ypwjw76cscyy3ar3tnufqtrv3nu + - &host_zen age135k4636aftqw524cuspnwd7hrcneu7q37k3upllaeuk9ud3k738sesr3wh creation_rules: - path_regex: secrets/.*\.yaml key_groups: - age: - - *user_js0ny - *host_zephyrus + - *host_zen diff --git a/nixcfgs/secrets/secrets.nix b/nixcfgs/secrets/secrets.nix deleted file mode 100644 index 5b854b3..0000000 --- a/nixcfgs/secrets/secrets.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - defaultAge = "age1mcvqpg39t32ll684r4m2l8j0l9zag6endg0h6zjw8svkgdwc4pjqkk5fvj"; -in { - age.identityPaths = [ - "~/.config/age/keys.txt" - ]; - "ts.age".publicKeys = [defaultAge]; -} diff --git a/nixcfgs/secrets/secrets.yaml b/nixcfgs/secrets/secrets.yaml index c81376a..c3f1077 100644 --- a/nixcfgs/secrets/secrets.yaml +++ b/nixcfgs/secrets/secrets.yaml @@ -1,26 +1,26 @@ -openrouter_api: ENC[AES256_GCM,data:ceu+FlTNrNoS56rHL9bdGjODfPBYnBd1GL97BgpmLvHz8q2KMXMvGofMTyZVGsLs1BEq4scjr+HN9r52tozLxeVWzkVfumcUMA==,iv:zT2vT94zAoKoutl58pbeOVqHm5nPmoMrA7wlZQcYVLs=,tag:+gS9EPcmfANCUipbeiAi0Q==,type:str] -tavily_api: ENC[AES256_GCM,data:blrxGOW/kcTbR2taeWeadhrzdtZK5ete4+0KE6yrJi3ibaMkkCGa05M=,iv:v4oh8/lA2q6l60By3H6RDXqbmBUya2W5sYxX8vDkz1c=,tag:8vwSl1zQnG5/fWDOhp9eHQ==,type:str] +tavily_api: ENC[AES256_GCM,data:2hdsutsj0mqytujPIF1t1gpfSE7ym4WV2/lDbdLUw4yyLv7Rfvgtww8=,iv:kIYZ7ETQtQzyf2ymsgSTrvOh00qLQt6715SEi3dqxt4=,tag:M4qTgeoMlcnfh7D418ppfQ==,type:str] +openrouter_api: ENC[AES256_GCM,data:XmsmgAEdiYP90JHnKmdy/jzgaFhmoU/wdYqxahIZ3NMZshgGIWv/fq7apOH8bh+yTytiIMrOdGGP1LZRHWVMeTqoDnWAimpweA==,iv:m2qykUpt9qE4ZAIHzQ0qhFUqEhPG6TiuVZWK+kOP2fg=,tag:Jtr/s17DJMVW215sh2/6+Q==,type:str] sops: age: - - recipient: age1mcvqpg39t32ll684r4m2l8j0l9zag6endg0h6zjw8svkgdwc4pjqkk5fvj + - recipient: age1z2km2vu3mw6usw8p2rhjzkugddmsvk0ypwjw76cscyy3ar3tnufqtrv3nu enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZGIwNlpPUlY2cCttTkJL - cEFDOWJ6TE0vUTQ3czJQTTdJUlpCWWJuRWp3CmJaZS9vbnBUVUpGaDR0MlNOK25q - b2Qvb0FjZlR2R1crTEdJTUFBbnR6ZWsKLS0tIDRkWFFXNkR0dml6eGdOZi9kUE41 - djJMZUlQWU5ELyswdkNXTUUwUUZQY1kKRLHcH5mpHyMKBchX/zE1C6CqxGw8Yu6X - efAVToPTbi6f/8a1SiegkxSulnyRrhNkX0NeqU9/8hLky8NHr1yN1g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSakpDZmpQZmNyVmM5TmRa + MlBLUit1Uy9PS05JNlZMWTl0RksxaXZOcVhVCk9UaEVHVGhXblcrNTVrZ0N5cUdo + ZlB2QlkxTjVGVkNKS1ppTlQvUGYvMm8KLS0tIGptRTFUUXhHQ1FLZ3JENGM4RStB + bGt6ZnJ6alVRaVdUb3M2U1lHelBqQmcKRk6F2qSSm24p9tTNmP2YOpc/Fr5dn+4U + ABLuAdm0AJub/8XY4bz90p/H7GvVIp7qIbTLZw4uubbX63CK/jvBcQ== -----END AGE ENCRYPTED FILE----- - - recipient: age1amkejw3q2aqf8yvh9mkqw8ad4g89mkuudyhv5k6k7s722fa85d6skem8vc + - recipient: age135k4636aftqw524cuspnwd7hrcneu7q37k3upllaeuk9ud3k738sesr3wh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWmFrdTNsK1lWZmNBMEZT - T2ZCRktNRldJdXphT0JweldqSTdPUGZLQmpVCnEyT2FnWGNkemZyT05NN3ptcUlW - dnZsdGNwOXlEdjdPcFBCcFBVU0FSRzgKLS0tIHdETzFSVE1YVUd5Q3ZzTWYyRWZK - c3ZZQlRrZDhtT2NFM0lnZTUxWmptQjgK5lZBkR5oSpb90oa+LWinEnvcmdPTF6wP - Q1gJoVoT/krUu22VSTOj/ojKEzS6uamZnJkMBhH31f1w2j4TEtY5Lw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEK1JjMUNDMi9uUEJ0VDFL + L2phRSttQk95K3BYNDJBR3A1bGtZRTdWcTEwCktFdHl1bm14OWdIT20yc2wxZmFR + UkhveEJ3bkx2d0M3OGtHUmhWeXZWN0kKLS0tIEpnRVhiZnRQOFVhQU11YjhSNzNi + MlBBYzA4bWkyOFNzWlFWbWhDMU9VSG8KJGAr3Gjg6+1OUC+d8+Yu+AW+zzfQ2MtX + 7RzIvGv4R3YtAHlX79BcIT6XwGMXVIF86Fu2QOoU7u8o4wpyAt0CXA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-08T13:02:24Z" - mac: ENC[AES256_GCM,data:QtK4Eg9DLb2TK1M1kzIsyJs4p7pUBeslGTjDxjdzatXcst2AyCKV3f0vc3bPPyE7WkSx51B9I9YGaRq/GNMIH5o16AcVwd1VNTTI5kEO5p+4RJywO1eR+DXidsCIFPAA5Rgh3lJIxdUCcDucZ5o/bPWzbDelrb+/RD4X1VozPD4=,iv:TOmgT3EyAENFIA7JxgkZMk7ZYUKnWrVEH7WL9Dg3fnw=,tag:po0WBC5dze20F5x/f47WqQ==,type:str] + lastmodified: "2025-11-21T08:42:38Z" + mac: ENC[AES256_GCM,data:JIfTM+8G+GLRoIIOSQaJPhg2/12Gqyf5thTuvs1EiL9sdG/J3DFkgpS9sE98FGqQDFHvqrKy+PcxuoAv0nRl99ftspi2Y5oiU3oqIzeDlyMRCaIITtZiWWhSr02LbD5MwkYjlk5mGWDg+GPisfUinY+cxZkmI8Ny1KZKAPr1rJE=,iv:mDOYhCJH1ODy7H8P/5sLBYxwxKCrsowTNirEU0BV+bw=,tag:QOjaXmwbrBhA8Y9VVihhzQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/nixcfgs/secrets/ts.age b/nixcfgs/secrets/ts.age deleted file mode 100644 index 6360f02..0000000 Binary files a/nixcfgs/secrets/ts.age and /dev/null differ