Merged main into zephyrus

.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:
@@ -143,9 +143,6 @@ bindsym $mod+r mode "resize"
     bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
     bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
     bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
-    # Special keys to adjust brightness via brightnessctl
-    # Special key to take a screenshot with grim
-    bindsym Print exec grim
 
 for_window [shell="xwayland"] title_format "[XWayland] %title"
 

.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/keybinds.conf

@@ -36,9 +36,14 @@ bindsym $mod+Shift+s move down
 bindsym $mod+Shift+w move up
 bindsym $mod+Shift+d move right
 
+bindsym $mod+Shift+f floating toggle
+
 ## Layout management
 bindsym $mod+tab layout tabbed
 
 ## Laptop
 bindsym --locked XF86MonBrightnessUp exec brightnessctl -e4 -n2 -d amdgpu_bl2 set 5%+
 bindsym --locked XF86MonBrightnessDown exec brightnessctl -e4 -n2 -d amdgpu_bl2 set 5%-
+
+## Utils
+bindsym Print exec ~/.local/bin/snag -d ~/screenshots/

.config/sway/config.d/outputs.conf

@@ -0,0 +1,2 @@
+output eDP-2 mode 2880x1800@120.000Hz pos 0 0 scale 2 adaptive_sync on allow_tearing yes
+output * max_render_time off

.config/sway/config.d/theme.conf

@@ -28,19 +28,21 @@ 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.urgent           $red       $base      $text      $surface0  $red
-client.placeholder      $surface0  $base      $text      $surface0  $surface0
+client.focused          $peach     $peach     $mantle    $yellow    $peach
+client.focused_inactive $surface2  $lavender  $mantle    $yellow    $lavender
+client.unfocused        $surface2  $blue      $mantle    $yellow    $blue
+client.urgent           $crust     $red       $crust     $surface0  $red
+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 {
   swaybar_command waybar

.config/sway/config.d/windows.conf

@@ -0,0 +1,5 @@
+for_window [shell="xwayland"] title_format "[XWayland] %title"
+
+assign [class="Unity"] workspace number 2
+for_window [title="Unity"] no_focus, move position 400 400
+for_window [title="Picture-in-Picture"] floating enable