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>

Element/config.json

@@ -24,7 +24,7 @@
     ],
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "defaultCountryCode": "GB",
-    "showLabsSettings": false,
+    "showLabsSettings": true,
     "features": {
         "feature_font_scaling": "labs",
         "feature_pinning": "labs",

X11/xprofile

@@ -4,18 +4,20 @@
 export TERMINAL="alacritty"
 export BROWSER="firefox"
 
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+export GTK_THEME="$(grep gtk-theme-name "${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini" | sed 's/.*\s*=\s*//')"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
 export QT_QPA_PLATFORMTHEME=qt5ct
 export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
 
+export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+
 # https://www.reddit.com/r/linux/comments/72mfv8/psa_for_firefox_users_set_moz_use_xinput21_to/
 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,4 +36,5 @@ Xft.hinting:    true
 Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcddefault
 
+Xcursor.size: 16
 Xcursor.theme: Breeze_Obsidian

alacritty/alacritty.yml

@@ -611,7 +611,7 @@ debug:
   #   - Info
   #   - Debug
   #   - Trace
-  log_level: Info
+  log_level: Warn
 
   # Print all received window events.
   #print_events: false

aliases

@@ -46,7 +46,7 @@ alias sudo='sudo '
 alias open=xdg-open
 
 # Command rewrites
-alias rm='rm -i'
+alias rm='rm -iv'
 alias mv='mv -i'
 alias cp='cp -ir'
 alias scp='scp -r'
@@ -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 master"
+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 gcm="git commit -s -em"
-alias gca="git commit -s --amend --date=\"\$(date -R)\""
-alias gcn="git commit -s --no-edit"
-alias gcan="gca -s --no-edit"
-alias gcam="gca -s -m"
-alias gst="git status"
+alias gmv="git mv"
+
+alias gc="git commit -sv"
+alias gcm="git commit -sv -em"
+alias gca="git commit -sv --amend --date=\"\$(date -R)\""
+alias gcn="git commit -sv --no-edit"
+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,31 +149,38 @@ alias grba="grb --abort"
 alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
-alias grbom="git rebase origin/master"
-gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
-gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
+alias grbom="git rebase \"origin/\$(git defbranch origin)\""
+gfrb() { ref="${1:-origin/$(git defbranch origin)}"; remote="${ref%%/*}"; git fetch "$remote" && git rebase "$ref" "${@:2}"; }
+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"
 alias gamc="git am --continue"
+alias gamsk="git am --skip"
 
 alias gcp="git cherry-pick"
 alias gcpa="git cherry-pick --abort"
 alias gcpc="git cherry-pick --continue"
+alias gcpsk="git cherry-pick --skip"
+
+alias grv="git revert"
+alias grva="git revert --abort"
+alias grvc="git revert --continue"
+alias grvsk="git revert --skip"
 
 alias gf="git fetch"
 alias gp="git push"
 alias gpf="gp --force"
 alias gpsu="git push --set-upstream"
 alias gpoH="git push origin HEAD"
-alias gpsuom="git push --set-upstream origin master"
+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 gdni="gd --no-index"
-alias gds="gd --staged"
-alias gsh="git show --format=fuller --patch-with-stat"
+alias gd="git diff --patch-with-stat --no-prefix"
+alias gdni="gd --no-index --no-prefix"
+alias gds="gd --staged --no-prefix"
+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"
@@ -168,12 +188,10 @@ 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 grv="git revert"
 alias gra="gr add"
 alias grr="gr rm"
 alias grao="gra origin"
@@ -183,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'
@@ -302,7 +320,7 @@ alias xresources="\$EDITOR \$XDG_CONFIG_HOME/X11/xresources ; xrdb merge \$XDG_C
 alias sshc="\$EDITOR ~/.ssh/config"
 alias dotfiles="cd \$XDG_CONFIG_HOME"
 alias i3c="\$EDITOR \$XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
-alias polybarc="\$EDITOR \$XDG_CONFIG_HOME/polybar/config; systemctl --user reload polybar@i3bar"
+alias polybarc="\$EDITOR \$XDG_CONFIG_HOME/polybar/config.ini; systemctl --user reload polybar@i3bar"
 
 alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'"
 

dunst/dunstrc

@@ -51,21 +51,16 @@
     # Ignore newlines '\n' in notifications.
     ignore_newline = no
 
-    # The geometry of the window:
-    #   [{width}]x{height}[+/-{x}+/-{y}]
-    # The geometry of the message window.
-    # The height is measured in number of notifications everything else
-    # in pixels.  If the width is omitted but the height is given
-    # ("-geometry x2"), the message window expands over the whole screen
-    # (dmenu-like).  If width is 0, the window expands to the longest
-    # message displayed.  A positive x is measured from the left, a
-    # negative from the right side of the screen.  Y is measured from
-    # the top and down respectevly.
-    # The width can be negative.  In this case the actual width is the
-    # screen width minus the width defined in within the geometry option.
+    # dynamic width from 0 to 400
+    # width = (0, 400)
+    # constant width of 400
+    width = (320, 360)
 
-    # 53 = 30 + 23 (bar-height)
-    geometry = "360x5-30+30"
+    # Position the notification in the top right corner
+    origin = top-right
+
+    # Offset from the origin
+    offset = 30x30
 
     # Shrink window if it's smaller than the width.  Will be ignored if
     # width is 0.
@@ -74,7 +69,7 @@
     # The transparency of the window.  Range: [0; 100].
     # This option will only work if a compositing windowmanager is
     # present (e.g. xcompmgr, compiz, etc.).
-    transparency = 15
+    transparency = 20
 
     # Don't remove messages, if the user is idle (no mouse or keyboard input)
     # for longer than idle_threshold seconds.

environment.d/20-xdg-overrides.conf

@@ -9,7 +9,7 @@ GEM_SPEC_CACHE="$XDG_CACHE_HOME/gem"
 GOPATH="$XDG_DATA_HOME/go"
 ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
 NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
 PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
 RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 TERMINFO="$XDG_DATA_HOME/terminfo"

fontconfig/fonts.conf

@@ -6,7 +6,7 @@
         <edit name="family" mode="prepend" binding="strong">
             <string>Noto Sans</string>
             <string>Noto Color Emoji</string>
-            <string>FontAwesome 5 Pro Light</string>
+            <string>FontAwesome 6 Pro Light</string>
         </edit>
 
         <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
@@ -18,7 +18,7 @@
         <edit name="family" mode="prepend" binding="strong">
             <string>Noto Serif</string>
             <string>Noto Color Emoji</string>
-            <string>FontAwesome 5 Pro Light</string>
+            <string>FontAwesome 6 Pro Light</string>
         </edit>
     </match>
 
@@ -27,7 +27,7 @@
         <edit name="family" mode="prepend" binding="strong">
             <string>Source Code Pro</string>
             <string>Noto Color Emoji</string>
-            <string>FontAwesome 5 Pro Light</string>
+            <string>FontAwesome 6 Pro Light</string>
         </edit>
     </match>
 

git/config

@@ -19,8 +19,14 @@
 [pull]
 	rebase = true
 	prune = true
+[merge]
+	ff = only
 [rebase]
 	autoStash = true
+[remote "origin"]
+	fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
+[remote "upstream"]
+	fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
 [log]
 	date = iso8601-local
 [format]
@@ -31,6 +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 = "!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

gtk-2.0/settings.ini

@@ -1,11 +1,8 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
 gtk-theme-name="Arc-Dark"
 gtk-icon-theme-name="Xenlism-Wildfire"
-gtk-font-name="Noto Sans 9"
+gtk-font-name="sans 9"
 gtk-cursor-theme-name="Breeze_Obsidian"
-gtk-cursor-theme-size=0
+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

@@ -2,9 +2,9 @@
 gtk-theme-name=Arc-Dark
 gtk-icon-theme-name=Xenlism-Wildfire
 gtk-application-prefer-dark-theme=true
-gtk-font-name=Noto Sans 9
+gtk-font-name=sans 9
 gtk-cursor-theme-name=Breeze_Obsidian
-gtk-cursor-theme-size=0
+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-4.0/settings.ini

@@ -0,0 +1 @@
+../gtk-3.0/settings.ini

i3/config

@@ -142,16 +142,17 @@ 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))"
 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 --release $mod+i        exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 250 "$(xclip -o -selection clipboard)"'
