From 0f9a9d9d8d841f50caba4796916064a452484132 Mon Sep 17 00:00:00 2001 From: inkch Date: Tue, 25 Jun 2024 13:53:02 +0900 Subject: [PATCH] fish: miscellaneous --- .../private_fish/abbreviations.fish.tmpl | 9 +- dot_config/private_fish/env.fish.tmpl | 6 + .../functions/encrypted_update-all.fish.age | 110 +++++++++--------- 3 files changed, 67 insertions(+), 58 deletions(-) diff --git a/dot_config/private_fish/abbreviations.fish.tmpl b/dot_config/private_fish/abbreviations.fish.tmpl index f10ac41..4b6f070 100644 --- a/dot_config/private_fish/abbreviations.fish.tmpl +++ b/dot_config/private_fish/abbreviations.fish.tmpl @@ -181,16 +181,19 @@ abbr trl "transmission-remote -l" abbr trc "transmission-remote-cli" # Git +abbr g 'git' abbr gs 'git status' abbr gfe 'git fetch' abbr gfa 'git fetch --all' abbr gco 'git checkout' abbr gcob 'git checkout -b' +abbr gcm 'git commit -m' abbr gcma 'git commit -am' abbr gbr 'git branch' abbr gbra 'git branch -a' abbr gd 'git diff' -abbr gl 'git log --graph --decorate --oneline --date=iso' +abbr gl 'git log -p --ext-diff' +abbr glg 'git log --graph --decorate --oneline --date=iso' abbr gemp 'git commit --allow-empty -m' abbr gps "git remote | fzf -1 | xargs -I'{}' git push {}" abbr gpl "git remote | fzf -1 | xargs -I'{}' git pull {}" @@ -199,7 +202,7 @@ abbr gpl "git remote | fzf -1 | xargs -I'{}' git pull {}" abbr rm 'rm -i' abbr rmi 'rm -I' abbr rmr 'rm -rI' -abbr rmd 'rmdir (fd -t d -t e)' +abbr rmd 'rmdir --ignore-fail-on-non-empty --parents (fd -t d -t e)' # abbr for `wishlist` (fish function) abbr wish 'wishlist' @@ -230,7 +233,7 @@ if type -q exa; end if type -q watchexec; - abbr wax 'watchexec' + abbr wex 'watchexec' end ## Use enhanced 'find' diff --git a/dot_config/private_fish/env.fish.tmpl b/dot_config/private_fish/env.fish.tmpl index 2c86917..00061fa 100644 --- a/dot_config/private_fish/env.fish.tmpl +++ b/dot_config/private_fish/env.fish.tmpl @@ -175,3 +175,9 @@ if type -q ksshaskpass: set -x SUDO_ASKPASS (which ksshaskpass) end {{- end }} + +{{- if (eq .chezmoi.hostname "arch") }} +if type -q ollama + set -x OLLAMA_HOST "10.0.2.1:11434" +end +{{- end }} diff --git a/dot_config/private_fish/functions/encrypted_update-all.fish.age b/dot_config/private_fish/functions/encrypted_update-all.fish.age index 4f41441..bd68eef 100644 --- a/dot_config/private_fish/functions/encrypted_update-all.fish.age +++ b/dot_config/private_fish/functions/encrypted_update-all.fish.age @@ -1,57 +1,57 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dVNIMlRRa0JSTmsycGFp -Q2FCc2NRSktsR25ZSysxVGQzeUNUWUxNeWtBCjJkNzhJZnZTZDdLSnRHVFlDMUdo -MWMrb0VLSFRMZ0tMNks4VUtuRXE2b2MKLS0tIExuUDdYSTM2ZWpXRnJvMUR3ZTZR -alJiVHRFaW9iRisyKy9oSnBFcEJKUVUKEmmj6QWfmT5k47zACyb0tsbsAj6jU4mQ -ml3uZ0B3BQbw5GdG6J/m1UzY5u9pikSVrlYuwoFRFcMO/kQfoneAk0ZTIWeNGndT -5uSs9RphadJdgfvRki0nXXk+GvxYhppPVOAP28LWsn4UnJ0gfOV41rcXpfMUlyt0 -9SDXZPf3WzV89t81aPLEvWfygsKvAZffN564yvlCZi0bTQ2vDIfIVhsu/PjBxlCa -9njjYosnqQxqsrNxV+GKpFPrhM92VXasjpFanFI+qJ6nH4zN5pg/LPY2H28zNSyN -jlfYspUZ6xj3f3UGa7JGeCZfLtEGVPifRLjtye9TlbizT0WU8x7QBE12XT1ur7gi -9pb6AXoQHF7vW1czLV2hAwV7f1rALIRrfZimNRIy3i3St7CHhEobMZS12+hqaafU -pqvC7YtE4+agutVCyTgSwENPjxWz6tDDNWFWI7YCeFuPZpAXYLGtnRuZEjqY3QGY -xgdTU+PtdXUn1OtcYBKujbM/AwmvMrYI+NRDeL96y8iSNFkQacN4NCTrJfwcSAAs -3Wn3S0I3mQUchRvztBxJygmKboTuLaYsDmulXy7YKGw/yXQbgspJfVBwW+M2bsBW -w+dgvuGC8LWhdOChjOZIaG1mkqiFH8WP9uvh2qgDdNcx5WWL/mVDgZyK6L1qF/zy -0j2cEuFb5DVGnIitA6RGairydZq3M4JFblUqRvu1tfYnRceSUVYNy3q00EebGa4q -RGTjMXsLLdCXUZNGx+PveH6uyvpx90EH6XHO8sv7pk4uEI++znQphcniEbLv1Lcx -oyDoCSnu2pcH2i3ZGLnxEuYFBE1mZqsgIrjPPbTlfJntsgqFKvfeLaz36P/qwblS -ET6MBZPmL68qtY4syCmKna3pfcDSUOSIXZ6GiCu9XJHp0HA2B7OCjrxWtrBu87nm -G29ezSDp+N9UubXkE7IoOUkS0AbK0IQkdt7b/hc2X9rhKsAKCXQigzByatY9z+dx -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 -JBUB3o8jMQ4= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkeml0aE1HOVNjL3hTZExQ +ckJtREpPNDNVK0l6dEpNTXFBYnZ0T0JiREdrCkVuRXBCbCtISHZzRDY2cTk5ZWlH +THpWa2oxdCtDNzdTRnp1SUlHKzh0ZE0KLS0tIHIxTHh3V255eTl1L0JOSnV2S2pF +ai9zYXJsL1RULzkrUU5nY0lqZ1krcncKPIF+AZc4bs9FwOkAkoPBhNEpY/4yUqn3 +Bz/4eYvEMPqAkSveY3VNVhVYIt9N1F+t5CdZTkgCwJ7HYMO96YKcNaXUvXuX6QnI +OFM8B5oNBS2wshabHa9/KuOh+Mxwf5SXCopXpsVx11SsCoA7cSwzINiqgI8oWAEY +ln0RhyYcI+vseJsJWvUNRUVoyYVks/ezSX+GRIw1evup/IslbWO1TUcN+mZzcgnJ +qIxS6D8+SWTOjWLzJ2LGoR3xTmtkOa6R6ryy3+Y+M5xtxyN6P9Ci9ZDbph3gI1Vz +FntdSvA3d3oU+CfgjFGEdUxjKxPnBmQ0LKy4TaBt04O/vda1j/bqwHNqPhG0Lkt4 +hMmfDKes1/8RZEndCyVVqsSs7uerkPscxDxv3gvEDVd8RlyVF1X3l3DIwBbDDgWb +bpxSc+g+J57nxEmZuzkkqy656ssLK04dK9J9nQ5JfmOO46/UzSY+Q0KC+9Txh6JP +VMo2mEFL129tugw38OhOcerWpIn19O40MbemJGeyFoSQo6WZgkEs/AH2pD45CCJa +YjB906Y3vXNicpZFtcDcqrDc8anlDRXKVJSQs/LBqgVx+lAsVchTkFJcINR7vz27 +9pZjrooBX1T0t28L9VIsu2jZiMDhi1J2TUTL8wmNjvW1FCrI0WXJ2utzcA1ir+h9 +msN4XX5jX/I26Yq8dvfLYqVbAZVDyJOkm9X9ziOJ7jojQbWY+tQDpDc4XrQ8Cfqb +Renve3AX9jQaZwc/yhTp8Rr5+jebpi5KmTNaL5aSyiSRzbd1OOhQgVLh14iNs9be +Emebp655/Ry+1NGy4QZXuUXljRO2IuEkY5E1JKifpXfdl1hBaQ6pMDQlmW+92Ekw +DeezwNW/IQY/RuRDYB3rc26RE46EdZkdMQ+BefB677qma8m1dIKAckAuTLTOmpa6 +PeQtF3ounP1nJbHxTHDHZjromgfVAWohae3V8MjpBNo7ZmLSnIgzSXLBZMOqYc4S +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 +WdldjAe2eIo= -----END AGE ENCRYPTED FILE-----