diff --git a/home/bin/encrypted_executable_kwork.sh.age b/home/bin/encrypted_executable_kwork.sh.age index e03f6f5..7b7cd13 100644 --- a/home/bin/encrypted_executable_kwork.sh.age +++ b/home/bin/encrypted_executable_kwork.sh.age @@ -1,41 +1,67 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpMzQ5MlhYT09rVmRTb3Nr -OUpyZTlqTUZOZlAwR01TWTg0THBQZUZtTzBZCjFxY3I5NXNIb2ZuUk0xbFVyMXpX -aC9iWm01bXNWZUVBRVdYdjRlb2ltV3MKLS0tIHJsbUo0WlNIK2dEcUhFOWNydlow -SXNzb05tSnAvUWloZVBOREdtdjNHMTQK3Zrd7C2sODbcZHN2ZF0C3sbD7zpEdY6V -O3bY1mPhIRd3mncob7DQuFVWv7Ih6XBnA7Fl6qQEN8JpwG5LGkgOWya/BVNwzTqr -kQXy5Zrp5o3/4/Je3hiXhRcxveHCs1FbLu02lCDiazRFsvsyxIY19f/Ba4H4D2LB -aYlK0vFZnepip+ZDCA3VCZfXgXDM/QTqwJmiZYKShF3P8px+cyr/YOa+D8uMioC5 -YH+X+/HapEmH/6f7whrIXhYJx+hQDXbfnk8/hOQyprGzXSYYUXpks+2ogFwy/75v -jd7MIEqxxlyDX13JoDVV2dU7mu4LB26npjLjwFpzkA+TRzhQO9RBSET+E4izmG+t -cTJii8E4N8dwqV2+cu+5i50Ab0JxvLG3+eQP+vPxi6A54wxSsXZW3WUFTtdlblHw -+l8U05TPBmmQlHJhS1Rb4GM496yjgDxBwB06oaYA43PeNBESUFHPxsSOzmrL2+lE -SWkohCw0L93VT98iRVMlHn0DGdJvxtr9rFBz1k7oKjJeDyKrGNbRFdpPwX84jG6w -jAz/G1eeHZAWU9K9FemwCyUlaN689F2Sz5NH16TW/flreJnjzQojy/Fwrv0IVX1D -kx1c3BjqwZDoTFp763j+gSiwhjucj2RR7beoGMCOZ8T0OyALNGzUHWbGLFaooUoO -koGWKFLtJ5Wz4J1nUTdczF0oBsnhqoh9z+Q7Xg6HgBmD04Klc0k1TYH1JfhZjB75 -EzQwzVGTwFZTGqdKbdksaH1SVWT9y6FQLCgSHklA5IocKgiqT/9ccKdwFZ8F2n4Q -1UhI/PhbrelCGqLSmztvwwHBGN5ANC3oB/BXIT23tF28jo1bC5eV87BS1h7/K/T2 -R24JZGzwTRSmtdIszbqFmz0LoJQueXP3bTOnaCyvgrjio+5i5gS0Uzw5ElGtqRvw -e+lqtVuMBn42E6uR/LHTgzUaxJmO+I9XmFIXvc/1ySRSyRBzV0Ij9Tb/opREJJGT -GXOjYq6qRmypRJ/tICgsZVcB3xuWhmSWsuDrfG6d+npujeJGbYzapxk8enoIFcxJ -WjbpOfg+CrSzrHgWhpm3Ye3ZEhFyKWf6/EVqsuE+X6fRVgzf6CqgTJQr3YvafQaG -iGv3pHYsfEavbkpLnSX2g/lcL2qqYgpF03PQJ3ck54khlQl2T+Bi478otTPYgT9/ -aljyqc+qKlVx4yn0WqgaB8eYfLWEL/OXaWo5lraQT0++4xPTjOTpsbsORM0J+XLt -DoQ20J7UGArjkHFfq22z1NKGxUVCzG+4WoKA5B8J0GJ0UQXLTCYvZEZEKsHqGGWM -5UI3uoEKpagrd8sPP+aGEXXQJfo4S09yc6/5O+VdAS1k4stHdzMCzaJulwCur8YG -JnJ3TwaoX0tp/PT7IXjNhmQsGHpjSptLAbDwoyHx2uZm/yd+zg2Rr6VtGkjlxe5q -rZQNg7raUCGQDIA8tvaGrJgqi7gxUjHRZXShSlK0gzJL88AyEu95ExNvd+AAnXzJ -c2x/zUtGHoNYpno3wELZ6oSbpgYnHVLrZRySm6Hf95kjPaSmhH+UBUO9Qd6lVGPu -E2ldl1iMS7kkXn7EGt+JlThJ9e7sPUjT1b+qjr1A/tCaDhQ+SLtzkJoVB9dYXeEc -CRbW+xorDYwmYXYW2ab1wGSaeVByB462Dkcmg+P+5wWIoQWFsfWL75iyEvr+nrsD -XMzaeCcwFTpGo5+7c+YNrCiat+Oj8/u/f0OKJ7kO79vPX9IuqEgGAfen36BATFWA -UDEKPrm54UAaUOCGrNGYS01qj/RtQaIDj6nqnk7MqLe+tO159ragOm9SMzdB7p8t -pWNPd+eYYEL+WPiTf4cIyF+AcdEaqx8Mxdajuc4lzjkU4eS5uQv2zLfRjHuMGSvp -TmgpZpOmVNw1NRsId7wq0gj9QLhQrjRA6dHrY2q5qMtHGtrM5ffIpXNEi4Dw9/qz -95txQZTXJf4Js8+W9A67QU0mTikLzpk774x+149qaVWlBC6GMHlAmmOKVHmkmMy7 -uhIk0j3XanTLZvbKcX/K/omF+QLCXKTCfiNLS/Qa14Dbkmq7AAnr18weN788WFn9 -NhgFhZfLEe2l7Rj5KWPEi+hn2BabTVvRDb4M8r/9a4uNuxavPLpO7CMbXEPd55YV -qdpDohWo7Un7arye5ew2JE05j257PXxfvbtVVQQrUlOJDvjFu8B3ddB953CHZ4wC -R7mAZF0R5VjZQ4DXBXSREjqLSDo= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2T2QvbUhyV3NKRHJtdkJX +ZzNHaUV2UlNnSXkwM0tEZi9FT29oajJtdzBZCk1lQmtCMTN1V2ZzY2JWdG1GM1h1 +ZXlEWW1qZXk4NUJqY0FrQmQwU0NXVFkKLS0tIHpSSFFpL2NJRXUvUVlhSTYwQ1JR +SmU2SlVlUHgra0hLWmpEVVNPWEZUQ0kKl2JGt5fsKk2FOeVs0PhYxs2QHS4PYxlT +vTgkU42uipOh25b7dJqUyhRU6qw5CV9ZMBDqjmHSzb9vPr6xhGgAclgivizeV+Ox +s8lSq6Xdrg6fsDlPrr9vgdszv+0c9gb9FxG7cIv5obBz3vZ3bFuDoNP+BwojltmO +URXWF/Umrfdc7KTiVmCLWzbpsOSlojsTwctsQ3zDBIenwtO9BYuu+G0WwSdUmKFH +IZj+A/rlZkoZn207wxdK+UiS7nASTsBl7cIzSNT3GjSFnWz5VOVUM5cQB+HZTJaI +4a1/R9vTiaALUzIyDYXCwNP0HRMcmb9d0qb4df4OmEiM0I+nSJ1kRy+9fY4NfS+8 +9z6P5cxSQrH5cMELnva3RwUnAFAVv9+X7epeh1h6A5fyIZbwj8uBPNW0OUgLNR7c +1mV0YAI0DzGvz+7rXeknlK06qcbVMIlvM4mn42EAiWwMMjXE9WO8BmDziqpLiFzH +tvZeWSln16hT18vABEcijO+6fRL42XGp39yF8ZjptLQIRU6YjyD5n9iblFvfTKym +OihhUYvjExfKKnBcBTu+fd5Abqb9+m9TM9Y/qLDLg1IbPB7laD+NOsXOq0nkA2oP +/OvnjulhEP0wV+YXL1Z+Mm5eaizDgUOJtaO0GaTZOUB+Da4Sc/D9WvZX5gCrARIg +4I8sPjtFmwgTA4Uob9Iwa120pjD1BDqlIEEYJui8krE4CDRnbYyh5wia9nOl5wSu +x9dZu/XhnPHlCH2X3O2p4lH/kE3K4e32eUm0Ue4SiuCDYwhvNGuSYK0lDjaU8HZ1 +B0KJptI+s4hWZf6RxsAs8ZZNiXJHPqQ9B3TC+xAaf52POEhcH1n3PSnmKu6ZFm1a +aIsbnvXNI1Jt0eCZszPOT3feB3o5fBEetNzXZmdODwbQxUWbsNH5lfc1WSG9pmEa +pFIkBG/1h9qTKXr0m0piZKvMgqFmfzp8XrCaen/5LgxUeVDPZ8qQo4jLzebxg7gS +faJ4TsnFCdfISsjz945cKl44di4l1XyRJVytqzJgvKndSG2h8zzmo0n8v/JzyNnU +Zcl2IuL7oJ8uH6CjreffVKHfndwMlHQ2CS7kKmAwyGxJRpsgK8cVO4T15bjrKlqv +D0JLQuV6klRAkt5Sur90Z+wbilnIELZyPjBliLhWYBOOKNaQBoBQjYxuWEszPXw5 +itT2IoOZ9Rl1prQ92xwKV7/unNH51vKp1C/yIYeVqbocXmxXvmxb5023ZaFVlOTI +KzZgOcPfp7vqiNs2AS4K9fVphYtnExugbQijxdkzx7zUCRxQxvaohjt/nCC+a01S +qGcoYKKRhuvqhAUCft756bRXHkLXFSq8iJ8OkNZbFiqch0vff2IHpgz8s+gdgQlN +5LqNiL6qIbyF2IrazJ8AgMBta6e+6tx0SdjfMig5ydp3oCQUZp8lIClPSzhkRQ1o +/3Srw8mEktkImW2cFsF0kHFG1LdINp5bCvqmN3+c52c/Jrvn5bF+WPThCcJZE2Mg +fAz3a9glr3bZPLo7FXlLiFvqtJvRofyvJd9Gtbm1xUaiq0ctUSPlUQ0nRTRT4h/M +4pT8Dn3FL7V5gz289NQpuhmNUx+GmdH54HO7Ncg62LFK9JmFEjhWGgCk0FpPMkab +46SgNd1+wdPvKYCr5h4gJWvRJJzDJ9bZPM/oF5hWsGnjsW52Zg9gX6jRLz858kF+ +K5Q8erQuuv3CM7j0vDAUI9b8ynu9nE0RlRHUDQOND0pWheZ4nvIwd34RBq4e8Eq8 +9nY/mHbtE4kw07N8uAsDF4XBRtHbghPn6mIm3KMyeeoE6/Oz7bdk2SJvR2o2kbNp +lPrnOtP488R+DQZ3Oz8qgMyH02PcgvcSs2Ybsvd/ZYqmjymW3yoDERHOapfuNu9I +e1pTFGVJP1/gZ2uVXtHwt2MNGF1Cl0jCR9V9XEYmfMW96pfoJqRq+5AMNW98EpSG +1SwfQ9dpfubusdCQ4u3TpsCrEN6dlgk24blDQ4geE8l756kXT7jBOHX5qN3AcPS2 +qB641iBTM6LWfTBSTmyfi+21w8oTz+DrHrjENCnxIXJZqi/DxxoaPT7D70Nphi76 +P4ZduYMvGp3SUcWmmLjT0j1YuWZuaFeB4VVZgf/9GpSfqw6r/OIVzVZPEigqNGBZ +vsS57PY1qmTNTINSBD4AYDMX87IXujWlSLvt/Zvs7o8r70EgwnWQAKzrnUmDxZ+4 +z+WMyWTyaknekcJPLt7j4YjKs9yy0VIDvsNbcyEJxdv8NQAsaPtc5mmKExulzZTS +q54HuFxLBTONkmACaFXoHQ5Tm3C8HZHoPlQiViZOGDuT1Zb7WdO1caKsYj9Yw5D8 +yD2WB5UUiOTlnBySKWz2cNIAGRZ86tG7j1a7w7dWJVA8UpwBWGYVA62Sd0ki5Xhi +ddUSZYUYBU3fFAENmkN+9S0zYAFr1VRVVUI+C+uDk/15H0DTuj5tMW7OG1OnmK87 +eKHvQS2Gol8UcsYTp2OeeM8mqlRqwFM2Ne8a6Pn8FEBX9sz2Ix3T+iVeJVcH3u7s +JVjw44OhxkqTy/QqWAcKeg9mDqlD0CRZ6Sq92SqXNz3lixpzWLxBODNB6vokrRHP +kDLteSwBOMYJz/kDEeJ2uQ+dPZ0+4frJ7+tm87UI/itpN7baDlf/4iieXnDGYuJ3 +D2mLl/hLXujnUYmIDY7TcArdU+kzEqTrgx3OuRWu1c8lC0Z1UuKGTx7l3tIYCj79 +/e8dukEgqB+sBrcOfoQMkqyHBz6ZbZCvPPUgmMgXQNHk9NXCRj3neF32A8pSBmeW +IuVs8K49Zc7H0XJgl0DBnK3I8DMeqpHjexIsGnUG2eNOkLUX1Tbw+HZvWOYta084 +tozTpF+vZF2fKFU6GRoyia6GuZO/DbTfe1B2UhKbU+1uYtWvMMD+MW4xhNLczJOE +slV6IjqsGjkV2dHlaDzbMCT7NgHU8aNxXJlBL1gngm5W6PS4Me1CdBjP3r367X4q +7z3MDkJwb3ckSKFQNeNkh8kn57Z7Bpuf9oWtS3Jc6bHVb17ErnWsOBAB3NwOf9ko +e/NoIc7PXNnFUaewNYGNmVFhfOsueTqLEugnD2FYq2myXyuzwMz53ZLEB+4aHgiH +e+sA+cFYdqoQRTIAzFLXFYKH4uc+v1c65Y04/wPe8zugVrvasxzQJPHtNKv4rJvg +NIKZ/s6M4ULTNnTmp2YqpNNbqHDxyXXuufZPA2DDrxiRrUEpzvOe9N+rk7pZZWtb +ltW2hYaxs3RlxpWI/QwA0gc3z6GrcJ7ZrcpTOhLEi5l0niJ8OsmtuS5gBT+6ESuw +yC27Pfxqp/WkvFsct9Bxc3NgbCOxIMkClPrMMB5cpursINGmZxz1RK53CEO2mc6c +V2fr1TGYOosVHvQvaqOT5SNS8tnK+j9Eo52W3yQYiot15crL5/rhG3voUV4N0579 +6HLwPfUzUz5/KMIbuwDjQ0eYcZh6Ggtx0is+caWzUkC2JWG5gS0vUbAGsAuzPpkW +KJJ2fCuuOmZM4YY5k0djNis195oEe6nkjsyE4CTv/yDO0/ZBH4rXAhnMnNXIWhNb +vpcMnR5syzS4N7Pr7yqkz4Y2wXxWenAPvW7dDd7WuHHIiW+Nzta4r8X8gx+pcDg4 +MOxv/9eCCy52CtEzwOu6HJrwsKvXNOLd9UFNqkYYHCMtcXIEym5xXMHBt/w4pdUv +I+hbKIHGjkExnV57a03U+ofhsGh/5oszNZ5I3e3ZaG5J+uguZhKC2Lyv7cpNy5JC +OG45zIs0z/5yMa4l8J75V90ar+r0aAt19WtZ9PWOKvI26+O1OPTGVpXEWMqCQ008 +SmLBKAdk58Y8lEY+NM0fIYt0o/uG2+Dvv17kvlaUtfzDrxz3FWmlOJu0i+u6ATgV +p8bTT8vtizZELAGRdtlMXmymJW2TuaGJkfayVuZNov7C03mV/+2k58hOkw0f -----END AGE ENCRYPTED FILE----- diff --git a/home/dot_gitconfig.tmpl b/home/dot_gitconfig.tmpl index de4c375..f39ba88 100644 --- a/home/dot_gitconfig.tmpl +++ b/home/dot_gitconfig.tmpl @@ -2,7 +2,7 @@ name = {{ .name }} {{- if eq .hosttype "work" }} email = {{ .email_work }} -{{ else }} +{{- else }} email = {{ .email_personal }} {{- end }} [core] @@ -57,8 +57,8 @@ [init] defaultBranch = main -{{- if eq .hosttype "work" }} -[includeIf "gitdir:~/projects/personal/"] +{{ if eq .hosttype "work" -}} +[includeIf "gitdir:~/projects/personal"] path = ~/.gitconfig-personal-override [includeIf "gitdir:~/.local/share/chezmoi"] diff --git a/home/encrypted_dot_zshwork.age b/home/encrypted_dot_zshwork.age index 47e76af..f23fad4 100644 --- a/home/encrypted_dot_zshwork.age +++ b/home/encrypted_dot_zshwork.age @@ -1,90 +1,59 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvVGF5ZE5KV1ZqajBMREFp -SlBWWlNVdnE1NWFkSStSNE16dGxsY1E3WUU0Cmg1aVYwU2tncFZqNEdpNnovUzRJ -b3I2Qms5cTNBL3BOMmJBVHJpQ0Y4amsKLS0tIC9JMlFZT1o2Tm00Qko2WEhvcWJt -VEp1eUwwRTFBRHR3TkJ4eU5MUnRLMFUKqtpY73n9s7/gkvNpPm0LtISYXPyau6Tv -rk5HgJ4WS7OgbT4v7401Ztvay5hFdjzVh8RWvgWB7Smap6gnrWpJJuN3vC0xUrmF -wrGHciLxOTCSW1EvOEA0euwYRs9RnNKzrTo5S9koS7fvuw/1Xy+/FdBMh4oGzall -lk9Ug0TtbfAq1BFsmvW4Y7gV2a74us7p82pwwp8mudQ9wcuD8Yt0Aq+V7EOevTQa -ej11U5Spo7nRwSQ5t7evG4fDzVN6sRTZenPr0R+b4E8+8GidEi/vZNIPVmwv/W7O -/nqufkGwbvkChEEVcuYziYhqz4Jwzj4XxaO9OgkzlaWUznCjT/fipCvhtySN2/zW -JTgWw5JAHkgDlsgSRjGIhYT2gsp4uyhU/ANqgkWodzovNBAmrj9FOV0ZmrJ8Vlfy -rjFAAQKtB9a6rp96LSYt3ti/E+KuNCZAHhAQVa3K0Xo5VP84rIKwTQ8M8/Fat59f -eLi0N+dZL3/vpk9eMF7N4UdvLN00ELQ61BrRAG/ZlQfATI3VxhCyzZVKhCwyNJi0 -vM9IjPTrGyZd51HmsSAWC2ue3wkQ6IxgW9biSu3HrwJbN3zYFssFcy6XAIRLKGfk -InqLgEW2JgS5WqxErQhgMfyLqQ4WDZhAZ8jI8ktLToc2nIkPUPCm2qqPp7DwY2Ae -iYl71b7GoM2RObFW1YnWDCIpqlWmM2bJo8sUzuSgElUrfc1njLfpNdZdHAx4TBZ9 -4bDJP+BlsAsV2g/8TmUomfo7gJvel9n2KBYiQvCctQ3LxS2Cu0zydgevuACXuN65 -U0qo7ISPqz7H0KnzbGfr7Ijh178erL4qr6upvfge84COp4BLWhZzoGczF5ByrzN+ -S0JWzgDXYf/e/xabkZcwJmJuo5M69TgCJWNPfLjJVNmekZpNpjml5YMh6z2CPump -S1zJZKswDKWTQmNFc5RMNg742/h8cia/ppCbQn1C/+LWwdfsx06L2INEuoHzK4kW -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 -vrVZips= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMYUhBdExTSUhGK2VpMkNk +Tk5oY1NKWVAzbGZqdVhWVHcxMlJ6Zy8xbUNVCm44cDU5TXpxRXdsRGNyZFVnUHQw +K2VHSXlwU3lYNWovU1Zpcy8vWjE2TDQKLS0tIElZNXQwaG50aVZBenhMMDBIdDdt +azJHNDBUMDg0ZE1IMzVzNkEwNmVGdWsK9V1q3W5mPee6f0sxL7GQgF97b+RryXIA +MquN95dLQx0bVXPyjKfOpQmREjeQ3tAHyespCm8rtuBMppH2Z2VPLU0MqdC5sT0G +jFYoyuSlNbChiLWrzNydU0BIhOy/lCdDF5nPL0uB83/R9yv1A6HGxONV5R2jdeWU +FH9VXxRFl5G9n5HjPMoNRw9Qt1+on4vHr/XMoQ51SoPGWfg+N3ksAt5p4uWV0p4D +6xdbrlMEA3JqmO9pTFiU2JIExIEgH4mWnWdE7PNk+aZxcGW5OVtmVnrlCGZhAmwE +wD0mweX7tBToVFSJ+9gkst01O9N5i5t1WTRopJVTDBhPeG/S2G83R2rkle6cQ79l +8A8ilEkDZKpnX8ifwDhGyMA71b6CEIrxWaVM+X5N+N/7alct+dKoVFUNc/Dt6P5v +gJOqhAsFhsxsLDcsuiy2kGFbe1P4HfbrC4KA7JFeeddRzov9J29HJILGX8DjxfcQ +lH9EOm4a03zJm/USxHlFHMWQ9XUkPFPcZsl+fYcZ6AH1Mw+U/8QR66mPQMRaqLyG +fQK7z8c00hZ0QFL9YR9yr2QOmQOIFEmThdHlSXzu73JMC05mDNQ9fuxTWTkKX+YF +rYakAbeZE9L70jJUXQ69tgoNxHRvkNsdqgiPMv9L1/OOLkX2KrAPjE3/lvBwxr7q +5zRSTuDxxx3/dIzWOTtbevsVVG4hrv3TxVcVdRbme57NsfNhYlHtBivycx+CFfkJ +rsAhpMd8Oc2E+3az8cmjBAtkAMmGSUrXfBCa2A1tF9eJO1iGlqmwsLWKOB8DY1t0 +yfr/iujZGiM43Z9Cj5stJODrzbzGm5A8Q+X+cnWaa9dyNlTgJzOSRHbrrpXHzG0/ +zllAl6uJFnhZ7x4XpPUe5JdVSYNJkQMSTKZE69JeVSmF7CmeeTc3dRZQxYKcr4x/ +VRhqhjWReCOPgfbmgWcBcNIdV+GeCE/0oDdS7rR5Rvzx7X/e088RrYd2QEooL42C +AmYhJxT8ZgA+33kwju1GGxzmdGm/dcravNVNai+w8EOkZH5NiUvtFyTh8i3KPpmM +HtK6yNrWI2ZJ5MAo8mRwD6/Chfg91N10BuU838Rfdjfefyfvn5uj9yvXYlxnFCYb +4dMbffiqhcyrFL2iba2YFEgtZSkIBhJyBMbIEgNuxT4SmSrhfenm1nUMDuqCzacG +az0Ese1oWX6obTgWTaTLMgLhN9Rm9qJNRWdN9hRiQH3lB2EmyC23j6oXCIUVaH32 +BIfsZp+ZhfInePJcpINN69qhQJ7HRt/mBOMfgqjso2ilDNSpbNakZbZdTnu377dT +lcxx9vt2gilRpC99S6IWGhmV93MqS5urSWsaHKLR9eV3fWukIBV2J2nb3w5SXOzV +7s8pnbJ7hezV/kqHPIUfx9bQ5c39KZF7e0xIaUECBhboi9pj2JXkcm5v5qmbMZ3u +zJlZDyvgwVvJLHas+/QPfxFuX5sSTpAwXkSBqagw2G0Wr/zNoKt0O+1lds0XuUiq +BaR6spcx3IlAX1aVc1eFP+Yc5MhaB5gk6s+P3OvjWGA2l/qK+dN5WHc3mhE6dVPS +QNcgQS2CFbj3PNH7VWgPlQ3RDgnJsetD2c5wSRJOtvAKZqC+x8nxlvlcKCf7GctM +lf+JZzvFhsDj/4IHCBJsFJIcP/1L5ueN9M3kh2cHV+A4Ra0BJmPlBSq7k+PfJwvE +zgxmVByKi3kgMerkdowWm1kf+viMQmxsWFMIzzt4fKkfkd6N/IYP60Jc062XT1sS +5ve4qJ0uyXrBRVU5jSGaf40p5Lw/ufYv9etitFsP0+s4kl4PwwFmhuT9+ZqfDakB +aIeIu19yub0EPFLUlV9TdvIb3SOjamb43YuckkV2jxmuLZ4ev8PDO88ET8ntfmte +aakrmpR8xrpbD2DWwH0C4R/UF5CW+xJ1UNAR3KJsLKvTZggbuP3qqtrIsrKT71Ps +tzd+wtjA357XHiLjQ1N+JOAXQG+OVDL5uveBWUYM2BbtU2/ocoqUbqUDLsFwBgsS +g2QA6Yuz5kQcioDWfkna8lmCzV6+pc+6bp/shcTdwEqcEk/3i/2SWNo+CjiUT1iP +K22C66Jo9KJzYe4CsMjd5IgeQI/kIjgqf5AIXynj8dyuuZYKfJFkiIi8SvModzuj +fj3xHPMg0xYU5LzGh9kLuEGyoJg12hNA3ySmTfvBLANgpl/2cRzWOKdIwpDXIX/G +sWcF0R1f/+K7vd/wIZh2YvXJwqFRiPqy+RWhAYWCZBCgHec98BxxTQAFu+kWoAvC +wjOMjTGjnSwl3HC6a+RHqul7aq5oZ/AQq+z+OxBSHUpbQswtIZYi7vJla1UB1VHM +H3CVtMUIDPFpOi8/YQYUwAlSqsak2ysbujy35aLWsLW85afCfxiacYbz3ebRgqgi +uLdizcZLRgQhRLUqu8nz8kQa87fK9MtsVLtVsbcJEfetNf4PLUCk4G9MnV8wosF4 +lDPQo0c1P5BMgRgoL2kTmCYi+tKfxBhqyLks2E+3ctvAW4sDbESxHwGz9Q1vLiaw +8aeL/D8aCIMsCNMDTjNATNrkIvO0uMin/bCdG3be2vnfEudGIHpygKY2d1wEkY66 +3QBDdo7PjJEE3pivy+rXGYJRJ0sLOhDF3bTrELxHLf4TFcmXT0mzRmU9eCv1z2w8 +b1DFuGEQyQBkfIWUWatg+sj1Qt5zU4x76Pwgq3XreNRss2mVFt7eX9Wvsu8N9wUz +aIfqSFgafQ+fLOOQAE5p38SD0Uva+MahVKlQkB5iAHLTHN2tFfYgQEQanYEtJkEG +DmNW8G/rbh2WNWrrvzZ2Xasgs01Ucoc9l1JluEZJerrbI4ZL4KcNABwU33Fcd0NY +4uhwcg7np/mlM/3NWKVN8yvlEwaSXIjWRmjlZfm6Yl+M69weLGmw3kMtU8TaCB4O +sbvLwpXmMKuQ24C3vcSnFN7GWpCj6pljDoGU1UXluUplVS4kgx6iIMkeWTkpW07Q +wL+42M6lll9BgVcKR/m09umoEpWvyh2N21tb1Z6hF2t8zBYM4ixyaLEB9DWj3Apj +EtkPSM3SbuOOTGhGWwA9/A4VXpZTqlgrRhn89qAk8bsXzrRS1Q7elF9kSXhVx8cW +roqwP7IIWCenKqOfNot+XFfhc1OAUVXvsxUnDbgI7Ft8hwFrvaCI8Tsj0rQVAjOf +adkjTPwP+hO8ln5LXOyVewdMa1tKyfnF6ziHa+Y69Mw2uWCllv1V1RYOBW0TIOr6 +B9bsp7caLEv1LTp/Y25kmveyQh47kAiFuDT8JwrTkpb8OlDGgHA7M0w77zjyc0jF +phqRGRwi2allcuroGpgDHIFuGlhcreyeFV56gYye6z+0Feo3Vuh5pSU2G09niqY3 +k1xZIfVjp6I9UDLImPS1Q5hF -----END AGE ENCRYPTED FILE----- diff --git a/home/private_dot_config/jj/config.toml.tmpl b/home/private_dot_config/jj/config.toml.tmpl index 393e318..0620cd8 100644 --- a/home/private_dot_config/jj/config.toml.tmpl +++ b/home/private_dot_config/jj/config.toml.tmpl @@ -2,7 +2,7 @@ name = {{ .name | quote }} {{- if eq .hosttype "work" }} email = {{ .email_work | quote }} -{{ else }} +{{- else }} email = {{ .email_personal | quote }} {{- end }} @@ -12,7 +12,7 @@ private-commits = "description(glob:'private:*') | bookmarks('merge')" [templates] {{- if eq .hosttype "work" }} git_push_bookmark = '"2025_{{ .github_work }}_jj_" ++ change_id.short()' -{{ else }} +{{- else }} git_push_bookmark = '"{{ .github_personal }}_jj_" ++ change_id.short()' {{- end }} @@ -34,7 +34,7 @@ bdiff = ["diff", "-r", "(trunk()..@)::"] default-command = ["log"] diff-formatter = ":git" -{{- if eq .hosttype "work" }} +{{ if eq .hosttype "work" -}} [[--scope]] --when.repositories = ["~/projects/personal", "~/.local/share/chezmoi"] [--scope.user]