diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index eca0f9b880d6..f0054e93cc18 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -286,6 +286,8 @@ See . - support for `ecryptfs` in nixpkgs has been removed. +- `services.xserver.cmt` has been removed as the `xf86-input-cmt` package was broken and unmaintained upstream. + - `programs.light` was removed from nixpkgs due to the corresponding package being unmaintained upstream. `brightnessctl` and `programs.acpilight` offer replacements. - `ceph` has been upgraded to v20. See the [Ceph "tentacle" release notes](https://docs.ceph.com/en/latest/releases/tentacle/#v20-2-0-tentacle) for details and recommended upgrade procedure. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 718fb29d4d8d..e27b4a1250ec 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1856,7 +1856,6 @@ ./services/x11/display-managers/xpra.nix ./services/x11/extra-layouts.nix ./services/x11/fractalart.nix - ./services/x11/hardware/cmt.nix ./services/x11/hardware/digimend.nix ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a66a9bd5b929..040b2bc34cd5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -510,6 +510,9 @@ in (mkRemovedOptionModule [ "services" "xtreemfs" ] '' services.xtreemfs has been removed as it was broken and unmaintained upstream '') + (mkRemovedOptionModule [ "services" "xserver" "cmt" ] '' + services.xserver.cmt has been removed as it was broken and unmaintained upstream + '') # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix deleted file mode 100644 index ca636fdb73fe..000000000000 --- a/nixos/modules/services/x11/hardware/cmt.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.xserver.cmt; - etcPath = "X11/xorg.conf.d"; - -in -{ - - options = { - - services.xserver.cmt = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; - }; - models = mkOption { - type = types.enum [ - "atlas" - "banjo" - "candy" - "caroline" - "cave" - "celes" - "clapper" - "cyan" - "daisy" - "elan" - "elm" - "enguarde" - "eve" - "expresso" - "falco" - "gandof" - "glimmer" - "gnawty" - "heli" - "kevin" - "kip" - "leon" - "lulu" - "orco" - "pbody" - "peppy" - "pi" - "pit" - "puppy" - "quawks" - "rambi" - "samus" - "snappy" - "spring" - "squawks" - "swanky" - "winky" - "wolf" - "auron_paine" - "auron_yuna" - "daisy_skate" - "nyan_big" - "nyan_blaze" - "veyron_jaq" - "veyron_jerry" - "veyron_mighty" - "veyron_minnie" - "veyron_speedy" - ]; - example = "banjo"; - description = '' - Which models to enable cmt for. Enter the Code Name for your Chromebook. - Code Name can be found at . - ''; - }; - }; # closes services - }; # closes options - - config = mkIf cfg.enable { - - services.xserver.modules = [ pkgs.xf86-input-cmt ]; - - environment.etc = { - "${etcPath}/40-touchpad-cmt.conf" = { - source = "${pkgs.chromium-xorg-conf}/40-touchpad-cmt.conf"; - }; - "${etcPath}/50-touchpad-cmt-${cfg.models}.conf" = { - source = "${pkgs.chromium-xorg-conf}/50-touchpad-cmt-${cfg.models}.conf"; - }; - "${etcPath}/60-touchpad-cmt-${cfg.models}.conf" = { - source = "${pkgs.chromium-xorg-conf}/60-touchpad-cmt-${cfg.models}.conf"; - }; - }; - - assertions = [ - { - assertion = !config.services.libinput.enable; - message = '' - cmt and libinput are incompatible, meaning you cannot enable them both. - To use cmt you need to disable libinput with `services.libinput.enable = false` - If you haven't enabled it in configuration.nix, it's enabled by default on a - different xserver module. - ''; - } - ]; - }; -}