summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vali-X.conf61
-rw-r--r--vali.nix3
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 @@
1# nvidia-settings: X configuration file generated by nvidia-settings 1{
2# nvidia-settings: version 340.76 (buildmeister@swio-display-x86-rhel47-01) Thu Jan 22 12:12:09 PST 2015 2 serverLayoutSection = ''
3
4Section "ServerLayout"
5 Identifier "Layout0" 3 Identifier "Layout0"
6 Screen 0 "Screen0" 0 0 4 Screen 0 "Screen0" 0 0
7 InputDevice "Keyboard0" "CoreKeyboard" 5 InputDevice "Keyboard0" "CoreKeyboard"
8 InputDevice "Mouse0" "CorePointer" 6 InputDevice "Mouse0" "CorePointer"
9 Option "Xinerama" "0" 7 Option "Xinerama" "0"
10EndSection 8 '';
11 9
12Section "Files" 10 config = ''
13EndSection 11 Section "InputDevice"
14 12 # generated from default
15Section "InputDevice" 13 Identifier "Mouse0"
16 # generated from default 14 Driver "mouse"
17 Identifier "Mouse0" 15 Option "Protocol" "auto"
18 Driver "mouse" 16 Option "Device" "/dev/input/mice"
19 Option "Protocol" "auto" 17 Option "Emulate3Buttons" "no"
20 Option "Device" "/dev/input/mice" 18 Option "ZAxisMapping" "4 5"
21 Option "Emulate3Buttons" "no" 19 EndSection
22 Option "ZAxisMapping" "4 5" 20
23EndSection 21 Section "InputDevice"
24 22 # generated from default
25Section "InputDevice" 23 Identifier "Keyboard0"
26 # generated from default 24 Driver "kbd"
27 Identifier "Keyboard0" 25 EndSection
28 Driver "kbd" 26 '';
29EndSection 27
30 28 monitorSection = ''
31Section "Monitor"
32 # HorizSync source: edid, VertRefresh source: edid 29 # HorizSync source: edid, VertRefresh source: edid
33 Identifier "Monitor0" 30 Identifier "Monitor0"
34 VendorName "Unknown" 31 VendorName "Unknown"
@@ -36,17 +33,17 @@ Section "Monitor"
36 HorizSync 24.0 - 160.0 33 HorizSync 24.0 - 160.0
37 VertRefresh 30.0 - 80.0 34 VertRefresh 30.0 - 80.0
38 Option "DPMS" 35 Option "DPMS"
39EndSection 36 '';
40 37
41Section "Device" 38 deviceSection = ''
42 Identifier "Device0" 39 Identifier "Device0"
43 Driver "nvidia" 40 Driver "nvidia"
44 VendorName "NVIDIA Corporation" 41 VendorName "NVIDIA Corporation"
45 BoardName "GeForce GTX 480" 42 BoardName "GeForce GTX 480"
46 BusID "PCI:1:0:0" 43 BusID "PCI:1:0:0"
47EndSection 44 '';
48 45
49Section "Screen" 46 screenSection = ''
50 Identifier "Screen0" 47 Identifier "Screen0"
51 Device "Device0" 48 Device "Device0"
52 Monitor "Monitor0" 49 Monitor "Monitor0"
@@ -60,5 +57,5 @@ Section "Screen"
60 SubSection "Display" 57 SubSection "Display"
61 Depth 24 58 Depth 24
62 EndSubSection 59 EndSubSection
63EndSection 60 '';
64 61}
diff --git a/vali.nix b/vali.nix
index 77685939..6afa3fbc 100644
--- a/vali.nix
+++ b/vali.nix
@@ -120,9 +120,8 @@ rec {
120 xkbOptions = "compose:caps"; 120 xkbOptions = "compose:caps";
121 121
122 videoDrivers = [ "nvidia" ]; 122 videoDrivers = [ "nvidia" ];
123 config = builtins.readFile ./vali-X.conf;
124 exportConfiguration = true; 123 exportConfiguration = true;
125 }; 124 } // (import vali-X.conf);
126 125
127 hardware.opengl.driSupport32Bit = true; 126 hardware.opengl.driSupport32Bit = true;
128 127