Remove linuxwacom: it is not compatible with new xserver

svn path=/nixos/trunk/; revision=21015

3 files changed, 1 insertions, 90 deletions

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3cf8096dac14..58446c37e8d9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -120,7 +120,6 @@
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
-  ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
deleted file mode 100644
index 2ad2c12c495b..000000000000
--- a/modules/services/x11/hardware/wacom.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.xserver.wacom;
-
-in
-
-{
-
-  options = {
-
-    services.xserver.wacom = {
-      
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable the Wacom touchscreen/digitizer.";
-      };
-
-      device = mkOption {
-        default = "/dev/ttyS0";
-        description = "Device to use.";
-      };
-
-      forceDeviceType = mkOption {
-        default = "ISDV4";
-        example = null;
-        description = "Some models (think touchscreen) require the device type to be specified.";
-      };
-
-    };
-
-  };
-
-
-  config = mkIf cfg.enable {
-
-    services.xserver.modules = [ pkgs.linuxwacom ];
-
-    services.udev.packages = [ pkgs.linuxwacom ];
-
-    services.xserver.serverLayoutSection =
-      ''
-        InputDevice "Wacom_stylus"
-        InputDevice "Wacom_cursor"
-        InputDevice "Wacom_eraser"
-      '';
-
-    services.xserver.config =
-      ''
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_stylus"
-          Option "Device" "${cfg.device}"
-          Option "Type" "stylus"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          Option "Button2" "3"
-        EndSection
-        
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_eraser"
-          Option "Device" "${cfg.device}"
-          Option "Type" "eraser"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          Option "Button1" "2"
-        EndSection
-        
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_cursor"
-          Option "Device" "${cfg.device}"
-          Option "Type" "cursor"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-        EndSection
-      '';
-        
-  };
-
-}
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e40800074e79..e1f62f89c11b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -155,7 +155,7 @@ in
 
       modules = mkOption {
         default = [];
-        example = [ pkgs.linuxwacom ];
+        example = [ pkgs.synaptics ];
         description = "Packages to be added to the module search path of the X server.";
       };