Config: Add author/committer distinction in git aliases"

.config/hypr/hyprland.conf

@@ -135,10 +135,10 @@ animations {
 # "Smart gaps" / "No gaps when only"
 workspace = w[tv1], gapsout:0, gapsin:0
 workspace = f[1], gapsout:0, gapsin:0
-windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
+windowrule = border_size 0, match:float 0, match:workspace w[tv1]
-windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
+windowrule = rounding 0, match:float 0, match:workspace w[tv1]
-windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
+windowrule = border_size 0, match:float 0, match:workspace f[1]
-windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
+windowrule = rounding 0, match:float 0, match:workspace f[1]
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
@@ -182,7 +182,7 @@ input {
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
 gestures {
-	workspace_swipe = false
+	workspace_swipe_touch = false
 }
 
 # Example per-device config
@@ -268,16 +268,16 @@ bind = $mainMod, T, togglespecialworkspace, magic
 #-- Move --#
 
 # Send window to workspace
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
 
 # Move window to previous/next workspace
 bind = $mainMod SHIFT, equal, movetoworkspace, e+1
@@ -391,23 +391,23 @@ bind = Control_L SHIFT, period, exec, dunstctl context
 # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
 
 # Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
+windowrule = suppress_event maximize, match:class .*
 
 # Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrule = no_focus true, match:class ^$, match:title ^$, match:xwayland true, match:float true, match:fullscreen false, match:pin false
 
 # Set to floating
-windowrule = float, class:feh # window rule v1 can only do either class or title, not both
+windowrule = float true, match:class feh # window rule v1 can only do either class or title, not both
-windowrule = float, class:mpv
+windowrule = float true, match:class mpv
-windowrule = float, class:org.pulseaudio.pavucontrol
+windowrule = float true, match:class org.pulseaudio.pavucontrol
-windowrule = float, class:pinentry-gtk
+windowrule = float true, match:class pinentry-gtk
-windowrule = float, class:xarchiver
+windowrule = float true, match:class xarchiver
-windowrule = float, class:firefox, title:Library
+windowrule = float true, match:class firefox, match:title Library
-windowrule = float, class:firefox, title:^About.*
+windowrule = float true, match:class firefox, match:title ^About.*
-windowrule = float, class:thunar, title:File Operation Progress
+windowrule = float true, match:class thunar, match:title File Operation Progress
 
 # Resize floating windows
-windowrule   = size >50% >70%, class:org.pulseaudio.pavucontrol
+windowrule   = size >50% >70%, match:class org.pulseaudio.pavucontrol
 
 # Put workspaces on specific monitors
 workspace = 1, monitor:desc:Ancor Communications Inc ASUS PB298 D7LMTF059917, persistent:true, default:true

.config/hypr/hyprpaper.conf

@@ -0,0 +1 @@
+splash = false

.config/zsh/.zlogin

@@ -1,7 +1,7 @@
 XORG_USER='rick'
 
 if [ "$WAYLAND" = true ]; then
-	[ "$USER" = "$XORG_USER" ] && [ "$(tty)" = "/dev/tty1" ] && exec hyprland > /dev/null 2>&1
+	[ "$USER" = "$XORG_USER" ] && [ "$(tty)" = "/dev/tty1" ] && exec start-hyprland > /dev/null 2>&1
 else
 	[ "$USER" = "$XORG_USER" ] && [ "$(tty)" = "/dev/tty1" ] && exec xinit -- vt1 > /dev/null 2>&1
 fi

.config/zsh/.zshrc

@@ -177,8 +177,8 @@ alias gd="git diff"
 alias gdc="git diff --cached"
 alias gds="git diff --staged"
 alias gf="git fetch"
-alias gl="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d    %C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
+alias gl="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d    %C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an <%cn>%C(reset)' --all"
-alias gle="git log --graph --stat --format=format:'%C(bold blue)commit %H%C(reset)%C(bold yellow)%d %C(reset)%nAuthor: %C(dim white)%an <%ae>%C(reset)%nDate:   %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%n%n%w(64,4,4)%B'"
+alias gle="git log --graph --stat --format=format:'%C(bold blue)commit %H%C(reset)%C(bold yellow)%d %C(reset)%nAuthor:    %C(dim white)%an <%ae>%C(reset)%nCommitter: %C(dim white)%cn <%ce>%C(reset)%nDate:      %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%n%n%w(64,4,4)%B'"
 alias gm="git merge"
 alias gp="git pull"
 alias gps='git push || git push origin $(git branch --show-current)'
@@ -186,7 +186,7 @@ alias gpsa='git remote | xargs -I remotes git push remotes $(git branch --show-c
 alias gpsaf='git remote | xargs -I remotes git push --force remotes $(git branch --show-current)'
 alias gr="git reset"
 alias gs="git status"
-alias gsh="git show --format=format:'%C(bold blue)commit %H%C(reset) %C(bold yellow)%d %C(reset)%nAuthor: %C(dim white)%an <%ae>%C(reset)%nDate:   %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%n%n%w(64,4,4)%B'"
+alias gsh="git show --format=format:'%C(bold blue)commit %H%C(reset) %C(bold yellow)%d %C(reset)%nAuthor:    %C(dim white)%an <%ae>%C(reset)%nCommitter: %C(dim white)%cn <%ce>%C(reset)%nDate:      %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%n%n%w(64,4,4)%B'"
 alias gt='git ls-tree -r --name-only $(git branch --show-current) .'
 
 # Scripts

.local/bin/wm/wallpaper.sh

@@ -11,13 +11,10 @@ if [ "$WAYLAND" = true ]; then
 	setsid -f hyprpaper
 
 	# Wait until hyprpaper is available
-	while true; do
+	while [ -z "$(find "$XDG_RUNTIME_DIR/hypr" -name ".hyprpaper.sock")" ]; do
-		output=$(hyprctl hyprpaper)
-		if ! echo "$output" | grep -q ".sock"; then
-			break
-		fi
 		sleep 0.1
 	done
+	sleep 0.1
 
 	hyprctl hyprpaper preload "$WALLPAPER"
 	hyprctl hyprpaper wallpaper ",$WALLPAPER"