From 41e97c7e0f71edc76fa387cbac64eaee84a6244b Mon Sep 17 00:00:00 2001
From: Pierre-Marie Charavel <charavel@pm.me>
Date: Sun, 8 Jun 2025 18:38:53 -0400
Subject: [PATCH] Sway update

---
 .bashrc                                    | 15 ++++++++----
 .config/sway/config                        |  8 +++----
 .config/sway/config.d/50-systemd-user.conf | 16 +++++++++++++
 .config/sway/config.d/theme.conf           | 27 ++++++++--------------
 .config/waybar/config.jsonc                |  2 +-
 5 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 .config/sway/config.d/50-systemd-user.conf

diff --git a/.bashrc b/.bashrc
index 17ebf54..28f1d1e 100644
--- a/.bashrc
+++ b/.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
-fi
-
 # pnpm
 export PNPM_HOME="/home/pmcc/.local/share/pnpm"
 case ":$PATH:" in
@@ -25,4 +21,13 @@ esac
 eval "$(starship init bash)"
 
 alias reboot-to-windows='sudo grub-reboot "Windows Boot Manager (on /dev/nvme1n1p1)" && sudo reboot'
-export PATH=~/.npm-global/bin:~/.local/bin:$PATH
+export PATH=~/.npm-global/bin:$PATH
+export SSH_AUTH_SOCK=~/.1password/agent.sock
+
+if uwsm check may-start; then
+    exec uwsm start sway.desktop
+fi
+
+#if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then
+#    exec sway
+#fi
diff --git a/.config/sway/config b/.config/sway/config
index d4ead64..5ad1695 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -56,10 +56,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 # Basics:
 #
     # Start a terminal
-    bindsym $mod+Return exec $term
+    bindsym $mod+Return exec uwsm app -- $term
 
     # Start your launcher
-    bindsym $mod+space exec $menu
+    bindsym $mod+space exec uwsm app -- $menu
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -72,7 +72,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+backspace exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+backspace exec uwsm stop
 
 #
 # Layout stuff:
@@ -151,6 +151,4 @@ bindsym $mod+r mode "resize"
 
 for_window [shell="xwayland"] title_format "[XWayland] %title"
 
-#xwayland disable
-
 include ~/.config/sway/config.d/*
diff --git a/.config/sway/config.d/50-systemd-user.conf b/.config/sway/config.d/50-systemd-user.conf
new file mode 100644
index 0000000..8781db9
--- /dev/null
+++ b/.config/sway/config.d/50-systemd-user.conf
@@ -0,0 +1,16 @@
+# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment
+# See FS#63021
+# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal.
+
+# Upstream refuses to set XDG_CURRENT_DESKTOP so we have to.
+exec systemctl --user set-environment XDG_CURRENT_DESKTOP=sway
+exec systemctl --user import-environment DISPLAY \
+                                         SWAYSOCK \
+                                         WAYLAND_DISPLAY \
+                                         XDG_CURRENT_DESKTOP
+
+exec hash dbus-update-activation-environment 2>/dev/null && \
+     dbus-update-activation-environment --systemd DISPLAY \
+                                                  SWAYSOCK \
+                                                  XDG_CURRENT_DESKTOP=sway \
+                                                  WAYLAND_DISPLAY
diff --git a/.config/sway/config.d/theme.conf b/.config/sway/config.d/theme.conf
index bed0f77..80457bf 100644
--- a/.config/sway/config.d/theme.conf
+++ b/.config/sway/config.d/theme.conf
@@ -28,29 +28,22 @@ set $mantle    #181825
 set $crust     #11111b
 
 # Warm Sunset Window Colors
-client.focused          $peach     $base      $text     $yellow    $peach
-client.focused_inactive $surface1  $base      $subtext1  $yellow    $surface1
-client.unfocused        $surface0  $base      $subtext0  $yellow    $surface0
+client.focused          $peach     $peach     $mantle    $yellow    $peach
+client.focused_inactive $lavender  $lavender  $mantle    $yellow    $lavender
+client.unfocused        $blue      $blue      $mantle    $yellow    $blue
 client.urgent           $red       $base      $text      $surface0  $red
-client.placeholder      $surface0  $base      $text      $surface0  $surface0
+client.placeholder      $surface0  $surface0  $text      $surface0  $surface0
 client.background       $base
 
 # Gaps and borders
-gaps inner 8
-gaps outer 5
-default_border normal 2
+gaps inner 4
+gaps outer 10
+default_border normal 4
 default_floating_border normal 4
 
+font pango:"JetBrainsMono Nerd Font" Normal 14
+
 # Status bar
 bar {
-    position top
-    colors {
-        statusline $text
-        background $surface0
-        separator  $overlay0
-        inactive_workspace $surface1 $surface0 $text
-        active_workspace   $surface2 $surface0 $text
-        focused_workspace  $peach $surface0 $text
-        urgent_workspace   $red $surface0 $text
-    }
+  swaybar_command waybar
 }
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index b84985b..a5b0150 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -115,7 +115,7 @@
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "⇓{bandwidthDownBytes} ⇑{bandwidthUpBytes} ",
+        "format-ethernet": "▼{bandwidthDownBytes} ▲{bandwidthUpBytes} ",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",