diff options
| -rw-r--r-- | home/desktops/sway/config.nix | 28 | ||||
| -rw-r--r-- | hosts/shinji/default.nix | 1 | ||||
| -rw-r--r-- | system/desktops/sway.nix | 2 |
3 files changed, 23 insertions, 8 deletions
diff --git a/home/desktops/sway/config.nix b/home/desktops/sway/config.nix index b3d07d4..db8c1a4 100644 --- a/home/desktops/sway/config.nix +++ b/home/desktops/sway/config.nix @@ -1,15 +1,29 @@ -{config, ...}: { +{ + config, + lib, + ... +}: { wayland.windowManager.sway = { config = { # monitors output = (builtins.listToAttrs (map (mon: { - name = mon.name; - value = { - dpms = "on"; - scale = toString mon.scale; - render_bit_depth = toString mon.bitdepth; - }; + name = + if mon.desc == "" + then mon.port + else mon.desc; + value = + { + dpms = "on"; + scale = toString mon.scale; + render_bit_depth = toString mon.bitdepth; + } + // lib.optionalAttrs mon.position.enabled { + position = "${toString mon.position.x} ${toString mon.position.y}"; + } + // lib.optionalAttrs mon.size.enabled { + mode = "${toString mon.size.x}x${toString mon.size.y}"; + }; }) config.monitors)) // { diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix index dae86a8..8ca28a3 100644 --- a/hosts/shinji/default.nix +++ b/hosts/shinji/default.nix @@ -77,6 +77,7 @@ desktops = { enable = true; hyprland.enable = true; + sway.enable = true; ly.enable = true; }; development = { diff --git a/system/desktops/sway.nix b/system/desktops/sway.nix index bb6d535..d0838a4 100644 --- a/system/desktops/sway.nix +++ b/system/desktops/sway.nix @@ -17,7 +17,7 @@ in { xdg-desktop-portal-wlr ]; config.sway = { - default = ["gtk" "wlr"]; + default = lib.mkForce ["gtk" "wlr"]; "org.freedesktop.impl.portal.Screenshot" = ["wlr"]; "org.freedesktop.impl.portal.ScreenCast" = ["wlr"]; }; |