diff --git a/configuration.nix b/configuration.nix
index 4284cb8..8a33fd8 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -52,7 +52,7 @@
   security.rtkit.enable = true;
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
   hardware.uinput.enable = true;
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix
index d5e122f..b4639f5 100755
--- a/system-modules/nvidia.nix
+++ b/system-modules/nvidia.nix
@@ -5,7 +5,7 @@ in
   config = lib.mkIf nvidia.enable {
     environment.systemPackages = with pkgs; [
       lshw
-      nvtop
+      nvtopPackages.full
       glxinfo
       (pkgs.writeShellScriptBin "nvidia-offload" ''
         export __NV_PRIME_RENDER_OFFLOAD=1