Remove hyprland, add sway

.bashrc

@@ -10,8 +10,8 @@ alias grep='grep --color=auto'
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 PS1='[\u@\h \W]\$ '
 
-if uwsm check may-start; then
+if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then
-  exec uwsm start hyprland.desktop
+    exec sway
 fi
 
 # pnpm
@@ -25,4 +25,4 @@ 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:$PATH
+export PATH=~/.npm-global/bin:~/.local/bin:$PATH

.config/alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0
 
 [font.normal]
 family = "JetBrainsMono Nerd Font"

.config/hypr/appearance.conf

@@ -1,99 +0,0 @@
-# https://wiki.hyprland.org/Configuring/Variables/#general
-general {
-    gaps_in = 8
-    gaps_out = 16
-
-    border_size = 2
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    col.active_border = $pink $mauve 45deg
-    col.inactive_border = $overlay0
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false
-
-    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = dwindle
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
-decoration {
-    rounding = 8
-
-    blur {
-        enabled = true
-        size = 6
-        passes = 3
-
-        # Blur background windows
-        ignore_opacity = false
-        new_optimizations = true
-        xray = false
-    }
-
-    shadow {
-        enabled = true
-        range = 12
-        render_power = 3
-        offset = 0, 0
-        color = $shadow_on
-        color_inactive = $shadow_off
-    }
-
-    # Window opacity
-    active_opacity = 0.95
-    inactive_opacity = 0.85
-    fullscreen_opacity = 1.0
-
-    # Dim inactive windows
-    dim_inactive = true
-    dim_strength = 0.1
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = easeOutQuint,0.23,1,0.32,1
-    bezier = easeInOutCubic,0.65,0.05,0.36,1
-    bezier = linear,0,0,1,1
-    bezier = almostLinear,0.5,0.5,0.75,1.0
-    bezier = quick,0.15,0,0.1,1
-
-    animation = global, 1, 10, default
-    animation = border, 1, 5.39, easeOutQuint
-    animation = windows, 1, 4.79, easeOutQuint
-    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
-    animation = windowsOut, 1, 1.49, linear, popin 87%
-    animation = fadeIn, 1, 1.73, almostLinear
-    animation = fadeOut, 1, 1.46, almostLinear
-    animation = fade, 1, 3.03, quick
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = layersIn, 1, 4, easeOutQuint, fade
-    animation = layersOut, 1, 1.5, linear, fade
-    animation = fadeLayersIn, 1, 1.79, almostLinear
-    animation = fadeLayersOut, 1, 1.39, almostLinear
-    animation = workspaces, 1, 1.94, almostLinear, fade
-    animation = workspacesIn, 1, 1.21, almostLinear, fade
-    animation = workspacesOut, 1, 1.94, almostLinear, fade
-}
-
-# https://wiki.hyprland.org/Configuring/Dwindle-Layout/
-dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # You probably want this
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc {
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-}
-
-xwayland {
-    force_zero_scaling = true
-}

.config/hypr/autostart.conf

@@ -1,2 +0,0 @@
-exec-once = uwsm app -- 1password --silent
-exec-once = uwsm app -- waybar

.config/hypr/colors.conf

@@ -1,28 +0,0 @@
-$rosewater = 0xfff5e0dc
-$flamingo = 0xfff2cdcd
-$pink = 0xfff5c2e7
-$mauve = 0xffcba6f7
-$red = 0xfff38ba8
-$maroon = 0xffeba0ac
-$peach = 0xfffab387
-$yellow = 0xfff9e2af
-$green = 0xffa6e3a1
-$teal = 0xff94e2d5
-$sky = 0xff89dceb
-$sapphire = 0xff74c7ec
-$blue = 0xff89b4fa
-$lavender = 0xffb4befe
-$text = 0xffcdd6f4
-$subtext1 = 0xffbac2de
-$subtext0 = 0xffa6adc8
-$overlay2 = 0xff9399b2
-$overlay1 = 0xff7f849c
-$overlay0 = 0xff6c7086
-$surface2 = 0xff585b70
-$surface1 = 0xff45475a
-$surface0 = 0xff313244
-$base = 0xff1e1e2e
-$mantle = 0xff181825
-$crust = 0xff11111b
-$shadow_on = 0x8011111b
-$shadow_off = 0x5011111b

.config/hypr/env.conf

@@ -1,13 +0,0 @@
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
-
-env = GDK_BACKEND,wayland,x11,*
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland;xcb

.config/hypr/hyprland.conf

@@ -1,10 +0,0 @@
-source = env.conf
-source = colors.conf
-source = monitors.conf
-source = programs.conf
-source = autostart.conf
-source = appearance.conf
-source = workspaces.conf
-source = rules.conf
-source = input.conf
-source = keybinds.conf

.config/hypr/input.conf

@@ -1,21 +0,0 @@
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = false
-}

