From b76f62d81171cd6f4c1b419c3d2ce7ba31cf9a32 Mon Sep 17 00:00:00 2001 From: Bruno21 Date: Thu, 5 May 2022 08:33:11 +0200 Subject: [PATCH] 05-05-2022 --- .gitconfig | 5 +++++ .zshrc | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitconfig b/.gitconfig index 0c9b9bb..f738af1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,7 @@ [user] name = Bruno21 email = bruno@clicclac.info + signingkey = 2D5E6C772EC115C821BD6D8A4B92F1D584F5513F [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f @@ -8,3 +9,7 @@ required = true [pull] rebase = false +[commit] + gpgsign = false +[gpg] + program = /usr/local/bin/gpg diff --git a/.zshrc b/.zshrc index f10c429..01715fb 100644 --- a/.zshrc +++ b/.zshrc @@ -234,9 +234,9 @@ alias reload='source ~/.zshrc' alias change="bbedit ~/.zshrc" if [ -x "$(command -v exa)" ]; then - alias l='exa -lbhgUmaFG@ --time-style=default --git --color-scale --icons' - alias ltree='exa -lbhgUma@ --time-style=default --git --color-scale --icons --tree --level=3' - cd() { builtin cd "$@" && exa -lbhgUmaFG@ --time-style=default --git --color-scale --icons; } + alias l='exa -lbhgUmaFG@ --time-style=default --git --color-scale --icons && echo' + alias ltree='exa -lbhgUma@ --time-style=default --git --color-scale --icons --tree --level=3 && echo' + cd() { builtin cd "$@" && exa -lbhgUmaFG@ --time-style=default --git --color-scale --icons && echo; } elif $coreutils; then cd() { builtin cd "$@" && gls -lA --color; } @@ -352,6 +352,8 @@ b() { cd $str } +function dirdiff () { diff <(cd $1 && gfind | sort) <(cd $2 && gfind | sort) | colordiff | less -R; } + # ---------------------------- # 7.b GIT # ---------------------------- @@ -452,7 +454,7 @@ alias nextcloud='cd $HOME/Nextcloud' # --------------------------- alias qfind="find / 2>/dev/null -name " # qfind: Quickly search for file -alias find="find / 2>/dev/null " +#alias find="find / 2>/dev/null " ff () { /usr/bin/find . -name "$@" ; } # ff: Find file under the current directory ffs () { /usr/bin/find . -name "$@"'*' ; } # ffs: Find file whose name starts with a given string @@ -773,5 +775,7 @@ zstyle ":plugin:history-search-multi-word" clear-on-cancel "no" # Whether export GPG_ID=bruno@clicclac.info +#neofetch + # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh