From baee46a6ef56fdec3393f5a6fd88356118b23639 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 1 Aug 2016 09:11:06 +0200
Subject: [PATCH] theba: switch to modesetting driver

---
 i3.nix       |  1 -
 large-sw.nix |  2 +-
 theba.nix    | 10 +++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/i3.nix b/i3.nix
index 4f2ce36..b6928b2 100644
--- a/i3.nix
+++ b/i3.nix
@@ -23,7 +23,6 @@
     arandr
     xss-lock i3lock
     xdotool
-    xlibs.xbacklight
   ] ++ gnome3.corePackages;
 
   fonts = {
diff --git a/large-sw.nix b/large-sw.nix
index a97ca19..f1dfdee 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -8,7 +8,7 @@
     gimp
     inkscape
     jabref
-    libreoffice
+    stable.libreoffice
     stable.calibre
 
     coq_8_5
diff --git a/theba.nix b/theba.nix
index 07428ac..cb2e833 100644
--- a/theba.nix
+++ b/theba.nix
@@ -32,8 +32,8 @@
     enable = true;
     # emulateWheel = true;
   };
-  services.xserver.config =
-    ''
+  services.xserver = {
+    config = ''
       Section "InputClass"
         Identifier "Trackpoint Wheel Emulation"
         MatchProduct "PS/2 Synaptics TouchPad"
@@ -45,6 +45,10 @@
         Option "YAxisMapping" "4 5"
         EndSection
     '';
+    videoDrivers = [ "modesetting" ];
+    useGlamor = true;
+  };
+  programs.light.enable = true;
 
   services.tlp.enable = true;
 
@@ -69,6 +73,6 @@
 
   virtualisation.virtualbox.host.enable = true;
 
-  boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
+  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
 
 }