diff --git a/.config/@web/cli/web-cli-update b/.config/@web/cli/web-cli-update index d334f3d..5fc80fc 100644 --- a/.config/@web/cli/web-cli-update +++ b/.config/@web/cli/web-cli-update @@ -1 +1 @@ -{"exp":1730400318321,"latestVersion":"2.28.72"} \ No newline at end of file +{"exp":1731441694462,"latestVersion":"2.28.76"} \ No newline at end of file diff --git a/.gitconfig b/.gitconfig index 7991046..48c0983 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,6 +3,12 @@ name = Joe Lillibridge #email = joe@lillibridge.email #signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILoyiVVnKMnTDgtals13aXoBarPzwyRlKMhVugOj15ap +[push] +autoSetupRemote = true + +[init] +defaultBranch = main + [gpg] format = ssh @@ -62,5 +68,3 @@ remotecopy = "!git remotehttps | pbcopy" [include] path = .gitconfig.local -[push] -autoSetupRemote = true diff --git a/.zshrc b/.zshrc index 94b2877..e247114 100644 --- a/.zshrc +++ b/.zshrc @@ -92,6 +92,23 @@ if [ "$system_type" = "Darwin" ]; then [ -f $HOME/.config/op/plugins.sh ] && source ~/.config/op/plugins.sh [ -e $HOME/.iterm2_shell_integration.zsh ] && source $HOME/.iterm2_shell_integration.zsh [ -f /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh ] && source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh + if [ -d /Applications/ShellHistory.app/Contents/Helpers ]; then + # adding shhist to PATH, so we can use it from Terminal + export PATH="${PATH}:/Applications/ShellHistory.app/Contents/Helpers" + + # creating an unique session id for each terminal session + __shhist_session="${RANDOM}" + + # prompt function to record the history + __shhist_prompt() { + local __exit_code="${?:-1}" + \history -D -t "%s" -1 | sudo --preserve-env --user ${SUDO_USER:-${LOGNAME}} shhist insert --session ${TERM_SESSION_ID:-${__shhist_session}} --username ${LOGNAME} --hostname $(hostname) --exit-code ${__exit_code} --shell zsh + return ${__exit_code} + } + + # integrating prompt function in prompt + precmd_functions=(__shhist_prompt $precmd_functions) + fi fi $HOME/.iterm2/it2check