Merged main into zephyrus

.bashrc

@@ -10,10 +10,6 @@ alias grep='grep --color=auto'
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 PS1='[\u@\h \W]\$ '
 
-if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then
-    exec sway --unsupported-gpu
-fi
-
 # pnpm
 export PNPM_HOME="/home/pmcc/.local/share/pnpm"
 case ":$PATH:" in
@@ -25,3 +21,13 @@ esac
 eval "$(starship init bash)"
 
 export PATH=~/.npm-global/bin:~/.local/bin:$PATH
+export SSH_AUTH_SOCK=~/.1password/agent.sock
+
+if uwsm check may-start; then
+    exec uwsm start -- sway.desktop --unsupported-gpu
+fi
+
+#if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then
+#    exec sway
+#fi
+alias claude="/home/pmcc/.config/claude/local/claude"