From 4bdb65b4b89173740a73668d288753fd2938aba1 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Thu, 7 Nov 2019 23:20:34 +0100 Subject: [PATCH] updated stuffs --- bin/ansi | 15 ++++- bin/desk | 13 ++++- bin/mo | 47 ++++++++++------ bin/notify | 2 +- bin/revolver | 2 +- cfg/zsh/cfg.d/export.zsh | 12 +--- cfg/zsh/cfg.d/ohmy.zsh | 2 +- cfg/zsh/cfg.d/source.d/alias-brew.zsh | 2 +- cfg/zsh/cfg.d/source.d/alias-os.zsh | 61 +++++++++++++++++++++ cfg/zsh/cfg.d/source.d/alias-systemd.zsh | 2 +- cfg/zsh/cfg.d/source.d/function-fzf.zsh | 2 +- cfg/zsh/cfg.d/source.d/function-workfix.zsh | 2 +- cfg/zsh/cfg.d/source.zsh | 2 +- cfg/zsh/cfg.zsh | 2 +- 14 files changed, 127 insertions(+), 39 deletions(-) diff --git a/bin/ansi b/bin/ansi index 6fedd26..a728e5a 100755 --- a/bin/ansi +++ b/bin/ansi @@ -427,6 +427,13 @@ ansi::invisible() { } ansi::isAnsiSupported() { + # Optionally override detection logic + # to support post processors that interpret color codes _after_ output is generated. + # Use environment variable "ANSI_FORCE_SUPPORT=" to enable the override. + if [[ -n "${ANSI_FORCE_SUPPORT-}" ]]; then + return 0 + fi + if hash tput &> /dev/null; then if [[ "$(tput colors)" -lt 8 ]]; then return 1 @@ -1513,6 +1520,12 @@ ansi() { m65="65;" ;; + --ideogram-stress) + $supported && ansi::ideogramStress + restoreText=true + m65="65;" + ;; + --reset-ideogram) $supported && ansi::noIdeogram ;; @@ -1603,7 +1616,7 @@ ansi() { fi if $restoreText; then - m="$m10$m22$m23$m24$m25$m27$m28$m29$m$m39$m49$m54$m55$m65" + m="$m10$m22$m23$m24$m25$m27$m28$m29$m39$m49$m54$m55$m65" printf '%s%sm' "$ANSI_CSI" "${m%;}" fi fi diff --git a/bin/desk b/bin/desk index 7b786f4..d8b5fb2 100755 --- a/bin/desk +++ b/bin/desk @@ -30,8 +30,11 @@ Usage: Activate a desk. Extra arguments are passed onto shell. If called with no arguments, look for a Deskfile in the current directory. If not a recognized desk, try as a path to directory containing a Deskfile. - $PROGRAM run - Run a command within a desk's environment then exit. Think '\$SHELL -c'. + $PROGRAM run '' + $PROGRAM run ... + Run a command within a desk's environment then exit. In the first form + shell expansion is performed. In the second form, the argument vector + is executed as is. $PROGRAM edit [desk-name] Edit (or create) a deskfile with the name specified, otherwise edit the active deskfile. @@ -138,7 +141,11 @@ cmd_go() { cmd_run() { local TODESK="$1" shift; - cmd_go "$TODESK" -ic "$@" + if [ $# -eq 1 ]; then + cmd_go "$TODESK" -ic "$1" + else + cmd_go "$TODESK" -ic '"$@"' -- "$@" + fi } diff --git a/bin/mo b/bin/mo index 55496ed..3015011 100755 --- a/bin/mo +++ b/bin/mo @@ -11,12 +11,18 @@ #/ #/ Simple usage: #/ -#/ mo [--false] [--help] [--source=FILE] filenames... +#/ mo [OPTIONS] filenames... #/ -#/ --fail-not-set - Fail upon expansion of an unset variable. -#/ --false - Treat the string "false" as empty for conditionals. -#/ --help - This message. -#/ --source=FILE - Load FILE into the environment before processing templates. +#/ Options: +#/ +#/ -u, --fail-not-set +#/ - Fail upon expansion of an unset variable. +#/ -e, --false +#/ - Treat the string "false" as empty for conditionals. +#/ -h, --help +#/ - This message. +#/ -s=FILE, --source=FILE +#/ - Load FILE into the environment before processing templates. # # Mo is under a MIT style licence with an additional non-advertising clause. # See LICENSE.md for the full text. @@ -32,14 +38,17 @@ # --allow-function-arguments # - Permit functions in templates to be called with additional # arguments. This puts template data directly in to the path -# of an eval statement. Use with caution. -# --fail-not-set - Fail upon expansion of an unset variable. Default behavior +# of an eval statement. Use with caution. Not listed in the +# help because it only makes sense when mo is sourced. +# -u, --fail-not-set +# - Fail upon expansion of an unset variable. Default behavior # is to silently ignore and expand into empty string. -# --false - Treat "false" as an empty value. You may set the +# -e, --false - Treat "false" as an empty value. You may set the # MO_FALSE_IS_EMPTY environment variable instead to a non-empty # value to enable this behavior. -# --help - Display a help message. -# --source=FILE - Source a file into the environment before processint +# -h, --help - Display a help message. +# -s=FILE, --source=FILE +# - Source a file into the environment before processint # template files. # -- - Used to indicate the end of options. You may optionally # use this when filenames may start with two hyphens. @@ -53,6 +62,7 @@ # options and arguments. This puts the content from the # template directly into an eval statement. Use with # extreme care. +# MO_FUNCTION_ARGS - Arguments passed to the function # MO_FAIL_ON_UNSET - When set to a non-empty value, expansion of an unset # env variable will be aborted with an error. # MO_FALSE_IS_EMPTY - When set to a non-empty value, the string "false" @@ -89,18 +99,22 @@ mo() ( MO_ALLOW_FUNCTION_ARGUMENTS=true ;; - --fail-not-set) + -u | --fail-not-set) # shellcheck disable=SC2030 MO_FAIL_ON_UNSET=true ;; - --false) + -e | --false) # shellcheck disable=SC2030 MO_FALSE_IS_EMPTY=true ;; - --source=*) - f2source="${arg#--source=}" + -s=* | --source=*) + if [[ "$arg" == --source=* ]]; then + f2source="${arg#--source=}" + else + f2source="${arg#-s=}" + fi if [[ -f "$f2source" ]]; then # shellcheck disable=SC1090 @@ -141,16 +155,17 @@ mo() ( # # Returns nothing. moCallFunction() { - local moArgs + local moArgs moFunctionArgs moArgs=() + moTrimWhitespace moFunctionArgs "$3" # shellcheck disable=SC2031 if [[ -n "${MO_ALLOW_FUNCTION_ARGUMENTS-}" ]]; then moArgs=$3 fi - echo -n "$2" | eval "$1" "$moArgs" + echo -n "$2" | MO_FUNCTION_ARGS="$moFunctionArgs" eval "$1" "$moArgs" } diff --git a/bin/notify b/bin/notify index 88ee67c..d1bd311 100755 --- a/bin/notify +++ b/bin/notify @@ -18,4 +18,4 @@ curl_close($curl); $json = json_decode($return, true); -if(isset($json['info'])) echo("Result: ${json['info']}"); +if(isset($json['info'])) echo("Result: ${json['info']}"); \ No newline at end of file diff --git a/bin/revolver b/bin/revolver index 75f1955..fe3624d 100755 --- a/bin/revolver +++ b/bin/revolver @@ -27,7 +27,7 @@ _revolver_spinners=( 'growHorizontal' '0.12 ▏ ▎ ▍ ▌ ▋ ▊ ▉ ▊ ▋ ▌ ▍ ▎' 'balloon' '0.14 " " "." "o" "O" "@" "*" " "' 'balloon2' '0.12 . o O ° O o .' - 'noise' '▓ ▒ ░' + 'noise' '0.14 ▓ ▒ ░' 'bounce' '0.1 ⠁ ⠂ ⠄ ⠂' 'boxBounce' '0.12 ▖ ▘ ▝ ▗' 'boxBounce2' '0.1 ▌ ▀ ▐ ▄' diff --git a/cfg/zsh/cfg.d/export.zsh b/cfg/zsh/cfg.d/export.zsh index 46e1421..e5f7c0b 100644 --- a/cfg/zsh/cfg.d/export.zsh +++ b/cfg/zsh/cfg.d/export.zsh @@ -6,7 +6,6 @@ brewpr="$(/home/linuxbrew/.linuxbrew/bin/brew --prefix)" gembin="$(ruby -e "puts Gem.user_dir")/bin" BASHER_SHELL=zsh BASHER_ROOT=/home/eeleater/.basher -FN_API_URL=https://faas.eeleater.org # Path path=(${brewpr}/sbin ${brewpr}/bin) # Homebrew @@ -21,9 +20,6 @@ if pacman -Qm android-sdk-build-tools &>/dev/null; then path+=(/opt/android-sdk/build-tools/${asdkver}); # Android SDK fi -if test -d /games; then - path+=(/games/weidu/bin/amd64) -fi path+=(/opt/phalcon-devtools) PTOOLSPATH="/opt/phalcon-devtools/" @@ -46,12 +42,8 @@ fpath+=(${brewpr}/share/zsh/site-functions) fpath+=(${dotlib}/local) fpath+=(${BASHER_ROOT}/cellar/completions/zsh) -# IPFS -IPFS_PATH=/var/lib/ipfs/repo -VAULT_ADDR=http://127.0.0.1:8200 - # Actually export -export dotlib dotcfg brewpr gembin PATH MANPATH INFOPATH EDITOR XDG_DATA_DIRS PTOOLSPATH IPFSPATH VAULT_ADDR FN_API_URL +export dotlib dotcfg brewpr gembin PATH MANPATH INFOPATH EDITOR XDG_DATA_DIRS PTOOLSPATH # Reload all Prompts -autoload -U promptinit && promptinit +autoload -U promptinit && promptinit \ No newline at end of file diff --git a/cfg/zsh/cfg.d/ohmy.zsh b/cfg/zsh/cfg.d/ohmy.zsh index f8eafbc..b0cb5d0 100644 --- a/cfg/zsh/cfg.d/ohmy.zsh +++ b/cfg/zsh/cfg.d/ohmy.zsh @@ -1,4 +1,4 @@ export ZSH="${dotlib}/ohmyzsh" DISABLE_AUTO_UPDATE="true" ZSH_DISABLE_COMPFIX="true" -source ${ZSH}/oh-my-zsh.sh +source ${ZSH}/oh-my-zsh.sh \ No newline at end of file diff --git a/cfg/zsh/cfg.d/source.d/alias-brew.zsh b/cfg/zsh/cfg.d/source.d/alias-brew.zsh index 5b58473..bbababf 100644 --- a/cfg/zsh/cfg.d/source.d/alias-brew.zsh +++ b/cfg/zsh/cfg.d/source.d/alias-brew.zsh @@ -1,4 +1,4 @@ alias brews='brew list -1' alias bubo='brew update && brew outdated' alias bubc='brew upgrade && brew cleanup' -alias bubu='bubo && bubc' +alias bubu='bubo && bubc' \ No newline at end of file diff --git a/cfg/zsh/cfg.d/source.d/alias-os.zsh b/cfg/zsh/cfg.d/source.d/alias-os.zsh index 2c2e09a..e0101c7 100644 --- a/cfg/zsh/cfg.d/source.d/alias-os.zsh +++ b/cfg/zsh/cfg.d/source.d/alias-os.zsh @@ -56,6 +56,62 @@ if (( $+commands[yaourt] )); then fi fi +if (( $+commands[yay] )); then + alias yaconf='yay -Pg' + alias yaupg='yay -Syu' + alias yasu='yay -Syu --noconfirm' + alias yain='yay -S' + alias yains='yay -U' + alias yare='yay -R' + alias yarem='yay -Rns' + alias yarep='yay -Si' + alias yareps='yay -Ss' + alias yaloc='yay -Qi' + alias yalocs='yay -Qs' + alias yalst='yay -Qe' + alias yaorph='yay -Qtd' + alias yainsd='yay -S --asdeps' + alias yamir='yay -Syy' + + + if (( $+commands[abs] && $+commands[aur] )); then + alias yaupd='yay -Sy && sudo abs && sudo aur' + elif (( $+commands[abs] )); then + alias yaupd='yay -Sy && sudo abs' + elif (( $+commands[aur] )); then + alias yaupd='yay -Sy && sudo aur' + else + alias yaupd='yay -Sy' + fi +fi + +if (( $+commands[pacaur] )); then + alias paupg='pacaur -Syu' + alias pasu='pacaur -Syu --noconfirm' + alias pain='pacaur -S' + alias pains='pacaur -U' + alias pare='pacaur -R' + alias parem='pacaur -Rns' + alias parep='pacaur -Si' + alias pareps='pacaur -Ss' + alias paloc='pacaur -Qi' + alias palocs='pacaur -Qs' + alias palst='pacaur -Qe' + alias paorph='pacaur -Qtd' + alias painsd='pacaur -S --asdeps' + alias pamir='pacaur -Syy' + + if (( $+commands[abs] && $+commands[aur] )); then + alias paupd='pacaur -Sy && sudo abs && sudo aur' + elif (( $+commands[abs] )); then + alias paupd='pacaur -Sy && sudo abs' + elif (( $+commands[aur] )); then + alias paupd='pacaur -Sy && sudo aur' + else + alias paupd='pacaur -Sy' + fi +fi + if (( $+commands[trizen] )); then function upgrade() { trizen -Syu @@ -68,12 +124,17 @@ elif (( $+commands[yaourt] )); then function upgrade() { yaourt -Syu } +elif (( $+commands[yay] )); then + function upgrade() { + yay -Syu + } else function upgrade() { sudo pacman -Syu } fi +# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips alias pacupg='sudo pacman -Syu' alias pacin='sudo pacman -S' alias pacins='sudo pacman -U' diff --git a/cfg/zsh/cfg.d/source.d/alias-systemd.zsh b/cfg/zsh/cfg.d/source.d/alias-systemd.zsh index ed22bc5..27d7e62 100644 --- a/cfg/zsh/cfg.d/source.d/alias-systemd.zsh +++ b/cfg/zsh/cfg.d/source.d/alias-systemd.zsh @@ -5,4 +5,4 @@ for cmd in $cmds; do done alias sc-enablenow="sc-enable --now" -alias sc-disablenow="sc-disable --now" +alias sc-disablenow="sc-disable --now" \ No newline at end of file diff --git a/cfg/zsh/cfg.d/source.d/function-fzf.zsh b/cfg/zsh/cfg.d/source.d/function-fzf.zsh index 4212c17..3ef1dcc 100644 --- a/cfg/zsh/cfg.d/source.d/function-fzf.zsh +++ b/cfg/zsh/cfg.d/source.d/function-fzf.zsh @@ -1,4 +1,4 @@ [[ $- == *i* && -f "/usr/share/fzf/completion.zsh" ]] && source "/usr/share/fzf/completion.zsh" 2> /dev/null [[ -f "/usr/share/fzf/key-bindings.zsh" ]] && source "/usr/share/fzf/key-bindings.zsh" [[ $- == *i* && -f "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" 2> /dev/null -[[ -f "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh" ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh" +[[ -f "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh" ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh" \ No newline at end of file diff --git a/cfg/zsh/cfg.d/source.d/function-workfix.zsh b/cfg/zsh/cfg.d/source.d/function-workfix.zsh index 30ed9c5..004dde4 100644 --- a/cfg/zsh/cfg.d/source.d/function-workfix.zsh +++ b/cfg/zsh/cfg.d/source.d/function-workfix.zsh @@ -1,3 +1,3 @@ # Fix MobaXterm Home/End key with ZSH bindkey '^[[H' beginning-of-line -bindkey '^[[F' end-of-line +bindkey '^[[F' end-of-line \ No newline at end of file diff --git a/cfg/zsh/cfg.d/source.zsh b/cfg/zsh/cfg.d/source.zsh index ffe19f1..50d00dd 100644 --- a/cfg/zsh/cfg.d/source.zsh +++ b/cfg/zsh/cfg.d/source.zsh @@ -7,4 +7,4 @@ for file in ${dotcfg}/zsh/cfg.d/source.d/*.zsh; do source $file done -source /usr/share/lmod/lmod/init/zsh +source /usr/share/lmod/lmod/init/zsh \ No newline at end of file diff --git a/cfg/zsh/cfg.zsh b/cfg/zsh/cfg.zsh index ae3580b..eda0a02 100644 --- a/cfg/zsh/cfg.zsh +++ b/cfg/zsh/cfg.zsh @@ -4,4 +4,4 @@ for file in ${HOME}/dotfiles/cfg/zsh/cfg.d/*.zsh; do done # Prompt -prompt z4rr3t +prompt z4rr3t \ No newline at end of file