Useful in places where keyboard shortcut is not available, such as
primary clipboard in in almost all GUI applications.

dotfiles/bash

@@ -1 +0,0 @@
-bashum

dotfiles/bashum/head.bashrc

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-mkdir -p /var/tmp/bash-rv
-
-BASHUM_TASK_CTX=false
-BASHUM_BMO_NAG=false
-
-for include in \
-  "${HOME}/.bash/colors.bashrc" \
-  "${HOME}/.bash/defaults.bashrc" \
-  "${HOME}/.bash/main.bashrc" \
-  "${HOME}/.bash/user/$USER.bashrc" \
-  "${HOME}/.bash/host/$(hostname -s).bashrc" \
-  "${HOME}/.bash/post.bashrc";
-do
-  test -f "$include" && . "$include";
-done
-true

dotfiles/bashum/host/morel.bashrc

@@ -1 +0,0 @@
-../../../../../config/dotfiles/bash/host/morel.bashrc

dotfiles/config/Xlib/global.Xdefaults

@@ -1,3 +1,5 @@
+Xcursor.size:               8
+
 URxvt.mapAlert:             true
 
 !## extensions

dotfiles/bashum/colors.bashrc → dotfiles/config/bashum/colors.bashrc

@@ -1,11 +1,19 @@
 #!/bin/bash
+#shellcheck disable=SC1087,SC2034
 
 #
 # Context symbol used in title and prompt
 #
 BASHUM_CTXSYM=${BASHUM_CTXSYM:-}
 
-# get some fancy colorz
+#
+# ANSI color codes
+#
+# Don't use these in prompts or line editing will likely be
+# broken.  (Bash/readline will count these character despite
+# the fact they don't move the cursor.)  Use BASHUM_PS_COLOR_*
+# instead.
+#
 BASHUM_COLOR_BLACK=$'\033[0;30m'
 BASHUM_COLOR_RED=$'\033[0;31m'
 BASHUM_COLOR_GREEN=$'\033[0;32m'
@@ -24,7 +32,13 @@ BASHUM_COLOR_LCYAN=$'\033[1;36m'
 BASHUM_COLOR_LWHITE=$'\033[1;37m'
 BASHUM_COLOR_NORMAL=$'\033[1;0m'
 
-# get some fancy colorz
+#
+# ANSI color codes
+#
+# Unlike BASHUM_COLOR_*, these have extra escapes for Bash
+# so that they can be used in Bash prompt without breaking
+# line editing.
+#
 BASHUM_PS_COLOR_BLACK=$'\[\033[0;30m\]'
 BASHUM_PS_COLOR_RED=$'\[\033[0;31m\]'
 BASHUM_PS_COLOR_GREEN=$'\[\033[0;32m\]'
@@ -43,7 +57,6 @@ BASHUM_PS_COLOR_LCYAN=$'\[\033[1;36m\]'
 BASHUM_PS_COLOR_LWHITE=$'\[\033[1;37m\]'
 BASHUM_PS_COLOR_NORMAL=$'\[\033[1;0m\]'
 
