diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 4660bf7c92d2..7e989c163e36 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -56,5 +56,5 @@ in
   # Use nss-myhostname to ensure that our hostname always resolves to
   # a valid IP address.  It returns all locally configured IP
   # addresses, or ::1 and 127.0.0.2 as fallbacks.
-  system.nssModules = [ pkgs.nss_myhostname ];
+  system.nssModules = [ pkgs.systemd ];
 }
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index cf4bbedfa272..cfe21c2a500e 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -22,9 +22,7 @@ let
     pathsToLink = "/lib/dri";
 
     # To admit zero-length 'paths'
-    postBuild = "
-      mkdir -p $out/lib/dri
-    ";
+    postBuild = "mkdir -p $out/lib/dri";
   };
 
   # file provided by services.xserver.displayManager.session.script
@@ -91,7 +89,7 @@ let
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
       fi
 
-      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri;
+      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
 
       source /etc/profile
 
@@ -139,7 +137,7 @@ let
 
   mkDesktops = names: pkgs.runCommand "desktops" {}
     ''
-      ensureDir $out
+      mkdir -p $out
       ${concatMapStrings (n: ''
         cat - > "$out/${n}.desktop" << EODESKTOP
         [Desktop Entry]
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index c93c443287b1..7cc507feb1d5 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -204,11 +204,11 @@ in
       };
 
       vaapiDrivers = mkOption {
-        default = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+        default = [ ];
         defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
         example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
         description = ''
-          Names of the packages providing libva acceleration drivers.
+          Packages providing libva acceleration drivers.
         '';
       };