Merge pull request #154 from MarcWeber/submit/x11-wacom-intuos5-fix

fix wacom hotplug and all Intuos 5 issues

2 files changed, 11 insertions, 83 deletions

diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
index 32e29e9b3880..dfc588cd2132 100644
--- a/modules/services/x11/hardware/wacom.nix
+++ b/modules/services/x11/hardware/wacom.nix
@@ -16,41 +16,15 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable the Wacom touchscreen/digitizer/tablet.";
-      };
-
-      device = mkOption {
-        default = null;
-        example = "/dev/ttyS0";
-        description = "Device to use. Set to null for autodetect (think USB tablet).";
-      };
-
-      forceDeviceType = mkOption {
-        default = null;
-        example = "ISDV4";
-        description = "Some models (think touchscreen) require the device type to be specified. Set to null for autodetect (think USB tablet).";
-      };
-
-      stylusExtraConfig = mkOption {
-        default = "";
-        example = ''
-            Option "Button1" "2"
-          '';
-        description = "Lines to be added to Wacom_stylus InputDevice section.";
-      };
-
-      eraserExtraConfig = mkOption {
-        default = "";
-        example = ''
-            Option "Button2" "3"
-          '';
-        description = "Lines to be added to Wacom_eraser InputDevice section.";
-      };
-
-      cursorExtraConfig = mkOption {
-        default = "";
-        example = "";
-        description = "Lines to be added to Wacom_cursor InputDevice section.";
+        description = ''
+          Whether to enable the Wacom touchscreen/digitizer/tablet.
+          If you ever have any issues such as, try switching to terminal (ctrl-alt-F1) and back
+          which will make Xorg reconfigure the device ?
+
+          If you're not satisfied by the default behaviour you can override
+          <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in
+          configuration.nix easily.
+        '';
       };
 
     };
@@ -66,54 +40,7 @@ in
 
     services.udev.packages = [ pkgs.xf86_input_wacom ];
 
-    services.xserver.serverLayoutSection =
-      ''
-        InputDevice "Wacom_stylus"
-        InputDevice "Wacom_eraser"
-        InputDevice "Wacom_cursor"
-      '';
-
-    services.xserver.config =
-      ''
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_stylus"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "stylus"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.stylusExtraConfig}
-        EndSection
-
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_eraser"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "eraser"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.eraserExtraConfig}
-        EndSection
-
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_cursor"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "cursor"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.cursorExtraConfig}
-        EndSection
-      '';
+    environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";
 
   };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 5738a24e69d9..8378e10cc46b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -434,6 +434,7 @@ in
         xorg.xlsclients
         xorg.xset
         xorg.xsetroot
+        xorg.xinput
         xorg.xprop
         pkgs.xterm
         pkgs.xdg_utils