diff options
| -rw-r--r-- | .config/bash/bashrc | 2 | ||||
| -rw-r--r-- | .config/kak/autoload/diff.kak | 5 | ||||
| -rw-r--r-- | .config/shell/profile | 1 | ||||
| -rwxr-xr-x | .local/bin/unlock-sign-key | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/.config/bash/bashrc b/.config/bash/bashrc index c7df633..0d8e415 100644 --- a/.config/bash/bashrc +++ b/.config/bash/bashrc @@ -10,7 +10,7 @@ fi [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/bash/local.bashrc" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/bash/local.bashrc" [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/bash/complete_alias" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/bash/complete_alias" -export PS1='\[\e]0;\w $(test "$IN_KAKOUNE_CONNECT" && printf '%s' "- $KAKOUNE_CLIENT@[$KAKOUNE_SESSION]")$(test "$TERM" && printf '%s' "- $TERM")\a\]\n\[\e[32m\]\u@\h \e[34m$(test "$IN_KAKOUNE_CONNECT" && printf '%s' "¶$KAKOUNE_SESSION") \[\e[33m\]\w\[\e[0m\] \[\e[1;91m\]$(branch="$(git branch --show-current 2>/dev/null)" && test "$branch" && printf '%s' " $branch")\[\e[0m\]\n\[\e[1;36;1m\]λ\[\e[0m\] ' +export PS1='\[\e]0;\w $(test "$IN_KAKOUNE_CONNECT" && printf '%s' "- $KAKOUNE_CLIENT@[$KAKOUNE_SESSION]")$(test "$TERM" && printf '%s' "- $TERM")\a\]\n\[\e[32m\]\u@\h \e[34m$(test "$IN_KAKOUNE_CONNECT" && printf '%s' "¶$KAKOUNE_SESSION") \[\e[33m\]\w\[\e[0m\] $(w="$(terraform workspace show; ls *.tf >/dev/null 2>&1)" && test "$w" && printf '%s' "🥡 $w") \[\e[1;91m\]$(branch="$(git branch --show-current 2>/dev/null)" && test "$branch" && printf '%s' " $branch")\[\e[0m\]\n\[\e[1;36;1m\]λ\[\e[0m\] ' export PROMPT_DIRTRIM=3 export PROMPT_COMMAND='history -a' export HISTSIZE=100000 diff --git a/.config/kak/autoload/diff.kak b/.config/kak/autoload/diff.kak index 257990b..0edeb08 100644 --- a/.config/kak/autoload/diff.kak +++ b/.config/kak/autoload/diff.kak @@ -89,3 +89,8 @@ enter-diff-mode %{ map global user d ':enter-diff-mode<ret>' -docstring 'Mappings for interacting with diffs!' map global diff s ':diff-selections<ret>' -docstring 'diff on selections or selection and reg_d' map global diff t ':diff-this<ret>' -docstring 'diff on selections or selection and reg_d' + +hook global WinSetOption filetype=diff %{ + map buffer normal <ret> :diff-jump<ret> + map buffer normal - %[:diff-jump -<ret>] +} diff --git a/.config/shell/profile b/.config/shell/profile index a6e8bd5..7f7773c 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -21,6 +21,7 @@ if [ "$(uname -s)" = "Darwin" ]; then brewpath="/opt/homebrew" export PATH="/usr/local/bin:$brewpath/bin:$PATH" + export PATH="$brewpath/share/google-cloud-sdk/bin:$PATH" export PATH="$brewpath/opt/findutils/libexec/gnubin:$PATH" export PATH="$brewpath/opt/util-linux/bin:$brewpath/opt/util-linux/sbin:$PATH" export PATH="$brewpath/opt/curl/bin:$PATH" diff --git a/.local/bin/unlock-sign-key b/.local/bin/unlock-sign-key new file mode 100755 index 0000000..7402296 --- /dev/null +++ b/.local/bin/unlock-sign-key @@ -0,0 +1,2 @@ +#!/bin/sh +echo "dummy" | gpg --sign --batch -o /dev/null |