diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-06 22:58:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 22:58:40 +0200 |
| commit | afdcebc111eae904018f274e66f0468826b3d07c (patch) | |
| tree | 734a0bf45416bb05a76aafde669d449d8dd3dd60 /modules | |
| parent | c08fa973078ef76b4043e6a6f85fef9c2daf1095 (diff) | |
| parent | 3c447cfa00f1b0340f75956a501352a8be80b7f3 (diff) | |
Merge pull request #45 from jrolfs/improve-trackpad
Improve trackpad settings support
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/defaults-write.nix | 4 | ||||
| -rw-r--r-- | modules/system/defaults/default.nix | 4 | ||||
| -rw-r--r-- | modules/system/defaults/trackpad.nix | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/modules/system/defaults-write.nix b/modules/system/defaults-write.nix index 7ad97da..7a5eba4 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 0f9877d..cb78518 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} ''; diff --git a/modules/system/defaults/trackpad.nix b/modules/system/defaults/trackpad.nix index c093ae2..1fb1c90 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. + ''; + }; + }; } |