adding legiondary to sops

2024-06-21 14:15:45 -05:00 · 2024-06-21 14:15:45 -05:00 · 23f9d0aee1
commit 23f9d0aee1
parent 8787e595bf
8 changed files with 234 additions and 140 deletions
--- a/.envrc
+++ b/.envrc
@ -1 +1,2 @@
 use nix
+export SOPS_AGE_KEY_FILE="$(expand_path ./age.key)"
--- a/.sops.yaml
+++ b/.sops.yaml
@ -14,6 +14,7 @@ keys:
  - hosts:
    - &durincore age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
    - &gandalf age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+    - &legiondary age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
    - &telperion age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
    - &varda age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf

@ -25,5 +26,6 @@ creation_rules:
        - *durincore
        - *gandalf
        - *jahanson
+        - *legiondary
        - *telperion
        - *varda
--- a/nixos/modules/nixos/security/acme/secrets.sops.yaml
+++ b/nixos/modules/nixos/security/acme/secrets.sops.yaml
@ -1,50 +1,68 @@
 security:
    acme:
-        env: ENC[AES256_GCM,data:/exabYG1GvSCxe+TBeECudCN6DQLVBrifa9509skrNRYBsbm1UJRK+WxO0xcrAQkcb1Lse4WE95ueQurSFaY81w=,iv:oD2zcXbO12TlOeH0xLYsaHWw4PVjMHtbVm1LAWp89oo=,tag:dwGBevRXV1B4n/5Sveq5cg==,type:str]
+        env: ENC[AES256_GCM,data:TC1MnB2jgK72fW8U4Frri0xzVk6uZ7jGKM9EgXbfu890JrFPnsUB+AcxzFZqSNZmvZmNS66art5wHUahXnV4HYM=,iv:uQXw0o4wiCZfdTNlzho0dDsKyvjmIpGRfdrNRa4CAYc=,tag:/zQXndwgeugu/gEIq3wubg==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzQkhYd1FKeWRhR3pMekhZ
+            d1ArMnlNcytOdWE0UW9KK0ZhV1hxSjR3REV3ClIySFhsR2hJY2tsTzR0R2NBWVdC
+            bmJmZ0FoMU1FcWVYOHo5cEcvUkpRVGsKLS0tIG83dExub3g3VW9KZEJWZDFuYmRi
+            Q1REaEEzYkZBRnVBWkV0d0x5WFZVdGcKtIry4Va6Lb9RcsSXMGko5iGhuLKfha5q
+            CCZxQbpUPAEMBuwVlA9piTnd5tUJRHF+1nClIk/So8HXi1wlj++WbQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoZkpNTHdtL2loc3IwQmtt
+            Ti9UUzhMbGY4OVVlQ1BTRU1GV0ZOdENsZlNJCjFiVWRtOUl0Ky8zQjBSMFRiWFBR
+            bDV3YldESThFMnlLYXYwcENiRElPZFUKLS0tIEE2ZkhRS25VN0dFV2lzdm9QeSth
+            cHA3bVJwT1pOUlBtSHpMV2FKV3VTN1UK8x9BVJ61qSer8g3Zk9L+nuC9A51ZkyBt
+            r7OKVysF7vXRt261ni9xMe8o9pMKLWIbE8JG1Hq3MdTOA+i0pl0neQ==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGVEVHekhud2xUclpURFZB
-            bzgrSkh2TWFibndHcTBpb3AySjRnUWliYzJBCmlROE83ZmJNbWpLaTExOUNwTmZw
-            dElIUThUQVo3MjlobjVrdFMrZUJHM1EKLS0tIGVlcU16Vm12eERKN1o1Ym1yRnJB
-            UkR2YUlLSnBWT0QrWTJuS0hRMnhBM2MKBaaD1gtd52RwKKPf7Yi7fhVEot6kIhAg
-            oaS589WtWIiIiEs/Fde8QfOEJ4aydhuyfVFGxsJkb8a5QGkjKP4Faw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzRWtIbnFZQUhoQ0x6TklO
+            eHZiMkw4NWdWYk9CYm81U0lFOUc5eGJUaDEwCnB5MVhQckN3MmM4VWEwZEVzVThB
+            ekdia0h5bmhVTTNDUUlzczlqQ2oxRW8KLS0tIGVKbWZPUWtSMHltWTcyS3FpSFFQ
+            UXFzZVNSdFp3RDRpR2dIYm1BVVYySWcKSPeGbz0eOKlrx2dQPjoF3j/TlzhagvE2
+            kndJ1E70ZwQNChWz6o0c1e69DFe6oTYznp+wz/Yb25SKKHbQbeqvvg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEdVV5dkRnSGJwdHB4NTJ6
+            dlFxd1RMRWNlWVM2OGcwV3FYWFNsODN5UG1FCkFyWXVJNDhkT3k0aTdoZzVJOWow
+            ZFlLTS9BcDNVRVgzakJwV29lY3Z0WncKLS0tIG5PKzFBdGxQRkJNYUlvekQ4TTlW
+            OWJrM2lJeldJNmJ3VGxFbmQreXhUZDAKEiCmdg737VSHHA4NcIGPo5vNLV25RUHR
+            3ArNbYe1Vv604vEhW53MjqlnGF69ve3zWS1zzy2je/4p+2WnH+y/QQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiSEwyT21iZHl2cEtKZTRG
-            RGwwclFtTnNkK2c0U2U0U2NTWTkrckllbHhrCkprUTRxcFJnT3hTS3VuUjZXQUti
-            MDNWZGMrSmFDL2svaTJDZlEwcFpEeEUKLS0tIEVBMDlxZmVEU0UreS9KZnNodWcy
-            bUF2WVRySUd6NDJpbFRiYWszVlFYeGMK7Cl76mjrhdMNKy3SXQ4KqpUJl/P9peJc
-            O+EZ0Q1m0tZrShg1soqdMb1p/00ubvy+Rvxx5Tq0jsIF/Lq0Y3Q3CA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMUnB4VXd6Ung3TG16V1oz
+            U2xBdnptR1FLUk56eFF4Mk4xUjltN0lNL3pNCjZOZnpnT29DOFVnNENRc1NQb3Jv
+            QTZyR1ZCbG13eFZ6S3B5Sm5acERxMVUKLS0tIFlxY0dQWlcrTkU4ZHdqUndEOXJE
+            dFZRc2J4Z1Z0QW9SUFBLWm1YWkFHSTgK0zUXHhd4yKrywogAa3R9am+p7r5BPEZN
+            lQDLjtpPZenSBMaxcY0HgrO+jAqY7vDbBixAci4kDf7QwZD/Dq3HrQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5U0cyRlFDaCsvSEZyeE1q
-            WXpUdU5teVpGT1J6dkJ3VHJudG5UaEIvMlYwCm8xcldxOTFEV3JJbUhYbHNjZjgw
-            T2tDZERTNnZtdVEvNWo5STZTdzZYbnMKLS0tIHpXQUREODAzOWIzcGVxZFJ1a2Rh
-            S2U3T2NUdkVKL3VhWGtRTXUrclJ3TnMKE+6waO9P3EWCGeBRmh3OH689ttLU0F0G
-            hEeBbwYSXfrXtHGSEwwNo++5vP1UVA7KUvLTF2G3mM2nhztJwacWtg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmVGhERElGbzcvZVBtYTBr
+            MDhQS1QzdnZyRFJ6MW5SL1NrcytoUDlNb3dnCjBIWWV6R3JlMG5HNXlFdTgxNjdK
+            N3ZkZjh0RzdMK2ZJcmpKSlRhckV0c1EKLS0tIDJ0RFdRSkR4MUtQSEdaSjJneGY2
+            cCtUWWtsWFZHcm1rZTErUWJQS24yNTgKm+y3Kr3VOUfJVSArk5B9t6h76iCBvmH1
+            cshXxIzj+Lts1HfZVzeYpCqx5m/aUtW83IuciXhEq/E0aJ/zQjsQpQ==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsSEREWEtSWTFUN1l3Uktp
-            YlJCNUZEMnBJL0xQc21VenBkVTgrcVBDQlJFCm51QkhVK2J4ODNQN3AyZ2V4dnQw
-            SVI2blo4SzdSYVdpeDluSFJ1YjFscXMKLS0tIEFMQXAyMGc2MHdMYjkxeHZOWHJ3
-            TnJ6dFBkUGpXMTBjRU5MMVJGTWZmd2sKh83VVst9g3e9lbx2v3b46X23HHtQAeS/
-            //oLEkBDuk5yqnNFtbcSGsWI9DBh9mD87bupw0Hz7GXTC/5LkApTkQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-18T16:39:41Z"
-    mac: ENC[AES256_GCM,data:tiHQmGUiTuM6aH5Vf9abJUIPDlQ73vmXHCNvkoBHanX7k9ScDxpByqgnDaIR2Tue4SusVVgXFpAlSda9fTT/bSgLUA1+0Qxo4YDLRz5I0pp4sCXAGVELHguADKwAbv+AyT7x4idzecLZ532RGqKkLWHljfOzHtAAlA8FBHH3ylk=,iv:iHlFeshdBreirhJGCBYUucUkz0oEbxYLo6dIeab73e0=,tag:ZeUXSWla9hDldeoqFIw+/g==,type:str]
+    lastmodified: "2024-06-21T19:06:07Z"
+    mac: ENC[AES256_GCM,data:wEonU2bLKng/xNHFS/Jlxiu0eGlln/40Th0ztlAL/dvtJaiRvK8+sEjFBkgnK+J0SjgrdyDN7wi6MbiDvEs/43XybiMmvPHMF+dn+ZTTh8sVqElzxR7+48EKVZ1zDIW2R7dmnOoqWy/jjKjYfP7GfMfnvdwq7ok1t77e3ackvAk=,iv:HLHxI2DJkcmURwFN+GmlsAhIpUx5pQ2lez7lY1ulD84=,tag:1TpnO9BE4TNMfG6ezrXA/Q==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/modules/nixos/services/forgejo/secrets.sops.yaml
+++ b/nixos/modules/nixos/services/forgejo/secrets.sops.yaml
@ -1,51 +1,69 @@
 services:
    forgejo:
        smtp:
-            password: ENC[AES256_GCM,data:p5iDVW+V0aIlj9RTHpMgko/1ahVkiHXafgm2u2g3TTrYFORBqCJqv+lCSSm4mGIabn4=,iv:GIx/dnn1y6Is6uzKEkmo326AUSS+I5RnLsV2duKHPBo=,tag:7R4222rGEsK+egunnB+llg==,type:str]
+            password: ENC[AES256_GCM,data:OXOU9RhFC7UyG5lB5C7OV8CfF1dqM0f3ZuJ/AUx7t95kYHtUB8ZGC9bSmTgo54XC4zA=,iv:XMdgayXrPFN8Ez8yHmg+rPs3fO55Hae9xPmu+LqA2PY=,tag:+n30XFcL3wu4XIXNS6ZnMw==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkeEw3V2k2U2RYWkRxb01I
+            Rkx3b014Snd6ZEhrbTljN2dTSDlka3k0WldNCmMwVS9NYlh3OHBrRkRkb2hJNnQy
+            NmIvYVlyVG1oRWhrMlVLeWxxd1QyVkUKLS0tIEcxblpRM0YxbmYvRTNqbGQ0T3Fw
+            SHN4WjU5aTNqVko5L2R4K1o0UjVwdTAKSHcrpxBBlhINSjOjEPvZ0meSR59b19+q
+            bLrlp9zOFUbeQCcg/RgFlSN+QmPnmCl+h8TtcnKtneanCzn5+FdMXg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpTVlkMzA1WmtGUkEvS1F6
+            Ti9udXc1Wm9CcG5oalNCOCtGTy94L1BnMndNCm83Zk9xMGpjMCtkZktWekNhNjhK
+            UnRCUUV6THFKOTUzRmJaTE4wV2U0UU0KLS0tIGNBakxYcEd1aEtKUzQyay82VTFN
+            MWRiRmpLdVdBSzBUTTRMRXBJOUY1TmMK2ZLSXOQpuTt0qi2U2/w7UxFTuiCSDMEV
+            3CM7biYL3paVY6k3Z31NfZp5HlOHoUtKxL742UkV9A5D5AhC1Kkjmw==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVOU9SMEZvQUxhZWU2dzJ0
-            Z1ZUODd0R2Rtb2lmaHhweC9Tb0J2anJuRno4Cis5UGZHc3pobkQ2OUJwSy9tV1RF
-            SmNvUi9Xek9oVFdPdzZQUnlJeWtBSEEKLS0tIFpoWTZOYlFOK2p4bTFaUVhGV1hz
-            dlpWOWhLT2VtYXdDQjJlWnh4T05TT3MKJtewm9QN1EfT8IQkkHdH0GGNDyg1wH6Z
-            Ja6lcZB580FPEHwoMC7cayQe5v82vbQsj6s8mOaUW9yRQLMQMkmOfA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4RE53aDFsQzdEMWtFS0pD
+            ZE5rYi95RUNzY215YmlVeTZLYjRRZzVTbjJNCkVMR21MQTUxOUVnay9CZERWMEpw
+            Q3JycWpSTllnY1NLVGhsckFvT2c2UDgKLS0tIG80R1hHYVg5S1NJNitrSzh0VW9t
+            dFhyZEpaN0lWNmsyUEhuUWptQWt1VzgKTeyVQO3HxLtY3kMvBD5QKC5Z52ZCjEGP
+            OQJGH+ecjJjyH6AXVkoz1PH4KEshLNp5tYvyfy0JmtuEtQfTBmxG9w==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RFFtYVF0U3h6dWFJRnVO
+            V2RELzVEZktMb1l2SVZDQ3UvRTJtYk5WcGdnCmhWREtHS2dYMmF1Q21SUW5lWDlL
+            dEJyZm5xYzZpdU44UUdpdm8rZkZzQ3MKLS0tIEVrUktsRCsrd0piVGdqVEpMMHNh
+            aWcwRkJvQVhaYlNESlZMcEFHWDBtbEkKEtSEUNM/oxPCGsjD+fmFYKxf/Zes8iHk
+            1mF0Abeo55zg8cEnNmn4itcPPTR/wdkgor4a4w4qhbrkHxrXMLfa0g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6bUNpMWJ1YklkV1JPMnFi
-            S0tiajlKblV5aTU2djJaQjN0M1IwOU9pdTNRCnFycmQ5WHFadmxhZ1R6a1ZHYjlW
-            TjVCN2dUelc5Qkt5Y0ZtYUtNRHN0WTAKLS0tIDFKSUE2YzFmQzB1TjgrRDFEalJO
-            MDg0bU9NS3VObVVYNDAvY1JIRU5xZEEKSWzp9smLNYypodRIh49XPBxS536XtFWf
-            kJWaLiUfULifcN46F8Tyts9dGHXx/bOgM5rCFAqtqTL7EaJbam13pw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByMTRwQWQ2TTEzRzFsMER6
+            Y0ZEeUVpWUZjc2sxR3Q2akgrNk5iaXdJYXp3CmVSRnFiczhvL1VOZ0syTDZrZUtF
+            MWo0TC9ZWnVJU3gvUmZUUjRGOWlTOVkKLS0tIHR2RmF3cGlKWmZML3NjZ1Q0L3c0
+            Z0d1Q0RCVm5tM0ViUGt2RlJPbEJld3MKFpANv4T1Vq/dRkK0wQ2IDSU2f02lOfmC
+            bQ3l5/GkhK2F+J6LUMb/r3WMgsIgBo7sP1F7dzC0r85m8gYcICHYQw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuQ09PSWwyY2tGZzdyOGxq
-            KzZuUW95Z2QzVXY4dk5tRGZ3MXMxNW9INXlRCmkra2t2UUMwWnBhM0VoTnpUaWIx
-            UW13a3VxZWJyL0ZDdk1IVXJNQitpblkKLS0tIGMwZHJqOGt4Y2FCUUUrc2tEQjY0
-            eWp3WmdOMUlTNVlUT3FMM0JCTnViQ28KE6rpeFodW4BAIDVdjpgPpRs26XgUya3b
-            Xbg6IuB90DvzNMKkoGB36Dh5cWUGFBsJ3QYopSDQGFbUepyDQa4Wvw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTUSs3NDJCUURIa0c0elFH
+            TGlmdVFUeWp3Y0VDbElUV2djSDRzd042RWhZCmFURXM4eWhTQkZ4a0NvQ2dWc1Zu
+            THpZaC9aa21YcjRBQ1NoWlZia1RtUm8KLS0tIGJqaW5DRUV5QjZ2TWtXMlZjMVV2
+            dmNBU0hjbEpZdCtVTWlLaWREQ0gweGsKbvxaLGdnO/3tpjHwy0V4YgKHrAhw+Q3I
+            RjB6A+tRCgd58pMIPHl/3FijWAXKCzQlEThzXPAetOH8PwvLBz6XkA==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6VG9uejd2YTZ4c1p3akFZ
-            dUtEbXk3S1UzeEhLeld4VXVLK1dVKytlOEc4ClFwbVVUUG9SbzB2bDZwRHA2cE4y
-            STFLOWR3S0YrQ1FBbjJDV3o1aW1rNjgKLS0tIDlnQkZhRlpXanY5TzViVzdTNGpo
-            NDhZZ24zWmwwNVE4VDM0bllyUkdxVncKdyYx4r4ERRy2lz7b2oK4JvzF1RnIJ/mV
-            neTz0N1LSdmTUAOUtRT7D73tR6HhBZQNxH4LIsYiRllto46mEamx7g==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-18T16:39:41Z"
-    mac: ENC[AES256_GCM,data:TQ019mze1TDfHM3unUvhLzQOdPVhZ0lIw+CbcuSGIqpjITr7nGVRYtPMvHtY9taxaAQgpdJghOaP9MS/YR6KT9II54qYtel944rmOHxOIpB8Oy/mRHBJvx1JhQxHzxPx6hLsLxNagSbgIpyiNGwMiR2gedBLPI/BBNcPGESiMTA=,iv:m4UnG4p0eWzRmspSU/RL4HSeq3Fr5t+9FnNMxgCMOJE=,tag:w2aJxYjVoEHlaQAT+VAa7g==,type:str]
+    lastmodified: "2024-06-21T19:06:07Z"
+    mac: ENC[AES256_GCM,data:HsD2OmJbNzB8JCiHBBK6Mt026GL0bo7Tb5wU66kzER+I+YlmFrr7a150J+XoBEImxtcFyPaE1WyXp31tPztJvLbU40Yya3Q5dnaZdbHUhlScC0S6WixQ1J2L57Pc+1z18HOa818+GVSXEVmY52boTwYjw3GDloanWGAGV0pSc/w=,iv:/xyljMGZxq/LTIC1e5wXWsKmOa/90fgQtQHZZxffxKQ=,tag:rzRLt04wtkd8kaNQ/OcauA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/modules/nixos/services/radicale/secrets.sops.yaml
+++ b/nixos/modules/nixos/services/radicale/secrets.sops.yaml
@ -1,50 +1,68 @@
 services:
    radicale:
-        htpasswd: ENC[AES256_GCM,data:4y6QUrivlOpUVNAGDuPb9w==,iv:AS13cN3EKDEfRCc6USejkYG4SEFS4sPoYrfok8jsfYg=,tag:60ZhYvH/+SQhZKR6M9Zlfw==,type:str]
+        htpasswd: ENC[AES256_GCM,data:diF88kezvQJWwZro4d9pjQ==,iv:/qv0h1IDEvrMmfM3ZNJd/ghPgMu3z1Pp76iHBgI42nk=,tag:+JIOYEldBDULpJ0EV+lOYA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMFVxV2xUR3hBNjlpNlR4
+            MFRoNU5wbU9EcTZveEY2eGNZNFdRamo2YmgwCmdzM2lTWEludkFVS3o4OGQzbzdm
+            Mkl2NFQzL2RQZjZqNmNvcm9qQk0yMkEKLS0tIExoSFg3ZGVoU0I2MG5QMHdFTlRC
+            V20xNmRaN2Y5b0Y4Q3ZLVW5Qc3M1Y2sK3e4MVQifL68K1hzmWBX98hmQDLk9mHt5
+            4hNrn+1mMhfY+LxxrrmXCqlu4/LM0COg8uZbPdTxxygnOmR2sy5E1A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzaUJLcS9SZU5NSUplNmly
+            c0RVK2UyNGZxMnJXNFFKdEVqUW8yRHQ3bkZBCkw3MnUwSE1SK1c4YjlGdXhNNS81
+            djd3N0RKVmE3VW1RQU8vM3d2OStBaTgKLS0tIGVnd1QvWjdRZGY5S1lVT05RZXR6
+            dTZ1aGZCd2wrUDhoY0l1Q0FGUU85N2sKcH+auX893oaxhUUu5pbB3YkHcA1HeEZ1
+            eW9aWRT+JAjelGuObk1dohjm+cJ60zSiOL22onOwzcTH3rXtEAWSMA==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLc011SkxreTJSZERMemlS
-            clM0NnhPekF3bFZiUXUreDZEN3dkN3NmN0RNCmM3UEdlV3Azbk4yL2dpS3ZRQVpv
-            OWRQZ2E0eGU5cVIxRUU1c3RxMnpucEUKLS0tIHhjVXhtZEdVb3lvRnpoVGdJbkNq
-            WEM1bGRUOFVrOU5jbmhxSmpRK0F4WWsKoV2ABFGgcLb0qMmorOzNaAzPf6AbMfr0
-            PUdIkaXLJrF3Qi3bts96KhlPLUA7llArSMrUBtkXeCit6xS+87Imuw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMb3JNZ0wzQVcwWTlTWXEv
+            ZE9pMW5wd3lDc2JVSU16SmphYjNCQ3lGeFRnCmlnOHphaHBHT3dzSDFEYTAycmRX
+            YU55NnBnNlV3QlJnTDZhUldCOVFZS3cKLS0tIGlIZ05YY2RQMWFKc0lSWXdhQWs4
+            Z2dQWUoxdmlKR29zSVJJQno5bmhZNGcKRHBpjtK+hSfa0+0HptzM2q3LiEwph/Ju
+            2+WrA22lmnruUSs2s4oSXMbClkWdJiJ0TyYl4HYALIvDEwRdUY6JQQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyKzFYdjd2SXlub3FxSFRG
+            Tm9uZUdraGxxWnlKM1FLUXVMWE5MbG9CU3l3CmxkTGhuUkZBR2cxbkpQUDhuN0Ro
+            R0JpZUJlVEUxdWFwelJzcGtwS2d4TmcKLS0tIHFMc1VhS1JvUUVGellVUmh0Qmkz
+            OVpFOExJL00vejNRdzVVa2ZXRlFTUDAKOohAwZ9VJZlBbhji45aSz4OZQc0PW0Wg
+            nX8CLKFMq/pgzCELz4TUwSQwBbpQ8tZO11hv9iYWWGLM7NUuuJ2Atw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBka1htN2tsN2ZZMkpDdHph
-            dk5EY1JkM0hONlRiaXFhdGVIT0xuVDA0b2tBCnlTVExGOHg5RFdiRzU0RWd3dEg3
-            aXB2UkhQRUF6QnBRN0FnNjRqMWIwRkUKLS0tIHJxOWNmR09PRVFQK1E3Um1laHJj
-            VmdPdHl0OGtGODBIZHVzelByaVVoRTAKWb7/Th4zdNFo+K+rwi+nHpbftxnnMOlt
-            BV0hsMpFBaQZXw01n9uw71MZiJZAbZOMA9P+toMKL9UwWSx+isa3gA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwWHZrbnhYUHBIa1FEeXdP
+            RmFEemIwWFRqcGV6OWFnNGxlUTE0d2tVbm1FCjJWVWViejQ3SG5FbjJRSHVjV243
+            eVZQRU8yVG13SFVJTXVXeWI5Y0xoNEkKLS0tIEd1V21BZzcyd1lHMzhiVlRQM3V3
+            OUhzbGgyZ3h0bWtpK1ZOUjE5MlpwZVUKsLQYcZVSaPL8ydMCzr8MIElf9TjeERpr
+            LAN/NUuSjM9YW/NhKKmSpqRFELHl4rWjxbvPeVZJa86QFNMfS2KKDA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNVTdVN1VnN1JpWkJFWC95
-            Qmc3dUNQdUtWSjRwWlVSVlJ2aGZ1MXIrMEFJCjNtck5vcGVhNnFQNXk2MjlHSC9P
-            aDU3WHQwbWdtbTBMcWdCUFE4Ulg5RlkKLS0tIGFDYnpGNE1SY2cvaUk4cWtBVmN6
-            VGRIaEpkUk1qN1RsakV2YkdCbGJhUGcK8l4O+ysy9MeOq5uqnzt9GdkkH53BPtFf
-            rmONh4pxPogBB0IsvZBz2NUsKkixnucEK0+SrF2X5x0wveMl/2Nm3Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzYnlEdi9KenFvd2FqVXd0
+            d3E5NGNJKzFZc0RBVHZQcnVMbnRDMjBhNEVRClYyQjI1cG5tb0tFK2xvZW1vWkpD
+            cE9pU20xYUlUNGlmRGN2OTJqYm56ZTQKLS0tIG5HSmNxYVc2RHhyRkJlODlUblZO
+            d1RwYVV0QU9rTzkvY1Y1Zy9aSkVXVnMK5cIv9FwUQJq+7yhXe2JCMUf+0A2xXR4q
+            N1imwJVytDXNpSZZcz9hkaNRyo52dhoo9wDIV45OZeJBaFInYH5Xfg==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3d2FMMStGS2dSYVcxMHNM
-            QXdPenBQMXJlWFJWcHp0U0h0SkNpWWlNdXgwClBTMk1TQXg4M3ZueVZha1dNN1gv
-            cTNuS3hBblNPQjBCa3o3N2xyNG9EZWMKLS0tIEo5SVc1b04xZndSNXQ4T3BOTmtr
-            M1NVZkphS2E1R2c3dWovcHlaTloxTkUKsDiyHq40XddMdcZ/2UmOUnPSu44SWTRZ
-            ZcDiYbfU4R7Ysgqaxl2iqBun/GOPWf4yeAbcynwXsLMUGG+XnsRWVw==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-18T16:39:41Z"
-    mac: ENC[AES256_GCM,data:9HLkT8t+LOSeVCWbjMhXMi7XduJ0nw4nZz9/dYCeyMW0w0/NscYn2avSUSks/5j14xAt4/NFmuM+KxW6z2dEdXE7DsCo1nWh+WyaTpL1QUId5xSWc6abQaexaKeRu/3QJ1wLNFgotaCuut96iFFTmvDL+t266ozxst8N3iR7zhk=,iv:NQwgSFv6Ogybrs6BMYl9eLeu0kNIJpmHR0MJCYHbCxA=,tag:X3BkmlHDt3E3GFT1iDYJHg==,type:str]
+    lastmodified: "2024-06-21T19:06:07Z"
+    mac: ENC[AES256_GCM,data:iaHVdgorw4EIDZS7aFjK/8cAwfBEifqb1orcOr6+jc5JzpiaLsuhK6GFyAIxRyYuS9edKn/+JU9HVweJdCbHxybPL0BV82QA5J+qXPFVT2fUwrDm34aQVuvMXcXh3tdbjESMEg2Gdve/xyox+cROjTWixrowvKLM5eVE2umuASc=,iv:8t3afGOPS1s6NGppUshc7/6JgRl4P2/6pB5Pxw4zfks=,tag:Rox35oGD2qdKuk5Sg7ricg==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/modules/nixos/services/restic/secrets.sops.yaml
+++ b/nixos/modules/nixos/services/restic/secrets.sops.yaml
@ -1,52 +1,70 @@
 services:
    restic:
-        password: ENC[AES256_GCM,data:23E=,iv:qK5OxK70KSC6nxsiovOWLDG1+6Mdlf+DNibc/mm3uGA=,tag:GV3V+T/Y8dO/L7pv+OkHzg==,type:str]
-        repository: ENC[AES256_GCM,data:Sbao4Q==,iv:M9asdh36DY4Ys3RHugTeduECunSkrcL9yjE0j+CaCTk=,tag:Nmy8LNJbwr7cOTQd1p/kqQ==,type:str]
-        env: ENC[AES256_GCM,data:wNFPsVW6DwZF6Qyyztt0Jw==,iv:PrP6gq+IMTUSKWIKt8zV8o1wbR51vZuZ95Yjwt07ypU=,tag:bBO0tYVR4qrSTZxMoQKgZA==,type:str]
+        password: ENC[AES256_GCM,data:Dcw=,iv:ZgtToHggZ4AAqH/9z8zC6HaQsLe+j5qkJ/hztNa124k=,tag:Ree7AGZrmEewlDjdO8fSKg==,type:str]
+        repository: ENC[AES256_GCM,data:m0pkpg==,iv:t9pY3OGnSnoZEbkRZgxTe1hR38ScfHOKymrgdtDpkas=,tag:hDRlbiUF51rdOMzFAc+PDw==,type:str]
+        env: ENC[AES256_GCM,data:mR0gXIt63a4OabiRXKKwIA==,iv:zd9qbwqf9j/cyAetFwFVdEP+uEpyN3SGBWBmLpR0lCc=,tag:w2ZXNI2sQWrY/fTskBxEKg==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArZXlCM2FiSitrS3JzR25n
+            aXVtdlBTYmtpeDhlV0JabG1MSHUyVG5Kc1NBCi81RnQ3NjFSbVhyS05IM0p2ZVhv
+            TUFKRmx0QWNhUGhpYzJuK3ppQXBPaWsKLS0tIFNlekdEcDY5akhZN1hGOUxKVjN3
+            aXBlKzk4b1V6YnlOdEFXeDY2RG04OVEKz01TWHIwQ0KKHd60lr5q7XODvj0fYLl0
+            Fhpcn75HLdo7CwZAmXorvse3MucppF9AecB8JqC4YYl/jKrBfEp/1g==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLQ29zb1dkNExJRWNoc2FT
+            UXRQOUpjQnF0S09Bb3ZRdy80dUt0c1J1dlZzCk9XOCtBeDRkQkdJSUEvUjgrVmw0
+            UE9xZytiaDhLMzlvOTVrendMUTNKRmsKLS0tIFVaUytJaW1WaHpmdFJLWTdxVyth
+            am9RaTFLdXpmd1JhQkxPSzFyS2twZmcKTPq6TN9cbmVRHIlerMQdraeAObJJEAp2
+            FFTboPgwIgHEcP4dJX8h2hADVxLRZ3cWAMXnuBYJKCOfhBFGkdzHFg==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaMzZ0Y0FRaUdzY0tMeEx5
-            VUJxZkFRUlY3clI1ejVCT0xPNnN3NTh1OHhZCnh2YkxkemZ0ekwxT1NQKzIvTGlH
-            ejZISVJqVmM2UE1iM0M1eGpDSTN6VGcKLS0tIHJxSEhobUxoYWNXeE1LbWV6N0t1
-            dGluUjZCbjFMMktnMFhHSVRscUtUNFEKFAEjmLUA0/9iZLQ4EhpPgyYYYkzQCpUL
-            bo83xqeLmxY7jU8HGF2YNyBe+I9LHpZvxDTiXzBDiK0Bry9b57hWgg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUTFBxb3NEczZ1K0FxRFhD
+            aC9McGQwRGIvTGNJMit3dFp4Vmd3aE90OTA4CjR1alJVMDBnWXgrMmZkRjF6U3NO
+            bE81K1N0ZVZmbzFPbllQeTBNY3ZSRmcKLS0tIDZHaFp4R2ppczZGdGUxOGpBd0xJ
+            WmpFOHNuQi9mbTVQVXNFK3V5VlN6M0EKhCtY+Yyg02xGSAwZ3avXRtKsWbI8NIgj
+            81xKq5fignbtlxqbNXGVUYHeC7+wEBcr9hnpVCXnxCXypO52R9uspw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKbXQvNHFyUEpYNG1mU0d0
+            UFlsQ0ZncWY2RUlGWlRVbnlJditZMkZLYWxJCjBuSWZoTDRpZG5sZ2pTRFUxWU1w
+            aGNtbytUY25nUFRzcVdQZHVVb1YyK2sKLS0tIFovR1ovbmRCZTVUN0liVHpXMEVK
+            TVVMdWNVZ05SM2JBUk9ocXVKa1E4b00K89BTU0Z62oSRPlOFDZoKqZQYOnEVnnHg
+            eTzNZcYE571qjizkx2rC7IecwcdqWDZyzVCc82oLtYnF3pF6VdLnuA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLS1diU0xaU0M0amJEajM3
-            YkpDeUh2VlNGa3liTFZMOGZYUDRoRUNGeldzCk5kSTcrOXNsclJTUnRoMEZqT0s5
-            WTVKcFh4WVlSY0JlYUp0QmF4dWhCWlEKLS0tIGhoeERZWmZCcHR5bEtRZW1JczFy
-            bEl2Yy9mb1NnbUx6WFFHUGhjUXNqV2cK4M0cAXzjNzG09g2FHCZUw8NQkw6Qw3o9
-            G3uFAkWw1Dny8PewS4tzOErAZlUQ0iKJDgUVqOrrBrfvctTFtBseAw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2a3NtZHRKVzhkNlN0WEFl
+            MXJLTkgxaCtTL1Yxdm90ZExHcVU2RkhMWDJjCmJGMGhmSUszZ1psbGg3Z2Q1L1ZB
+            RmM4dEdTRWxvUDhBVHhuRHNiUWx4bWsKLS0tIFhJT1NKNXk1c0NVTVZuTGVDMGRC
+            cGgrRnk5SWQ0cDVUd1B5b0YyaUx0T0EKI/gnOtpIAEno5uJ6ssjWYH9rD/ybRfz2
+            tq3joOLOILnWp68goBb2uzxN5jepO4GiA5cZ+QNENCPS1ekxXPlbeg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3WE9jVFRMRC9iNFVaTnNw
-            OEovY3hwYW5kWnlrSTRIbFU5enFJVXlFVTJjCkdueno5bXZFS0VPU2RWdk5PUTRj
-            Tk53UGJVZXZ3MExER2txVlRsVDIvY1kKLS0tIFI3VlNyYzB1S1RLS2JEbW54MTdW
-            aHpBN3ZqWENXc1cvZE5Xa2FiaHNlU0UKQ5/xk21o60JLZ6xNcB0cFHkoTXMN99LD
-            okhdVhlpml06ODoMIsFq/PR3adjeWJRjB7C4/Bz/wzlEUmze3TQMew==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtNlhiY29zbVBHeXQvQ3Ix
+            dkQzSkRvSGVsMTFRVlI3K1FUTzRnd1VPbEJnClNTK0ZaL2pDbEpZc1VVNTN3MzJH
+            UGliMHhtczdqampxRGNxdWgwSEpsakEKLS0tIGtpZFcyZHBRWllqVkY5bldRZTZu
+            dmQzRkVGeVRaemVsYUZMaTBHNmt3NU0KKX4V8zfDz3YKGrfzlCjlM6xBvaTcjE38
+            eCxMJkQD71d+1Zi8EvaT7mwoDUFWOWZuUD6HaKmhk4cf866ZiGMtQQ==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3L0h2T3crY2JpaGMreS8z
-            YkJLOTMvbTRKUFNlWXgzZkpPUVJ5eDFON3pFCnBEeDg1YnpxNXZvdWtPbndRT1VZ
-            ZUhPRFE3TGFYaGluSDRjbkFHdi81NVEKLS0tIFJYZ3NaSVd6a25qMmxZV1VUNk50
-            Wmo2cHY4cUZFMkFlUmNKcmg2RjcrUncKmbMWBL8r6R777c3SvFmmRpRY2oRQsf+A
-            Yqlv0wmrD6A1B61SDRDwkmFggnk0PquznZD/y0JctqRqmcstAscyNQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-18T16:39:41Z"
-    mac: ENC[AES256_GCM,data:sMTQ25VnUOrMSN9Ro7GoovFWh9Y/4RmHXm/mRHNuOGpl2utXGGQhAGM0F2lpdQwJfd/cRneiDfEJ1GSV+yaSPfTm2KFVVM+Kzl7AyHQO6W1dEvaMhJgGvxixc0SkF9zuU0WXnNOxW67fKUuuZZ69TwMdcVmwF1u7pV9tsONtgf8=,iv:Heynu00CnyU17zNkv1riz2hpulbXOeoi7ukj7c3Qk1g=,tag:Jqkaqq3XSXvENl/8a1z2QA==,type:str]
+    lastmodified: "2024-06-21T19:06:07Z"
+    mac: ENC[AES256_GCM,data:xLi2iNygP7Gu04Avho0ZONrJyw0N5mqpl8ZVe6QjlVuRFyCjfsb0Frav5FUNSKTLKZ6mTI8u0+TvdqsvPjSq9gRmubqgPY8UlyfBlkmv3g3GWgjOxDz8A1/H8OaNXYInmmZMcarh9XxbxHC38xZeaeNoxJ7P6NXMd5pJdexLfws=,iv:KINYy0+vPHff7EOPHyxNXYQMVECymno2OKb1sBPLrZ4=,tag:u9iaYmZ4s6jFkZ1oRtbCtA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/profiles/global/secrets.sops.yaml
+++ b/nixos/profiles/global/secrets.sops.yaml
@ -1,53 +1,71 @@
 services:
    pushover:
-        env: ENC[AES256_GCM,data:Ug92K492ytxkRMHTw6fmYKgpkz47gBg9aLxqivo+t5GejJbIU1cOewo88/7ASmslceTAiY57NcBTM56eHw7U9+HEq1IjX6RukM/OxZ27R4aMkLCdf1c7DNJ5GOOvX2Zo,iv:uVXUIervTvgLnr60oeWeysB08TR/jy9AjNMWLW75teo=,tag:l2ZGGzMKcVTdnKx5q7XJiA==,type:str]
-pushover-user-key: ENC[AES256_GCM,data:EWMIbhjq6+CH958H661xlxcVNLSKWHgxVyjTCU50,iv:Ph6z7Tri64WoPnCbTtrCA2ziprID1VXg8rynx6j6OOg=,tag:MZvq0AE1gp9Ga/73s6MWOw==,type:str]
-pushover-api-key: ENC[AES256_GCM,data:1rnQ/dgls1iLtx3efKT37PyrZyArVbRe7BjmKYqZ,iv:pRvkTjRtpf5PhXG555OR+TVmgzwmJnF8+Pb2wfbTKWU=,tag:3DFYTgLxQFQIT4qTP9cQgQ==,type:str]
-jahanson-password: ENC[AES256_GCM,data:HPLOlKHCpQIhat5qKKg=,iv:AawKpXj+2ZfEXg/eO2On4qtqHsoxksdRxH6nr+/oTGE=,tag:4wWfOGXybP6B88iGdFMF9A==,type:str]
+        env: ENC[AES256_GCM,data:6gXriOrC50I1nWvAt/CcmyDyYHzzZ5zHC/1/LsSIPBP02aT3hoFej+QJ28GDI00hNW5EqCH7lnzB5Vbsmqw1i/hGbRckag5XEFgvB/5GNq2vA5WNu1YFMtCmTo1Pz0Su,iv:g+stTvZDbDjHr6LGmII3e2VVWm1WI7tPO9BqxTi7EdA=,tag:JwZWx56+9fFfHQP743v4Gw==,type:str]
+pushover-user-key: ENC[AES256_GCM,data:OyXzkdlN1Uj1OFTqMQ4NosKv1HQSc/21vTihixv2,iv:n6XNCyVdkBRAosMtw4Af/70TjNobzYObP5Nu/hMuNDs=,tag:1XMAoN1QX9khNNKlLpg/yw==,type:str]
+pushover-api-key: ENC[AES256_GCM,data:lCOPXXrCK05YhXq//0GDbchJENxeFLHsx+8ZQYeM,iv:mxPSPzuBUPd1bW+hbpVvbxC48FoIIfKbgF8nPLcVzF4=,tag:R1VJ/lIU7YaGHzceym/FdQ==,type:str]
+jahanson-password: ENC[AES256_GCM,data:IQK2IWaawwy178ba7Ek=,iv:fnvMhdaVI0N+1ZFY3wOP9BoM1BanWATFrn5wgpCgYRs=,tag:okQyqhOk1R2Njb+NE1k+3g==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
+        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaNmhQRzRKbEpVTTY5bFA5
+            QVovcXNpVUhUTnRIUXBPOHhWZGg2NXNiNjJjCllzckJiNkxRZmI4RnRXeEN1OXNo
+            Qlk4NEd6NjNBOTd0eExWYWpBNDlzdjQKLS0tIEFaMDFtOVIrWDNiUWM4SDk2NWRk
+            TnRSSzlEQnlZTy8rUEw1elpkUjdUYUUKiDHQmSL9iO34SKRVvuAZPPsAeIJzUPfe
+            CsAJ88IBilru/2sMk4PkW5s1H+u+A8XuRrJpGRtwNARgROQnrx6DaQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nuj9sk2k8ede06f8gk5twdlc593uuc7lll2dvuy20nxw9zn97u5swrcjpj
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4SDVjWFlhd0FtV2RnbDRR
+            K2FVOTR0cFZpazdvbEpRcDVWTmFNcXhqdW5jCmplY3djUnVpSHFEZ2RtUnUxdEdz
+            MGNtRDc3TVc0OEkzWTh2UlJZc0xMTW8KLS0tIFczb2RtT3JVS3JFU0xHbCtHTFdR
+            VnpuMTNLS1NiVTRiTWpGV08xcXZuUUEKlqNO8R9HwvB/+d5aUy28DGwos9xizDGJ
+            9iwstLl235NFvyd1j/+XHKj7fZmfOv9ugJVLPrhs/D1t4nENKCaw6A==
+            -----END AGE ENCRYPTED FILE-----
        - recipient: age18kj3xhlvgjeg2awwku3r8d95w360uysu0w5ejghnp4kh8qmtge5qwa2vjp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSTUzM1RzZEFVZTJBdFAz
-            UnlYSmllNUdWa3BEa1BWQnBtbXZ1YTBnR25RClVIdy9YTUFyZ2VOdHlyVnNxTS9W
-            Smw5dDc2S053ZElsdHZpdTRQc2dCWGsKLS0tIGZXUzNMTFlxaVFWNE1GREphanBu
-            Rkdyd2lXUE5ucUVYT1FOZVlJR0hORGcKC5k9U3D+rfp4yEOx88APxmobjvOnf9jn
-            POshirAInB/FjEOCb6gwmX8Y/0KJK1A69vwrx3+C4S+8xWcTQwnHqA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArU01UUHpGMFh6cGRPeVha
+            aS93MkYrbHpJeTZGN2RTbUVOTCtGczFtMEQ0CjJaYTBJMG43aHovcnp1NVZhZG1C
+            SlhCL1JUZmZlTGhURGpOcm1nZ3FqK0kKLS0tIEk5a2ljNHNBQXBST0x0cHpYQkIv
+            SkRJdTY5U3FSSGpKZTZ0VFBJV1gzaW8Kimk9wdUzE3/gHeRmg+XSJXWwGv/05w3Q
+            7ZKtuCR+Mz1AK5nJidyOpbD9XpeRVKEipisRVcpDyOo4gNOfoBg/DQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1pwagehqxs4kwnlpe3lc0jnzc203fnnte9f37xvc76pdznxs59vgsxj6urx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxa3Q4dDZzSEM3Y2Zya2Vs
+            MEhFOHBnc1ZZSGNrRG9TcnBBWHAxYXQ0SWo0CkQ3Y0tBaTk3Qm1CY2l5ZFlqMURy
+            OGgwNVVKTzFjYzV3Tm11VU51S2pBTlUKLS0tIFJVQVpXZjFuWWVDL1Bxd3Bvcm8y
+            NGNlb1NBTHZ6NjB0RHlobDVPbDdRMHMKp3cmQCoNIwN4JmoiozyT5Kw3o0UYbJ1S
+            7cMxdZa2OIbMi5FbLZWk+0cS2xgesd1+NKF6QekCNMMNIwY/hoCs7Q==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z3vjvkead2h934n3w4m5m7tg4tj5qlzagsq6ly84h3tcu7x4ldsqd3s5fg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMeCtkNnllZ3RHSjdVWHpq
-            N0pXM3B3RVJ2QnNwVXpvN2Q3R09mSFU1QWtnCnRvYnR6eVZCaEJkMjMxeEFzRHZ2
-            enVodXlHUVFGcEZpTnFHT1VkTGwzbFkKLS0tIFhCTzQ3Ny9TOVBTamZ5SHIzKzFZ
-            L2NsSjFGWHR4ZDBQR0FFZUdCUXpPRmcKdC6gSCxkHvThXEhp94b3Gx/5Tz4E2B6C
-            TcwMZVgCC2VkSMASj1Jg08AX+xmJ92gc2xl/v9hQ3MWJbR38KBkaBw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBdnJkTDBoM080cEpzQ0lN
+            N1E0Zk9vcTV5Qm13MW9QZUFkWnc4QlEyZlhnCnA3dXBYaUZpNHd2cFVERWdTNU13
+            UkRnUGphdGdmQU1QRHJqZDljYkRjL1kKLS0tIFRQNVNwN0ZmVmI5eE5EYVBRYkcz
+            MUNtc0F0MSthSzNkZ0x0aTgrSytFbWsKXB3bUQCR1yY2aZzWmq8jL02JlrVJJ5dH
+            9RKOoUGTMWcxDiSYGkdHsC2rUEuDox+0n+6Ip+W6BpKrHiflWKjflw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1a8z3p24v32l9yxm5z2l8h7rpc3nhacyfv4jvetk2lenrvsdstd3sdu2kaf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvMk1XRjdHQUtYbnNrb1oy
-            SnlwVjBEUTd3dFdlaWh6UGlFTzR1RmpKYjE4CmhSKzFBOFFJSmtnM3Zwc3pKUy9j
-            SmJiNFhoVmd0ZzE0V2xDK0dzaGhZRGMKLS0tIHlqbWozZHV1R3JSclQ0ZWNRejlD
-            b1Q4RjJSWm1uSjRVNWd1WjBld1hUbk0KOB+7u0eLMslPCBE745dk7P8kVgELGp6m
-            glDmVIqsKmvutZ54AhCtI/pOuL5vlmnstRn8MCXcZgXbm3a80BSNFg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxNXc5d2VuYnp1QWw3ZGR1
+            a2dPVFBGeThhZXFreFoySW1ncG13VGZOT2t3CmhhT2hHVm9uOHkxMkdiRXM3L0hT
+            dHAxeVovR254bkZrcVdwa2JYOTRNZGsKLS0tIHpBOS9lcTYxbWRpelV2ODViMDNR
+            QjJXUUorOW5ZN0dqdlpLdStPU2FvbTAKw/D5UA2QCZOp1UKFYpTCCaV19nG954O2
+            ghmQ80XxKAmBHHsHoID2o3Va66NeKEGS7RX2cKKVBW0aPUYhQhEF3Q==
            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1d9p83j52m2xg0vh9k7q0uwlxwhs3y6tlv68yg9s2h9mdw2fmmsqshddz5m
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOcUFiQk5yMGJBUitabTB6
-            UHFVRXFVVWFoREV2dXZXcVJ0cG11TlhCUEVVCnAxQkJUUkU1VUhSaWNLQStpcUJu
-            ZzJBQjlUQXhuZk9PZXRJSktnQWFHZmcKLS0tIFI4TUNwREF5cXNXZEd1NUJ3MGFH
-            OFVrMXovMDVZTU5obE42NXkwektRa0UKmd1VNqD43WmhwICUohG2DLsZ9wYsGujp
-            IERwiWAiCppqOEULQeZti8ioPHJDs6tjpuAR+vZ1TD/uhdJP4xsfcA==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-18T16:39:41Z"
-    mac: ENC[AES256_GCM,data:EXz+9dIdcI21WlJ9r/lewrfx9MjynA1eS82MMnO0BBiE2KV6XcMvrxStMIerXY/0nr2XGoZii8amo072naaHBTCwCsaDlx0Ry3oMyZYZNFwTM2mqIK93CymIkhe/qhMyNxDTmKc3QFEiRtimLnUx8YW27leS1b4mNFHcauXYNHA=,iv:EEmK39VBNXnJayk6z4MfHHsfj7OuwXUeLZQ06q2y2cE=,tag:9PLLS5BbwB1wmA+UV/oIwA==,type:str]
+    lastmodified: "2024-06-21T19:06:07Z"
+    mac: ENC[AES256_GCM,data:drQbhDcotys+nxfnjfpd1XIFaKcPZHwEcNGdzEb8nvrTjeK8zexYcyGb8JoXqB3LnnfkH9bjjjbwh3yRNEV5HqCiZaxwfI0hDmNbZkARNbmDsdXVpFjBGCH1WbYxuThKO9baOZRilX20X2t3D92q/o6qBulZIWKmPzmx6sn0ke0=,iv:7F4T+ockwc7mj45YZ/El2LVOS9c1B7D6JJRDy4Of/uE=,tag:0loBmpfDrg9g6eyMKHyldQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/profiles/hw-legion-15arh05h.nix
+++ b/nixos/profiles/hw-legion-15arh05h.nix
@ -3,6 +3,7 @@
  # Support windows partition
  mySystem.system.packages = with pkgs; [
    ntfs3g
+    fira-code-nerdfont
  ];

  boot = {