+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
 
 # Media player controls
 bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause

picom/picom.conf

@@ -4,31 +4,29 @@ log-level = "info";
 
 # Shadow
 shadow = true;
-shadow-radius = 24;
-shadow-offset-x = -24;
-shadow-offset-y = -24;
-shadow-opacity = 0.6;
-# shadow-red = 0.0;
-# shadow-green = 0.0;
-# shadow-blue = 0.0;
+shadow-radius = 30;
+shadow-offset-x = -30;
+shadow-offset-y = -26;
+shadow-opacity = 0.35;
+shadow-color = "#000000";
 shadow-exclude = [
 	"class_g = 'slop'",
 	"class_g = 'Conky'",
 	"class_g ?= 'Notify-osd'",
-	"class_g = 'Cairo-clock'",
-	"class_g = 'firefox' && argb",
+	"class_g = 'firefox' && argb && (window_type = 'utility' || window_type = 'popup_menu')",
 	"name = 'Notification'",
 	"name = 'cpt_frame_window'",
 	"_GTK_FRAME_EXTENTS@:c"
 ];
 # shadow-exclude = "n:e:Notification";
 # shadow-exclude-reg = "x10+0+0";
+# shadow-ignore-shaped = true;
 xinerama-shadow-crop = true;
 
 # Opacity
 frame-opacity = 1.0;
