Olivier
25cf0167c1
- Added a new `streaming-display.nix` module to configure a headless 4K virtual output for Sunshine and Moonlight. - Introduced a Python script `generate-virtual-edid.py` to create a virtual display EDID with 4K capabilities. - Updated `configuration.nix` to integrate the new streaming display module and enable related services. - Modified `displays.nix` to accommodate the new streaming display settings and ensure compatibility with existing GPU passthrough configurations.
117 lines
3.2 KiB
Nix
117 lines
3.2 KiB
Nix
# 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`).
|
|
|
|
#TODO[epic=Moderate] Clean this up, move to host's configuration.nix.
|
|
{ config, lib, ... }:
|
|
let
|
|
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}
|
|
}
|
|
'';
|
|
|
|
niriOutputs =
|
|
(if gpuPassthru then
|
|
''
|
|
output "DP-1" {
|
|
mode "2560x1080@144"
|
|
scale 1.0
|
|
position x=0 y=0
|
|
focus-at-startup
|
|
}
|
|
output "HDMI-A-2" {
|
|
mode "1920x1080@60"
|
|
scale 1.0
|
|
position x=-1920 y=0
|
|
}
|
|
''
|
|
else
|
|
''
|
|
output "DP-3" {
|
|
mode "2560x1080@144"
|
|
scale 1.0
|
|
position x=0 y=0
|
|
focus-at-startup
|
|
}
|
|
output "HDMI-A-3" {
|
|
mode "1920x1080@60"
|
|
scale 1.0
|
|
position x=-1920 y=0
|
|
}
|
|
output "DP-4" {
|
|
mode "1920x1080@144"
|
|
scale 1.0
|
|
position x=0 y=-1080
|
|
}
|
|
'')
|
|
+ virtualOutputNiri;
|
|
|
|
virtualOutputHyprland =
|
|
lib.optionalString streamingDisplay
|
|
"${streamingCfg.connector}, ${streamingCfg.mode}, 7680x0, ${toString (streamingCfg.niriScale or 1.0)}";
|
|
|
|
hyprlandMonitors =
|
|
(if gpuPassthru then
|
|
[
|
|
"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;
|
|
|
|
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"
|
|
]
|
|
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"
|
|
];
|
|
in
|
|
{
|
|
chiasson.desktop.niri.extraSettings = {
|
|
extraConfig = niriOutputs;
|
|
};
|
|
|
|
chiasson.desktop.niri.extraBinds."XF86Tools".spawn = [
|
|
"wpctl"
|
|
"set-mute"
|
|
"@DEFAULT_AUDIO_SOURCE@"
|
|
"toggle"
|
|
];
|
|
|
|
chiasson.desktop.hyprland.settings = lib.mkIf config.chiasson.desktop.hyprland.enable {
|
|
monitor = lib.mkBefore hyprlandMonitors;
|
|
workspace = hyprlandWorkspaces;
|
|
};
|
|
}
|