treewide: only ever set unmergable options via lib.mkDefault

Also extract documentation from raspberry-pi/2/ profile.

1 files changed, 7 insertions, 5 deletions

diff --git a/acer/aspire/4810t/default.nix b/acer/aspire/4810t/default.nix
index b984623..ed0e923 100644
--- a/acer/aspire/4810t/default.nix
+++ b/acer/aspire/4810t/default.nix
@@ -1,3 +1,5 @@
+{ lib, ... }:
+
 {
   boot = {
     initrd.kernelModules = [ "ata_piix" ];
@@ -15,12 +17,12 @@
   hardware.opengl.driSupport = false;
 
   services.xserver = {
-    enable = true;
-    defaultDepth = 24;
-    videoDriver = "intel";
-    autorun = true;
+    enable = lib.mkDefault true;
+    defaultDepth = lib.mkDefault 24;
+    videoDrivers = [ "intel" ];
+    autorun = lib.mkDefault true;
     synaptics = {
-      enable = true;
+      enable = lib.mkDefault true;
       dev = "/dev/input/event8";
     };
   };