diff options
| author | Guillaume Maudoux <layus.on@gmail.com> | 2016-08-03 08:15:18 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <layus.on@gmail.com> | 2016-08-03 08:15:18 +0200 |
| commit | 0f0be5e498ac29e9011c7a29a7612871c0bc393f (patch) | |
| tree | 87c0baf4e92b06ab32bc71bbdac820e5cff77cfc /nixos | |
| parent | 3875690d80d257a76ef19d7db828fbb19e4a955e (diff) | |
| download | nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar.gz nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar.bz2 nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar.lz nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar.xz nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.tar.zst nixpkgs-0f0be5e498ac29e9011c7a29a7612871c0bc393f.zip | |
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 14c7131e611..47ce9e56604 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 e74b19c8e71..5c068e89dd7 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)."; + } + ]; + }; } |