-# active-opacity = 0.8;
-inactive-opacity = 0.6;
+active-opacity = 1.0;
+inactive-opacity = 0.5;
 inactive-opacity-override = true;
 # inactive-dim = 0.2;
 # inactive-dim-fixed = true;
@@ -40,7 +38,7 @@ opacity-rule = [
 blur:
 {
 	method = "dual_kawase";
-	strength = 8;
+	strength = 10;
 };
 blur-background-frame = true;
 blur-background-fixed = true;
@@ -49,56 +47,88 @@ blur-background-exclude = [
 	"class_g = 'Onboard'",
 	"class_g = 'slop'",
 	"class_g = 'Polybar'",
-	"class_g = 'firefox' && argb",
+	"class_g = 'firefox' && argb && (window_type = 'utility' || window_type = 'popup_menu')",
 	"window_type = 'dock'",
 	"window_type = 'desktop'",
-	"_GTK_FRAME_EXTENTS@:c"
+	"_GTK_FRAME_EXTENTS@:c",
+	"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
 ];
 
+# Corners
+corner-radius = 9;
+
 # Fading
 fading = true;
 fade-delta = 10;
-fade-in-step = 0.04
+fade-in-step = 0.035;
 fade-out-step = 0.06;
 no-fading-openclose = false;
 no-fading-destroyed-argb = false;
 # fade-exclude = [ ];
 
-# Other
-backend = "glx";
-mark-wmwin-focused = true;
-mark-ovredir-focused = true;
-use-ewmh-active-win = true;
-detect-rounded-corners = true;
-detect-client-opacity = true;
-refresh-rate = 0;
-# vsync = true;
-# sw-opti = true;
-# unredir-if-possible = true;
-# unredir-if-possible-delay = 5000;
-# unredir-if-possible-exclude = [ ];
+# Focus
 focus-exclude = [
 	"i:ai:chromium",
 	"class_g = 'firefox'",
-	"class_g = 'zoom'"
+	"class_g = 'zoom'",
+	"class_g = 'guvcview'",
+	"class_g = 'Entangle'",
+	"class_g = 'obs'",
+	"class_g = 'parsecd'",
+	"class_g = 'discord'",
+	"class_g = 'steam_app_271590'"
 ];
+
+# Other
+# https://github.com/yshui/picom/blob/next/picom.sample.conf#L203
+backend = "glx";
+vsync = true;
+mark-wmwin-focused = true;
+mark-ovredir-focused = true;
+detect-rounded-corners = true;
+detect-client-opacity = true;
+use-ewmh-active-win = true;
+# unredir-if-possible = true;
+# unredir-if-possible-delay = 5000;
+# unredir-if-possible-exclude = [ ];
 detect-transient = true;
 detect-client-leader = true;
 invert-color-include = [ ];
-# resize-damage = 1;
+resize-damage = 1;
 
 # GLX backend
 glx-no-stencil = true;
 glx-no-rebind-pixmap = true;
-xrender-sync-fence = true;
+# xrender-sync-fence = true;
+# no-use-damage = false;
 use-damage = true;
 
 # Window type settings
-wintypes:
-{
-  tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
-  dock = { shadow = false; }
-  dnd = { shadow = false; }
-  popup_menu = { opacity = 0.8; }
-  dropdown_menu = { opacity = 0.8; }
+wintypes: {
+	tooltip = {
+		opacity = 0.75;
+		full-shadow = false;
+		blur-background = false;
+	}
+
+	dock = {
+		# Prevents polybar getting a forehead-shadow
+		shadow = false;
+	}
+
+	dnd = {
+		# Prevents dragged text in a browser getting blur/shadow
+		shadow = false;
+		blur-background = false;
+	}
+
+	popup_menu = {
+		opacity = 0.8;
+	}
+
+	dropdown_menu = {
+		opacity = 0.8;
+	}
 };
+
+# vim: ft=conf noet

polybar/config.ini

@@ -1,5 +1,5 @@
 [colours]
-background = transparent
+background = #0000
 text = #eceff1
 icon = #147a82
 warning = #ffcb00
@@ -10,25 +10,23 @@ urgent = #e53935
 format-foreground = ${colours.text}
 format-background = ${colours.background}
 format-spacing = 0
-format-margin  = 2.5
+format-margin  = 3
 format-offset  = 0
 
 screenchange-reload = true
 
 [bar/i3bar]
-monitor = ${env:MONITOR:HDMI-0}
 dpi  = ${xrdb:Xft.dpi:96}
 fixed-center = false
 enable-ipc = true
 
 width = 100%
-#offset-x = 18px
 height = 16pt
 bottom = true
 radius = 0
 
 font-0 = sans:pixelsize=9;2pt
-font-1 = FontAwesome5ProLight:pixelsize=10;2pt
+font-1 = FontAwesome6ProLight:pixelsize=10;2pt
 
 foreground = ${colours.text}
 background = ${colours.background}
@@ -39,22 +37,21 @@ padding-right = 2pt
 border-size = 0
 border-left-size = 16pt
 border-right-size = 16pt
-border-bottom-size = 8pt
+border-bottom-size = 10pt
 
 line-size = 0
 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 wlan gateway eth memory cpu xbacklight battery cputemp gputemp date
+modules-right = volume updates weather wifi ethernet memory cpu cputemp backlight battery date
 
 tray-position = right
 tray-detached = false
 tray-background = ${colours.background}
 #tray-offset-x = -20
 #tray-offset-y = 0
-tray-maxsize = 12pt
+tray-maxsize = 16pt
 tray-padding = 8pt
 tray-scale = 1.0
 
@@ -134,8 +131,9 @@ label-urgent-foreground = ${colours.urgent}
 label-urgent-padding = ${self.label-focused-padding}
 
 
-[module/xbacklight]
-type = internal/xbacklight
+[module/backlight]
+type = internal/backlight
+card = intel_backlight
 
 label = %percentage%
 format = <label>
@@ -143,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
@@ -166,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>
@@ -187,12 +179,12 @@ ramp-signal-2 = 
 ramp-signal-foreground = ${colours.icon}
 
 
-[module/eth]
+[module/ethernet]
 type = internal/network
-interface = eth0
-interval = 3.0
+interface-type = wired
+interval = 10.0
 
-label-connected = %local_ip%
+label-connected = %local_ip% & %local_ip6%
 format-connected-prefix = "  "
 format-connected-prefix-foreground = ${colours.icon}
 format-connected-underline = ${colours.background}

rofi/arc-dark.rasi

@@ -8,7 +8,7 @@ window {
   border:           0.3em;
   border-color:     #2f343f;
   padding:          0.8em;
-  background-color: rgba(56, 60, 74, 0.95);
+  background-color: rgba(56, 60, 74, 0.9);
   transparency:     "real";
 }
 

rofi/config.rasi

@@ -1,9 +1,6 @@
 configuration {
-  theme: "arc-dark";
   font: "sans 14";
   dpi: 0;
-  width: 35;
-  lines: 10;
 
   /* show-icons: true; */
   separator-style: "solid";
@@ -142,4 +139,15 @@ configuration {
 /*  me-accept-custom: "Control+MouseDPrimary";*/
 }
 
+@theme "arc-dark"
+
+window {
+	width: 700;
+}
+
+listview {
+	lines: 10;
+	columns: 1;
+}
+
 /* vim: ft=css sw=2 */

scripts/dpi

@@ -4,48 +4,66 @@ set -eu
 # Based on https://github.com/vincentbernat/awesome-configuration/blob/master/bin/xsettingsd-setup
 CONF_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
 
+BLUR_STRENGTH=10
+CORNER_RADIUS=9
+CURSOR_SIZE=16
+
 xrdbget() {
     set -o pipefail
     xrdb -query | grep -i -m1 "$1" | sed 's/^.*:\s//g' || echo "$2"
 }
 
-dpi=$1
+xsetting_bool() {
+    case "$1" in
+        true) echo 1;;
+        false) echo 0;;
+        default) echo -1;;
+        *) echo -1;;
+    esac
+}
 