-#shellcheck disable=SC1087
 bashum__colordemo() {
     local bla=$BASHUM_COLOR_BLACK
     local red=$BASHUM_COLOR_RED

dotfiles/config/bashum/head.bashrc

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+mkdir -p /var/tmp/bashum-rv
+
+BASHUM_TASK_CTX=false
+BASHUM_BMO_NAG=false
+
+for include in \
+  "${HOME}/.config/bashum/colors.bashrc" \
+  "${HOME}/.config/bashum/defaults.bashrc" \
+  "${HOME}/.config/bashum/main.bashrc" \
+  "${HOME}/.config/bashum/user/$USER.bashrc" \
+  "${HOME}/.config/bashum/host/$(hostname -s).bashrc" \
+  "${HOME}/.config/bashum/post.bashrc";
+do
+  test -f "$include" && . "$include"
+done
+true

dotfiles/config/bashum/host/morel.bashrc

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/config/bashum/host/morel.bashrc

dotfiles/bashum/main.bashrc → dotfiles/config/bashum/main.bashrc

@@ -13,6 +13,21 @@ test -f /usr/share/git-core/contrib/completion/git-prompt.sh \
 ### SUBZ ###
 ### '''' ###
 
+prepend() {
+    #
+    # pre-pend $2 to filename $1
+    #
+    local path=$1
+    local prefix=$2
+    local dirpath
+    local filename
+    local abspath
+    abspath=$(readlink -f "$path")
+    dirpath=$(dirname "$abspath")
+    filename=$(basename "$abspath")
+    echo mv "$path" "$dirpath/$prefix-$filename"
+}
+
 smv() {
     #
     # scp but rm the source
@@ -39,17 +54,58 @@ smvr() {
     scp -r "$src" "$dst" && rm -r "$src"
 }
 
-
-bb() {
+snore() {
     #
-    # Ring the bell
+    # Sleep loudly-ish for $1 time
     #
     local stime=${1:-0}
     test "$stime" == 0 || echo -e "sleeping for $BASHUM_COLOR_LGREEN$stime$BASHUM_COLOR_NORMAL"
     sleep "$stime"
+}
+
+dotsleep() {
+    #
+    # Sleep with dots for $1 seconds
+    #
+    local secs=$1
+    echo -e "sleeping for $BASHUM_COLOR_LGREEN$secs$BASHUM_COLOR_NORMAL seconds"
+    local secs_togo=$secs
+    while test "$secs_togo" -gt 0; do
+        sleep 1
+        echo -n .
+        ((secs_togo--))
+    done
+    echo
+}
+
+bb() {
+    #
+    # Ring the bell after $1 time of sleep
+    #
+    local stime=${1:-0}
+    snore "$stime"
     printf '\a'
 }
 
+spec_cksources() {
+    #
+    # Check Source?: URL's in RPM spec file $1
+    #
+    local file=$1
+    local hdr
+    local url
+    rpmspec -P "$file" \
+      | grep -E 'Source[0-9]+: *http' \
+      | while read -r hdr url; do
+            echo -n "$hdr: $url .."
+            curl -fsSL -I "$url" >/dev/null || {
+                echo fail
+                return 1
+            }
+            echo ok
+        done
+}
+
 nn() {
     #
     # Ring the bell and send notification $1 after $2 time
@@ -72,10 +128,34 @@ pp() {
     read -r junk -p "Press Enter to continue"
 }
 
+wrep() {
+    #
+    # Print each line on STDIN $1 times horizontally
+    #
+    echo >&2 "use sdup -w instead!"
+    local rep=${1:-1}; shift
+    local delim=${1:-" "}; shift
+    local line
+    local n
+    while read -r line; do
+        local head=true
+        n=$rep
+        while test "$n" -gt 0;
+        do
+            $head || echo -n "$delim"
+            $head && head=false
+            echo -n "$line"
+            ((n--))
+        done
+        echo
+    done
+}
+
 lrep() {
     #
     # Print each line on STDIN $1 times
     #
+    echo >&2 "use sdup -l instead!"
     local rep=${1:-1}; shift
     local line
     local n
@@ -93,6 +173,7 @@ prep() {
     #
     # Print STDIN $1 times
     #
+    echo >&2 "use sdup instead!"
     local rep=${1:-1}; shift
     local data
     data=$(cat)
@@ -419,13 +500,73 @@ xop() {
     # Common clipboard operations with fixnl() on top
     #
     local op=$1
-    local file=${2:-/dev/stdin}
+    local arg=${2:-/dev/stdin}
     case $op in
-        oo) xclip -selection clipboard -o    | fixnl ;;
-        o)  xclip -o                         | fixnl ;;
-        ii) fixnl -c | xclip -selection clipboard -i ;;
-        i)  fixnl -c | xclip -i                      ;;
-    esac <"$file"
+        aa) <<<"$arg" fixnl -c | xclip -selection clipboard -i ;;
+        a)  <<<"$arg" fixnl -c | xclip -i                      ;;
+        ii) <"$arg"   fixnl -c | xclip -selection clipboard -i ;;
+        i)  <"$arg"   fixnl -c | xclip -i                      ;;
+        oo) <"$arg"   xclip -selection clipboard -o    | fixnl ;;
+        o)  <"$arg"   xclip -o                         | fixnl ;;
+        *)  return 2 ;;
+    esac
+}
+
+xt() {
+    #
+    # Type out selection clipboard content using xdotool
+    #
+    local stime=${1:-3}
+    local body
+    snore "$stime"
+    body=$(xo)
+    xdotool type "$body"
+}
+
+xtt() {
+    #
+    # Type out C-C clipboard content using xdotool
+    #
+    local stime=${1:-3}
+    local body
+    snore "$stime"
+    body=$(xoo)
+    xdotool type "$body"
+}
+
+xdl() {
+    #
+    # Download URL from primary clipboard to path $1
+    #
+    local dest=$1
+    local url
+    url=$(xo)
+    _xdl "$dest" "$url"
+}
+
+xxdl() {
+    #
+    # Download URL from C-C clipboard to path $1
+    #
+    local dest=$1
+    local url
+    url=$(xoo)
+    _xdl "$dest" "$url"
+}
+
+_xdl() {
+    #
+    # Download URL from primary clipboard to path $1
+    #
+    local dest=$1
+    local url=$2
+    local es
+    test -n "$dest" || return 2
+    test -f "$dest" && return 2
+    test -n "$url" || return 2
+    curl -fsSL "$url" >"$dest"; es=$?
+    bb
+    return $es
 }
 
 xod() {
@@ -481,7 +622,7 @@ xvxx() {
     # back to the browser and paste it over the old (still selected) text.
     # That's it, no need to make up and save temporary files.
     #
-    # If you quickly realize you need to re-edit the text, use xvvx().
+    # If you quickly realize you need to re-edit the text, use xxvxx().
     #
     xop o | vipe | xop ii
 }
@@ -509,7 +650,37 @@ xpst() {
                 echo "does not exist: $path"
                 continue
             }
-            cp -r "$path" .
+            cp -ar "$path" .
+        done
+}
+
+xpst_l() {
+    #
+    # Symlink paths from clipboard, with relative paths
+    #
+    { xop o; echo; } \
+      | while read -r path; do
+            echo "path='$path'" >&2
+            test -e "$path" || {
+                echo "does not exist: $path"
+                continue
+            }
+            ln -sr "$path" .
+        done
+}
+
+xpst_la() {
+    #
+    # Symlink paths from clipboard, with absolute paths
+    #
+    { xop o; echo; } \
+      | while read -r path; do
+            echo "path='$path'" >&2
+            test -e "$path" || {
+                echo "does not exist: $path"
+                continue
+            }
+            ln -s "$path" .
         done
 }
 
