diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index 2c14562..335f882 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -5,6 +5,16 @@ in { extraConfig = let output = node "output"; in [ + (output "DP-3" [ + (leaf "mode" "2560x1440@169.900") + (leaf "scale" 1.0) + (leaf "position" { + x = 0; + y = 0; + }) + (leaf "transform" "normal") + (flag "focus-at-startup") + ]) (output "DP-1" [ (leaf "mode" "2560x1440@169.900") (leaf "scale" 1.0) diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 13cc513..6310aac 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -19,6 +19,8 @@ ./networking.nix ./disk-config.nix ./hardware.nix + ./specialisation/kde.nix + ./specialisation/niri-hybrid.nix ]; youthlic = { @@ -48,21 +50,6 @@ }; }; - specialisation = { - # cosmic = { - # inheritParentConfig = true; - # configuration = { - # youthlic.gui.enabled = lib.mkForce "cosmic"; - # }; - # }; - kde = { - inheritParentConfig = true; - configuration = { - youthlic.gui.enabled = lib.mkForce "kde"; - }; - }; - }; - programs.gnupg.agent = { enable = true; }; diff --git a/nixos/configurations/Tytonidae/gui.nix b/nixos/configurations/Tytonidae/gui.nix index fc9c3f0..91d916c 100644 --- a/nixos/configurations/Tytonidae/gui.nix +++ b/nixos/configurations/Tytonidae/gui.nix @@ -1,6 +1,6 @@ {pkgs, ...}: let extraConfig = '' - output "DP-1" { + output "DP-3" { mode "2560x1440@169.900" scale 1.0 position x=0 y=0 @@ -15,7 +15,7 @@ } window-rule { match app-id="apps.regreet" - open-on-output "DP-1" + open-on-output "DP-3" } ''; in { diff --git a/nixos/configurations/Tytonidae/specialisation/kde.nix b/nixos/configurations/Tytonidae/specialisation/kde.nix new file mode 100644 index 0000000..91e0f65 --- /dev/null +++ b/nixos/configurations/Tytonidae/specialisation/kde.nix @@ -0,0 +1,8 @@ +{lib, ...}: { + config.specialisation.kde = { + inheritParentConfig = true; + configuration = { + youthlic.gui.enabled = lib.mkForce "kde"; + }; + }; +} diff --git a/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix b/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix new file mode 100644 index 0000000..ca1ea8b --- /dev/null +++ b/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix @@ -0,0 +1,28 @@ +{lib, ...}: let + extraConfig = '' + output "DP-1" { + mode "2560x1440@169.900" + scale 1.0 + position x=0 y=0 + transform "normal" + focus-at-startup + } + output "eDP-1" { + mode "2560x1440@165.003" + scale 1.5 + position x=2560 y=0 + transform "normal" + } + window-rule { + match app-id="apps.regreet" + open-on-output "DP-1" + } + ''; +in { + config.specialisation.niri-hybrid = { + inheritParentConfig = true; + configuration = { + youthlic.gui.niri.extraConfig = lib.mkForce extraConfig; + }; + }; +}