diff --git a/.config/shell/functions b/.config/shell/functions index 5a7e4f5..d0e899e 100644 --- a/.config/shell/functions +++ b/.config/shell/functions @@ -204,9 +204,8 @@ alias scud='systemctl --user disable --now' # Reload or restart matching systemctl service unalias scr 2>/dev/null scr() { - systemctl --user daemon-reload - echo -n "User: " && systemctl --user reload-or-restart "$@" || - { echo -n "System: " && sudo systemctl reload-or-restart "$@"; } && + echo -n "User: " && systemctl --user daemon-reload && systemctl --user reload-or-restart "$@" || + { echo -n "System: " && sudo systemctl daemon-reload && sudo systemctl reload-or-restart "$@"; } && echo "Successful reload" || scs "$@" } diff --git a/.config/topgrade.toml b/.config/topgrade.toml index 557e65e..5917ff2 100644 --- a/.config/topgrade.toml +++ b/.config/topgrade.toml @@ -1,3 +1,4 @@ +display_preamble = false # Don't ask for confirmations #assume_yes = ["emacs"] diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 22414fa..0fe7078 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -159,7 +159,7 @@ setopt hist_save_no_dups setopt hist_reduce_blanks unsetopt hist_ignore_space zshaddhistory() { - [[ $1 != netkeeper* ]] && [[ $1 != killm* ]] + [[ $1 != netkeeper* ]] && [[ $1 != killm* ]] && [[ $1 != "stretchly reset" ]] } setopt sh_word_split diff --git a/.local/bin/scripts/qobuz b/.local/bin/scripts/qobuz index a448d10..91ccdc6 100755 --- a/.local/bin/scripts/qobuz +++ b/.local/bin/scripts/qobuz @@ -1,9 +1,12 @@ #!/bin/sh -ex target="${1:-$PWD}" cd $DATA/5* -tar xf Qobuz-commandes.tar -mv -v *.jpg Qobuz-commandes/ -mv -v Qobuz-commandes $target/qobuz #$d4/music/Worship/ +mkdir -p qobuz +cd qobuz +tar xf ../Qobuz-commandes.tar +mv -v ../*.jpg . || true +cd .. +mv -v qobuz $target/ #$d4/music/Worship/ rm -i Qobuz-commandes.tar cd $target/qobuz find -type d -exec sh -c 'test $(ls "{}" | wc -l) -eq 1 && find "{}" -maxdepth 1 -type f | xargs -i% mv -v % .' \; diff --git a/.local/bin/server/zulips b/.local/bin/server/zulips index f000e52..22a9205 100755 --- a/.local/bin/server/zulips +++ b/.local/bin/server/zulips @@ -1,5 +1,6 @@ #!/bin/sh -e # Execute commands on a zulip server +# https://zulip.readthedocs.io/en/latest/production/management-commands.html zulipdepl="/home/zulip/deployments/current" case $1 in (upgrade)