X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=7222619ca0b86c08de528ba30bc082951f3174a2;hb=363110875986d10c37122e5b430f357520504d8a;hp=71e07dd70617c1f3501d827dbdef849b8c0c5ed5;hpb=b1cde8ad485e24b740e769acd3b1c7b86b9a0115;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 71e07dd..7222619 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -351,6 +351,7 @@ zshrc_longrun_preexec() {
 
     # Don't track the time for certain (possible) long running processes which
     # need no automatic notification.
+    local ignore
     for ignore in elinks man mutt vim; do
         case $program in
             $ignore | $ignore\ *)
@@ -790,6 +791,7 @@ compdef slocate=locate
 compdef srsync=rsync
 compdef srsync-incremental=rsync
 compdef svalgrind=valgrind
+compdef sc=systemctl
 
 
 # CUSTOM ALIASES AND FUNCTIONS
@@ -845,6 +847,7 @@ alias -g S='| sort'
 alias -g SL='| sort | less'
 alias -g T='| tail'
 alias -g U='| uniq'
+alias -g X='`xsel -p || xclip -o`' # X selection
 
 # Make going up directories simple.
 alias -g ...='../..'
@@ -993,6 +996,11 @@ if [[ $LD_PRELOAD != *libcoloredstderr.so* ]]; then
             printf '\e[91m%s\e[0m' $line
             print -n $'\0'
         done &)
+
+        # Reset doesn't work with this hack.
+        reset() {
+            command reset "$@" 2>&1
+        }
     fi
 fi
 
@@ -1073,4 +1081,39 @@ zshrc_restart_precmd() {
 }
 precmd_functions+=(zshrc_restart_precmd)
 
+
+# RELOAD SETTINGS
+
+zshenv_reload_time=0 # load before first command
+zshenv_boot_time=$(date -d "$(uptime -s)" '+%s') # uptime in epoch seconds
+
+# Automatically source ~/.zsh/env.update when the file changes (and exists).
+# Can be used e.g. to update SSH_AGENT_PID and GPG_AGENT_INFO variables in
+# running zsh processes. Sourced immediately before executing shell commands
+# (preexec) to ensure the environment is always up to date.
+zshenv_reload_preexec() {
+    local file
+    file=~/.zsh/env.update
+
+    local stat
+    if ! zstat -A stat +mtime $file 2>/dev/null; then
+        return
+    fi
+    # File was modified before reboot. Skip it to prevent loading of old
+    # values.
+    if [[ $stat -lt $zshenv_boot_time ]]; then
+        return
+    fi
+    # File wasn't modified, nothing to do.
+    if [[ $stat -le $zshenv_reload_time ]]; then
+        return
+    fi
+    zshenv_reload_time=$EPOCHSECONDS
+
+    unsetopt warn_create_global
+    . $file
+    setopt warn_create_global
+}
+preexec_functions+=(zshenv_reload_preexec)
+
 # vim: ft=zsh