Olivier/chiasson-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(hosts): simplify streaming display configuration

Browse Source 
Refactor the streaming display logic for the 14900k host to use the
`streamingDisplay` configuration object directly instead of separate
variables. This simplifies the monitor layout logic for both Niri and
Hyprland.

Additionally, remove the fragile `sunshineOutputIndex` option in favor
of using the stable connector name for Sunshine's `output_name`. This
prevents issues where numeric monitor indices drift after hotplugging.
The change also includes an explicit encoder list for Sunshine to avoid
probing for AV1 on hardware that does not support it.
This commit is contained in:
OlivierChiasson
2026-07-18 09:35:52 -03:00
parent 6f35d60aab
commit f1bd5146a3
2 changed files with 35 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hosts/14900k/_private/displays.nix
+22 -53
View File
@@ -1,25 +1,15 @@
# Monitor layout for 14900k.
# NVIDIA (default): DP-3 ultrawide, HDMI-A-3 + DP-4 side/top stack; DP-2 virtual 4K when streamingDisplay enabled.
# Intel iGPU (gpu passthru): DP-1 ultrawide, HDMI-A-2 Samsung to the left.
# Niri: `extraSettings` (KDL via `extraConfig`, other wrapper-modules keys) + `extraBinds` (merged keybinds).
# Hyprland: `chiasson.desktop.hyprland.settings` (merged in HM when `chiasson.desktop.hyprland.enable`).
# NVIDIA (default): DP-3 ultrawide, HDMI-A-3 + DP-4 stack; DP-2 virtual 4K when streamingDisplay is on.
# Intel iGPU (gpu passthru): DP-1 ultrawide, HDMI-A-2 to the left.
# Niri uses `extraSettings.extraConfig`; Hyprland uses `chiasson.desktop.hyprland.settings`.
#TODO[epic=Moderate] Clean this up, move to host's configuration.nix.
{ config, lib, ... }:
let
streamingDisplay = config.chiasson.system.streamingDisplay;
gpuPassthru = config.chiasson.system.gpuPassthru.enable;
streamingDisplay = config.chiasson.system.streamingDisplay.enable or false;
streamingCfg = config.chiasson.system.streamingDisplay or { };
virtualOutputNiri =
lib.optionalString streamingDisplay ''
output "${streamingCfg.connector}" {
mode "${streamingCfg.mode}"
scale ${toString (streamingCfg.niriScale or 1.0)}
position ${streamingCfg.niriPosition}
}
'';
# Niri outputs: a static block per GPU layout, plus the optional virtual 4K panel.
niriOutputs =
(if gpuPassthru then
''
@@ -54,48 +44,30 @@ let
position x=0 y=-1080
}
'')
+ virtualOutputNiri;
virtualOutputHyprland =
lib.optionalString streamingDisplay
"${streamingCfg.connector}, ${streamingCfg.mode}, 7680x0, ${toString (streamingCfg.niriScale or 1.0)}";
+ lib.optionalString streamingDisplay.enable ''
output "${streamingDisplay.connector}" {
mode "${streamingDisplay.mode}"
scale ${toString streamingDisplay.niriScale}
position ${streamingDisplay.niriPosition}
}
'';
# Hyprland monitor strings, with the virtual panel appended when enabled.
hyprlandMonitors =
(if gpuPassthru then
[
"DP-1, 2560x1080@144, 0x0, 1"
"HDMI-A-2, 1920x1080@60, -1920x0, 1"
]
[ "DP-1, 2560x1080@144, 0x0, 1" "HDMI-A-2, 1920x1080@60, -1920x0, 1" ]
else
[
"DP-3, 2560x1080@144, 0x0, 1"
"DP-4, 1920x1080@144, 0x-1080, 1"
"HDMI-A-3, 1920x1080@60, -1920x0, 1"
])
++ lib.optional streamingDisplay virtualOutputHyprland;
[ "DP-3, 2560x1080@144, 0x0, 1" "DP-4, 1920x1080@144, 0x-1080, 1" "HDMI-A-3, 1920x1080@60, -1920x0, 1" ])
++ lib.optional streamingDisplay.enable "${streamingDisplay.connector}, ${streamingDisplay.mode}, 7680x0, ${toString streamingDisplay.niriScale}";
hyprlandWorkspaces =
if gpuPassthru then
[
"1, monitor:DP-1, default:true"
"2, monitor:DP-1"
"3, monitor:DP-1"
"4, monitor:HDMI-A-2, default:true"
"5, monitor:HDMI-A-2"
"6, monitor:HDMI-A-2"
]
[ "1, monitor:DP-1, default:true" "2, monitor:DP-1" "3, monitor:DP-1"
"4, monitor:HDMI-A-2, default:true" "5, monitor:HDMI-A-2" "6, monitor:HDMI-A-2" ]
else
[
"1, monitor:DP-3, default:true"
"2, monitor:DP-3"
"3, monitor:DP-3"
"4, monitor:HDMI-A-3, default:true"
"5, monitor:HDMI-A-3"
"6, monitor:HDMI-A-3"
"7, monitor:DP-4"
"8, monitor:DP-4"
"9, monitor:DP-4"
];
[ "1, monitor:DP-3, default:true" "2, monitor:DP-3" "3, monitor:DP-3"
"4, monitor:HDMI-A-3, default:true" "5, monitor:HDMI-A-3" "6, monitor:HDMI-A-3"
"7, monitor:DP-4" "8, monitor:DP-4" "9, monitor:DP-4" ];
in
{
chiasson.desktop.niri.extraSettings = {
@@ -103,10 +75,7 @@ in
};
chiasson.desktop.niri.extraBinds."XF86Tools".spawn = [
"wpctl"
"set-mute"
"@DEFAULT_AUDIO_SOURCE@"
"toggle"
"wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"
];
chiasson.desktop.hyprland.settings = lib.mkIf config.chiasson.desktop.hyprland.enable {