From 5231124fde87b1c0e9f099bca7174a6672ce427f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 4 Jul 2015 12:56:25 +0200
Subject: Tweaks to vali X cofig

---
 vali-X.conf | 61 +++++++++++++++++++++++++++++--------------------------------
 vali.nix    |  3 +--
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/vali-X.conf b/vali-X.conf
index 07337a2f..8114d53c 100644
--- a/vali-X.conf
+++ b/vali-X.conf
@@ -1,34 +1,31 @@
-# nvidia-settings: X configuration file generated by nvidia-settings
-# nvidia-settings:  version 340.76  (buildmeister@swio-display-x86-rhel47-01)  Thu Jan 22 12:12:09 PST 2015
-
-Section "ServerLayout"
+{
+  serverLayoutSection = ''
     Identifier     "Layout0"
     Screen      0  "Screen0" 0 0
     InputDevice    "Keyboard0" "CoreKeyboard"
     InputDevice    "Mouse0" "CorePointer"
     Option         "Xinerama" "0"
-EndSection
-
-Section "Files"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/input/mice"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "kbd"
-EndSection
-
-Section "Monitor"
+  '';
+
+  config = ''
+    Section "InputDevice"
+      # generated from default
+      Identifier     "Mouse0"
+      Driver         "mouse"
+      Option         "Protocol" "auto"
+      Option         "Device" "/dev/input/mice"
+      Option         "Emulate3Buttons" "no"
+      Option         "ZAxisMapping" "4 5"
+    EndSection
+
+    Section "InputDevice"
+      # generated from default
+      Identifier     "Keyboard0"
+      Driver         "kbd"
+    EndSection
+  '';
+
+  monitorSection = ''
     # HorizSync source: edid, VertRefresh source: edid
     Identifier     "Monitor0"
     VendorName     "Unknown"
@@ -36,17 +33,17 @@ Section "Monitor"
     HorizSync       24.0 - 160.0
     VertRefresh     30.0 - 80.0
     Option         "DPMS"
-EndSection
+  '';
 
-Section "Device"
+  deviceSection = ''
     Identifier     "Device0"
     Driver         "nvidia"
     VendorName     "NVIDIA Corporation"
     BoardName      "GeForce GTX 480"
     BusID          "PCI:1:0:0"
-EndSection
+  '';
 
-Section "Screen"
+  screenSection = ''
     Identifier     "Screen0"
     Device         "Device0"
     Monitor        "Monitor0"
@@ -60,5 +57,5 @@ Section "Screen"
     SubSection     "Display"
         Depth       24
     EndSubSection
-EndSection
-
+  '';
+}
diff --git a/vali.nix b/vali.nix
index 77685939..6afa3fbc 100644
--- a/vali.nix
+++ b/vali.nix
@@ -120,9 +120,8 @@ rec {
     xkbOptions = "compose:caps";
 
     videoDrivers = [ "nvidia" ];
-    config = builtins.readFile ./vali-X.conf;
     exportConfiguration = true;
-  };
+  } // (import vali-X.conf);
 
   hardware.opengl.driSupport32Bit = true;
     
-- 
cgit v1.2.3