@@ -535,7 +706,7 @@ vxx() {
     # or another GUI application.  Run the command with `vxx`, edit
     # the text, move back to the application and paste it.
     #
-    # If you quickly realize you need to re-edit the text, use xvvx().
+    # If you quickly realize you need to re-edit the text, use xxvxx().
     #
     vipe | xop ii
 }
@@ -544,7 +715,7 @@ xcxx() {
     #
     # Filter text in primary clipboard using command $@ and save it to C-C clipboard
     #
-    # Similar to xvvx() but instead of interactive editing, provided filter
+    # Similar to xvxx() but instead of interactive editing, provided filter
     # command is run.
     #
     local cmd=("$@")
@@ -552,6 +723,42 @@ xcxx() {
     return "${PIPESTATUS[1]}"
 }
 
+xtrans() {
+    #
+    # Translate text in primary clipboard using code $1 and output it
+    #
+    # Similar to xcxx but assumes code snippet, and prints the result
+    # to make it easier to check it visually.
+    #
+    local code=$1
+    test $# -gt 1 && code=$(printf '%q ' "$@")
+#   echo >&2 "debug:code=$code"
+    local es
+    xop o | bash -c "$code" | xop ii
+    es="${PIPESTATUS[1]}"
+    xop oo >&2
+    echo >&2
+    return "$es"
+}
+
+xfromc() {
+    #
+    # Get text using code $1 and output it
+    #
+    # Similar to xtrans but assumes code snippet, and prints the result
+    # to make it easier to check it visually.
+    #
+    local code=$1
+    test $# -gt 1 && code=$(printf '%q ' "$@")
+    echo >&2 "debug:code=$code"
+    local es
+    bash -c "$code" | xop ii
+    es="${PIPESTATUS[0]}"
+    xop oo >&2
+    echo >&2
+    return "$es"
+}
+
 vx() {
     #
     # Edit stdin and save it to primary clipboard
@@ -609,6 +816,14 @@ cal() {
         64:*)
             command cal -M "$@"
             ;;
+        127:*)
+            echo >&2 "cal(): cal command is not installed"
+            return 127
+            ;;
+        *)
+            echo >&2 "cal(): error: cal_es=$cal_es, cal_v=$cal_v"
+            return 5
+            ;;
     esac
 }
 
