zshrc: add more git aliases, dotfiles update alias

[dotfiles.git] / etc / zsh / .zshrc

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index d49afaad3ca717ecff82561aa94d179a67851e70..64c7c5e79266d90850b3c6b2289811ec01668278 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -22,13 +22,12 @@ export SAVEHIST=1000
 export PYTHONSTARTUP=${XDG_CONFIG_HOME:-~/.config}/pythonrc
 ## vim
 export VIMINIT='let$MYVIMRC=($XDG_CONFIG_HOME??($HOME."/.config"))."/vim/.vimrc"|execute"source"$MYVIMRC'
-## wayland/sway
-# XXX: only do this if we're actually in wayland, but without a start script
-export XDG_SESSION_TYPE=wayland
-export QT_QPA_PLATFORM=wayland-egl
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=-1
-export SDL_VIDEODRIVER=wayland
-export TERMINAL=${$(whence -p konsole footclient urxvt xterm)[(f)1]}
+## wayland/gui env
+export XDG_SESSION_TYPE=${XDG_SESSION_TYPE:-wayland}
+export QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-wayland-egl}
+export QT_WAYLAND_DISABLE_WINDOWDECORATION=${QT_WAYLAND_DISABLE_WINDOWDECORATION:--1}
+export SDL_VIDEODRIVER=${SDL_VIDEODRIVER:-wayland}
+export TERMINAL=${TERMINAL:-$(whence -p konsole footclient urxvt xterm)[(f)1]}
 
 ### imports
 autoload -Uz zmv
@@ -162,7 +161,10 @@ for k v in ${(kv)a}; do
 done
 unset a k v
 
-### abbreviation aliases
+### aliases
+## builtins
+alias rehash='_sev_setpath; rehash'
+## utils
 alias h='fc -l -25'
 alias j='jobs -l'
 alias l='ls -AF'
@@ -217,20 +219,25 @@ alias pa=$ps
 alias spa="sudo $ps"
 unset ps
 ## git
+alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'
 alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
+alias gu='git pull'
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
 }
 alias u=up
 if [[ -v commands[zoxide] ]] {
-    eval "$(zoxide init zsh)"
+    # https://github.com/ajeetdsouza/zoxide/issues/513
+    eval "${$(zoxide init zsh):s#_files -/#_cd#}"
     alias cd=z
 }
+## dotfiles
+alias dfu='d=${$(echo ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d git pull'
 
 ### hooks
 autoload -Uz add-zsh-hook
@@ -267,7 +274,7 @@ add-zsh-hook chpwd sev_chpwd
 ### system-specific configs and aliases
 case $OSTYPE; in
     freebsd*)
-        # colors
+        ## colors
         export CLICOLOR=
         export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
 
@@ -277,8 +284,8 @@ case $OSTYPE; in
 
         ## install port dependencies from pkg (like pkgsrc `bmake bin-install')
         # XXX: should probably use package-depends where possible, breaks when
-        #     port name is different to package name
-        #     (eg. graphics/sdl20 == sdl2, devel/glib20 == glib2, etc)
+        #      port name is different to package name
+        #      (eg. graphics/sdl20 == sdl2, devel/glib20 == glib2, etc)
         function portpkg {
             case "$1" {
             build|run)