diff --git a/cli/git/alias.zsh b/cli/git/alias.zsh index 2447942..59c7bad 100644 --- a/cli/git/alias.zsh +++ b/cli/git/alias.zsh @@ -8,6 +8,7 @@ push() } alias "s"="git status" +alias "gs"="git status" alias "gp"="git pull" alias "gP"="git push" alias "gl"="git log" diff --git a/cli/misc/alias.zsh b/cli/misc/alias.zsh index 75b864d..600d574 100644 --- a/cli/misc/alias.zsh +++ b/cli/misc/alias.zsh @@ -1,7 +1,9 @@ alias "jctl"="sudo journalctl -n 1000 -fu" -alias "open"="xdg-open" -alias "op"="xdg-open" +if ! type open &> /dev/null; then + alias "open"="xdg-open" +fi +alias "op"="open" alias "ssh"="kitty +kitten ssh" diff --git a/cli/zsh/config/zsh/zshrc b/cli/zsh/config/zsh/zshrc index f98c84d..bfa7471 100644 --- a/cli/zsh/config/zsh/zshrc +++ b/cli/zsh/config/zsh/zshrc @@ -1,10 +1,10 @@ +[[ -f ~/.localrc ]] && source ~/.localrc source ~/.config/profile export -U PATH=$PATH alias edit=$EDITOR -[[ -f ~/.localrc ]] && source ~/.localrc [[ -f $XDG_CONFIG_HOME/zsh/localrc ]] && source $XDG_CONFIG_HOME/zsh/localrc [[ -f $XDG_CONFIG_HOME/profile ]] && source $XDG_CONFIG_HOME/profile @@ -48,10 +48,20 @@ function zvm_after_init() bindkey '^H' backward-kill-word bindkey '5~' kill-word -ZSH=/usr/share/oh-my-zsh/ -ZSH_CUSTOM=/usr/share/zsh +if type brew &>/dev/null; then + ZSH=~/.oh-my-zsh + source $(brew --prefix)/opt/powerlevel10k/powerlevel10k.zsh-theme + + + FPATH=$(brew --prefix)/share/zsh-completions:$FPATH +else + ZSH=/usr/share/oh-my-zsh/ + ZSH_CUSTOM=/usr/share/zsh + source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme +fi + + zstyle ':omz:update' mode disabled -source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n]