i3: screenshot to clipboard by default

Use Shift+PrtScr to upload to the http share, as that's a less common
use-case.

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

X11/xprofile

@@ -16,8 +16,8 @@ export MOZ_USE_XINPUT2=1 # enable pixel-accurate scrolling in firefox
 
 
 # Load Xorg resources and set the DPI
-xrdb -merge $XDG_CONFIG_HOME/X11/xresources
-xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
+xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
+"$XDG_CONFIG_HOME/scripts/dpi" "$(xrdb -query | grep -i xft.dpi | cut -d: -f2 | xargs)"
 
 setxkbmap -option caps:none
 xset r rate 200 18

X11/xresources

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

aliases

@@ -119,7 +119,6 @@ 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)\""
@@ -127,7 +126,6 @@ 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"
@@ -139,8 +137,8 @@ alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
 alias grbom="git rebase \"origin/\$(git defbranch)\""
-gfrb() { remote="${1%%/*}"; git fetch "$remote" && git rebase "$@"; }
-gfrbi() { remote="${1%%/*}"; git fetch "$remote" && git rebase -i "$@"; }
+gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
+gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
 
 alias gam="git am"
 alias gama="git am --abort"
@@ -177,7 +175,6 @@ 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

@@ -37,23 +37,7 @@
 	count = !echo $(pwd) && git rev-list HEAD --count
 	unpushed = !git log --oneline @{u}..HEAD
 	leaders = !git shortlog -s -n --all --no-merges
-	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"
+	defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
 [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="BreezeX-Black"
-gtk-cursor-theme-size=28
+gtk-cursor-theme-name="Breeze_Obsidian"
+gtk-cursor-theme-size=16
 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=BreezeX-Black
-gtk-cursor-theme-size=28
+gtk-cursor-theme-name=Breeze_Obsidian
+gtk-cursor-theme-size=16
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1

i3/config

@@ -142,8 +142,8 @@ bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -
 bindsym $mod+Shift+p            exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
 bindsym $mod+Shift+e            exec "pkill rofi; rofi -show emoji -modi emoji -normal-window"
 bindsym $mod+Shift+i            exec rofi-fontawesome
-bindsym --release Print         exec screenshot
-bindsym --release $mod+Print    exec screenshot --clip
+bindsym --release Print         exec screenshot --clip
+bindsym --release $mod+Print    exec screenshot
 bindsym --release Shift+Print   exec screenshot --active
 bindsym --release $mod+Shift+Print exec screenshot --active --clip
 bindsym $mod+Shift+x            exec systemd-run-i3 -n i3-sensible-terminal --class floating-term --hold -e /bin/echo "$(xprop -id $(xdotool getactivewindow))"

picom/picom.conf

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

scripts/dpi

@@ -4,9 +4,9 @@ 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
+BLUR_STRENGTH=10
 CORNER_RADIUS=9
+CURSOR_SIZE=16
 
 xrdbget() {
     set -o pipefail
@@ -57,13 +57,13 @@ Xft.dpi: $dpi
 Xcursor.size: $cursor
 EOF
 xrandr --dpi "$dpi" &
-systemctl --user reload-or-restart xsettingsd &
+systemctl --user try-reload-or-restart xsettingsd &
 wait
 
-systemctl --user reload \
+systemctl --user try-reload-or-restart \
     i3 \
     polybar@i3bar &
-systemctl --user restart \
+systemctl --user try-restart \
     dunst &
 
 wait