From 52130c59cc77a4ff15482568ce8057e956b3a17a Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 18 Sep 2024 11:34:19 +0100 Subject: [PATCH] Add home monitors to Ronin config Add monitor mode and scale to sway config, add extra profile for kanshi for home configuration. --- system/Ronin.nix | 40 ++++++++++++++++++++++++++++++++++++---- system/Vanguard.nix | 10 +++++----- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/system/Ronin.nix b/system/Ronin.nix index 5ca4b299..a28781ca 100644 --- a/system/Ronin.nix +++ b/system/Ronin.nix @@ -4,7 +4,16 @@ home-manager.users.${username} = { imports = [ ./home/work.nix ]; wayland.windowManager.sway.config = { - output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; + output = { + # Work + "Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; + # Home + "Acer Technologies ED270R TJMEE0043W01".mode = "1920x1080@120Hz"; + "Microstep MSI G27CQ4 E2 Unknown" = { + mode = "2560x1440@120Hz"; + scale = "1.25"; + }; + }; workspaceOutputAssign = [ { output = "eDP-1"; @@ -17,7 +26,9 @@ settings = let laptopScreen.criteria = "eDP-1"; - monitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3"; + workMonitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3"; + homeMonitor1.criteria = "Acer Technologies ED270R TJMEE0043W01"; + homeMonitor2.criteria = "Microstep MSI G27CQ4 E2 Unknown"; in [ { @@ -34,20 +45,41 @@ } { profile = { - name = "docked"; + name = "work"; outputs = [ { inherit (laptopScreen) criteria; status = "disable"; } { - inherit (monitor) criteria; + inherit (workMonitor) criteria; status = "enable"; position = "0,0"; } ]; }; } + { + profile = { + name = "home"; + outputs = [ + { + inherit (laptopScreen) criteria; + status = "disable"; + } + { + inherit (homeMonitor1) criteria; + status = "enable"; + position = "0,140"; + } + { + inherit (homeMonitor2) criteria; + status = "enable"; + position = "1920,0"; + } + ]; + }; + } ]; }; }; diff --git a/system/Vanguard.nix b/system/Vanguard.nix index 77695811..238ea3c9 100644 --- a/system/Vanguard.nix +++ b/system/Vanguard.nix @@ -37,17 +37,17 @@ }; wayland.windowManager.sway.config = { output = { + "Acer Technologies ED270R TJMEE0043W01" = { + mode = "1920x1080@120Hz"; + position = "0 140"; + adaptive_sync = "off"; + }; "Microstep MSI G27CQ4 E2 Unknown" = { mode = "2560x1440@120Hz"; scale = "1.25"; position = "1920 0"; adaptive_sync = "on"; }; - "Acer Technologies ED270R TJMEE0043W01" = { - mode = "1920x1080@120Hz"; - position = "0 140"; - adaptive_sync = "off"; - }; }; workspaceOutputAssign = [ {