diff --git a/modules/home/desktop/niri/services/kanshi/default.nix b/modules/home/desktop/niri/services/kanshi/default.nix index a9e124b..4ba50f7 100644 --- a/modules/home/desktop/niri/services/kanshi/default.nix +++ b/modules/home/desktop/niri/services/kanshi/default.nix @@ -1,18 +1,25 @@ { enable = true; - settings = [ + settings = let + main = "Philips Consumer Electronics Company 27M2N5500 UK02418033254"; + second = "Samsung Electric Company S24R65x H4TMA03291"; + builtin = { + eldrid = "Chimei Innolux Corporation 0x1406 Unknown"; + sarien = "LG Display 0x068B Unknown"; + # morphius =; + }; + in [ { output = { - criteria = "Philips Consumer Electronics Company 27M2N5500 UK02418033254"; + criteria = main; position = "0,0"; - scale = 1.33; + scale = 4.0 / 3.0; adaptiveSync = true; }; } { - # eldrid built-in output = { - criteria = "Chimei Innolux Corporation 0x1406 Unknown"; + criteria = builtin.eldrid; position = "0,0"; scale = 1.2; # adaptiveSync = true; @@ -20,7 +27,15 @@ } { output = { - criteria = "Samsung Electric Company S24R65x H4TMA03291"; + criteria = builtin.sarien; + position = "0,0"; + scale = 1.25; + # adaptiveSync = true; + }; + } + { + output = { + criteria = second; mode = "1920x1080@74.973"; position = "1920,0"; transform = "90"; @@ -28,39 +43,64 @@ }; } { - profile.name = "desktop"; - profile.outputs = [ - { - criteria = "Philips Consumer Electronics Company 27M2N5500 UK02418033254"; - } - { - criteria = "Samsung Electric Company S24R65x H4TMA03291"; - } - ]; + profile = { + name = "dunamis"; + outputs = [{criteria = main;} {criteria = second;}]; + }; } { - profile.name = "eldrid-docked"; - profile.outputs = [ - { - criteria = "Philips Consumer Electronics Company 27M2N5500 UK02418033254"; - position = "0,0"; - } - { - # some scaling quirks - criteria = "Chimei Innolux Corporation 0x1406 Unknown"; - position = "1933,0"; - } - ]; + profile = { + name = "eldrid-docked"; + outputs = [ + { + criteria = main; + position = "0,0"; + scale = 4.0 / 3.0; + } + { + criteria = builtin.eldrid; + position = "1920,0"; + } + ]; + }; } { - profile.name = "eldrid-undocked"; - profile.outputs = [ - { - criteria = "Chimei Innolux Corporation 0x1406 Unknown"; - position = "0,0"; - } - ]; + profile = { + name = "eldrid-undocked"; + outputs = [ + { + criteria = builtin.eldrid; + position = "0,0"; + } + ]; + }; + } + { + profile = { + name = "sarien-docked"; + outputs = [ + { + criteria = main; + position = "0,0"; + scale = 4.0 / 3.0; + } + { + criteria = builtin.sarien; + position = "1920,0"; + } + ]; + }; + } + { + profile = { + name = "sarien-undocked"; + outputs = [ + { + criteria = builtin.sarien; + position = "0,0"; + } + ]; + }; } ]; } - diff --git a/modules/shared/nixos/default.nix b/modules/shared/nixos/default.nix index bcff798..14c7903 100644 --- a/modules/shared/nixos/default.nix +++ b/modules/shared/nixos/default.nix @@ -45,8 +45,8 @@ in { internal = { ids = ["0001:0001" "048d:c101"]; settings.main = let - idleTimeout = toString 220; - holdTimeout = toString 170; + idleTimeout = toString 200; + holdTimeout = toString 150; in { a = "lettermod(alt, a, ${idleTimeout}, ${holdTimeout})"; s = "lettermod(meta, s, ${idleTimeout}, ${holdTimeout})";