zsh: remove erroneously retained merge text

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 8fa153de1cab484b90a6d9569491106f0f5255d9..d1d10ddb528e0bbcef30e58dfc3dffc92a30b2cb 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -22,12 +22,6 @@ 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/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
@@ -143,7 +137,7 @@ if [[ ! -v _sev_force_zkbd && ( -v terminfo || -v termcap ) ]] {
     if [[ -n $keymap ]] {
         source $keymap
     } else {
-        echo "Failed to source keymap file $keymap" >&2
+        echo -E "Failed to source keymap file $keymap" >&2
     }
     unfunction find_keymap; unset keymap
 }
@@ -257,6 +251,7 @@ unset ps
 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'
+alias ga.='git add .'
 alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
@@ -271,8 +266,14 @@ if [[ -v commands[zoxide] ]] {
     eval "${$(zoxide init zsh):s#_files -/#_cd#}"
     alias cd=z
 }
+alias cd..=up
 ## dotfiles
-alias dfu='d=${$(echo ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d git pull'
+alias dfu='d=${$(echo -E - ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d {
+  git pull &&
+  git submodules init &&
+  git submodules sync &&
+  git submodules update
+}'
 
 ### hooks
 autoload -Uz add-zsh-hook
@@ -345,7 +346,7 @@ case $OSTYPE; in
         function vol {
             if [[ -z "$1" ]] {
                 for x in $(mixerctl -a | grep 'outputs\.master'); do
-                    echo $x
+                    echo -E - $x
                 done
                 return
             }