Unverified Commit 85808e4b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #304902 from SuperSandro2000/libinput-xserver 

 nixos/libinput: move out of xserver
parents 3ed7049c cb8b6a5d

nixos/doc/manual/configuration/profiles/graphical.section.md

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ graphical installation CD. 
It sets [](#opt-services.xserver.enable),

[](#opt-services.displayManager.sddm.enable),

[](#opt-services.xserver.desktopManager.plasma5.enable),

and [](#opt-services.xserver.libinput.enable) to true. It also

and [](#opt-services.libinput.enable) to true. It also

includes glxinfo and firefox in the system packages list.

nixos/doc/manual/configuration/x-windows.chapter.md

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ Latitude series) can be enabled as follows: 


```nix

{

  services.xserver.libinput.enable = true;

  services.libinput.enable = true;

}

```
@@ -216,7 +216,7 @@ For instance, the following disables tap-to-click behavior: 


```nix

{

  services.xserver.libinput.touchpad.tapping = false;

  services.libinput.touchpad.tapping = false;

}

```

nixos/modules/installer/tools/tools.nix

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ in 
        # };



        # Enable touchpad support (enabled default in most desktopManager).

        # services.xserver.libinput.enable = true;

        # services.libinput.enable = true;



        # Define a user account. Don't forget to set a password with ‘passwd’.

        # users.users.alice = {

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ 
  ./services/hardware/joycond.nix

  ./services/hardware/kanata.nix

  ./services/hardware/lcd.nix

  ./services/hardware/libinput.nix

  ./services/hardware/lirc.nix

  ./services/hardware/nvidia-container-toolkit

  ./services/hardware/monado.nix
@@ -1473,7 +1474,6 @@ 
  ./services/x11/gdk-pixbuf.nix

  ./services/x11/hardware/cmt.nix

  ./services/x11/hardware/digimend.nix

  ./services/x11/hardware/libinput.nix

  ./services/x11/hardware/synaptics.nix

  ./services/x11/hardware/wacom.nix

  ./services/x11/imwheel.nix

nixos/modules/profiles/graphical.nix

+4 −2
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ 
  services.xserver = {

    enable = true;

    desktopManager.plasma5.enable = true;

    libinput.enable = true; # for touchpad support on many laptops

  };



  services.displayManager.sddm.enable = true;

  services = {

    displayManager.sddm.enable = true;

    libinput.enable = true; # for touchpad support on many laptops

  };



  # Enable sound in virtualbox appliances.

  hardware.pulseaudio.enable = true;