Sway update

.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

.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
 }