From 80c40828782c99915212400de52cd823fd9855cb Mon Sep 17 00:00:00 2001 From: Xevion Date: Sat, 20 Dec 2025 00:19:09 -0600 Subject: [PATCH] feat: auto-configure git include.path in chezmoi init hook --- home/hooks/.init_pre.ts | 9 +++++++ home/private_dot_ssh/encrypted_config.age | 29 +++++++++++------------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/home/hooks/.init_pre.ts b/home/hooks/.init_pre.ts index 91ba27a..48aa80f 100755 --- a/home/hooks/.init_pre.ts +++ b/home/hooks/.init_pre.ts @@ -11,6 +11,15 @@ const log = (...args: any[]): void => { }; const filePath = join(homedir(), "key.txt"); +const chezmoiSourceDir = join(homedir(), ".local", "share", "chezmoi"); + +// Configure git to include repo-local .gitconfig (for age diff support) +const gitIncludeResult = await $`git -C ${chezmoiSourceDir} config --local include.path ../.gitconfig`.quiet(); +if (gitIncludeResult.exitCode === 0) { + log("git include.path configured"); +} else { + log("warning: failed to configure git include.path"); +} if (await exists(filePath)) { log("key.txt already exists"); diff --git a/home/private_dot_ssh/encrypted_config.age b/home/private_dot_ssh/encrypted_config.age index c240217..51b8869 100644 --- a/home/private_dot_ssh/encrypted_config.age +++ b/home/private_dot_ssh/encrypted_config.age @@ -1,17 +1,16 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBudHpaMG13RFFpdGU1QUYy -YlNJV3B0b3ZkaUlBQ3g1WFVIRm5qNHd0NFZvCkY3bmtPQnpzaWkxdDZCb1h0N1RM -WEpObHhsRko1M3RWZUZEZGZLblNZeFEKLS0tIGliWUZic0ErYmVtZTRoVDhGNU5P -aDR2K0Z4TXNkbWUzSjlUZ2kwb1VKbUEKV3BqFxqkzbof8m2cZqSZthydfzzYgQJG -Unx1o/II5tCGXRrMjSmWtOmK1chfucBIDP6rTNsmDA6MadRASBWfSe3WcCFb+DQk -i1qUnIlFsAZIS9dthLM9zAwG4Urb7ydfHT610I1vNOzCqZHECvkYKhlEptiEbcaJ -rWht9lnkDLmkCL1PqpVmSAdXsxQ9kljV9GIzjJIm8Aa4S2kDZ2aN5aAvbjSv5Wd+ -Eyq6w9Z4D8E5t7hRtaY4wFp1EXQjVV9O6oCI6yuWek8qUzj7CurmGyokBE1pXLpt -9LHGxPDLa5wyUiMWFwkSgTJodL2MA4rywdu1wneSF4XI77jlu2OJTII/xiV/aKmF -6vtiH1ziYDGPflX8GG84UFatLbcBWZcOcHDUfoYQO0m63jo1nst8BRmSoxw4eWAG -0PPnj8mHmBGuYK97YgT0oYqmssvkNFThYG1ZLOeVFUEztFU+XsgMrzkOfLXT/NTD -+hb3SYVsxcSt4A6nS0mbJdKU7tUEiik0brY80g5ZNDUwXBCyMEojZ8IvOEXAwq1/ -QTIH/ju0VNtaCdj+3BFbcWwxo70loU05alnN7R6dP2/gsWp3vYy8FyceJHYnftXk -+ALTOmi6sySn82zlqUp4GMD9sNs0JQNHTnt6aym0FE7ZnuzE+s0UMi0crHqwllBu -Z/4EuHsekIy+c9oBx2sVVD/a8sby +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Ylp3ZmEyRll6VEtDaWFF +Ty9lV2x0NUxTRlJCcTF5cVd6WUdmeVFBZlQ4CmIrVEFYbkc0aEwrVmZmYzIzSkhM +UGR3NmtlNTBZanhTNllrUDdocmN0UG8KLS0tIDhrcDAwQW12S010L1BmRWhQYVZH +MUp3WjNvOWM2OVB0c3ZWWDBUejhmUGcK6xPo72wDxFjSRkJwpPNk05QCQBQ7W2+D ++Md7CPV5qyzGFowdGdl0krEvW3OBsa1yhTwzE9ncZ3efXqazU9R7XRwR6duOJniC +mLma+U2VXTmGsBwckOhgGIU6LD+7XWuGylgD7XR41MxJ/jHt4J/y+lDWagPW4VIO +xefiB576OO8QmRwP3MEuJfJAWRc/CcFYLn1+VfJFVrwVwZGqm/oKJolPCy4U0J4+ +Y61jkCjVq3J1TneowsjRVWznMjnZzl4lLjGtXGwwL1T6JjsVi+IMGEHU+gr0E/q2 ++IyZfI9kgDLTjoaGeG97ZQEOTPN99l1oojIGMdNm1+xiyeX2aEvXIVl6mXTObL5W +/o1BiGP1nbiPl8q0uTz3Ry8f8THYTDUlNKR/816ZkuFSJSqax6QOI/QpixeXRtDI +6T4qZOJ0W3pgQCj1GBSUcYhI0vdejnIoyQ2pOe0plu9sdNhm9f5bFpEFwvUC+4Um +PErKw/QBLbpjL8DWNY4S5bvWeE7WO5IEFSoHLE1WCbU8R3Mg7pkSHQu5SOpc/RSw +hNJghs6rPu1GrNH3nyfE07Gix0yed8YSxp5u0Qx3UvuW4DqqraqfANmsZs1KOTNG +GJxb6Ig8LDPW/36anwZadGx3pJf+ -----END AGE ENCRYPTED FILE-----