From 0b176bb7aa8e687b4c8badfcf93546f90cff1857 Mon Sep 17 00:00:00 2001 From: Amolith Date: Fri, 1 Nov 2024 12:00:36 -0600 Subject: [PATCH] Various --- dot_config/git/config.tmpl | 4 +- dot_config/isync/encrypted_mbsyncrc.age | 92 ++++++++--------- dot_config/msmtp/encrypted_config.age | 125 ++++++++++++------------ dot_config/zsh/private_dot_zshrc.tmpl | 32 ++++-- 4 files changed, 139 insertions(+), 114 deletions(-) diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl index 8b500ca034f6e474a7c4e6f851ac8e8d38cc4b3f..39ded7e9b71ea201eda0ba067a1d462286bc6c8f 100644 --- a/dot_config/git/config.tmpl +++ b/dot_config/git/config.tmpl @@ -25,7 +25,7 @@ smtpserverport = 587 annotate = yes [credential "smtp://smtp.nixnet.email:587"] - helper = !bw get password 'git-send-email-amo_sec' + helper = !op read "op://Private/git-send-email-amo_sec/password" [core] pager = delta [delta] @@ -51,3 +51,5 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +[rerere] + enabled = true diff --git a/dot_config/isync/encrypted_mbsyncrc.age b/dot_config/isync/encrypted_mbsyncrc.age index 9d25b2850d520241b62295a70879015fd78b33d9..dea3175db26d8abc4a47cba0a2704bbbae500a16 100644 --- a/dot_config/isync/encrypted_mbsyncrc.age +++ b/dot_config/isync/encrypted_mbsyncrc.age @@ -1,47 +1,49 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBdk5Za1JU -VTJnUzE2Mk1QZW5ZdkZUU0QvVTFDTXRSM1pWNjNnWWlCY3ozMQo0a1lFa0xFVHBk -MHp2QnByVUphalNCc0M2emtLSldHZUFwVFRFRGZ6dHpZCi0+IHBpdi1wMjU2IHBE -YXpSZyBBeUNXcVlwTm56blFPc2hETy9SdnB4WHptcFFvSTlvc01rUmJGZ3dGQVZZ -NAorVzRKcTZSdmtXR3kvRHBuSnlSUE8xcUsrR0lsKy9KV1ptNmZETUdVaUtVCi0+ -ID00Pi1ncmVhc2Ugay5fRj8nIElWN3dkRyA9TS1rVwpzYzQxKzkrdTZ2UXIrVDIw -ZmdIbnU2Y1ZxaTdwUlIwZXRkYUw1bUJVdkovUkUyYwotLS0gWGZYd29qb3Q3SGFE -WDJWNjNsb2Y1cXlZemsxMkhCcXQxc1JkaUNqcVdiSQohDWKEZ7K2JBAC8g9ekSlN -DeNIbSnEGKEAfQpIi9sh23MuKbKM26zzK9KXqPm7uPwJ7RrstFiyybRYlLvBMgL/ -VOLV7pu3Poyt+UTpg2plmOFiaHSe96yZBauDzZDFTsuqJUysHyXzOyk6hC34k8zT -luqBuZYlkQ0LJK/pF63nxU58ZaJAE6F3gWMjhdtwUKN7Uyt//wEfoZR/c2Dh9gYn -hNc8EIIQxtdoCvLTobJ9uBY5AinDLLElbi9E+16HwitumhvC6DHatOJdFNFlCo3P -hpexmj2iyRzx0v2WRo5rn4/IBljGoWL/8MZSz4g/SSfuBqb6uqy6lh99gSKD8Xnn -4BX8Ne9lvMsHjHDCh5a9d6SZJR1G5XseK+S28DPtegZCG/AdoN36eNKyo13/6kFf -NroHmmhsUjvIWc8n8abrKyEdlj/D5NWWswMiLlZhrtM8m/IMI1+PGK2gXBTvxaYf -hOA+ZooksNfy38JEQamsPhdM1qLN/kdYa7MSRiMdrGBp1FyZI5c5r+JMO241Q3Z7 -uervVmlve7RIjh5uWSPxRvF2+26aubESEE7V6GaWnVUdKZlT4WWxi3EIL8Oy4m3Z -HWC5EMAMnt10Tbjydp3HPyGAZJPwG6sIjlWcm4/sGD0bUpWt8nab8cojC4akLDuz -aokU5aa424CfkZCR8cIhoVnM9aQhjVmekYXaxWEmzjaqBc8t3tQknF1CvCjbN46r -lDddn/I4JXufbQwKkKaYklpCAFeQokQu4Gy1TvzwiTotByjhDuMGr1MW/6fYo1ze -dodvtVa1s9LyqLUhqwFv3izIsxH6hu9HeHqP3NJUGuNLLHTngHOAavJHDiUk4Xlw -P7H0zQh4/o+f3I79XDg7MOa5nvRSecPvD7jJ6Ju/uFYvN0+1Up0OECOIdTFVwJmG -J4doRKPChSd31BGFVqRiMQwkZX0iJRTSPYFOCB9oXC79+g/SUdAKQX8AKDV6Ll1s -apyClclrjQtED3IXMsQhkU0LdEUyGPZxQxD1d3KUFSP3e5ZfQZlZCRlduXaQw3Jw -pTa1Hboc7oT1GFEv8leIyFehCfNzClNRHEKZ+wXabRI9Z+3uegcqwyV24hHt2X8K -Mx/TRtmoTUiTHW/Fdr1Zzkrb//x0SIXsMk7NPHYgmic27dSNCDm2sbcoEhm6zwIC -6n3akM3ye9JY6TrvfJGHbtEp0hYRT7KB1a0DzL5g1Tk7E13zdXiAI9lLNiMirLvB -O7+ebg1Ej3WEl1yZ4Pp2dUJYyunVMPqAyNr34o+BBjgTOR2aq5le10gDwTHmsLLH -hWxXq5JGxJ+k4PVPWXhlYHc8vMUh8Rf205VEDKTYFCsntu4YPXsZoc69I7myia85 -jNzAWXC9cI4yKnuaxniXyV4rAE8LKeXyNxeyYPdQiq9V60eGDkj/qM7spDfM9nB4 -/C8yH5UoohxrKuM44bAtODarreJUy0i4x6UJR7OKBHjg87T+osL7q4dehB3e4MQK -lZFJz6IxiDuiGLmBUsCUTWDTHSb0SCmb9R1UBo4IMxvk8ZCZYCQ9MfTucH6entRV -+3bmSmUpsHyGTPZfQI067Z5ODqnXikx8W9d67nDc0U69bFxBofqM+x9saxptdEvQ -BVz0Fcf/hz+CHAJ7Nv0bojxWJj4ZDapVPFPn/S1kZWhoDH/9tiALCcjpJ6QZAG9M -R7QUgk23LNCF9uLnynnYc3FxazRz3tU7CEyoU2VmVy0VmOgWIwpIWsYQZYDzhIEx -B5XC49xJVvNbQZX5GcqeQqQDEQaHgV/GcDPg9AMFKR/eVCEn7DKvGPpQcyTZ+QOL -A1kWI+nCkjNGsnqDCh8SIVKTlL+z29NwXUyym6/BYpfW7hQfNk7tO0NgreR6FCOa -orxSLKmxNsG8eyPkIETWZ6t829uDiLVoMd350WV5nxw+hmTn6cf3LeNhHlyjbqw0 -sKzEHNXbVEFtD4hWs1S8V94Xg601OXmp5DsH51hpwAcPPj/CypAB6A3ueNp3eMWr -oVUk59X9iVVhTnTxs1LDx4/9wsuR4p/XVcHk626hVoDVkgMx0gqo2zv6cSeiqjh9 -EO02ZpqXA2AN2MtfND28Vz2of/WZD0DY1NaNLwMNeopIz2bWUFSsGK7FQIKezXq8 -wiN5xTr5GJV0cLskePbLXEPhLF74aXlj4GfbVtVaQd/GivowQquEeBDPql4RlgZv -shi+PThJ9xdbOjkblsM0IXgyvhaguwM0izgHvAhH9FFO5NG6Yi20vXUDafntKR0x -bTEXcGi9NzKbTr75m/bPZ6Uc3/8oSj90F6ZEXfclZRGgT6+tAlK14NnuQMm6vtw6 -NUZWVDYaNHIYqgVSxcs02E+rG367v837FEO0NFgQQ/MEJw== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBZ0ZNMEpx +V1FOaGZkL050MUJRL1ZMaS9SSW9DeUxqTzVWVE00c0NoSUg4dgpabDY0bzZvZk9Y +RzQ3VVBMSGNnN3JYd2I3aXJVa1VWWWhKTy9Jbnh5UkhFCi0+IHBpdi1wMjU2IHBE +YXpSZyBBK0lORDNZSExrRHIrVkNuNzJmSjRWZHNobDdvZDVKWFZvNDdHNmtZb2pX +QQpzYUpzdWRWbGE4SnhoaVJUQTdoWjBCb2hyK1ovaWovY0lYZTJvSGxhSTNFCi0+ +IHhrLWdyZWFzZSAyOkwuTiBebS13XE8qIE8lT2hmbSBlZzxMQ11uWApGZmR5S3I4 +QklnMVBuZit2WHdUTUszTndySGRsR0x3ZS9rR1ZhbTNwUzRtVGVjdEM3RlB4djVG +Z1N2M2N3bEM1Cmk2MS90RzNPRFZOUzYydEh3UWJwWUxsbG51cwotLS0gWHg0clBC +OURGbjB4Z1Zzc0ZIR09aUlk2N1V6QTZnQWEvblRxUjlxdEltWQqXhEPGDD++M+Y6 +gZqLvM8yhuqLUhbE4RTjb0gHCd4UhcshkGC/zdlrHEj/GdHG6WU9sA9NUAcyd2Lc +VMEFwKlH1acw9tzMtEMeJn6eN18YLNqdrPIuAv694Lriowqu5eqQp22IXSxzUyx7 +t+43NPXCj75i5WDnHEW8NJmQKpbSYvTrdsyvWrbCD6aHcnpoajclNyRpBoahlDYc +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 +AKcjYTVrQ8osZQ== -----END AGE ENCRYPTED FILE----- diff --git a/dot_config/msmtp/encrypted_config.age b/dot_config/msmtp/encrypted_config.age index 7a7e2bfa19b6c14b9da102582e114bb34e25fd3f..473a9abc3bc0559038b4f7d5740dcecc6094de50 100644 --- a/dot_config/msmtp/encrypted_config.age +++ b/dot_config/msmtp/encrypted_config.age @@ -1,64 +1,65 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBb2ZFam94 -dXpYSUJla3NId3hjQmtPTG5GcHE2dzU3aGNpY2RobW9IK0Q3cwo4bHNEd1loUkc3 -QUZ0ejd4bW9CLzFCRmpSY0Q5Tk5MN1lWS3NNVXB1TUY4Ci0+IHBpdi1wMjU2IHBE -YXpSZyBBaG1wSE1rMEZtTEQ2WXFHMFNQL2JSZFhtelV5WHU4UWgzTGZyR3E4SEor -SQpCU3pwUWVkRGs5SXZUbFU5eUM4cS9aSDhzV2JncUJsd25VY1dXZTNlR29rCi0+ -IG0tZ3JlYXNlICJcIGhBM1xfICpWLDM2R0JKICkKQTNWd2R6ODdLRFM1QmE0WEEw -eUVYSDJTSi9oWVd4Umo0OERFbDRObkUzbHd4cGtxQkxsZVAzdFdEazBQbUlMOQo2 -dWUrcm1PcGl3Yy9HRGdybFI2SXBVc1QKLS0tIDNGM3I4VlNyR1J5MnhlenM5Y2I3 -WUNHSGZxOWZMcWtBUFhYZTJWUTJTUjAKuyf4O6+aRarG1AqEO2H+lVnAv1p5YXfj -wL1ROgwqY/0pl0JONI/5bZKqx0odo/seDMpKENVBDZjU69riCVPRE4WJxRK77yk7 -zvBiR1A4i934JV231icsW8WzCvYs3n1e3kKWkF75ictXiV0rLYE27+HQJHwGf0ns -rcyofuBVrkkhcscw77QYYJJkxvRuf7Xbcr24oacG7WIYgYvo+TDqqxxm6WmxVaib -+9YR/box73wM5H9Niof9tmjZE6RQEOSoUNs50wJL0hHxGNlK/7pm4KsrQdDcZGw6 -CjRsTyYxHwi3tlPltlyvsEQPQZRpsbLvCoDCioJl1lU8FvcozwMwVB0uJLTxJx41 -Q8I2RHL32y/Y45jevJURJlf1SKN5gIpljUZUPK6KN6Ta9Jvc+wl4DGbJOYiDqMzL -9u/S483LyFWNrX/etAqlwr5riztuZAITOKUH4P/BYrGN8DA8sfBenDPuUVjlY1pd -9N2+VA/4uBJjDirRqy0988lHUog480P9ZZsAq0E9J3wViWWNnO4yv0FceC8dFZN9 -2BkExlcLwx/JlqdrX1JwZVzeURsIlsCBmOV6p3Dga1+hwPnMDVnuo8lOg+HqpfqQ -AIctVHdXsCyZ/91C/+pSQ3dLK6PW2FX9zIgs1z91+Mc6QpJX6jqao5NVZvNttB5v -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 -bgQMZaevvpuwNbSElQEHJ7k49O7t+vbKlildHoz2NMxAOGDNemiunqCBsHYnlOIb -TY35a6NSix9z4xy5knuPQh5JDPcOFU9DhAcDIqNhZZhZbkWOEHF+4i6e53n7RXZy -+G+QGv3umUuzLQnv2uMWfpUbpcs3nh5U0rjpprBg0uOI5MTo6F9ATe5iUObI6YHh -Yo4am2MpvENwGj/xoODXS1Z1H/9XwVO7r0F580+lP/tVoPmZsJdc3s6n92/aaZUj -DAPAYSF8x+gWSx+GaiAOeKUH0pXsHVyMQS8BOibdhNw6JCFLlQ== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHBpdi1wMjU2IEhBV2NqUSBBbWgwdS9m +cFI4cGRxT1JZRXhadndSbmdMeUFHQ2Jod3R1eWU0d0VmSGU5MQowK3I4WXk4d2xG +Z3ZFN1A5TjhuRi9QNCsvVEcyVkRrTU9lcTZoWmRQa3pRCi0+IHBpdi1wMjU2IHBE +YXpSZyBBd05VQ1RNeCtuNjlkRGVKT216ZGtUaUlBNXpkcmhiUWRmcUUwbGVTZzdS +cQpSVXhYb25xejQvMDVNM0pZNDNLU0pjbHNpbkdXb2xJUUc2SHBseFFnY2gwCi0+ +IEpFLWdyZWFzZQp6Y2twenFsOWtkUzdzcXBGcjV2RVJhTGt0S3J5MUEycERqeFo1 +N0FFRGRwbjRlcVRpNm9CMXdMZXA4VkxOWVorCktmMVBMWlhsVlc4OG8xOHRLRG5n +Y3RXMDBMNmNYaE9BRDAzMmdYS2FxR1ZRV0NJCi0tLSBWT0hDTGdGcEZoOTN6UStK +emxDaEszVWV3dTZVbUVyYm05dnltUXhoand3CkwXpbsM2GD1+l3VIKZzf2ybP6el +/T/uX2ROE0wzjzkg04933U5ONjdEaY+XDsHdTaCBZ8zQBMoZWkxO8grHDHwlF0gW +iB2RnlgnfOVoXzJ8mIt3bm5gwpJesYSzFVVMvAbuc0OI0gDlLxUusOoeZnXzmaXn +F++pCBvN2OUG8qN+uougMN+5rgJczkhCkrnq1AK4uL62LYsuY2DYlvDE/4TEKwY/ +YS9+uZNrEwcTSDZ1yJLFr6fdCWD2Fup1vmD42X577oKbehvtHSq+tnp6jITq5tqI +w2NnR1QOKKHA807HLbvz0/UQw+534eGkECYHQBZVXwLBLcFqTsBQzuQA6B3KBFEe +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 -----END AGE ENCRYPTED FILE----- diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl index 615e2d8ab7e849bd325c381ee79cc61345be23b7..8402b46a24b4b0d397cffd641458f95a81de86a8 100644 --- a/dot_config/zsh/private_dot_zshrc.tmpl +++ b/dot_config/zsh/private_dot_zshrc.tmpl @@ -126,8 +126,8 @@ export PATH="$PATH:/usr/lib/kf5" # Additional preferences export LANG=en_GB.UTF-8 -export EDITOR='zeditor --wait' -export VISUAL='zeditor --wait' +export EDITOR="zeditor --wait" +export VISUAL="$EDITOR" export _JAVA_AWT_WM_NONREPARENTING=1 export MANPAGER="nvim +Man!" export COLUMNS=80 @@ -176,7 +176,7 @@ alias ts="tailscale" alias tmateqr='tmate show-messages | tail -n 1 | qrencode -o - -t ANSIUTF8' alias info="info --vi-keys" alias datetime="date +%Y-%m-%d_%H%M%S_%Z" -alias e="$EDITOR" +alias e="devour eval $EDITOR" alias u="linx-client" alias clip="xclip -selection clipboard" alias tmp="cd $(mktemp -d) && export TEMP=$(pwd)" @@ -186,7 +186,7 @@ alias mov="joshuto ~/Bulk/Media/Movies" alias tv="joshuto ~/Bulk/Media/TV\ Shows" alias yt="joshuto ~/Bulk/Media/YouTube" alias erase="shred -vzfun 32" -alias dl="yt-dlp -f bestvideo+bestaudio --write-sub --write-auto-sub --sub-lang en --sub-format srt/best --convert-subs srt --embed-subs -o '%(upload_date)s %(title)s.%(ext)s'" +alias dl="yt-dlp --write-sub --write-auto-sub --sub-lang en --sub-format srt/best --convert-subs srt --embed-subs -o '%(upload_date)s %(title)s.%(ext)s'" alias us="unsilence -t 15 -as 1.25" alias roll="roll -v" alias sxiv="sxiv -p" @@ -205,10 +205,28 @@ alias drafts='e $(rg -l "draft: true" $HOME/repos/personal/secluded | fzf --prev # Custom functions function pass() { - bw get password $@ | xclip -selection clipboard + bw get password $@ | xclip -selection clipboard } function gi() { - curl -sLw https://www.toptal.com/developers/gitignore/api/$@ ; + curl -sLw https://www.toptal.com/developers/gitignore/api/$@ ; +} + +sshedit() { + emulate -L zsh + setopt err_exit no_unset pipe_fail + + local tmpdir=$(mktemp -d) + chmod 700 "$tmpdir" + pushd "$tmpdir" > /dev/null + local remote_host="$1" + local remote_file="$2" + local local_file="${remote_file:t}" # ZSH way to get basename + + rsync -az "${remote_host}:${remote_file}" "$local_file" + eval "$EDITOR $local_file" + rsync -az "$local_file" "${remote_host}:${remote_file}" + popd > /dev/null + rm -rf "$tmpdir" } # Navi integration @@ -236,6 +254,8 @@ source $XDG_CONFIG_HOME/zsh/completions/starship.zsh source $XDG_CONFIG_HOME/zsh/completions/antidot.zsh source $XDG_CONFIG_HOME/zsh/completions/klog.zsh source $XDG_CONFIG_HOME/zsh/completions/chezmoi.zsh +source $XDG_CONFIG_HOME/zsh/completions/himalaya.zsh +eval "$(op completion zsh)"; compdef _op op eval "$(starship init zsh)"