Merge remote-tracking branch 'lass/master'

1 files changed, 12 insertions, 12 deletions

diff --git a/lass/1systems/xerxes/physical.nix b/lass/1systems/xerxes/physical.nix
index f88578e19..5d60dfc45 100644
--- a/lass/1systems/xerxes/physical.nix
+++ b/lass/1systems/xerxes/physical.nix
@@ -17,6 +17,7 @@
   boot.blacklistedKernelModules = [
     "goodix"
   ];
+
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.initrd.luks.devices.crypted.device = "/dev/sda3";
@@ -27,11 +28,6 @@
     "boot.shell_on_fail"
   ];
 
-  services.xserver.displayManager.sessionCommands = ''
-    (sleep 2 && ${pkgs.xorg.xrandr}/bin/xrandr --output eDP-1 --rotate right)
-    (sleep 2 && ${pkgs.xorg.xinput}/bin/xinput set-prop 'Goodix Capacitive TouchScreen' 'Coordinate Transformation Matrix' 0 1 0 -1 0 1 0 0 1)
-  '';
-
   fileSystems."/" = {
     device = "rpool/root";
     fsType = "zfs";
@@ -76,11 +72,15 @@
     IdleActionSec=300
   '';
 
-  services.xserver.extraConfig = ''
-    Section "Device"
-    Identifier "Intel Graphics"
-    Driver "Intel"
-    Option "TearFree" "true"
-    EndSection
-  '';
+  services.xserver = {
+    videoDrivers = [ "intel" ];
+    deviceSection = ''
+      Option "TearFree" "true"
+    '';
+    displayManager.sessionCommands = ''
+      echo nonono > /tmp/xxyy
+      (sleep 2 && ${pkgs.xorg.xrandr}/bin/xrandr --output eDP1 --rotate right)
+      (sleep 2 && ${pkgs.xorg.xinput}/bin/xinput set-prop 'Goodix Capacitive TouchScreen' 'Coordinate Transformation Matrix' 0 1 0 -1 0 1 0 0 1)
+    '';
+  };
 }