From cc279e8a044361dbed1cc6330b5db9c60309293e Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Tue, 3 Oct 2017 12:13:51 -0700 Subject: [PATCH 1/2] Write trackpad preferences to non-bluetooth namespace as well --- modules/system/defaults-write.nix | 4 +++- modules/system/defaults/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix index 7ad97da3..7a5eba49 100644 --- a/modules/system/defaults-write.nix +++ b/modules/system/defaults-write.nix @@ -23,7 +23,8 @@ let LaunchServices = defaultsToList "com.apple.LaunchServices" cfg.LaunchServices; dock = defaultsToList "com.apple.dock" cfg.dock; finder = defaultsToList "com.apple.finder" cfg.finder; - trackpad = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad; + trackpad = defaultsToList "com.apple.AppleMultitouchTrackpad" cfg.trackpad; + trackpadBluetooth = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad; in @@ -42,6 +43,7 @@ in ${concatStringsSep "\n" dock} ${concatStringsSep "\n" finder} ${concatStringsSep "\n" trackpad} + ${concatStringsSep "\n" trackpadBluetooth} ''; }; diff --git a/modules/system/defaults/default.nix b/modules/system/defaults/default.nix index 0f9877d0..cb785182 100644 --- a/modules/system/defaults/default.nix +++ b/modules/system/defaults/default.nix @@ -20,7 +20,8 @@ let global = defaultsToList "-g" cfg.global; dock = defaultsToList "com.apple.dock" cfg.dock; finder = defaultsToList "com.apple.finder" cfg.finder; - trackpad = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad; + trackpad = defaultsToList "com.apple.AppleMultitouchTrackpad" cfg.trackpad; + trackpadBluetooth = defaultsToList "com.apple.driver.AppleBluetoothMultitouch.trackpad" cfg.trackpad; LaunchServices = defaultsToList "com.apple.LaunchServices" cfg.LaunchServices; in @@ -39,6 +40,7 @@ in ${concatStringsSep "\n" dock} ${concatStringsSep "\n" finder} ${concatStringsSep "\n" trackpad} + ${concatStringsSep "\n" trackpadBluetooth} ${concatStringsSep "\n" LaunchServices} ''; From 3c447cfa00f1b0340f75956a501352a8be80b7f3 Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Tue, 3 Oct 2017 12:14:29 -0700 Subject: [PATCH 2/2] Add 'TrackpadThreeFingerDrag' setting to trackpad module --- modules/system/defaults/trackpad.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/system/defaults/trackpad.nix b/modules/system/defaults/trackpad.nix index c093ae21..1fb1c901 100644 --- a/modules/system/defaults/trackpad.nix +++ b/modules/system/defaults/trackpad.nix @@ -21,5 +21,13 @@ with lib; ''; }; + system.defaults.trackpad.TrackpadThreeFingerDrag = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Whether to enable three finger drag. The default is false. + ''; + }; + }; }