update
This commit is contained in:
parent
e1c96bc1d2
commit
317c7d208d
16 changed files with 699 additions and 255 deletions
209
.zshrc
209
.zshrc
|
|
@ -1,40 +1,21 @@
|
|||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export POWERSHELL_TELEMETRY_OPTOUT=1
|
||||
export PROMPT_EOL_MARK=''
|
||||
export FZF_DEFAULT_OPTS="--preview 'bat --color=always {}'"
|
||||
export EDITOR='nvim'
|
||||
export GEM_HOME="$HOME/gems"
|
||||
export PATH="$HOME/.local/bin:$HOME/gems/bin:/usr/local/go/bin:$HOME/go/bin:/home/linuxbrew/.linuxbrew/bin:$PATH"
|
||||
export GOBIN=~/go/bin
|
||||
export BAT_THEME="Catppuccin Mocha"
|
||||
export LS_COLORS="$(vivid generate catppuccin-mocha)"
|
||||
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=none,fg=white,bold"
|
||||
#eval $(thefuck --alias)
|
||||
# Generate Completions if not found
|
||||
if [ ! -f $HOME/.config/shell/fzf.completion.zsh ]; then
|
||||
fzf --zsh > $HOME/.config/shell/fzf.completion.zsh
|
||||
fi
|
||||
|
||||
alias tf=tofu
|
||||
alias terraform=tofu
|
||||
alias k=kubectl
|
||||
alias ls='ls --color'
|
||||
alias vim='nvim'
|
||||
alias c='clear'
|
||||
alias pwsh='pwsh -NoLogo'
|
||||
alias pbpaste='xclip -selection clipboard -o'
|
||||
alias ls='eza'
|
||||
alias ll='eza -l'
|
||||
alias lg='lazygit'
|
||||
alias tree='eza -T'
|
||||
alias cat='bat -P'
|
||||
alias network='nmtui'
|
||||
#alias docker='podman'
|
||||
alias sudo='sudo '
|
||||
alias grep='rg'
|
||||
alias connectvpn='sudo openvpn ~/Documents/openvpn/openvpn.ovpn'
|
||||
alias gc='git commit -a'
|
||||
alias gd='git diff'
|
||||
alias gp='git push'
|
||||
alias bw='NODE_OPTIONS="--no-deprecation" bw'
|
||||
if [ ! -f $HOME/.config/shell/zoxide.completions.zsh ]; then
|
||||
zoxide init --cmd cd zsh > $HOME/.config/shell/zoxide.completions.zsh
|
||||
fi
|
||||
|
||||
if [ ! -f $HOME/.config/shell/bw.completions.zsh ]; then
|
||||
bw completion --shell zsh > $HOME/.config/shell/bw.completions.zsh
|
||||
fi
|
||||
|
||||
# Load seperated config files
|
||||
for conf in "$HOME/.config/shell/"*.zsh; do
|
||||
source "${conf}"
|
||||
done
|
||||
unset conf
|
||||
|
||||
if command -v tmux &> /dev/null && [[ "$TERMINAL_EMULATOR" == "JetBrains-JediTerm" ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
|
||||
cwd=$(pwd)
|
||||
|
|
@ -82,7 +63,7 @@ zinit light zsh-users/zsh-completions
|
|||
zinit light zsh-users/zsh-autosuggestions
|
||||
zinit light Aloxaf/fzf-tab
|
||||
|
||||
zinit wait lucid for OMZP::{'git','sudo','archlinux','aws','kubectl','kubectx','command-not-found','web-search','jsontools','copypath','copyfile','copybuffer','dirhistory'}
|
||||
#zinit wait lucid for OMZP::{'git','sudo','archlinux','aws','kubectl','kubectx','command-not-found','web-search','jsontools','copypath','copyfile','copybuffer','dirhistory'}
|
||||
# Add in snippets
|
||||
#zinit snippet OMZP::git
|
||||
#zinit snippet OMZP::sudo
|
||||
|
|
@ -132,157 +113,3 @@ zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
|
|||
zstyle ':completion:*' menu no
|
||||
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath'
|
||||
zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
|
||||
|
||||
# Generate Completions if not found
|
||||
if [ ! -f ~/.fzf.completion.zsh ]; then
|
||||
fzf --zsh > ~/.fzf.completion.zsh
|
||||
fi
|
||||
|
||||
if [ ! -f ~/.zoxide.completions.zsh ]; then
|
||||
zoxide init --cmd cd zsh > ~/.zoxide.completions.zsh
|
||||
fi
|
||||
|
||||
if [ ! -f ~/.bw.completions.zsh ]; then
|
||||
bw completion --shell zsh > ~/.bw.completions.zsh
|
||||
fi
|
||||
|
||||
source ~/.fzf.completion.zsh
|
||||
source ~/.fzf.key-bindings.zsh
|
||||
source ~/.zoxide.completions.zsh
|
||||
source ~/.bw.completions.zsh
|
||||
|
||||
unlockbw ()
|
||||
{
|
||||
export BW_SESSION="$(bw unlock $(secret-tool lookup drive bitwarden) --raw)"
|
||||
export GITLAB_TOKEN="$(bw get password cli-gitlab)"
|
||||
export OLLAMA_TOKEN="$(bw get password cli-ollama-token)"
|
||||
}
|
||||
lockbw ()
|
||||
{
|
||||
unset BW_SESSION
|
||||
unset GITLAB_TOKEN
|
||||
unset OLLAMA_TOKEN
|
||||
}
|
||||
|
||||
unlockvault() {
|
||||
local POD_NAME="vault-0"
|
||||
local NAMESPACE="vault"
|
||||
local UNSEAL_KEY=$VAULT_UNSEAL
|
||||
local PASSWORD=$VAULT_TOKEN
|
||||
local K8S_API_SERVER=$(kubectl exec -it $POD_NAME -n $NAMESPACE -- printenv | grep KUBERNETES_SERVICE_HOST | cut -d "=" -f2)
|
||||
local JWT=$(kubectl exec -it $POD_NAME -n $NAMESPACE -- cat /var/run/secrets/kubernetes.io/serviceaccount/token)
|
||||
|
||||
kubectl exec -it $POD_NAME -n $NAMESPACE -- /bin/sh << EOF
|
||||
vault operator unseal $UNSEAL_KEY
|
||||
vault login $PASSWORD
|
||||
vault write auth/kubernetes/config \
|
||||
token_reviewer_jwt="${JWT}" \
|
||||
kubernetes_host="https://${K8S_API_SERVER}:443" \
|
||||
kubernetes_ca_cert=@/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
|
||||
EOF
|
||||
}
|
||||
|
||||
tmux-new () {
|
||||
local -r name=${(U)1-"$(basename $(pwd))"}
|
||||
tmux new-session -d -s $name
|
||||
tmux switch-client -t $name
|
||||
}
|
||||
|
||||
load-profile () {
|
||||
ansible-playbook /home/user/.dotfiles/ansible/.config/ansible/local.yml -K
|
||||
}
|
||||
|
||||
function omz_urlencode() {
|
||||
emulate -L zsh
|
||||
local -a opts
|
||||
zparseopts -D -E -a opts r m P
|
||||
|
||||
local in_str="$@"
|
||||
local url_str=""
|
||||
local spaces_as_plus
|
||||
if [[ -z $opts[(r)-P] ]]; then spaces_as_plus=1; fi
|
||||
local str="$in_str"
|
||||
|
||||
# URLs must use UTF-8 encoding; convert str to UTF-8 if required
|
||||
local encoding=$langinfo[CODESET]
|
||||
local safe_encodings
|
||||
safe_encodings=(UTF-8 utf8 US-ASCII)
|
||||
if [[ -z ${safe_encodings[(r)$encoding]} ]]; then
|
||||
str=$(echo -E "$str" | iconv )
|
||||
if [[ $? != 0 ]]; then
|
||||
echo "Error converting string from $encoding to UTF-8" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Use LC_CTYPE=C to process text byte-by-byte
|
||||
# Note that this doesn't work in Termux, as it only has UTF-8 locale.
|
||||
# Characters will be processed as UTF-8, which is fine for URLs.
|
||||
local i byte ord LC_ALL=C
|
||||
export LC_ALL
|
||||
local reserved=';/?:@&=+$,'
|
||||
local mark='_.!~*''()-'
|
||||
local dont_escape="[A-Za-z0-9"
|
||||
if [[ -z $opts[(r)-r] ]]; then
|
||||
dont_escape+=$reserved
|
||||
fi
|
||||
# $mark must be last because of the "-"
|
||||
if [[ -z $opts[(r)-m] ]]; then
|
||||
dont_escape+=$mark
|
||||
fi
|
||||
dont_escape+="]"
|
||||
|
||||
# Implemented to use a single printf call and avoid subshells in the loop,
|
||||
# for performance (primarily on Windows).
|
||||
local url_str=""
|
||||
for (( i = 1; i <= ${#str}; ++i )); do
|
||||
byte="$str[i]"
|
||||
if [[ "$byte" =~ "$dont_escape" ]]; then
|
||||
url_str+="$byte"
|
||||
else
|
||||
if [[ "$byte" == " " && -n $spaces_as_plus ]]; then
|
||||
url_str+="+"
|
||||
elif [[ "$PREFIX" = *com.termux* ]]; then
|
||||
# Termux does not have non-UTF8 locales, so just send the UTF-8 character directly
|
||||
url_str+="$byte"
|
||||
else
|
||||
ord=$(( [##16] #byte ))
|
||||
url_str+="%$ord"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
echo -E "$url_str"
|
||||
}
|
||||
|
||||
function open_command() {
|
||||
local open_cmd
|
||||
|
||||
# define the open command
|
||||
case "$OSTYPE" in
|
||||
darwin*) open_cmd='open' ;;
|
||||
cygwin*) open_cmd='cygstart' ;;
|
||||
linux*) [[ "$(uname -r)" != *icrosoft* ]] && open_cmd='nohup xdg-open' || {
|
||||
open_cmd='cmd.exe /c start ""'
|
||||
[[ -e "$1" ]] && { 1="$(wslpath -w "${1:a}")" || return 1 }
|
||||
} ;;
|
||||
msys*) open_cmd='start ""' ;;
|
||||
*) echo "Platform $OSTYPE not supported"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# If a URL is passed, $BROWSER might be set to a local browser within SSH.
|
||||
# See https://github.com/ohmyzsh/ohmyzsh/issues/11098
|
||||
if [[ -n "$BROWSER" && "$1" = (http|https)://* ]]; then
|
||||
"$BROWSER" "$@"
|
||||
return
|
||||
fi
|
||||
|
||||
${=open_cmd} "$@" &>/dev/null
|
||||
}
|
||||
|
||||
if [ -e /home/user/.nix-profile/etc/profile.d/nix.sh ]; then . /home/user/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
# Install Ruby Gems to ~/gems
|
||||
export GEM_HOME="$HOME/gems"
|
||||
export PATH="$HOME/gems/bin:$PATH"
|
||||
source $(brew --prefix)/share/zsh-history-substring-search/zsh-history-substring-search.zsh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue