Merge pull request #28772 from grahamc/issue-20189-libinput

Enable libinput in the installer and start deprecating synaptics

authored by Graham Christensen and committed by GitHub fb182034 b35972b3

+13 -2
+8
nixos/doc/manual/release-notes/rl-1709.xml
··· 176 removed. The system support had been broken for several years. 177 </para> 178 </listitem> 179 </itemizedlist> 180 181 <para>Other notable improvements:</para>
··· 176 removed. The system support had been broken for several years. 177 </para> 178 </listitem> 179 + <listitem> 180 + <para> 181 + Touchpad support should now be enabled through 182 + <literal>libinput</literal> as <literal>synaptics</literal> is 183 + now deprecated. See the option 184 + <literal>services.xserver.libinput.enable</literal>. 185 + </para> 186 + </listitem> 187 </itemizedlist> 188 189 <para>Other notable improvements:</para>
+3
nixos/modules/installer/tools/nixos-generate-config.pl
··· 605 # services.xserver.layout = "us"; 606 # services.xserver.xkbOptions = "eurosign:e"; 607 608 # Enable the KDE Desktop Environment. 609 # services.xserver.displayManager.sddm.enable = true; 610 # services.xserver.desktopManager.plasma5.enable = true;
··· 605 # services.xserver.layout = "us"; 606 # services.xserver.xkbOptions = "eurosign:e"; 607 608 + # Enable touchpad support. 609 + # services.xserver.libinput.enable = true; 610 + 611 # Enable the KDE Desktop Environment. 612 # services.xserver.displayManager.sddm.enable = true; 613 # services.xserver.desktopManager.plasma5.enable = true;
+1 -1
nixos/modules/profiles/graphical.nix
··· 8 enable = true; 9 displayManager.sddm.enable = true; 10 desktopManager.plasma5.enable = true; 11 - synaptics.enable = true; # for touchpad support on many laptops 12 }; 13 14 environment.systemPackages = [ pkgs.glxinfo ];
··· 8 enable = true; 9 displayManager.sddm.enable = true; 10 desktopManager.plasma5.enable = true; 11 + libinput.enable = true; # for touchpad support on many laptops 12 }; 13 14 environment.systemPackages = [ pkgs.glxinfo ];
+1 -1
nixos/modules/services/x11/hardware/synaptics.nix
··· 29 enable = mkOption { 30 type = types.bool; 31 default = false; 32 - description = "Whether to enable touchpad support."; 33 }; 34 35 dev = mkOption {
··· 29 enable = mkOption { 30 type = types.bool; 31 default = false; 32 + description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable."; 33 }; 34 35 dev = mkOption {