pine64-pinebook-pro: improvements and simplifications

pine64/pinebook-pro/default.nix

@@ -36,38 +36,18 @@
     "tcpm"
     "typec"
 
+    # PCIe/NVMe
+    "nvme"
+    "pcie_rockchip_host"
+    "phy_rockchip_pcie"
+
     # Misc. modules
     "cw2015_battery"
     "gpio_charger"
     "rtc_rk808"
   ];
 
-  services.udev.extraHwdb = lib.mkMerge [
-    # https://github.com/elementary/os/blob/05a5a931806d4ed8bc90396e9e91b5ac6155d4d4/build-pinebookpro.sh#L253-L257
-    # Disable the "keyboard mouse" in libinput. This is reported by the keyboard firmware
-    # and is probably a placeholder for a TrackPoint style mouse that doesn't exist
-    ''
-      evdev:input:b0003v258Ap001Ee0110-e0,1,2,4,k110,111,112,r0,1,am4,lsfw
-        ID_INPUT=0
-        ID_INPUT_MOUSE=0
-    ''
-  ];
-
-  # https://github.com/elementary/os/blob/05a5a931806d4ed8bc90396e9e91b5ac6155d4d4/build-pinebookpro.sh#L253-L257
-  # Mark the keyboard as internal, so that "disable when typing" works for the touchpad
-  environment.etc."libinput/local-overrides.quirks".text = ''
-    [Pinebook Pro Keyboard]
-    MatchUdevType=keyboard
-    MatchBus=usb
-    MatchVendor=0x258A
-    MatchProduct=0x001E
-    AttrKeyboardIntegration=internal
-  '';
-
   hardware.enableRedistributableFirmware = true;
-  hardware.firmware = [
-    (pkgs.callPackage ./firmware/ap6256-firmware { })
-  ];
 
   # The default powersave makes the wireless connection unusable.
   networking.networkmanager.wifi.powersave = lib.mkDefault false;