diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-08-05 19:26:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 19:26:07 +0200 |
| commit | f044035a9eb83bb9b4be1c90cf9205e8723a1453 (patch) | |
| tree | 339091064c2ddb373f2fc6af6d950f6799cc2eca /nixos | |
| parent | fae6264d3a547ca6540c9a28e86ac80ee8b1b53b (diff) | |
| parent | 0f0be5e498ac29e9011c7a29a7612871c0bc393f (diff) | |
| download | nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar.gz nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar.bz2 nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar.lz nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar.xz nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.tar.zst nixlib-f044035a9eb83bb9b4be1c90cf9205e8723a1453.zip | |
Merge pull request #17470 from layus/synaptics-conflict
Warn for conflict between synaptics and libinput
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/hardware/libinput.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/x11/hardware/synaptics.nix | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 14c7131e611c..47ce9e566045 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -227,6 +227,14 @@ in { EndSection ''; + assertions = [ + # already present in synaptics.nix + /* { + assertion = !config.services.xserver.synaptics.enable; + message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver)."; + } */ + ]; + }; } diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index e74b19c8e710..5c068e89dd71 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -205,6 +205,13 @@ in { EndSection ''; + assertions = [ + { + assertion = !config.services.xserver.libinput.enable; + message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver)."; + } + ]; + }; } |