.config/hypr/keybinds.conf

@@ -1,76 +0,0 @@
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, $terminal
-bind = $mainMod, escape, killactive,
-bind = $mainMod ALT, backspace, exec, uwsm stop
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, space, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d
-
-bind = $mainMod, F, fullscreen, 1
-bind = $mainMod SHIFT, F, fullscreen, 0
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous

.config/hypr/monitors.conf

@@ -1,7 +0,0 @@
-monitor=DP-1, 3840x2160@240, 0x0, 1.6, bitdepth, 10
-monitor=DP-2, 2560x1440@240, 2400x-140, 1.25, transform, 3
-
-render {
-    direct_scanout = 1
-    cm_fs_passthrough = 1
-}

.config/hypr/programs.conf

@@ -1,3 +0,0 @@
-$terminal = alacritty
-$fileManager = thunar
-$menu = rofi -show drun

.config/hypr/rules.conf

@@ -1,11 +0,0 @@
-# https://wiki.hyprland.org/Configuring/Window-Rules/
-
-windowrule = suppressevent maximize, class:.*
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
-
-windowrule = float, class:1Password
-windowrule = float, class:unityhub
-windowrule = float, title:Steam Settings
-windowrule = float, class:steam, title:Friends List
-windowrule = float, class:firefox, title:Picture-in-Picture
-windowrule = float, class:com.saivert.pwvucontrol

.config/hypr/workspaces.conf

@@ -1,5 +0,0 @@
-workspace = 1, monitor:DP-1, default:true
-workspace = 2, monitor:DP-1
-workspace = 3, monitor:DP-2, default:true
-workspace = 4, monitor:DP-2
-workspace = 5, monitor:DP-2

.config/sway/config

@@ -0,0 +1,156 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term alacritty
+# Your preferred application launcher
+set $menu rofi -show drun
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+#
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Start your launcher
+    bindsym $mod+space exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    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'
+
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+#    bindsym $mod+s layout stacking
+#    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+#    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+#    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    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
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+    # Special key to take a screenshot with grim
+    bindsym Print exec grim
+
+for_window [shell="xwayland"] title_format "[XWayland] %title"
+
+#xwayland disable
+
+include ~/.config/sway/config.d/*

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

@@ -0,0 +1,40 @@
+## 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
+
+## Layout management
+bindsym $mod+tab layout tabbed

.config/sway/config.d/outputs

@@ -0,0 +1,2 @@
+output DP-1 mode 3840x2160@240.000Hz pos 0 0 scale 1 render_bit_depth 10 adaptive_sync on
+output DP-2 mode 2560x1440@240.000Hz pos 3840 0 scale 1 transform 90 adaptive_sync off

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

@@ -0,0 +1,56 @@
+# 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     $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.background       $base
+
+# Gaps and borders
+gaps inner 8
+gaps outer 5
+default_border normal 2
+default_floating_border normal 4
+
+# 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
+    }
+}

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

@@ -0,0 +1,8 @@
+workspace 1 output DP-1
+workspace 2 output DP-1
+workspace 3 output DP-1
+workspace 4 output DP-1
+workspace 5 output DP-2
+workspace 6 output DP-2
+workspace 7 output DP-2
+workspace 8 output DP-2