diff --git a/config/sway/config b/config/sway/config index 8b55d08..ff0993b 100644 --- a/config/sway/config +++ b/config/sway/config @@ -3,35 +3,6 @@ output HDMI-A-1 resolution 1920x1080@72.038hz pos 1920 0 transform 90 input type:keyboard xkb_numlock enabled -# Colours based on Catppuccino Frappe Lavender -bar { - position top - status_command while ~/.config/sway/status.sh; do sleep 1; done - colors { - # bar text - statusline #c6d0f5 - # bar background on all displays - background #292c3c - # focused bar on current display - focused_background #292c3c - # active workspace on each display - active_workspace #c6d0f5 #303446 #c6d0f5 - # focused workspace on current display - focused_workspace #c6d0f5 #303446 #c6d0f5 - # inactive workspace on each display - inactive_workspace #414559 #292c3c #838ba7 - } -# tray { -# icon_theme $icon -# } -} - -output * bg #313244 solid_color - -client.focused #5b6078 #24273a #cad3f5 #5b6078 -client.focused_inactive #494d64 #1e2030 #cad3f5 -client.unfocused #494d64 #1e2030 #5b6078 - include /etc/sway/config.d/* include /home/siina/.config/sway/config.d/* @@ -39,5 +10,5 @@ exec gentoo-pipewire-launcher & # Screencast fix exec --no-startup-id dbus-update-activation-environment --all # Enable agent storage for things like nextcloud-client -exec gnome-keyring-daemon --start --components=secrets -exec export $(gnome-keyring-daemon) +#exec gnome-keyring-daemon --start --components=secrets +#exec export $(gnome-keyring-daemon) diff --git a/config/sway/config.d/03-workspaces b/config/sway/config.d/03-workspaces index 4b169ef..139b80b 100644 --- a/config/sway/config.d/03-workspaces +++ b/config/sway/config.d/03-workspaces @@ -1,7 +1,8 @@ -workspace 1 output DP-3 -workspace 2 output DP-3 +workspace Terminal output DP-3 +workspace Steam output DP-3 +workspace Heroic output DP-3 workspace Unity Editor output DP-3 -workspace 4 output HDMI-A-1 +workspace Chat output HDMI-A-1 workspace 5 output HDMI-A-1 workspace Mail output HDMI-A-1 workspace OBS output HDMI-A-1 diff --git a/config/sway/config.d/app_assignment b/config/sway/config.d/app_assignment index a0ac048..98105ba 100644 --- a/config/sway/config.d/app_assignment +++ b/config/sway/config.d/app_assignment @@ -1,8 +1,10 @@ -assign [title="Steam"] 2 +assign [title="Steam"] Steam assign [title="Vivaldi"] Browser -assign [title="Discord"] 4 -assign [app_id="org.telegram.desktop"] 5 -assign [app_id="org.gajim.Gajim"] 5 +assign [title="Discord"] Chat +assign [app_id="heroic"] Heroic +assign [class="battle.net.exe"] Battle.net +assign [app_id="org.telegram.desktop"] Chat +assign [app_id="org.gajim.Gajim"] Chat assign [app_id="thunderbird"] Mail assign [app_id="com.obsproject.Studio"] OBS assign [class="unityhub"] Unity Editor diff --git a/config/sway/config.d/autostart b/config/sway/config.d/autostart index 191374f..4d16934 100644 --- a/config/sway/config.d/autostart +++ b/config/sway/config.d/autostart @@ -4,19 +4,10 @@ exec gentoo-pipewire-launcher restart & # Run in bg/tray exec keepassxc -workspace 1 exec kitty - -workspace 2 exec /usr/bin/steam - -workspace 3 -exec discord -exec firefox-bin - -workspace 4 +exec vivaldi +exec vesktop exec telegram-desktop exec gajim -# Focus back to main workspace -workspace 1 diff --git a/config/sway/config.d/common_floating b/config/sway/config.d/common_floating index f9b9c5a..c48c561 100644 --- a/config/sway/config.d/common_floating +++ b/config/sway/config.d/common_floating @@ -10,3 +10,5 @@ for_window [class = "(?i)pinentry"] floating enable for_window [title = "Administrator privileges required"] floating enable for_window [title = "Unlock Database"] floating enable for_window [title = "Reminders"] floating enable +for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable, resize set width 1030 height 710 +for_window [class="steam_app.*"] inhibit_idle fullscreen; floating enable; border none diff --git a/config/sway/config.d/theme b/config/sway/config.d/theme index 9fd489f..7bcb365 100644 --- a/config/sway/config.d/theme +++ b/config/sway/config.d/theme @@ -4,8 +4,9 @@ default_border pixel 0 gaps inner 10 # swayfx things -blur enable -shadows enable +blur enable +shadows enable +shadow_color #0000007F set $icon 'Zafiro-Icons-Dark' set $cursor 'Catppuccin-Frappe-Lavender' @@ -15,15 +16,70 @@ set $font 'Iosevka Aile 10' #font pango:$font font $bar_font -# Qt-based things are modified using `qt6ct` for now - +# Qt-based things are modified using `qt{5,6}ct` and `kvantum` set $gnome-schema org.gnome.desktop.interface -seat seat0 xcursor_theme $cursor +seat seat0 xcursor_theme $cursor exec_always { export GTK_THEME="$font" gsettings set $gnome-schema cursor-theme $cursor gsettings set $gnome-schema font-name $font gsettings set $gnome-schema gtk-theme $gtktheme gsettings set $gnome-schema icon-theme $icon - gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' + gsettings set $gnome-schema color-scheme 'prefer-dark' } + +# Catppuccin Frappe +set $rosewater #f2d5cf +set $flamingo #eebebe +set $pink #f4b8e4 +set $mauve #ca9ee6 +set $red #e78284 +set $maroon #ea999c +set $peach #ef9f76 +set $yellow #e5c890 +set $green #a6d189 +set $teal #81c8be +set $sky #99d1db +set $sapphire #85c1dc +set $blue #8caaee +set $lavender #babbf1 +set $text #c6d0f5 +set $subtext1 #b5bfe2 +set $subtext0 #a5adce +set $overlay2 #949cbb +set $overlay1 #838ba7 +set $overlay0 #737994 +set $surface2 #626880 +set $surface1 #51576d +set $surface0 #414559 +set $base #303446 +set $mantle #292c3c +set $crust #232634 + +bar { + position top + status_command while ~/.config/sway/status.sh; do sleep 1; done + colors { + # bar text + statusline $text + # bar background on all displays + background #292c3c + # focused bar on current display + focused_background #292c3c + # active workspace on each display + active_workspace $text #303446 #c6d0f5 + # focused workspace on current display + focused_workspace $text #303446 #c6d0f5 + # inactive workspace on each display + inactive_workspace $surface0 #292c3c $overlay1 + } +# tray { +# icon_theme $icon +# } +} + +output * bg #313244 solid_color + +client.focused #5b6078 #24273a #cad3f5 #5b6078 +client.focused_inactive #494d64 #1e2030 #cad3f5 +client.unfocused #494d64 #1e2030 #5b6078