Move common stuff to sway config

.config/sway/config

@@ -4,6 +4,73 @@
 #
 # Read `man 5 sway` for a complete reference.
 
+# 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
+
+# Official Catppuccin Mocha Colors (from catppuccin.com)
+
+set $rosewater #f5e0dc
+set $flamingo  #f2cdcd
+set $pink      #f5c2e7
+set $mauve     #cba6f7
+set $red       #f38ba8
+set $maroon    #eba0ac
+set $peach     #fab387
+set $yellow    #f9e2af
+set $green     #a6e3a1
+set $teal      #94e2d5
+set $sky       #89dceb
+set $sapphire  #74c7ec
+set $blue      #89b4fa
+set $lavender  #b4befe
+set $text      #cdd6f4
+set $subtext1  #bac2de
+set $subtext0  #a6adc8
+set $overlay2  #9399b2
+set $overlay1  #7f849c
+set $overlay0  #6c7086
+set $surface2  #585b70
+set $surface1  #45475a
+set $surface0  #313244
+set $base      #1e1e2e
+set $mantle    #181825
+set $crust     #11111b
+
+# Warm Sunset Window Colors
+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 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
+}
+
 ### Variables
 #
 # Logo key. Use Mod1 for Alt.
@@ -138,14 +205,70 @@ bindsym $mod+r mode "resize"
 #
 # Utilities:
 #
-    # Special keys to adjust volume via PulseAudio
+# Special keys to adjust volume via PulseAudio
-    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
-    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
-    bindsym --locked XF86AudioRaiseVolume 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
+bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
 
 for_window [shell="xwayland"] title_format "[XWayland] %title"
+for_window [title="Pipewire Volume Control"] floating enable
+for_window [title="Picture-in-Picture"] floating enable
+for_window [class="org.kde.haruna"] floating enable
+for_window [title=".*\.PopupWindow"] floating enable
+for_window [title="Unity"] no_focus, move position 400 400
+for_window [class="Unity" title="Project Settings"] floating enable
+for_window [class="Unity" title=".*\.AnnotationWindow"] floating enable
+for_window [class="Unity" title="Color"] floating enable
+
+assign [class="Unity"] workspace number 3
+
+## Workspace
+
+# Switch to workspace
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+f1 workspace number 5
+bindsym $mod+f2 workspace number 6
+bindsym $mod+f3 workspace number 7
+bindsym $mod+f4 workspace number 8
+
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+f1 move container to workspace number 5
+bindsym $mod+Shift+f2 move container to workspace number 6
+bindsym $mod+Shift+f3 move container to workspace number 7
+bindsym $mod+Shift+f4 move container to workspace number 8
+
+## Window management
+
+bindsym $mod+escape kill
+
+# Move focus
+bindsym $mod+a focus left
+bindsym $mod+s focus down
+bindsym $mod+w focus up
+bindsym $mod+d focus right
+
+# Move window
+bindsym $mod+Shift+a move left
+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
+
+## Utils
+bindsym Print exec bash -c 'file=$(~/.local/bin/snag -d ~/screenshots/) && wl-copy < $file'
+bindsym Print+Ctrl exec bash -c 'file=$(~/.local/bin/snag -r -d ~/screenshots/) && wl-copy < $file'
 
-#seat * xcursor_theme catppuccin-latte-peach-cursors 32
 
 include ~/.config/sway/config.d/*

.config/sway/config.d/50-systemd-user.conf

@@ -1,16 +0,0 @@
-# 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/inputs.conf

@@ -1,5 +0,0 @@
-input 2362:12305:ASUP1208:00_093A:3011_Touchpad {
-  natural_scroll enabled
-  tap enabled
-  pointer_accel 0.5
-}

.config/sway/config.d/keybinds.conf

@@ -1,52 +0,0 @@
-## Workspace
-
-# Switch to workspace
-bindsym $mod+1 workspace number 1
-bindsym $mod+2 workspace number 2
-bindsym $mod+3 workspace number 3
-bindsym $mod+4 workspace number 4
-bindsym $mod+f1 workspace number 5
-bindsym $mod+f2 workspace number 6
-bindsym $mod+f3 workspace number 7
-bindsym $mod+f4 workspace number 8
-
-# Move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number 1
-bindsym $mod+Shift+2 move container to workspace number 2
-bindsym $mod+Shift+3 move container to workspace number 3
-bindsym $mod+Shift+4 move container to workspace number 4
-bindsym $mod+Shift+f1 move container to workspace number 5
-bindsym $mod+Shift+f2 move container to workspace number 6
-bindsym $mod+Shift+f3 move container to workspace number 7
-bindsym $mod+Shift+f4 move container to workspace number 8
-
-## Window management
-
-bindsym $mod+escape kill
-
-# Move focus
-bindsym $mod+a focus left
-bindsym $mod+s focus down
-bindsym $mod+w focus up
-bindsym $mod+d focus right
-
-# Move window
-bindsym $mod+Shift+a move left
-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 XF86KbdBrightnessUp exec asusctl -n
-bindsym --locked XF86KbdBrightnessDown exec asusctl -p
-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 bash -c 'file=$(~/.local/bin/snag -d ~/screenshots/) && wl-copy < $file'
-bindsym Print+Ctrl exec bash -c 'file=$(~/.local/bin/snag -r -d ~/screenshots/) && wl-copy < $file'

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

@@ -1,2 +0,0 @@
-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

@@ -1,49 +0,0 @@
-# Official Catppuccin Mocha Colors (from catppuccin.com)
-
-set $rosewater #f5e0dc
-set $flamingo  #f2cdcd
-set $pink      #f5c2e7
-set $mauve     #cba6f7
-set $red       #f38ba8
-set $maroon    #eba0ac
-set $peach     #fab387
-set $yellow    #f9e2af
-set $green     #a6e3a1
-set $teal      #94e2d5
-set $sky       #89dceb
-set $sapphire  #74c7ec
-set $blue      #89b4fa
-set $lavender  #b4befe
-set $text      #cdd6f4
-set $subtext1  #bac2de
-set $subtext0  #a6adc8
-set $overlay2  #9399b2
-set $overlay1  #7f849c
-set $overlay0  #6c7086
-set $surface2  #585b70
-set $surface1  #45475a
-set $surface0  #313244
-set $base      #1e1e2e
-set $mantle    #181825
-set $crust     #11111b
-
-# Warm Sunset Window Colors
-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 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

@@ -1,12 +0,0 @@
-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
-for_window [class="org.kde.haruna"] floating enable
-for_window [title=".*\.PopupWindow"] floating enable
-for_window [class="Unity" title="Project Settings"] floating enable
-for_window [class="Unity" title=".*\.AnnotationWindow"] floating enable
-for_window [class="Unity" title="Color"] floating enable
-
-for_window [title="Pipewire Volume Control"] floating enable

.config/sway/config.d/workspaces.conf

@@ -1,4 +0,0 @@
-workspace 1 output eDP-2
-workspace 2 output eDP-2
-workspace 3 output eDP-2
-workspace 4 output eDP-2