about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-02-08 13:03:22 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-02-08 13:10:12 +0100
commitae393e63dd12e97389f1a17e1074ab12eef7e8df (patch)
tree07044ddeca0d7e74ed7b2664342ac4b4dd6e955c /machines
parent249620044a5dc6f0ab1d7b5824f93336b9a37b79 (diff)
Move a few attributes from "xserver" to "mesa".
The attributes driSupport32Bit, s3tcSupport and videoDrivers are now no
longer in services.xserver and now reside in services.mesa.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/dnyarri.nix6
-rw-r--r--machines/mmrnmhrm.nix6
2 files changed, 4 insertions, 8 deletions
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index a2f5001a..e638cd2f 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -128,9 +128,7 @@ with import ../lib;
   services.synergy.client.enable = true;
   services.synergy.client.serverAddress = "mmrnmhrm";
 
-  services.xserver = {
-    videoDrivers = [ "ati" ];
+  services.mesa.videoDrivers = [ "ati" ];
 
-    xrandrHeads = [ "HDMI-0" "DVI-0" ];
-  };
+  services.xserver.xrandrHeads = [ "HDMI-0" "DVI-0" ];
 }
diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix
index f8412c0a..057b514c 100644
--- a/machines/mmrnmhrm.nix
+++ b/machines/mmrnmhrm.nix
@@ -44,8 +44,6 @@ with import ../lib;
   services.synergy.server.enable = true;
   services.synergy.server.configFile = ../cfgfiles/synergy.conf;
 
-  services.xserver = {
-    videoDrivers = [ "nouveau" ];
-    xrandrHeads = [ "DVI-I-2" "DVI-I-1" ];
-  };
+  services.mesa.videoDrivers = [ "nouveau" ];
+  services.xserver.xrandrHeads = [ "DVI-I-2" "DVI-I-1" ];
 }