From 31eaab7106cb332bf10b55aa733a5a06ff386c23 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 3 Jun 2025 15:15:08 +0200 Subject: [PATCH] chore: multiple xorg change for fischer --- machines/fischer/default.nix | 75 ++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix index 333535d..1ec72e4 100644 --- a/machines/fischer/default.nix +++ b/machines/fischer/default.nix @@ -126,36 +126,65 @@ in services.autorandr = { enable = true; + matchEdid = true; + ignoreLid = true; profiles = { default = { fingerprint = { - eDP-1-1 = "00ffffffffffff0006af9af900000000141f0104a51e13780363f5a854489d240e505400000001010101010101010101010101010101fa3c80b870b0244010103e002dbc1000001ac83080b870b0244010103e002dbc1000001a000000fe004a38335646804231343055414e0000000000024101b2001100000a410a20200068"; + "eDP*" = + "00ffffffffffff0006af9af900000000141f0104a51e13780363f5a854489d240e505400000001010101010101010101010101010101fa3c80b870b0244010103e002dbc1000001ac83080b870b0244010103e002dbc1000001a000000fe004a38335646804231343055414e0000000000024101b2001100000a410a20200068"; }; config = { - eDP-1-1.enable = true; + "eDP*" = { + enable = true; + primary = true; + position = "0x0"; + mode = "1920x1200"; + }; }; }; dock-julien = { fingerprint = { - eDP-1-1 = "00ffffffffffff0006af9af900000000141f0104a51e13780363f5a854489d240e505400000001010101010101010101010101010101fa3c80b870b0244010103e002dbc1000001ac83080b870b0244010103e002dbc1000001a000000fe004a38335646804231343055414e0000000000024101b2001100000a410a20200068"; - DP-1-5-3 = "00ffffffffffff0010ac42d1425439312021010380351e78eaa3d5ab524f9d240f5054a54b008100b300d100714fa9408180d1c00101565e00a0a0a02950302035000f282100001a000000ff004446354c5459330a2020202020000000fc0044454c4c205032343233440a20000000fd00314b1d711c000a2020202020200107020318b14d010203071112161304141f051065030c001000023a801871382d40582c45000f282100001e011d8018711c1620582c25000f282100009e011d007251d01e206e2855000f282100001e7e3900a080381f4030203a000f282100001a00000000000000000000000000000000000000000000000000000000000000c1"; - DP-1-5-1 = "00ffffffffffff0026cd6b610f01010117210104a5351e783be725a8554ea0260d5054bfef80d140d100d1c0b30095009040818081c0565e00a0a0a02950302035000f282100001a000000ff0031323134383332333030313335000000fd00314b0f5a19000a202020202020000000fc00504c32343933510a202020202001c5020320f153101f051404131e1d121116150f0e030207060123097f0783010000394e00a0a0a02250302035000f282100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000079"; + "eDP*" = + "00ffffffffffff0006af9af900000000141f0104a51e13780363f5a854489d240e505400000001010101010101010101010101010101fa3c80b870b0244010103e002dbc1000001ac83080b870b0244010103e002dbc1000001a000000fe004a38335646804231343055414e0000000000024101b2001100000a410a20200068"; + "DP*-3" = + "00ffffffffffff0010ac42d1425439312021010380351e78eaa3d5ab524f9d240f5054a54b008100b300d100714fa9408180d1c00101565e00a0a0a02950302035000f282100001a000000ff004446354c5459330a2020202020000000fc0044454c4c205032343233440a20000000fd00314b1d711c000a2020202020200107020318b14d010203071112161304141f051065030c001000023a801871382d40582c45000f282100001e011d8018711c1620582c25000f282100009e011d007251d01e206e2855000f282100001e7e3900a080381f4030203a000f282100001a00000000000000000000000000000000000000000000000000000000000000c1"; + "DP*-1" = + "00ffffffffffff0026cd6b610f01010117210104a5351e783be725a8554ea0260d5054bfef80d140d100d1c0b30095009040818081c0565e00a0a0a02950302035000f282100001a000000ff0031323134383332333030313335000000fd00314b0f5a19000a202020202020000000fc00504c32343933510a202020202001c5020320f153101f051404131e1d121116150f0e030207060123097f0783010000394e00a0a0a02250302035000f282100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000079"; }; config = { - eDP-1-1.enable = false; - DP-1-5-1 = { + "eDP*".enable = false; + "DP*-1" = { enable = true; primary = true; position = "0x0"; mode = "2560x1440"; }; - DP-1-5-3 = { + "DP*3" = { enable = true; position = "2560x0"; mode = "2560x1440"; }; }; }; + + dock-theo = { + fingerprint = { + "eDP*" = + "00ffffffffffff0006af9af900000000141f0104a51e13780363f5a854489d240e505400000001010101010101010101010101010101fa3c80b870b0244010103e002dbc1000001ac83080b870b0244010103e002dbc1000001a000000fe004a38335646804231343055414e0000000000024101b2001100000a410a20200068"; + "DP*-1" = + "00ffffffffffff0010ac4042424d34412d200104a53c22783ac525aa534f9d25105054a54b00714f8180a9c0d1c081c081cf01010101023a801871382d40582c450056502100001e000000ff0039464c505a4e330a2020202020000000fc0044454c4c205032373232480a20000000fd00384c1e5311010a2020202020200000"; + }; + config = { + "eDP*".enable = false; + "DP*-1" = { + enable = true; + primary = true; + position = "0x0"; + mode = "1920x1080"; + }; + }; + }; }; }; @@ -170,7 +199,10 @@ in # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.autoRepeatDelay = 250; + services.xserver.autoRepeatInterval = 30; + hardware.nvidia.forceFullCompositionPipeline = true; services.libinput.touchpad.tapping = false; hardware.nvidia.prime = { @@ -179,14 +211,33 @@ in nvidiaBusId = "PCI:1:0:0"; }; - hardware.nvidia = { + nix = { + distributedBuilds = true; + buildMachines = [ + { + hostName = "epyc.infra.newtype.fr"; + maxJobs = 100; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + sshUser = "root"; + sshKey = "/home/julien/.ssh/id_ed25519"; + supportedFeatures = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ]; + speedFactor = 2; + } + ]; + }; + hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = true; - #powerManagement.finegrained = true; open = true; nvidiaSettings = true; - dynamicBoost.enable = true; package = config.boot.kernelPackages.nvidiaPackages.beta; };