diff --git a/system/Ronin.nix b/system/Ronin.nix index bec6a204..5ca4b299 100644 --- a/system/Ronin.nix +++ b/system/Ronin.nix @@ -4,10 +4,7 @@ home-manager.users.${username} = { imports = [ ./home/work.nix ]; wayland.windowManager.sway.config = { - output = { - "eDP-1".scale = "1.25"; - "Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; - }; + output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; workspaceOutputAssign = [ { output = "eDP-1"; @@ -19,15 +16,8 @@ enable = true; settings = let - laptopScreen = { - criteria = "eDP-1"; - scale = 1.25; - # position = "2560,576"; - }; - monitor = { - criteria = "Dell Inc. DELL P3223QE CCG8YN3"; - scale = 1.5; - }; + laptopScreen.criteria = "eDP-1"; + monitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3"; in [ { @@ -35,7 +25,7 @@ name = "default"; outputs = [ { - inherit (laptopScreen) criteria scale; + inherit (laptopScreen) criteria; status = "enable"; position = "0,0"; } @@ -47,11 +37,11 @@ name = "docked"; outputs = [ { - inherit (laptopScreen) criteria scale; + inherit (laptopScreen) criteria; status = "disable"; } { - inherit (monitor) criteria scale; + inherit (monitor) criteria; status = "enable"; position = "0,0"; } diff --git a/system/Vanguard.nix b/system/Vanguard.nix index 82e8ed05..c9f8ea51 100644 --- a/system/Vanguard.nix +++ b/system/Vanguard.nix @@ -23,7 +23,7 @@ cartridges prismlauncher (writeShellScriptBin "steamscope" '' - gamescope -w 2560 -h 1440 -r 165 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui + gamescope -w 2560 -h 1440 -r 120 --adaptive-sync --force-grab-cursor --fullscreen -e -- steam -gamepadui '') ]; programs.obs-studio = { @@ -39,13 +39,12 @@ output = { "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"; + position = "0 360"; adaptive_sync = "off"; }; }; diff --git a/system/default.nix b/system/default.nix index 77f4724a..9b9da568 100644 --- a/system/default.nix +++ b/system/default.nix @@ -152,10 +152,10 @@ { inherit monospace serif sansSerif; sizes = { - applications = 12; - desktop = 10; - popups = 14; - terminal = 12; + applications = 16; + desktop = 14; + popups = 18; + terminal = 16; }; }; };