MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Enable libinput in the installer and start deprecating synaptics
This commit is contained in:
Graham Christensen 2017-08-30 20:43:29 -04:00 committed by GitHub
commit fb18203450
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-1709.xml
View file

@ -176,6 +176,14 @@ rmdir /var/lib/ipfs/.ipfs
removed. The system support had been broken for several years. removed. The system support had been broken for several years.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Touchpad support should now be enabled through
<literal>libinput</literal> as <literal>synaptics</literal> is
now deprecated. See the option
<literal>services.xserver.libinput.enable</literal>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
<para>Other notable improvements:</para> <para>Other notable improvements:</para>

3
nixos/modules/installer/tools/nixos-generate-config.pl
View file

@ -605,6 +605,9 @@ $bootLoaderConfig
# services.xserver.layout = "us"; # services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
# Enable touchpad support.
# services.xserver.libinput.enable = true;
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.
# services.xserver.displayManager.sddm.enable = true; # services.xserver.displayManager.sddm.enable = true;
# services.xserver.desktopManager.plasma5.enable = true; # services.xserver.desktopManager.plasma5.enable = true;

2
nixos/modules/profiles/graphical.nix
View file

@ -8,7 +8,7 @@
enable = true; enable = true;
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
synaptics.enable = true; # for touchpad support on many laptops libinput.enable = true; # for touchpad support on many laptops
}; };
environment.systemPackages = [ pkgs.glxinfo ]; environment.systemPackages = [ pkgs.glxinfo ];

2
nixos/modules/services/x11/hardware/synaptics.nix
View file

@ -29,7 +29,7 @@ in {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "Whether to enable touchpad support."; description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable.";
}; };
dev = mkOption { dev = mkOption {