-if [ -z "$1" ]; then
-    >&2 printf "Usage\n\t%s: <dpi>" "$(basename "$0")"
+
+if [ -z "$1" ] || [ "$1" -gt 200 ] || [ "$1" -lt 96 ]; then
+    >&2 printf "Usage\n\t%s: value\n\n  value\t Value must be within 96-200 inclusive\n" "$(basename "$0")"
     exit 1
 fi
 
-# Update picom and xorg
-sed -i "s/strength =.*$/strength = $(( dpi*8/96 ));/" "$CONF_DIR/picom/picom.conf" &
-xrandr --dpi "$dpi" &
-
+dpi=$1
 scale=$(( dpi/96 ))
-cursor=$(( dpi/6 ))
+cursor=$(( (dpi*CURSOR_SIZE)/96 ))
+
+# Update picom scale
+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
 mkdir -p "$CONF_DIR/xsettingsd"
 {
-    cat "$CONF_DIR/xsettingsd.local" 2>/dev/null || true
+    cat "$CONF_DIR/xsettingsd.local" 2>/dev/null || :
     echo "Xcursor/size $cursor"
     echo "Gtk/CursorThemeSize $cursor"
     echo "Gtk/CursorThemeName \"$(xrdbget Xcursor.theme Adwaita)\""
     echo "Xft/HintStyle \"$(xrdbget Xft.hintstyle hintfull)\""
-    echo "Xft/Hinting \"$(xrdbget Xft.hinting -1)\""
+    echo "Xft/Hinting $(xsetting_bool "$(xrdbget Xft.hinting default)")"
     echo "Xft/RGBA \"$(xrdbget Xft.rgba rgb)\""
     echo "Xft/DPI $(( dpi*1024 ))"
     echo "Gdk/WindowScalingFactor $scale"
     echo "Gdk/UnscaledDPI $(( dpi*1024/scale ))"
 } > "$CONF_DIR/xsettingsd/xsettingsd.conf"
 
