2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 16b6a862593..027dd827b4d 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -1,4 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 {
 
@@ -6,9 +8,9 @@
 
   options = {
 
-    hardware.enableAllFirmware = pkgs.lib.mkOption {
+    hardware.enableAllFirmware = mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = types.bool;
       description = ''
         Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu.
       '';
@@ -19,7 +21,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
+  config = mkIf config.hardware.enableAllFirmware {
     hardware.firmware = [ "${pkgs.firmwareLinuxNonfree}/lib/firmware" ];
   };
 
diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix
index dea04ac753c..20684656750 100644
--- a/nixos/modules/hardware/pcmcia.nix
+++ b/nixos/modules/hardware/pcmcia.nix
@@ -36,7 +36,7 @@ in
       config = mkOption {
         default = null;
         description = ''
-          Path to the configuration file which map the memory, irq
+          Path to the configuration file which maps the memory, IRQs
           and ports used by the PCMCIA hardware.
         '';
       };