Enable service accounting, and remove libinput workaround

master
Sven Slootweg 7 years ago
parent e117ed836d
commit a2e201f5a0

@ -16,6 +16,7 @@ in {
(callPackageFile ../profiles/system/bluetooth.nix) (callPackageFile ../profiles/system/bluetooth.nix)
(callPackageFile ../profiles/system/pulseaudio.nix) (callPackageFile ../profiles/system/pulseaudio.nix)
(callPackageFile ../profiles/system/virtualization.nix) (callPackageFile ../profiles/system/virtualization.nix)
(callPackageFile ../profiles/system/service-accounting.nix)
(callPackageFile ../profiles/software/elasticsearch.nix) (callPackageFile ../profiles/software/elasticsearch.nix)
@ -114,51 +115,6 @@ in {
pkgs.fritzing pkgs.fritzing
]; ];
environment.etc."X11/xorg.conf.d/40-libinput.conf".text = ''
# Match on all types of devices but joysticks
Section "InputClass"
Identifier "libinput pointer catchall"
MatchIsPointer "on"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
Section "InputClass"
Identifier "libinput keyboard catchall"
MatchIsKeyboard "on"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
Section "InputClass"
Identifier "libinput touchpad catchall"
MatchIsTouchpad "on"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
Section "InputClass"
Identifier "libinput touchscreen catchall"
MatchIsTouchscreen "on"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
Section "InputClass"
Identifier "libinput tablet catchall"
MatchIsTablet "on"
MatchDevicePath "/dev/input/event*"
Driver "libinput"
EndSection
'';
environment.etc."X11/xorg.conf.d/40-libinput.conf".enable = true;
services.xserver.inputClassSections = [''
Identifier "Keyboard catchall"
MatchIsKeyboard "on"
Option "XkbRules" "evdev"
''];
services.udev.extraRules = '' services.udev.extraRules = ''
# Copyright (c) 2014-present PlatformIO <contact@platformio.org> # Copyright (c) 2014-present PlatformIO <contact@platformio.org>
# #

Loading…
Cancel
Save