picom: Adjust shadow alignment/size

Picom can now accurately draw shadows (again?) so tweak them so they're
horizontally centred and slightly below the window so they look
aesthetically pleasing.

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

X11/xprofile

@@ -4,11 +4,13 @@
 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
 

aliases

@@ -112,7 +112,7 @@ 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 ga="git add"
 alias gap="git add -p"
 alias gau="git add -u"
@@ -136,7 +136,7 @@ alias grba="grb --abort"
 alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
-alias grbom="git rebase origin/master"
+alias grbom="git rebase \"origin/\$(git defbranch)\""
 gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
 gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
 
@@ -160,7 +160,7 @@ 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"

git/config

@@ -37,6 +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 = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
 [advice]
 	statusHints = false
 	pushUpdateRejected = false

gtk-2.0/settings.ini

@@ -1,6 +1,3 @@
-# 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="sans 9"

gtk-4.0/settings.ini

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

picom/picom.conf

@@ -4,10 +4,10 @@ log-level = "info";
 
 # Shadow
 shadow = true;
-shadow-radius = 24;
-shadow-offset-x = -20;
-shadow-offset-y = -20;
-shadow-opacity = 0.3;
+shadow-radius = 30;
+shadow-offset-x = -30;
+shadow-offset-y = -26;
+shadow-opacity = 0.35;
 shadow-color = "#000000";
 shadow-exclude = [
 	"class_g = 'slop'",
@@ -55,12 +55,12 @@ blur-background-exclude = [
 ];
 
 # Corners
-corner-radius = 8;
+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;

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