-{
-    echo "Xft.dpi: $dpi"
-    echo "Xcursor.size: $cursor"
-} | xrdb -merge &
-
-systemctl --user reload-or-restart xsettingsd &
+xrdb -merge <<EOF &
+Xft.dpi: $dpi
+Xcursor.size: $cursor
+EOF
+xrandr --dpi "$dpi" &
+systemctl --user try-reload-or-restart xsettingsd &
 wait
 
-systemctl --user reload \
+systemctl --user try-reload-or-restart \
     i3 \
-    polybar@i3bar
+    polybar@i3bar &
+systemctl --user try-restart \
+    dunst &
+
+wait

scripts/otp

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NOTIF_PERSIST=30000
+NOTIF_INFORM=5000
+
+stdout=
+caller=
+notif=
+
+while getopts "on:" o; do
+	case "${o}" in
+		o)
+			stdout=1;;
+		n)
+			caller="${OPTARG}"
+			;;
+		*)
+			exec ykman oath accounts list
+			;;
+	esac
+done
+shift $((OPTIND-1))
+
+if [ $# -lt 1 ]; then
+	exec ykman oath accounts list
+fi
+
+if [ -n "$caller" ]; then
+	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
+
+code=$(ykman oath accounts code -s "$1")
+if [ -z "$stdout" ]; then
+	echo "$code" | tee >(xclip -i)
+	xdotool type "$code"
+else
+	echo "$code"
+fi
+
+if [ -n "$code" ] && [ -n "$notif" ]; then
+	trap : EXIT
+	notify-send -r "$notif" -t $NOTIF_INFORM "Yubikey Touched" "otp generated for $caller"
+fi

scripts/systemd-run-i3

@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+slice=app
 rand=$(tr -dc 'a-f0-9' < /dev/urandom | head -c 8)
 
 args=()
@@ -16,14 +17,11 @@ do case "$opt" in
 done
 shift $((OPTIND-1))
 
-if [ -z "$slice" ]; then
-    slice=app
-fi
-
 exec systemd-run \
     --user \
     --collect \
     --slice="$slice" \
     --unit="$slice-$1-$rand" \
     --property=BindsTo=graphical-session.target \
-    ${args[@]} -- "$@"
+    --property=ExitType=cgroup \
+    "${args[@]}" -- "$@"

ssh/askpass

@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+if [ -z "$SSH_HOST" ]; then
+    >&2 echo 'Missing SSH_HOST variable'
+    exit 1
+fi
+
+case "$SSH_HOST" in
+    *)
+        echo 'Unknown SSH host'
+        exit 1
+        ;;
+esac

