aliases: git: Add -v to git commit

Shows full patch in the commit message editor. Very handy, yes

Signed-off-by: Joe Groocock <jgroocock@cloudflare.com>

aliases

@@ -110,25 +110,38 @@ alias ginit='git init'
 alias gignore='$EDITOR .gitignore'
 alias gitc='$EDITOR $XDG_CONFIG_HOME/git/config'
 alias ggignore='$EDITOR $XDG_CONFIG_HOME/git/gitignore'
-alias gcl="git clone --recursive"
+
 alias gco="git checkout"
 alias gcom="git checkout \"\$(git defbranch)\""
+alias gsw="git switch"
+alias gswm="git switch \"\$(git defbranch)\""
+alias gbr="git branch"
+alias gtg="git tag"
+alias gbl="git blame"
+alias gt="git tag"
+alias gst="git status"
+alias grl="git reflog"
+alias gfp="git format-patch"
+alias gcl="git clone --recursive"
+
 alias ga="git add"
 alias gap="git add -p"
 alias gau="git add -u"
 alias gaN="git add -N"
 alias gaa="ga -A"
 alias grm="git rm"
-alias gc="git commit -s"
+alias gmv="git mv"
-alias gcm="git commit -s -em"
+
-alias gca="git commit -s --amend --date=\"\$(date -R)\""
+alias gc="git commit -sv"
-alias gcn="git commit -s --no-edit"
+alias gcm="git commit -sv -em"
-alias gcan="gca -s --no-edit"
+alias gca="git commit -sv --amend --date=\"\$(date -R)\""
-alias gcam="gca -s -m"
+alias gcn="git commit -sv --no-edit"
-alias gst="git status"
+alias gcan="gca --no-edit"
+alias gcam="gca -m"
 
 alias gm="git merge"
 alias gma="git merge --abort"
+alias gmc="git merge --continue"
 
 alias grb="git rebase"
 alias grbi="grb -i"
@@ -136,9 +149,9 @@ alias grba="grb --abort"
 alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
-alias grbom="git rebase \"origin/\$(git defbranch)\""
+alias grbom="git rebase \"origin/\$(git defbranch origin)\""
-gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
+gfrb() { ref="${1:-origin/$(git defbranch origin)}"; remote="${ref%%/*}"; git fetch "$remote" && git rebase "$ref" "${@:2}"; }
-gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
+gfrbi() { ref="${1:-origin/$(git defbranch origin)}"; remote="${ref%%/*}"; git fetch "$remote" && git rebase -i "$ref" "${@:2}"; }
 
 alias gam="git am"
 alias gama="git am --abort"
@@ -164,10 +177,10 @@ alias gpsuom="git push --set-upstream origin \"\$(git defbranch)\""
 alias gpall="git remote | xargs -L1 git push"
 alias gl="git pull --rebase"
 alias glp="gl && gp"
-alias gd="git diff --patch-with-stat"
+alias gd="git diff --patch-with-stat --no-prefix"
-alias gdni="gd --no-index"
+alias gdni="gd --no-index --no-prefix"
-alias gds="gd --staged"
+alias gds="gd --staged --no-prefix"
-alias gsh="git show --format=fuller --patch-with-stat"
+alias gsh="git show --format=fuller --patch-with-stat --no-prefix"
 alias glg="git log --color --format=fuller --stat --no-merges --graph"
 alias glgp="git log --color --format=fuller --patch-with-stat --no-merges --graph"
 alias glog="git log --color --oneline --decorate --graph"
@@ -175,10 +188,9 @@ alias glog="git log --color --oneline --decorate --graph"
 alias grst="git reset"
 alias gundo="git reset --keep @~1"
 alias gclean="git clean"
-alias gbr="git branch"
+alias gclm="git cleanmerged"
 alias gbrl="git for-each-ref --sort=committerdate refs/heads/ --format=\"%(refname:short)\" | fzf -x --ansi --multi --preview-window=right:70% --preview=\"git log --format=fuller --stat --color=always {} | head -n\$((\$(tput lines)*10))\""
-alias gtg="git tag"
+
-alias gbl="git blame"
 alias gr="git remote"
 alias gra="gr add"
 alias grr="gr rm"
@@ -189,12 +201,12 @@ alias gsta='git stash'
 alias gstd='gsta drop'
 alias gstl='gsta list --stat --color'
 alias gstp='gsta pop'
-alias gstv="gsta show -p stash@{0}"
+alias gstv="gsta show --patch-with-stat stash@{0}"
 
 # Docker aliases
 alias d=docker
 alias dps="docker ps --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
-alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
+alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.opencontainers.image.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
 alias dnets="docker network ls -q | xargs docker inspect | jq '.[] | select(.Name != \"host\" and .Name != \"none\") | [.] | map(.Name + \"\t\" + (.IPAM.Config | map(.Subnet) | join(\"\t\")))[]' -r | sort -V -k2,3 | column -t"
 daddrs() { docker inspect "${1:-bridge}" | jq '.[0].Containers | map(.Name + "\t" + .IPv4Address + "\t" + .IPv6Address)[]' -r | sort -V -k2,3 | column -t; }
 alias din='docker inspect'

git/config

@@ -37,7 +37,23 @@
 	count = !echo $(pwd) && git rev-list HEAD --count
 	unpushed = !git log --oneline @{u}..HEAD
 	leaders = !git shortlog -s -n --all --no-merges
