git: Add mv/reflog/clean-merged aliases

Signed-off-by: Joe Groocock <me@frebib.net>

X11/xresources

@@ -36,5 +36,5 @@ Xft.hinting:    true
 Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcddefault
 
-Xcursor.size: 16
-Xcursor.theme: Breeze_Obsidian
+Xcursor.size: 28
+Xcursor.theme: BreezeX-Black

aliases

@@ -119,6 +119,7 @@ alias gau="git add -u"
 alias gaN="git add -N"
 alias gaa="ga -A"
 alias grm="git rm"
+alias gmv="git mv"
 alias gc="git commit -s"
 alias gcm="git commit -s -em"
 alias gca="git commit -s --amend --date=\"\$(date -R)\""
@@ -126,6 +127,7 @@ alias gcn="git commit -s --no-edit"
 alias gcan="gca -s --no-edit"
 alias gcam="gca -s -m"
 alias gst="git status"
+alias grl="git reflog"
 
 alias gm="git merge"
 alias gma="git merge --abort"
@@ -175,6 +177,7 @@ alias glog="git log --color --oneline --decorate --graph"
 alias grst="git reset"
 alias gundo="git reset --keep @~1"
 alias gclean="git clean"
+alias gclm="git cleanmerged"
 alias gbr="git branch"
 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"

git/config

@@ -38,6 +38,7 @@
 	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/@@\"
+	cleanmerged = !git branch --merged \"origin/$(git defbranch)\" | grep -ve \"^\\\\*\" -e \"^. $(git defbranch)$\" | xargs -r git branch -d
 [advice]
 	statusHints = false
 	pushUpdateRejected = false

gtk-2.0/settings.ini

@@ -1,8 +1,8 @@
 gtk-theme-name="Arc-Dark"
 gtk-icon-theme-name="Xenlism-Wildfire"
 gtk-font-name="sans 9"
-gtk-cursor-theme-name="Breeze_Obsidian"
-gtk-cursor-theme-size=16
+gtk-cursor-theme-name="BreezeX-Black"
+gtk-cursor-theme-size=28
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1

gtk-3.0/settings.ini

@@ -3,8 +3,8 @@ gtk-theme-name=Arc-Dark
 gtk-icon-theme-name=Xenlism-Wildfire
 gtk-application-prefer-dark-theme=true
 gtk-font-name=sans 9
-gtk-cursor-theme-name=Breeze_Obsidian
-gtk-cursor-theme-size=16
+gtk-cursor-theme-name=BreezeX-Black
+gtk-cursor-theme-size=28
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1

picom/picom.conf

@@ -38,7 +38,7 @@ opacity-rule = [
 blur:
 {
 	method = "dual_kawase";
-	strength = 8;
+	strength = 12;
 };
 blur-background-frame = true;
 blur-background-fixed = true;

scripts/dpi

@@ -4,6 +4,10 @@ set -eu
 # Based on https://github.com/vincentbernat/awesome-configuration/blob/master/bin/xsettingsd-setup
 CONF_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
 
+BLUR_STRENGTH=12
+CURSOR_SIZE=28
+CORNER_RADIUS=9
+
 xrdbget() {
     set -o pipefail
     xrdb -query | grep -i -m1 "$1" | sed 's/^.*:\s//g' || echo "$2"
@@ -26,11 +30,11 @@ fi
 
 dpi=$1
 scale=$(( dpi/96 ))
-cursor=$(( dpi/6 ))
+cursor=$(( (dpi*CURSOR_SIZE)/96 ))
 
 # Update picom scale
-sed -i -e "s/strength =.*$/strength = $(( dpi*8/96 ));/" \
-    -e "s/corner-radius =.*$/corner-radius = $(( dpi/13 ));/" \
+sed -i -e "s/strength =.*$/strength = $(( (dpi*BLUR_STRENGTH)/96 ));/" \
+    -e "s/corner-radius =.*$/corner-radius = $(( (dpi*CORNER_RADIUS)/96 ));/" \
     "$CONF_DIR/picom/picom.conf" &
 
 # Build xsettingsd.conf