diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index f39a56b..42558f4 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -21,7 +21,6 @@ &.side { margin: 10px; - margin-right: 0px; } &.bg { diff --git a/.config/eww/eww.yuck##hostname.normandy b/.config/eww/eww.yuck##hostname.normandy index be1188f..a1d0aa4 100644 --- a/.config/eww/eww.yuck##hostname.normandy +++ b/.config/eww/eww.yuck##hostname.normandy @@ -11,7 +11,7 @@ (include "./windows.yuck") (defwindow leftbar - :monitor 1 + :monitor 2 :geometry (geometry :width "100%" :height "36px" :anchor "top center") @@ -25,7 +25,7 @@ (normandy-leftbar--right))) (defwindow rightbar - :monitor 0 + :monitor 1 :geometry (geometry :width "100%" :height "26px" :anchor "top center") @@ -38,8 +38,22 @@ "" ;;(normandy-rightbar--center) (normandy-rightbar--right))) +(defwindow centerbar + :monitor 0 + :geometry (geometry :width "100%" + :height "26px" + :anchor "top center") + :exclusive true + :focusable false + :stacking "fg" + (centerbox :orientation "h" + :class "bar root" + (normandy-centerbar--left) + (normandy-centerbar--center) + (normandy-centerbar--right))) + (defwindow sidebar - :monitor 1 + :monitor 2 :geometry (geometry :width "210px" :height "1044px" :anchor "left bottom") @@ -48,3 +62,13 @@ :stacking "fg" (normandy-sidebar)) +(defwindow sidebar2 + :monitor 1 + :geometry (geometry :width "210px" + :height "1044px" + :anchor "right bottom") + :exclusive true + :focusable false + :stacking "fg" + (normandy-sidebar)) + diff --git a/.config/eww/windows.yuck b/.config/eww/windows.yuck index 83602e2..f06dcdd 100644 --- a/.config/eww/windows.yuck +++ b/.config/eww/windows.yuck @@ -58,6 +58,31 @@ (sway-workspace :group "left") (sway-workspaces :group "left"))) +(defwidget normandy-centerbar--left [] + (box :orientation "h" + :halign "start" + :space-evenly false + :spacing 20 + :class "leftbox" + (sway-workspaces :group "center") + (sway-workspace :group "center"))) + +(defwidget normandy-centerbar--center [] + (box :orientation "h" + :halign "end" + :space-evenly false + :spacing 20 + :class "centerbox" + (system-name))) + +(defwidget normandy-centerbar--right [] + (box :orientation "h" + :halign "end" + :space-evenly false + :spacing 20 + :class "rightbox" + (mpris2))) + (defwidget normandy-rightbar--left [] (box :orientation "h" :halign "start" diff --git a/.config/sway/display-arrangement.conf##hostname.normandy b/.config/sway/display-arrangement.conf##hostname.normandy index 88871ec..df53929 100644 --- a/.config/sway/display-arrangement.conf##hostname.normandy +++ b/.config/sway/display-arrangement.conf##hostname.normandy @@ -3,9 +3,11 @@ ### ### set $leftdisplay 'HDMI-A-1' +set $centerdisplay 'DP-1' set $rightdisplay 'DP-2' output { - $leftdisplay pos 0 0 mode --custom 1920x1080@75Hz - $rightdisplay pos 1920 0 mode --custom 1920x1080@75Hz + $leftdisplay pos 0 220 mode --custom 1920x1080@75Hz + $centerdisplay pos 1920 0 mode 2560x1440@165Hz + $rightdisplay pos 4480 230 mode --custom 1920x1080@75Hz } diff --git a/.config/sway/workspace-arrangement.conf##class.triple-monitor b/.config/sway/workspace-arrangement.conf##class.triple-monitor new file mode 100644 index 0000000..16baca7 --- /dev/null +++ b/.config/sway/workspace-arrangement.conf##class.triple-monitor @@ -0,0 +1,75 @@ +### -*-conf-space-*- ### +# Dual-Monitor Workspace Settings # +### ### + +# This file defines the workspaces and creates the keybinds to switch +# between them and move containers around between them. This version +# is for dual-monitor systems. The host-specific display-arrangement.conf +# file should declare the $leftdisplay and $rightdisplay variables used +# here. + +workspace { + # Left monitor workspaces + 1 output $leftdisplay + 2 output $leftdisplay + 3 output $leftdisplay + 4 output $leftdisplay + 5 output $leftdisplay + 6 output $leftdisplay + 7 output $leftdisplay + 8 output $leftdisplay + 9 output $leftdisplay + 10 output $leftdisplay + + # Center monitor workspaces + 11 output $centerdisplay + 12 output $centerdisplay + 13 output $centerdisplay + 14 output $centerdisplay + 15 output $centerdisplay + 16 output $centerdisplay + 17 output $centerdisplay + 18 output $centerdisplay + 19 output $centerdisplay + 20 output $centerdisplay + + # Right monitor workspaces + 21 output $rightdisplay + 22 output $rightdisplay + 23 output $rightdisplay + 24 output $rightdisplay + 25 output $rightdisplay + 26 output $rightdisplay + 27 output $rightdisplay + 28 output $rightdisplay + 29 output $rightdisplay + 30 output $rightdisplay +} + +## Workspace Switching Keybinds +bindsym { + $mod+1 exec swaymsg workspace $(sway-find-workspace 1 ) + $mod+2 exec swaymsg workspace $(sway-find-workspace 2 ) + $mod+3 exec swaymsg workspace $(sway-find-workspace 3 ) + $mod+4 exec swaymsg workspace $(sway-find-workspace 4 ) + $mod+5 exec swaymsg workspace $(sway-find-workspace 5 ) + $mod+6 exec swaymsg workspace $(sway-find-workspace 6 ) + $mod+7 exec swaymsg workspace $(sway-find-workspace 7 ) + $mod+8 exec swaymsg workspace $(sway-find-workspace 8 ) + $mod+9 exec swaymsg workspace $(sway-find-workspace 9 ) + $mod+0 exec swaymsg workspace $(sway-find-workspace 10) +} + +## Window Reassignment Keybinds +bindsym { + $mod+Shift+1 exec swaymsg move container to workspace $(sway-find-workspace 1 ) + $mod+Shift+2 exec swaymsg move container to workspace $(sway-find-workspace 2 ) + $mod+Shift+3 exec swaymsg move container to workspace $(sway-find-workspace 3 ) + $mod+Shift+4 exec swaymsg move container to workspace $(sway-find-workspace 4 ) + $mod+Shift+5 exec swaymsg move container to workspace $(sway-find-workspace 5 ) + $mod+Shift+6 exec swaymsg move container to workspace $(sway-find-workspace 6 ) + $mod+Shift+7 exec swaymsg move container to workspace $(sway-find-workspace 7 ) + $mod+Shift+8 exec swaymsg move container to workspace $(sway-find-workspace 8 ) + $mod+Shift+9 exec swaymsg move container to workspace $(sway-find-workspace 9 ) + $mod+Shift+0 exec swaymsg move container to workspace $(sway-find-workspace 10) +} diff --git a/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.normandy b/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.normandy index da9fb01..41f8b63 100644 --- a/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.normandy +++ b/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.normandy @@ -1,4 +1,4 @@ # -*-conf-unix-*- [Service] -ExecStartPost=eww open-many leftbar rightbar sidebar +ExecStartPost=eww open-many leftbar centerbar rightbar sidebar sidebar2