-	defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
+	defbranch = "!defbranch() { \
+		r=\"${1:-origin}\"; \
+		{ \
+			git symbolic-ref \"refs/remotes/$r/HEAD\" || { \
+				git remote set-head \"$r\" -a >&2 && \
+				git symbolic-ref \"refs/remotes/$r/HEAD\"; \
+			}; \
+		} 2>/dev/null \
+			| sed \"s@^refs/remotes/$r/@@\"; \
+	}; defbranch"
+	cleanmerged = "!cleanmerged() { \
+		r=\"${1:-origin}\"; \
+		b=\"${2:-$(git defbranch \"$r\")}\"; \
+		git branch --merged \"$r/$b\" | \
+			grep -ve \"^\\\\*\" -e \"^. $b$\" | \
+			xargs -r git branch -d; \
+	}; cleanmerged"
 [advice]
 	statusHints = false
 	pushUpdateRejected = false

i3/config

@@ -150,7 +150,7 @@ bindsym $mod+Shift+x            exec systemd-run-i3 -n i3-sensible-terminal --cl
 bindsym $mod+$alt+space         exec systemd-run-i3 -s background -n ~/.config/i3/cycleaudio.py
 bindsym $mod+numbersign         exec systemd-run-i3 -n i3-sensible-terminal --hold -e sh -c 'xclip -o | gpg --decrypt 2>&1'
 bindsym $mod+r                  exec bash -c 'pwgen -snc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i -r'
-bindsym $mod+g                  exec systemd-run-i3 -n notify-send -c transfer "$(gist -PRpc)"
+bindsym $mod+g                  exec systemd-run-i3 -n bash -xc 'xclip -o | gh gist create -d Paste - 2>&1 | grep -vE "^[-✓] Creat(ing|ed) gist" | tee >(xclip -i >&2 >/dev/null) | xargs -r notify-send -c transfer'
 bindsym --release $mod+i        exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 10 -- "$(xclip -o -selection clipboard)"'
 bindsym $mod+z                  exec otp | rofi -dmenu -p otp | xargs otp
 

polybar/config.ini

@@ -44,8 +44,7 @@ line-colour = #f00
 
 modules-left = i3
 modules-center =
-# modules-right = volume updates weather xkeyboard wlan gateway eth memory cpu xbacklight battery cputemp gputemp date
+modules-right = volume updates weather wifi ethernet memory cpu cputemp backlight battery date
-modules-right = volume updates weather wlan eth memory cpu xbacklight battery cputemp gputemp date
 
 tray-position = right
 tray-detached = false
@@ -132,8 +131,9 @@ label-urgent-foreground = ${colours.urgent}
 label-urgent-padding = ${self.label-focused-padding}
 
 
-[module/xbacklight]
+[module/backlight]
-type = internal/xbacklight
+type = internal/backlight
+card = intel_backlight
 
 label = %percentage%
 format = <label>
@@ -141,12 +141,6 @@ format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
 
 
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-
 [module/cpu]
 type = internal/cpu
 interval = 2
@@ -164,9 +158,9 @@ format-prefix-foreground = ${colours.icon}
 label = %percentage_used%%
 
 
-[module/wlan]
+[module/wifi]
 type = internal/network
-interface = wlp1s0
+interface-type = wireless
 interval = 3.0
 
 format-connected = <ramp-signal>  <label-connected>
@@ -185,9 +179,9 @@ ramp-signal-2 = 
 ramp-signal-foreground = ${colours.icon}
 
 
-[module/eth]
+[module/ethernet]
 type = internal/network
-interface = lan
+interface-type = wired
 interval = 10.0
 
 label-connected = %local_ip% & %local_ip6%

scripts/otp

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
+set -euo pipefail
+
+NOTIF_PERSIST=30000
+NOTIF_INFORM=5000
+
+stdout=
+caller=
+notif=
 
 while getopts "on:" o; do
 	case "${o}" in
@@ -19,24 +27,19 @@ if [ $# -lt 1 ]; then
 fi
 
 if [ -n "$caller" ]; then
-    notif="$(notify-send -p "Touch your Yubikey" "$caller is requesting otp for $1")"
+	notif="$(notify-send -p -t $NOTIF_PERSIST "Touch your Yubikey" "$caller is requesting otp for $1")"
+	trap 'notify-send -r $notif -t 1 "Touch your Yubikey" "$caller is requesting otp for $1"' EXIT
 fi
 
-ykman oath accounts code -s "$1" 2>&1 |
+code=$(ykman oath accounts code -s "$1")
-    while read -r x; do
+if [ -z "$stdout" ]; then
-        if grep -Pqw '[0-9]{6}' <<< "$x"; then
+	echo "$code" | tee >(xclip -i)
-            if [ -z "$stdout" ]; then
+	xdotool type "$code"
-                echo "$x" | tee >(xclip -i)
+else
-                xdotool type "$x"
+	echo "$code"
-            else
+fi
-                echo "$x"
+
-            fi
+if [ -n "$code" ] && [ -n "$notif" ]; then
-        fi
+	trap : EXIT
-        if [ -z "$stdout" ]; then
+	notify-send -r "$notif" -t $NOTIF_INFORM "Yubikey Touched" "otp generated for $caller"
-            notify-send "$x";
-        fi
-    done
-
-if [ -n "$notif" ]; then
-    notify-send -r "$notif" -t 1000 "Touch your Yubikey" "otp generated for $caller"
 fi