systemd/user/default.target.wants/pipewire.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire.service

systemd/user/picom.service

@@ -4,7 +4,7 @@ Requires=graphical-session.target
 After=dbus.service graphical-session.target xorg.target
 
 [Service]
-ExecStart=/usr/bin/picom --experimental-backends --dbus
+ExecStart=/usr/bin/picom --dbus
 Restart=always
 Slice=session.slice
 

systemd/user/pipewire-session-manager.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/wireplumber.service

systemd/user/pipewire.service.wants/wireplumber.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/wireplumber.service

systemd/user/polybar@.service

@@ -1,11 +1,11 @@
 [Unit]
-Description=Polybar
+Description=Polybar bar %i
 Requires=graphical-session.target
 After=graphical-session.target pulseaudio.socket i3.service
 
 [Service]
 ExecStart=/usr/bin/polybar --reload --log=warning %i
-ExecReload=/usr/bin/polybar-msg cmd restart -p $MAINPID
+ExecReload=/usr/bin/polybar-msg -p $MAINPID cmd restart
 Restart=always
 Slice=session.slice
 

systemd/user/pulseaudio.service.d/override.conf

@@ -1,2 +0,0 @@
-[Service]
-Slice=session.slice

systemd/user/sockets.target.wants/pipewire.socket

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire.socket

