From 1c6decbe03e8137c9f2d587eeec52e08602a1910 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 6 Jun 2023 01:33:40 -0500 Subject: [PATCH] Back to sway --- os/linux/bin/wm | 25 +++++++++++++++---------- os/linux/sway/config | 15 ++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/os/linux/bin/wm b/os/linux/bin/wm index 9972a7b..68655d1 100755 --- a/os/linux/bin/wm +++ b/os/linux/bin/wm @@ -1,14 +1,19 @@ #!/usr/bin/env sh -# exec "$(dirname "$0")/../sway/init" -c="$HOME/.config" -ev="$c/hypr/hyprland.conf" -ee="$c/lytedev-env" -for e in "host-desktop" "host-laptop"; do - f="$ee/$e/hyprland.d.conf" - [ -f "$f" ] && c="$f" -done +# sway -echo "Using config $c" +if [ "$1" = 'hyprland' ]; then + c="$HOME/.config" + ev="$c/hypr/hyprland.conf" + ee="$c/lytedev-env" + for e in "host-desktop" "host-laptop"; do + f="$ee/$e/hyprland.d.conf" + [ -f "$f" ] && ev="$f" + done -exec Hyprland -c "$c" + echo "Using config $ev" + + exec Hyprland -c "$ev" +else + exec "$(dirname "$0")/../sway/init" +fi diff --git a/os/linux/sway/config b/os/linux/sway/config index bec01dc..51d8231 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -5,14 +5,13 @@ # + Super+Shift+b should balance the size of all selected nodes. set $mod Mod4 -set $default_gap 0 +set $default_gap 10 xwayland enable focus_wrapping no gaps inner $default_gap -smart_borders no_gaps -hide_edge_borders both -default_border pixel 2 +smart_borders on +default_border pixel 3 focus_follows_mouse no mouse_warping none popup_during_fullscreen smart @@ -173,7 +172,7 @@ bindsym $mod+shift+alt+f for_window [class=$tilers] floating toggle include /etc/sway/config.d/* include $XDG_CONFIG_HOME/lytedev-env/*/sway/config -client.focused #6c88a6 #6c88a6 #6c88a6 #6c88a6 #6c88a6 +client.focused #74c7ec #74c7ec #74c7ec #74c7ec #74c7ec client.focused_inactive #100814 #100814 #9b9ebf #100814 #100814 client.unfocused #100814 #100814 #9b9ebf #100814 #100814 @@ -187,8 +186,10 @@ exec mako # exec gammastep -t 6500:3500 -l 39.0:-94.5 # exec /usr/lib/kdeconnectd -exec exec kitty --single-instance fish -i -exec tmux start-server +exec kitty --single-instance +exec /usr/lib/polkit-kde-authentication-agent-1 +exec eww daemon +exec eww open-many bar # exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"