diff --git a/.zshrc.local b/.zshrc.local index 6e53fee..a80d258 100644 --- a/.zshrc.local +++ b/.zshrc.local @@ -12,8 +12,6 @@ alias ll='ls -l' alias la='ls -a' alias lla='ls -al' alias color-picker='grim -g "$(slurp -p)" -t ppm - | convert - -format "%[pixel:p{0,0}]" txt:-' -alias foundryvtt='pushd ~/Games/FoundryVTT && (node resources/app/main.js --dataPath="$HOME/.local/share/FoundryVTT/" && popd) || popd' -alias ts='watson log -dcj | watson2timesheet' # Prompt autoload -U colors zsh/terminfo @@ -37,11 +35,6 @@ zstyle ':prompt:grml:left:items:percent' token '%(!.#.❯) ' zstyle ':prompt:grml:left:items:percent' pre "%{$fg[green]%}" zstyle ':prompt:grml:left:items:percent' post "%{$reset_color%}" -# SSH agent -if hash keychain 2>/dev/null; then - eval `keychain --quiet --agents ssh --eval` -fi - # fzf [ -s "/usr/share/fzf/key-bindings.zsh" ] && . "/usr/share/fzf/key-bindings.zsh" [ -s "/usr/share/fzf/completion.zsh" ] && . "/usr/share/fzf/completion.zsh" @@ -51,10 +44,9 @@ if hash fnm 2>/dev/null; then eval "$(fnm env)" fi -# SDKMAN! -export SDKMAN_DIR="$HOME/.sdkman" -[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ] && . "$SDKMAN_DIR/bin/sdkman-init.sh" - # Go export GOPATH="$HOME/Development/go" -export PATH="$PATH:$HOME/Development/go/bin" \ No newline at end of file +export PATH="$PATH:$HOME/Development/go/bin" + +# Individual configuration +. "$HOME/.zshrc.local.local" diff --git a/.zshrc.local.local##default b/.zshrc.local.local##default new file mode 100644 index 0000000..d5ba483 --- /dev/null +++ b/.zshrc.local.local##default @@ -0,0 +1,4 @@ +# SSH agent +export GPG_TTY="$(tty)" +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent diff --git a/.zshrc.local.local##hostname.avior b/.zshrc.local.local##hostname.avior new file mode 100644 index 0000000..ead6bf6 --- /dev/null +++ b/.zshrc.local.local##hostname.avior @@ -0,0 +1,11 @@ +# SSH agent +if hash keychain 2>/dev/null; then + eval `keychain --quiet --agents ssh --eval` +fi + +# Watson +alias ts='watson log -dcj | watson2timesheet' + +# SDKMAN! +export SDKMAN_DIR="$HOME/.sdkman" +[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ] && . "$SDKMAN_DIR/bin/sdkman-init.sh"