@@ -617,18 +832,17 @@ cal() {
 ### '''' ###
 
 HISTCONTROL=ignoredups:erasedups
-shopt -s histappend
-PROMPT_COMMAND="history -n; history -w; history -c; history -r; $PROMPT_COMMAND"
+# shopt -s histappend
+# PROMPT_COMMAND="history -n; history -w; history -c; history -r; $PROMPT_COMMAND"
 
 HISTIGNORE="$HISTIGNORE:ls:ll:la:cd"
-HISTIGNORE="$HISTIGNORE:git dc:git st"
-HISTIGNORE="$HISTIGNORE:reset"
+HISTIGNORE="$HISTIGNORE:git st"
 HISTIGNORE="$HISTIGNORE:se *:sc *"
-HISTSIZE=-1
-HISTFILESIZE=100000
+HISTSIZE=33333
+HISTFILESIZE=33333
 HISTTIMEFORMAT='%F %T '
 GLOBIGNORE=.:..
-shopt -s histverify
+# shopt -s histverify
 
 # some more aliases
 alias cls='clear'
@@ -650,25 +864,35 @@ alias lsblk='lsblk -o +UUID,LABEL'
 alias pstree='pstree -h'
 alias virsh='virsh --connect qemu:///system'
 alias wttr='curl -s "wttr.in/?1&n&q"'
-alias xaa='xclip -o | audit2allow'
 alias xi='xop i'
 alias xii='xop ii'
+alias xa='xop a'
+alias xaa='xop aa'
 alias xo='xop o'
 alias xoo='xop oo'
 alias reboot="echo -n . ; sync ; echo -n . ; sync ; echo -n . ; systemctl reboot"
 alias poweroff="echo -n . ; sync ; echo -n . ; sync ; echo -n . ; systemctl poweroff"
 
-x4x() {
+x4xx() {
     #
     # Pad text from primary clipboard with 4 spaces; save to C-C clipboard
     #
     # ...that is, for inclusion as Markdown verbatim text.
     #
-    xo | pad4 | xii
+    xop oo | pad4 | xop ii
 }
 
-RV_TMP="/tmp/bash-rv"
-mkdir -p "$RV_TMP"
+x4x() {
+    #
+    # Pad text from primary clipboard with 4 spaces; save back
+    #
+    # ...that is, for inclusion as Markdown verbatim text.
+    #
+    xop -o | pad4 | xop i
+}
+
+BASHUM__RV_TMP="/tmp/bashum-rv"
+mkdir -p "$BASHUM__RV_TMP"
 
 ### ...... ###
 ### OTHERS ###
@@ -686,6 +910,8 @@ export PRETTY_DEBUG_EXCLUDE=inigrep
 export MDVIMB__CONVERTER=cmark
 export MDVIMB__STYLE=darkzen    # pergamen
 
+export MYPY_CACHE_DIR="$HOME/.cache/mypy/the_darn_cache"
+
 #shellcheck disable=SC2034
 {
     GIT_PS1_SHOWDIRTYSTATE=true

dotfiles/bashum/post.bashrc → dotfiles/config/bashum/post.bashrc

@@ -9,7 +9,7 @@ __bashum__lastrv() {
     local rvfile        # path to return value cache file
     local lastrv        # actual last return value
     local do_rm         # true if we should remove the cache
-    rvfile="$RV_TMP/$$.lastrv"
+    rvfile="$BASHUM__RV_TMP/$$.lastrv"
     lastrv="$(cat "$rvfile")"
     do_rm=false
     test "$1" == "-r" && do_rm=true
@@ -23,7 +23,7 @@ __bashum__lastrv() {
 }
 
 __bashum__save_rv() {
-    local rvfile="$RV_TMP/$$.lastrv"
+    local rvfile="$BASHUM__RV_TMP/$$.lastrv"
     [ -w "${rvfile%/*}" ] && echo "$1" > "$rvfile"
 }
 
@@ -102,13 +102,13 @@ __bashum__wdir() {
     #
     local mode=${1:-normal}
     case $mode:$PWD in
-        shrinky:*)              __bashum__shrinkypath "$PWD" ;;
-        normal:*)               echo "${PWD/$HOME/\~}" ;;
-        short:$HOME)            echo "~" ;;
-        short:$HOME/??????????) echo "${PWD/$HOME/\~}" ;;
-        short:$HOME/*/*)        echo "…${PWD##*/}" ;;
-        short:$HOME/*)          echo "${PWD/$HOME/\~}" ;;
-        short:*)                echo "$PWD" ;;
+        shrinky:*)                  __bashum__shrinkypath "$PWD" ;;
+        normal:*)                   echo "${PWD/$HOME/\~}" ;;
+        short:"$HOME")              echo "~" ;;
+        short:"$HOME"/??????????)   echo "${PWD/$HOME/\~}" ;;
+        short:"$HOME"/*/*)          echo "…${PWD##*/}" ;;
+        short:"$HOME"/*)            echo "${PWD/$HOME/\~}" ;;
+        short:*)                    echo "$PWD" ;;
     esac
 }
 
@@ -118,8 +118,8 @@ __bashum__shrinkypath() {
     #
     local path=$1
     case $path in
-        $HOME)      echo "~"; return ;;
-        $HOME/*)    echo -n "~"; __bashum__shrink_relpath "${path#$HOME/}" ;;
+        "$HOME")    echo "~"; return ;;
+        "$HOME"/*)  echo -n "~"; __bashum__shrink_relpath "${path#$HOME/}" ;;
         *)          echo "$path"; return ;;
     esac
 }

dotfiles/bashum/setup → dotfiles/config/bashum/setup

@@ -1,17 +1,17 @@
 #!/bin/bash
 
 put() {
-    echo "$1" >> "$HOME/.bashrc"
+    echo "$1" >>"$HOME/.bashrc"
 }
 
 mark="# added by https://gitea.vornet.cz/netvor/mydots"
 if grep -qFe "$mark" "$HOME/.bashrc";
 then
-    echo "already set up, giving up";
+    echo >&2 "already set up, giving up";
     exit 1;
 else
     put ''
     put '# added by https://gitea.vornet.cz/netvor/mydots'
-    put 'test -f "${HOME}/.bash/head.bashrc" \'
-    put ' && . "${HOME}/.bash/head.bashrc"'
+    put 'test -f "${HOME}/.config/bashum/head.bashrc" \'
+    put ' && . "${HOME}/.config/bashum/head.bashrc"'
 fi

dotfiles/gittum/bin/metacm → dotfiles/config/gittum/bin/metacm

@@ -12,7 +12,7 @@ mktmpl() {
     local mtmpl_name="$1"; shift
     local mtmpl_path
     local tmpl_path
-    mtmpl_path="$HOME/.gittum/template/$mtmpl_name"
+    mtmpl_path="$HOME/.config/gittum/template/$mtmpl_name"
     test -f "$mtmpl_path" || die "no such meta-template: $mtmpl_path"
     bash -n "$mtmpl_path" || die
     tmpl_path="/.$(mktemp -t gittum-metacm.XXXXXXXX)"

dotfiles/config/gittum/bin/setup

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+gitver=$(git --version | cut -d ' ' -f 3)
+if [[ "x$gitver" > "x1.8" ]]; then
+    tilde='~'
+else
+    tilde=$HOME
+fi
+
+host=$(hostname -s)
+user=$(whoami)
+
+mkconfig() {
+    echo "[include]"
+    echo "    path = $tilde/.config/gittum/main.gitconfig"
+    echo "    path = $tilde/.config/gittum/host/$host.gitconfig"
+    echo "    path = $tilde/.config/gittum/user/$user.gitconfig"
+    echo "    path = $tilde/.config/gittum/private.gitconfig"
+}
+
+mkconfig >>"$HOME/.gitconfig"

dotfiles/gittum/bin/slurp → dotfiles/config/gittum/bin/slurp

@@ -24,6 +24,17 @@ allowed_slurp() {
     test -f "$ok_file"
 }
 
+this_branch_upstream() {
+    #
+    # Print upstream of current bvranch
+    #
+    git branch -vv \
+      | grep '^\*' \
+      | cut -d \] -f1 \
+      | cut -d \[ -f2 \
+      | cut -d :  -f1
+}
+
 allowed_push() {
     #
     # Is push allowed for the remote branch??
@@ -38,15 +49,24 @@ allowed_push() {
     #       main   aaf02f0 [main/master: ahead 25] Some other commit
     #     * master add0a03 [jdsumsion/master] Some commit
     #
-    local tbranch=$(
-        git branch -vv \
-          | grep '^\*' \
-          | cut -d \] -f1 \
-          | cut -d \[ -f2 \
-          | cut -d :  -f1
-    )
+    local tbranch
+    test -n "$ok_file" || return 1
+    tbranch=$(this_branch_upstream)
     test -n "$tbranch" || return 0
-    grep -qxF "PUSH $tbranch" "$ok_file" 2>/dev/null
+    grep -qxE "PUSH ([^ ]+ )?$tbranch" "$ok_file" 2>/dev/null
+}
+
+has_flag() {
+    #
+    # Has $ok_file have flag $1 for this branch?
+    #
+    local flag=$1
+    local tbranch
+    test -n "$ok_file" || return 1
+    tbranch=$(this_branch_upstream)
+    grep -xE "PUSH [^ ]+ $tbranch" "$ok_file" \
+     | cut -d' ' -f2 \
+     | grep -qwe "$flag"
 }
 
 git_relative() {
@@ -92,7 +112,11 @@ go_push() {
     #
     if $force_push || allowed_push;
     then
-        git push -o ci.skip
+        if has_flag ci; then
+            git push
+        else
+            git push -o ci.skip
+        fi
     fi
 }
 
@@ -101,9 +125,11 @@ main() {
     local ok_file
     local force_slurp=false
     local force_push=false
+    local skip_ci=true
     while true; do case $1 in
         --force-slurp)  force_slurp=true; shift ;;
         --force-push)   force_push=true;  shift ;;
+        --skip-ci)      skip_ci=true; shift ;;
         --)             shift; break ;;
         -*)             usage ;;
         *)              break ;;

dotfiles/config/gittum/host/adoref.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/adoref.gitconfig

dotfiles/config/gittum/host/malakar.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/malakar.gitconfig

dotfiles/config/gittum/host/morel.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/morel.gitconfig

dotfiles/config/gittum/host/nauron.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/nauron.gitconfig

dotfiles/config/gittum/host/tamten.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/tamten.gitconfig

dotfiles/config/gittum/host/vagrus.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/vagrus.gitconfig

dotfiles/gittum/main.gitconfig → dotfiles/config/gittum/main.gitconfig

@@ -11,15 +11,19 @@
   blog = log --graph --oneline --pretty=tformat:'%Cred%h%Creset - %C(yellow)%s%Creset %C(green)<%an>%Creset %C(blue)@%d%Creset' --abbrev-commit
   cm = commit --verbose
   cma = commit --verbose --amend
-  cmf = !~/.gittum/bin/metacm msg_flake8
-  cmt = !~/.gittum/bin/metacm msg_tmp
-  cmr = !~/.gittum/bin/metacm msg_typo
-  cmv = !~/.gittum/bin/metacm msg_bumpv
-  cmw = !~/.gittum/bin/metacm msg_wip
+  cme = commit --allow-empty -m 'WIP empty commit just for the kicks'
+  cmv = !~/.config/gittum/bin/metacm msg_bumpv
+  cmw = !~/.config/gittum/bin/metacm msg_wip
   co = checkout
   com = checkout master
   cp = cherry-pick
   dc = !clear && git diff --cached
+  dcw = !clear && git diff --cached --word-diff=color
+  dcp = !clear && git diff --cached --word-diff=porcelain
+  dcc = !clear && git diff --cached --word-diff=color --word-diff-regex=.
+  df = diff --word-diff=color
+  dfp = diff --word-diff=porcelain
+  dfc = diff --word-diff=color --word-diff-regex=.
   gr = log --graph --full-history --color\
        --pretty=tformat:"%x1b[31m%h%x20%x1b[32m%d%x1b[0m%x20%s%x1b[0m"
   gra = log --all --graph --full-history --color\
@@ -34,18 +38,19 @@
   rb = rebase
   rbc = rebase --continue
   rbi = rebase --interactive
-  rme = ! ~/.gittum/bin/remote-edit
+  rme = ! ~/.config/gittum/bin/remote-edit
   rmv = remote --verbose
-  sibling = ! ~/.gittum/bin/sibling
-  slurp = ! ~/.gittum/bin/slurp
+  sibling = ! ~/.config/gittum/bin/sibling
+  slurp = ! ~/.config/gittum/bin/slurp
   st = status
   sh = show
   sw = show --word-diff=color
   swp = show --word-diff=porcelain
   swc = show --word-diff=color --word-diff-regex=.
-  who = ! ~/.gittum/bin/who
-  whoo = ! ~/.gittum/bin/whoo
-  xtragc = ! ~/.gittum/bin/xtragc
+  swm = show --format="format:%B" --no-patch
+  who = ! ~/.config/gittum/bin/who
+  whoo = ! ~/.config/gittum/bin/whoo
+  xtragc = ! ~/.config/gittum/bin/xtragc
 
 [diff]
     guitool = kdiff3

dotfiles/i3/config → dotfiles/config/i3/config

@@ -319,22 +319,11 @@ mode "resize" {
         bindsym Escape      mode "default"
 }
 
-bar {
-    id clementine
-    status_command "~/.i3/bin/cstatus"
-    workspace_buttons no
-    tray_output none
-    mode hide
-    hidden_state hide
-    modifier none
-    output eDP-1
-}
-
 bindsym --release button3 kill
 
 bar {
         id main
-        status_command "~/.i3/bin/i3staplus"
+        status_command "~/.config/i3/bin/i3staplus"
         bindsym button2 exec thunar
         bindsym button3 exec "$spn xclose"
         separator_symbol "•"
@@ -431,16 +420,16 @@ bindsym XF86AudioMute           exec "$spn bmo au flip"
 ## Typing macros wow                                                    ##
 #------------------------------------------------------------------------#
 
-bindsym --release $mod+Ctrl+apostrophe      exec "xdotool .i3/macros/apostrophe.xdotool"
-bindsym --release $mod+Ctrl+asterisk        exec "xdotool .i3/macros/asterisk.xdotool"
-bindsym --release $mod+Ctrl+slash           exec "xdotool .i3/macros/slash.xdotool"
-bindsym --release $mod+Ctrl+comma           exec "xdotool .i3/macros/comma.xdotool"
-bindsym --release $mod+Ctrl+semicolon       exec "xdotool .i3/macros/semicolon.xdotool"
-bindsym --release $mod+Ctrl+period          exec "xdotool .i3/macros/period.xdotool"
-bindsym --release $mod+Ctrl+9               exec "xdotool .i3/macros/9.xdotool"
-bindsym --release $mod+Ctrl+grave           exec "xdotool .i3/macros/grave.xdotool"
-bindsym --release $mod+Ctrl+bracketleft     exec "xdotool .i3/macros/bracketleft.xdotool"
-bindsym --release $mod+Ctrl+bracketright    exec "xdotool .i3/macros/bracketright.xdotool"
+bindsym --release $mod+Ctrl+apostrophe      exec "xdotool .config/i3/macros/apostrophe.xdotool"
+bindsym --release $mod+Ctrl+asterisk        exec "xdotool .config/i3/macros/asterisk.xdotool"
+bindsym --release $mod+Ctrl+slash           exec "xdotool .config/i3/macros/slash.xdotool"
+bindsym --release $mod+Ctrl+comma           exec "xdotool .config/i3/macros/comma.xdotool"
+bindsym --release $mod+Ctrl+semicolon       exec "xdotool .config/i3/macros/semicolon.xdotool"
+bindsym --release $mod+Ctrl+period          exec "xdotool .config/i3/macros/period.xdotool"
+bindsym --release $mod+Ctrl+9               exec "xdotool .config/i3/macros/9.xdotool"
+bindsym --release $mod+Ctrl+grave           exec "xdotool .config/i3/macros/grave.xdotool"
+bindsym --release $mod+Ctrl+bracketleft     exec "xdotool .config/i3/macros/bracketleft.xdotool"
+bindsym --release $mod+Ctrl+bracketright    exec "xdotool .config/i3/macros/bracketright.xdotool"
 
 
 

dotfiles/config/i3/macros/xt.dash

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+
+fixnl () {
+    local arg=$1;
+    local cache;
+    local nlcount;
+    local lastchr;
+    local single=keep;
+    case $arg in 
+        -c | --chop-single)
+            single=chop
+        ;;
+    esac;
+    cache="$(mktemp -t fixnl.XXXXXXXX)";
+    cat > "$cache";
+    nlcount=$(<"$cache" wc -l);
+    lastchr=$(<"$cache" tail -c1 | hexdump -e '"%02x"');
+    case $nlcount:$lastchr:$single in 
+        0:??:*)
+            cat "$cache"
+        ;;
+        1:0a:chop)
+            head -c -1 "$cache"
+        ;;
+        1:0a:keep)
+            cat "$cache"
+        ;;
+        *:0a:*)
+            cat "$cache"
+        ;;
+        *:??:*)
+            cat "$cache";
+            echo
+        ;;
+    esac;
+    rm "$cache"
+}
+
+main () { 
+    local body;
+    body="$(xclip -o)"
+    declare -p body >~/body.declare
+    echo -n "$body" | hexdump -C >~/body.hexdump
+    sleep 0.5s
+    xdotool type "$body"
+}
+
+main "$@"

dotfiles/config/mutt/muttrc

@@ -0,0 +1 @@
+set folder = "~/.local/share/mutt/Mail"

dotfiles/gittum/bin/setup

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-gitver=$(git --version | cut -d ' ' -f 3)
-if [[ "x$gitver" > "x1.8" ]]; then
-    tilde='~'
-else
-    tilde=$HOME
-fi
-
-host=$(hostname -s)
-user=$(whoami)
-
-mkconfig() {
-    echo "[include]"
-    echo "    path = $tilde/.gittum/main.gitconfig"
-    echo "    path = $tilde/.gittum/host/$host.gitconfig"
-    echo "    path = $tilde/.gittum/user/$user.gitconfig"
-    echo "    path = $tilde/.gittum/private.gitconfig"
-}
-
-mkconfig >>"$HOME/.gitconfig"

dotfiles/gittum/template/msg_flake8

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo Flake8

dotfiles/gittum/template/msg_tmp

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo ""
-echo "# use this file to define temporary template"

dotfiles/gittum/template/msg_typo

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "Fix typo"

dotfiles/signature

@@ -1,2 +1,3 @@
 Alois Mahdal <netvor@vornet.cz>
-#shellfu, #starapekarna, https://netvor.info/
+IRC (netvor at Libera): #shellfu, #vpsfree, #fedora-devel
+WWW: https://netvor.info/