Merge remote-tracking branch 'origin/main' into docs/niri-portable-desk

This commit is contained in:
Frank committed 2026-10-30 15:56:39 -07:00
commit e197c80dcb
1 file changed
+22 -22
@@ -1,5 +1,5 @@
// ────────────── Desk Profile: portable (second desk) ────────────── // ────────────── Desk Profile: portable (second desk) ──────────────
// Two PM1601 16" panels in portrait beside the laptop panel. // Two PM1601 16" panels, landscape, flanking the laptop panel.
// Applied by symlinking this file to cfg/display.kdl (see scripts/desk.sh). // Applied by symlinking this file to cfg/display.kdl (see scripts/desk.sh).
// Panels are keyed by EDID identity, NOT by connector name — connector names // Panels are keyed by EDID identity, NOT by connector name — connector names
// reshuffle between docks; identity travels with the panel. Long names copied // reshuffle between docks; identity travels with the panel. Long names copied
@@ -9,19 +9,19 @@
// requires: PNP(XYM) PM1601 0000000000000 // requires: PNP(XYM) PM1601 0000000000000
// requires: PNP(XYM) PM1601 demoset-1 // requires: PNP(XYM) PM1601 demoset-1
// //
// Layout (logical, y grows downward; the two panels form one 2400x1920 band): // Layout (logical, y grows downward; three 1920-wide columns):
// //
// ┌──────────────┬──────────┬──────────┐ // ┌──────────┬──────────────┬──────────┐
// │ │ PM1601 │ PM1601 │ // │ PM1601 │ │ PM1601 │
// │ │ rot 90 │ rot 90 │ // │ 1920x1200│ eDP-1 │ 1920x1200│
// │ eDP-1 │ 1200x1920│ 1200x1920│ // │(HDMI-A-1)│ 1920x1080 │ (DP-2) │
// │ 1920x1080 │ (DP-2) │(HDMI-A-1)│ // │ │ │ │
// │ │ │ │ // └──────────┴──────────────┴──────────┘
// └──────────────┴──────────┴──────────┘ // x=0,y=0 x=1920,y=60 x=3840,y=0
// x=0,y=420 x=1920,0 x=3120,0
// //
// The laptop sits 420 px down so its centre (960) meets the centre of the // HDMI-A-1 sits to the LEFT of the laptop by request (2026-10-30); DP-2 stays
// 1920-tall panel band — no dead corner where the cursor crosses. // on its right. The laptop is 60 px down so it is centred against the taller
// 1200 px panels — no dead corner where the cursor crosses.
// Modes are the panels' reported preferred modes, copied verbatim: niri // Modes are the panels' reported preferred modes, copied verbatim: niri
// matches mode strings exactly and silently falls back to preferred on a // matches mode strings exactly and silently falls back to preferred on a
// miss, so a typo here costs the refresh rate without an error. // miss, so a typo here costs the refresh rate without an error.
@@ -31,20 +31,20 @@ output "Lenovo Group Limited 0x40A9 Unknown" {
mode "1920x1080@60.001" mode "1920x1080@60.001"
scale 1.0 scale 1.0
transform "normal" transform "normal"
position x=0 y=420 position x=1920 y=60
focus-at-startup focus-at-startup
} }
output "PNP(XYM) PM1601 0000000000000" {
mode "1920x1200@59.950"
scale 1.0
transform "90"
position x=1920 y=0
}
output "PNP(XYM) PM1601 demoset-1" { output "PNP(XYM) PM1601 demoset-1" {
mode "1920x1200@59.950" mode "1920x1200@59.950"
scale 1.0 scale 1.0
transform "90" transform "normal"
position x=3120 y=0 position x=0 y=0
}
output "PNP(XYM) PM1601 0000000000000" {
mode "1920x1200@59.950"
scale 1.0
transform "normal"
position x=3840 y=0
} }