From 297d49d5cad6fdd3fdb3e6719f7ffb41b5deb4ee Mon Sep 17 00:00:00 2001 From: "xiongdian.me" Date: Wed, 16 Nov 2022 15:03:08 +0800 Subject: [PATCH] improve git-branches; util-linux --- .zshrc2 | 8 ++++---- tools/alpine.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.zshrc2 b/.zshrc2 index e2009ab..68f9327 100644 --- a/.zshrc2 +++ b/.zshrc2 @@ -88,14 +88,14 @@ alias "se"='sudo -sE' alias "pbd"='ping baidu.com' alias "p114"='ping 114.114.114.114' alias "p666"='ping6 2001:da8::666' -alias "git-branches"='git for-each-ref --sort=-committerdate refs/heads refs/remotes --format="%(authordate:format:%y-%m-%d %H:%M)|%(color:red)%(objectname:short)|%(color:yellow)%(refname:short)%(color:reset)|%(color:reset)%(authorname): %(color:green)%(subject)" --color=always | column -ts"|"' -sibd() { ssh -p 12022 root@$1${1:+.}ibd.ink } -sob() { ssh -p 24022 root@$1${1:+.}ob.ac.cn } -snasp() { ssh -o ProxyJump="ssh@nasp.ob.ac.cn:36022" dictxiong@$1 } case $(bash "$DOTFILES/tools/common.sh" get_os_type) in macos ) alias l='ls -lAGh -D "%y-%m-%d %H:%M"' ;; * ) alias l='ls -lAGh --time-style="+%y-%m-%d %H:%M"' ;; esac +sibd() { ssh -p 12022 root@$1${1:+.}ibd.ink } +sob() { ssh -p 24022 root@$1${1:+.}ob.ac.cn } +snasp() { ssh -o ProxyJump="ssh@nasp.ob.ac.cn:36022" dictxiong@$1 } +git-branches() { git for-each-ref --sort=-committerdate refs/heads refs/remotes --format="%(authordate:format:%y-%m-%d.%a %H:%M %z)|%(color:red)%(objectname:short)|%(color:yellow)%(refname:short)%(color:reset)|%(color:reset)%(authorname): %(color:green)%(subject)" --color=always --count=${1:-10} | column -ts"|" } piv-agent() { eval $(ssh-agent -k) diff --git a/tools/alpine.sh b/tools/alpine.sh index b98b6e1..0879e84 100755 --- a/tools/alpine.sh +++ b/tools/alpine.sh @@ -14,7 +14,7 @@ apk_add() apk update # mass installation - apk add zsh git tmux vim curl wget bash python3 py3-pip htop gcc g++ cmake make fzf perl linux-headers bind-tools iputils man-db coreutils + apk add zsh git tmux vim curl wget bash python3 py3-pip htop gcc g++ cmake make fzf perl linux-headers bind-tools iputils man-db coreutils util-linux #for i in {fzf,ripgrep}; do apk add $i -y; done }