4810t: fix evaluation, clean up

acer/aspire/4810t/default.nix

@@ -1,14 +1,7 @@
-/* imported from https://nixos.org/wiki/Acer_4810T */
-
-{ config, pkgs, lib, ... }:
-
 {
- # Make te network WLAN card (wlan0) firmware available
- require = [ <nixpkgs>/nixos/modules/hardware/network/intel-5000.nix ];
-
- boot = rec {
-   initrd.kernelModules = [ "ata_piix" ];
-   kernelParams = [
+  boot = {
+    initrd.kernelModules = [ "ata_piix" ];
+    kernelParams = [
       "apm=on"
       "acpi=on"
       "vga=0x317"
@@ -16,22 +9,19 @@
       # Important, to disable Kernel Mode Setting for the graphics card
       # This will allow backlight regulation
       "nomodeset"
-   ];
-   kernelModules = [
-     "kvm-intel"
-   ];
- };
-
- services = {
-   xserver = {
-     enable = true;
-     defaultDepth = 24;
-     videoDriver = "intel";
-     autorun = true;
-     driSupport = false;
-     synaptics = {
-       enable = true;
-       dev = "/dev/input/event8";
-     };
+    ];
   };
-};
+
+  hardware.opengl.driSupport = false;
+
+  services.xserver = {
+    enable = true;
+    defaultDepth = 24;
+    videoDriver = "intel";
+    autorun = true;
+    synaptics = {
+      enable = true;
+      dev = "/dev/input/event8";
+    };
+  };
+}