commit 85808e4b33f65c7d418db493f18243db4285094c · pyrox.dev/nixpkgs

+1 -1

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

···

       6
        
       It sets [](#opt-services.xserver.enable),

     

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

     

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

     

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

     

       10
        
       includes glxinfo and firefox in the system packages list.

···

       6
        
       It sets [](#opt-services.xserver.enable),

     

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

     

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

     

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

     

       10
        
       includes glxinfo and firefox in the system packages list.

+2 -2

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

···

       207
        
       

     

       208
        
       ```nix

     

       209
        
       {

     

       210
       -
         services.xserver.libinput.enable = true;

     

       211
        
       }

     

       212
        
       ```

     

       213
        
       

     
···

       216
        
       

     

       217
        
       ```nix

     

       218
        
       {

     

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

     

       220
        
       }

     

       221
        
       ```

     

       222

···

       207
        
       

     

       208
        
       ```nix

     

       209
        
       {

     

       210
       +
         services.libinput.enable = true;

     

       211
        
       }

     

       212
        
       ```

     

       213
        
       

     
···

       216
        
       

     

       217
        
       ```nix

     

       218
        
       {

     

       219
       +
         services.libinput.touchpad.tapping = false;

     

       220
        
       }

     

       221
        
       ```

     

       222

+1 -1

nixos/modules/installer/tools/tools.nix

···

       185
        
               # };

     

       186
        
       

     

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

     

       188
       -
               # services.xserver.libinput.enable = true;

     

       189
        
       

     

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

     

       191
        
               # users.users.alice = {

···

       185
        
               # };

     

       186
        
       

     

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

     

       188
       +
               # services.libinput.enable = true;

     

       189
        
       

     

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

     

       191
        
               # users.users.alice = {

+1 -1

nixos/modules/module-list.nix

···

       559
        
         ./services/hardware/joycond.nix

     

       560
        
         ./services/hardware/kanata.nix

     

       561
        
         ./services/hardware/lcd.nix

     

       0
        
       
     

       562
        
         ./services/hardware/lirc.nix

     

       563
        
         ./services/hardware/nvidia-container-toolkit

     

       564
        
         ./services/hardware/monado.nix

     
···

       1473
        
         ./services/x11/gdk-pixbuf.nix

     

       1474
        
         ./services/x11/hardware/cmt.nix

     

       1475
        
         ./services/x11/hardware/digimend.nix

     

       1476
       -
         ./services/x11/hardware/libinput.nix

     

       1477
        
         ./services/x11/hardware/synaptics.nix

     

       1478
        
         ./services/x11/hardware/wacom.nix

     

       1479
        
         ./services/x11/imwheel.nix

···

       559
        
         ./services/hardware/joycond.nix

     

       560
        
         ./services/hardware/kanata.nix

     

       561
        
         ./services/hardware/lcd.nix

     

       562
       +
         ./services/hardware/libinput.nix

     

       563
        
         ./services/hardware/lirc.nix

     

       564
        
         ./services/hardware/nvidia-container-toolkit

     

       565
        
         ./services/hardware/monado.nix

     
···

       1474
        
         ./services/x11/gdk-pixbuf.nix

     

       1475
        
         ./services/x11/hardware/cmt.nix

     

       1476
        
         ./services/x11/hardware/digimend.nix

     

       0
        
       
     

       1477
        
         ./services/x11/hardware/synaptics.nix

     

       1478
        
         ./services/x11/hardware/wacom.nix

     

       1479
        
         ./services/x11/imwheel.nix

+4 -2

nixos/modules/profiles/graphical.nix

···

       7
        
         services.xserver = {

     

       8
        
           enable = true;

     

       9
        
           desktopManager.plasma5.enable = true;

     

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

     

       11
        
         };

     

       12
        
       

     

       13
       -
         services.displayManager.sddm.enable = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
        
         # Enable sound in virtualbox appliances.

     

       16
        
         hardware.pulseaudio.enable = true;

···

       7
        
         services.xserver = {

     

       8
        
           enable = true;

     

       9
        
           desktopManager.plasma5.enable = true;

     

       0
        
       
     

       10
        
         };

     

       11
        
       

     

       12
       +
         services = {

     

       13
       +
           displayManager.sddm.enable = true;

     

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

     

       15
       +
         };

     

       16
        
       

     

       17
        
         # Enable sound in virtualbox appliances.

     

       18
        
         hardware.pulseaudio.enable = true;

+1 -1

nixos/modules/services/desktop-managers/plasma6.nix

···

       238
        
           services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true);

     

       239
        
           services.udisks2.enable = true;

     

       240
        
           services.upower.enable = config.powerManagement.enable;

     

       241
       -
           services.xserver.libinput.enable = mkDefault true;

     

       242
        
       

     

       243
        
           # Extra UDEV rules used by Solid

     

       244
        
           services.udev.packages = [

···

       238
        
           services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true);

     

       239
        
           services.udisks2.enable = true;

     

       240
        
           services.upower.enable = config.powerManagement.enable;

     

       241
       +
           services.libinput.enable = mkDefault true;

     

       242
        
       

     

       243
        
           # Extra UDEV rules used by Solid

     

       244
        
           services.udev.packages = [

+2 -2

nixos/modules/services/display-managers/sddm.nix

···

       111
        
             let

     

       112
        
               westonIni = (pkgs.formats.ini { }).generate "weston.ini" {

     

       113
        
                 libinput = {

     

       114
       -
                   enable-tap = xcfg.libinput.mouse.tapping;

     

       115
       -
                   left-handed = xcfg.libinput.mouse.leftHanded;

     

       116
        
                 };

     

       117
        
                 keyboard = {

     

       118
        
                   keymap_model = xcfg.xkb.model;

···

       111
        
             let

     

       112
        
               westonIni = (pkgs.formats.ini { }).generate "weston.ini" {

     

       113
        
                 libinput = {

     

       114
       +
                   enable-tap = config.services.libinput.mouse.tapping;

     

       115
       +
                   left-handed = config.services.libinput.mouse.leftHanded;

     

       116
        
                 };

     

       117
        
                 keyboard = {

     

       118
        
                   keymap_model = xcfg.xkb.model;

+1 -1

nixos/modules/services/x11/desktop-managers/budgie.nix

···

       214
        
       

     

       215
        
           services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel.

     

       216
        
           services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel.

     

       217
       -
           services.xserver.libinput.enable = mkDefault true; # for BCC's Mouse panel.

     

       218
        
           services.colord.enable = mkDefault true; # for BCC's Color panel.

     

       219
        
           services.gnome.at-spi2-core.enable = mkDefault true; # for BCC's A11y panel.

     

       220
        
           services.accounts-daemon.enable = mkDefault true; # for BCC's Users panel.

···

       214
        
       

     

       215
        
           services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel.

     

       216
        
           services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel.

     

       217
       +
           services.libinput.enable = mkDefault true; # for BCC's Mouse panel.

     

       218
        
           services.colord.enable = mkDefault true; # for BCC's Color panel.

     

       219
        
           services.gnome.at-spi2-core.enable = mkDefault true; # for BCC's A11y panel.

     

       220
        
           services.accounts-daemon.enable = mkDefault true; # for BCC's Users panel.

+1 -1

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       116
        
             services.touchegg.enable = mkDefault true;

     

       117
        
             services.udisks2.enable = true;

     

       118
        
             services.upower.enable = mkDefault config.powerManagement.enable;

     

       119
       -
             services.xserver.libinput.enable = mkDefault true;

     

       120
        
             services.xserver.updateDbusEnvironment = true;

     

       121
        
             networking.networkmanager.enable = mkDefault true;

     

       122

···

       116
        
             services.touchegg.enable = mkDefault true;

     

       117
        
             services.udisks2.enable = true;

     

       118
        
             services.upower.enable = mkDefault config.powerManagement.enable;

     

       119
       +
             services.libinput.enable = mkDefault true;

     

       120
        
             services.xserver.updateDbusEnvironment = true;

     

       121
        
             networking.networkmanager.enable = mkDefault true;

     

       122

+1 -1

nixos/modules/services/x11/desktop-managers/deepin.nix

···

       61
        
             services.gnome.gnome-keyring.enable = mkDefault true;

     

       62
        
             services.bamf.enable = mkDefault true;

     

       63
        
       

     

       64
       -
             services.xserver.libinput.enable = mkDefault true;

     

       65
        
             services.udisks2.enable = true;

     

       66
        
             services.upower.enable = mkDefault config.powerManagement.enable;

     

       67
        
             networking.networkmanager.enable = mkDefault true;

···

       61
        
             services.gnome.gnome-keyring.enable = mkDefault true;

     

       62
        
             services.bamf.enable = mkDefault true;

     

       63
        
       

     

       64
       +
             services.libinput.enable = mkDefault true;

     

       65
        
             services.udisks2.enable = true;

     

       66
        
             services.upower.enable = mkDefault config.powerManagement.enable;

     

       67
        
             networking.networkmanager.enable = mkDefault true;

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       96
        
       

     

       97
        
           services.udisks2.enable = true;

     

       98
        
           services.upower.enable = config.powerManagement.enable;

     

       99
       -
           services.xserver.libinput.enable = mkDefault true;

     

       100
        
       

     

       101
        
           services.dbus.packages = [ e.efl ];

     

       102

···

       96
        
       

     

       97
        
           services.udisks2.enable = true;

     

       98
        
           services.upower.enable = config.powerManagement.enable;

     

       99
       +
           services.libinput.enable = mkDefault true;

     

       100
        
       

     

       101
        
           services.dbus.packages = [ e.efl ];

     

       102

+1 -1

nixos/modules/services/x11/desktop-managers/gnome.nix

···

       339
        
             # services.packagekit.enable = mkDefault true;

     

       340
        
             services.udisks2.enable = true;

     

       341
        
             services.upower.enable = config.powerManagement.enable;

     

       342
       -
             services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       343
        
       

     

       344
        
             # Explicitly enabled since GNOME will be severely broken without these.

     

       345
        
             xdg.mime.enable = true;

···

       339
        
             # services.packagekit.enable = mkDefault true;

     

       340
        
             services.udisks2.enable = true;

     

       341
        
             services.upower.enable = config.powerManagement.enable;

     

       342
       +
             services.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       343
        
       

     

       344
        
             # Explicitly enabled since GNOME will be severely broken without these.

     

       345
        
             xdg.mime.enable = true;

+1 -1

nixos/modules/services/x11/desktop-managers/lxqt.nix

···

       69
        
       

     

       70
        
           services.upower.enable = config.powerManagement.enable;

     

       71
        
       

     

       72
       -
           services.xserver.libinput.enable = mkDefault true;

     

       73
        
       

     

       74
        
           xdg.portal.lxqt.enable = mkDefault true;

     

       75

···

       69
        
       

     

       70
        
           services.upower.enable = config.powerManagement.enable;

     

       71
        
       

     

       72
       +
           services.libinput.enable = mkDefault true;

     

       73
        
       

     

       74
        
           xdg.portal.lxqt.enable = mkDefault true;

     

       75

+1 -1

nixos/modules/services/x11/desktop-managers/mate.nix

···

       88
        
             services.udev.packages = [ pkgs.mate.mate-settings-daemon ];

     

       89
        
             services.gvfs.enable = true;

     

       90
        
             services.upower.enable = config.powerManagement.enable;

     

       91
       -
             services.xserver.libinput.enable = mkDefault true;

     

       92
        
       

     

       93
        
             security.pam.services.mate-screensaver.unixAuth = true;

     

       94

···

       88
        
             services.udev.packages = [ pkgs.mate.mate-settings-daemon ];

     

       89
        
             services.gvfs.enable = true;

     

       90
        
             services.upower.enable = config.powerManagement.enable;

     

       91
       +
             services.libinput.enable = mkDefault true;

     

       92
        
       

     

       93
        
             security.pam.services.mate-screensaver.unixAuth = true;

     

       94

+1 -1

nixos/modules/services/x11/desktop-managers/pantheon.nix

···

       159
        
             services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];

     

       160
        
             services.udisks2.enable = true;

     

       161
        
             services.upower.enable = config.powerManagement.enable;

     

       162
       -
             services.xserver.libinput.enable = mkDefault true;

     

       163
        
             services.xserver.updateDbusEnvironment = true;

     

       164
        
             services.zeitgeist.enable = mkDefault true;

     

       165
        
             services.geoclue2.enable = mkDefault true;

···

       159
        
             services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];

     

       160
        
             services.udisks2.enable = true;

     

       161
        
             services.upower.enable = config.powerManagement.enable;

     

       162
       +
             services.libinput.enable = mkDefault true;

     

       163
        
             services.xserver.updateDbusEnvironment = true;

     

       164
        
             services.zeitgeist.enable = mkDefault true;

     

       165
        
             services.geoclue2.enable = mkDefault true;

+1 -1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       348
        
             services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true);

     

       349
        
             services.udisks2.enable = true;

     

       350
        
             services.upower.enable = config.powerManagement.enable;

     

       351
       -
             services.xserver.libinput.enable = mkDefault true;

     

       352
        
       

     

       353
        
             # Extra UDEV rules used by Solid

     

       354
        
             services.udev.packages = [

···

       348
        
             services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true);

     

       349
        
             services.udisks2.enable = true;

     

       350
        
             services.upower.enable = config.powerManagement.enable;

     

       351
       +
             services.libinput.enable = mkDefault true;

     

       352
        
       

     

       353
        
             # Extra UDEV rules used by Solid

     

       354
        
             services.udev.packages = [

+1 -1

nixos/modules/services/x11/desktop-managers/xfce.nix

···

       164
        
           services.gvfs.enable = true;

     

       165
        
           services.tumbler.enable = true;

     

       166
        
           services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

     

       167
       -
           services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager

     

       168
        
       

     

       169
        
           # Enable default programs

     

       170
        
           programs.dconf.enable = true;

···

       164
        
           services.gvfs.enable = true;

     

       165
        
           services.tumbler.enable = true;

     

       166
        
           services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

     

       167
       +
           services.libinput.enable = mkDefault true; # used in xfce4-settings-manager

     

       168
        
       

     

       169
        
           # Enable default programs

     

       170
        
           programs.dconf.enable = true;

+2 -2

nixos/modules/services/x11/hardware/cmt.nix

···

       46
        
       

     

       47
        
           assertions = [

     

       48
        
             {

     

       49
       -
               assertion = !config.services.xserver.libinput.enable;

     

       50
        
               message = ''

     

       51
        
                 cmt and libinput are incompatible, meaning you cannot enable them both.

     

       52
       -
                 To use cmt you need to disable libinput with `services.xserver.libinput.enable = false`

     

       53
        
                 If you haven't enabled it in configuration.nix, it's enabled by default on a

     

       54
        
                 different xserver module.

     

       55
        
               '';

···

       46
        
       

     

       47
        
           assertions = [

     

       48
        
             {

     

       49
       +
               assertion = !config.services.libinput.enable;

     

       50
        
               message = ''

     

       51
        
                 cmt and libinput are incompatible, meaning you cannot enable them both.

     

       52
       +
                 To use cmt you need to disable libinput with `services.libinput.enable = false`

     

       53
        
                 If you haven't enabled it in configuration.nix, it's enabled by default on a

     

       54
        
                 different xserver module.

     

       55
        
               '';

+8 -4

nixos/modules/services/x11/hardware/libinput.nix nixos/modules/services/hardware/libinput.nix

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       -
       let cfg = config.services.xserver.libinput;

     

       6
        
       

     

       7
        
           xorgBool = v: if v then "on" else "off";

     

       8
        
       

     
···

       223
        
       in {

     

       224
        
       

     

       225
        
         imports =

     

       226
       -
           (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [

     

       227
        
             "accelProfile"

     

       228
        
             "accelSpeed"

     

       229
        
             "buttonMapping"

     
···

       242
        
             "transformationMatrix"

     

       243
        
             "disableWhileTyping"

     

       244
        
             "additionalOptions"

     

       245
       -
           ]);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       246
        
       

     

       247
        
         options = {

     

       248
        
       

     

       249
       -
           services.xserver.libinput = {

     

       250
        
             enable = mkEnableOption "libinput" // {

     

       251
        
               default = config.services.xserver.enable;

     

       252
        
               defaultText = lib.literalExpression "config.services.xserver.enable";

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       +
       let cfg = config.services.libinput;

     

       6
        
       

     

       7
        
           xorgBool = v: if v then "on" else "off";

     

       8
        
       

     
···

       223
        
       in {

     

       224
        
       

     

       225
        
         imports =

     

       226
       +
           (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "libinput" "touchpad" option ]) [

     

       227
        
             "accelProfile"

     

       228
        
             "accelSpeed"

     

       229
        
             "buttonMapping"

     
···

       242
        
             "transformationMatrix"

     

       243
        
             "disableWhileTyping"

     

       244
        
             "additionalOptions"

     

       245
       +
           ]) ++ [

     

       246
       +
             (mkRenamedOptionModule [ "services" "xserver" "libinput" "enable" ]   [ "services" "libinput" "enable" ])

     

       247
       +
             (mkRenamedOptionModule [ "services" "xserver" "libinput" "mouse" ]    [ "services" "libinput" "mouse" ])

     

       248
       +
             (mkRenamedOptionModule [ "services" "xserver" "libinput" "touchpad" ] [ "services" "libinput" "touchpad" ])

     

       249
       +
           ];

     

       250
        
       

     

       251
        
         options = {

     

       252
        
       

     

       253
       +
           services.libinput = {

     

       254
        
             enable = mkEnableOption "libinput" // {

     

       255
        
               default = config.services.xserver.enable;

     

       256
        
               defaultText = lib.literalExpression "config.services.xserver.enable";

+3 -3

nixos/modules/services/x11/hardware/synaptics.nix

···

       30
        
             enable = mkOption {

     

       31
        
               type = types.bool;

     

       32
        
               default = false;

     

       33
       -
               description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable.";

     

       34
        
             };

     

       35
        
       

     

       36
        
             dev = mkOption {

     
···

       207
        
       

     

       208
        
           assertions = [

     

       209
        
             {

     

       210
       -
               assertion = !config.services.xserver.libinput.enable;

     

       211
       -
               message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver).";

     

       212
        
             }

     

       213
        
           ];

     

       214

···

       30
        
             enable = mkOption {

     

       31
        
               type = types.bool;

     

       32
        
               default = false;

     

       33
       +
               description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable.";

     

       34
        
             };

     

       35
        
       

     

       36
        
             dev = mkOption {

     
···

       207
        
       

     

       208
        
           assertions = [

     

       209
        
             {

     

       210
       +
               assertion = !config.services.libinput.enable;

     

       211
       +
               message = "Synaptics and libinput are incompatible, you cannot enable both.";

     

       212
        
             }

     

       213
        
           ];

     

       214

+1 -1

nixos/tests/libinput.nix

···

       12
        
       

     

       13
        
             test-support.displayManager.auto.user = "alice";

     

       14
        
       

     

       15
       -
             services.xserver.libinput = {

     

       16
        
               enable = true;

     

       17
        
               mouse = {

     

       18
        
                 naturalScrolling = true;

···

       12
        
       

     

       13
        
             test-support.displayManager.auto.user = "alice";

     

       14
        
       

     

       15
       +
             services.libinput = {

     

       16
        
               enable = true;

     

       17
        
               mouse = {

     

       18
        
                 naturalScrolling = true;