systemd/user/sockets.target.wants/pulseaudio.socket

@@ -1 +0,0 @@
-/usr/lib/systemd/user/pulseaudio.socket

systemd/user/ssh@.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=SSH persistent connection to %i
+
+[Service]
+Type=forking
+Slice=ssh.slice
+Environment=SSH_ASKPASS=%E/ssh/askpass
+Environment=SSH_HOST=%i
+ExecStart=/usr/bin/ssh -fNT %i
+Restart=on-failure
+
+[Install]
+WantedBy=ssh.target

vim/vimrc

@@ -70,7 +70,7 @@ set splitright          " Vertical split to right of current.
 
 " Whitespace highlight settings
 set list
-set listchars=eol:$,space:·,tab:>-,trail:◦,extends:▶,precedes:◀
+set listchars=space:·,tab:>-,trail:◦,extends:▶,precedes:◀
 highlight SpecialKey ctermfg=8
 
 set cc=+1

zsh/.zshrc

@@ -16,9 +16,10 @@ if exists tty && tty -s; then
 fi
 
 # Configure less and add colours
-export LESS="-RI --mouse --wheel-lines=3"
+export LESS="-nRIFRSXM --mouse --wheel-lines=3"
 export PAGER="less"
 export MANPAGER="less -+N"
+export SYSTEMD_LESS="$LESS"
 export SYSTEMD_PAGER="less $LESS"
 # Disable histfile
 export LESSHISTFILE=-
@@ -59,17 +60,18 @@ ZINIT[HOME_DIR]="$XDG_CACHE_HOME/zsh/zinit"
 ZINIT[BIN_DIR]="${ZINIT[HOME_DIR]}/bin"
 ZINIT[PLUGINS_DIR]="${ZINIT[HOME_DIR]}/plugins"
 if [ ! -e "${ZINIT[HOME_DIR]}" ]; then
-    git clone https://github.com/zdharma/zinit.git "${ZINIT[HOME_DIR]}"
+    git clone https://github.com/zdharma-continuum/zinit.git "${ZINIT[HOME_DIR]}"
 fi
 source "${ZINIT[HOME_DIR]}"/zinit.zsh
 
-zinit wait lucid light-mode for \
- atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \
-    zdharma/fast-syntax-highlighting \
- blockf \
-    zsh-users/zsh-completions \
- atload"!_zsh_autosuggest_start" \
-    zsh-users/zsh-autosuggestions
+zinit wait lucid for \
+    atinit"ZINIT[COMPINIT_OPTS]=-C;zicompinit;zicdreplay" \
+    atload"FAST_HIGHLIGHT[chroma-zinit]=" \
+        zdharma-continuum/fast-syntax-highlighting \
+    blockf \
+        zsh-users/zsh-completions \
+    atload"!_zsh_autosuggest_start" \
+        zsh-users/zsh-autosuggestions
 
 zinit light agkozak/zsh-z
 
@@ -108,6 +110,9 @@ bindkey -M vicmd K vi-kill-eol
 bindkey -M vicmd j vi-find-next-char-skip
 bindkey -M vicmd l vi-repeat-search
 
+# Disable all fsh chromas, fixes `zi` being slow
+FAST_HIGHLIGHT=()
+
 ZSH_AUTOSUGGEST_USE_ASYNC=true
 ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=128
 ZSH_AUTOSUGGEST_CLEAR_WIDGETS=("${(@)ZSH_AUTOSUGGEST_CLEAR_WIDGETS:#(up|down)-line-or-history}")

zsh/plugins/fish-theme.zsh

@@ -1,7 +1,7 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-    pwd | sed -E 's|^'$HOME'|~|;s|(.*)/|\1%|;s|((^\|/)\.?[^/%]{1})[^/%]*|\1|g;s|(.*)%|\1/|'
+    pwd | sed -E 's|^'$HOME'|~|;s|([\.~]?[^/]{1})[^/]*/|\1/|g'
 }
 
 function zle-line-init zle-keymap-select {