From 0e7e1791e6b81c6ba55e6a73cdd8ae9c4bd57024 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 2 Jan 2017 14:58:50 +0100
Subject: machines/aszlig: Remove "with lib;"

I now prefer to explicitly state the function along with the "lib."
namespace instead of making it available over the whole scope of the
module.

One of the main reasons for this is that you can do early error checking
with nix-instantiate --parse.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/arilou.nix    | 10 ++++------
 machines/aszlig/dnyarri.nix   |  6 ++----
 machines/aszlig/kzerza.nix    |  6 ++----
 machines/aszlig/mmrnmhrm.nix  |  6 ++----
 machines/aszlig/tishtushi.nix |  6 ++----
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index f77fbe38..8fbc4353 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let
   rootUUID = "e9c95c74-e4cf-41f6-bb45-baf8dd579217";
   swapUUID = "4d172959-5cfd-4164-a46e-fa7be0dfd03a";
@@ -20,7 +18,7 @@ in {
   };
 
   networking.hostName = "arilou";
-  networking.wireless.enable = mkForce true;
+  networking.wireless.enable = lib.mkForce true;
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
   fileSystems."/".fsType = "btrfs";
@@ -35,12 +33,12 @@ in {
   fileSystems."/tmp".fsType = "tmpfs";
   fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
-  swapDevices = singleton {
+  swapDevices = lib.singleton {
     device = "/dev/disk/by-uuid/${swapUUID}";
   };
 
-  services.openssh.enable = mkForce false;
+  services.openssh.enable = lib.mkForce false;
   services.xserver.videoDrivers = [ "intel" "ati" "nouveau" ];
 
-  nix.maxJobs = mkForce 2;
+  nix.maxJobs = lib.mkForce 2;
 }
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 52bfaf3f..d65b343f 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -1,7 +1,5 @@
 { pkgs, lib, ... }:
 
-with lib;
-
 {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
@@ -50,7 +48,7 @@ with lib;
     ${pkgs.hdparm}/sbin/hdparm -B 255 /dev/disk/by-id/ata-ST31500541AS_6XW0M217
   '';
 
-  swapDevices = singleton {
+  swapDevices = lib.singleton {
     device = "/dev/shofixti/swap";
   };
 
@@ -73,6 +71,6 @@ with lib;
   vuizvui.user.aszlig.services.i3.reverseHeads = true;
   vuizvui.user.aszlig.services.i3.workspaces."6" = {
     label = "Chromium";
-    assign = singleton { class = "^Chromium(?:-browser)?\$"; };
+    assign = lib.singleton { class = "^Chromium(?:-browser)?\$"; };
   };
 }
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index 41b380b9..08462ade 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -1,7 +1,5 @@
 { pkgs, lib, ... }:
 
-with lib;
-
 let
   rootUUID = "ad41f848-d14a-4a89-9d04-3e48bd73dc5c";
   diskID = "usb-0000_Removable_Drive_23372707080836980013-0:0";
@@ -9,13 +7,13 @@ in {
   vuizvui.user.aszlig.profiles.base.enable = true;
   vuizvui.createISO = true;
 
-  services.xserver.enable = mkForce false;
+  services.xserver.enable = lib.mkForce false;
 
   services.gpm.enable = true;
   services.gpm.protocol = "exps2";
 
   boot = {
-    kernelParams = singleton "consoleblank=0";
+    kernelParams = lib.singleton "consoleblank=0";
     initrd.kernelModules = [ "fbcon" "usb_storage" ];
     loader.grub.device = "/dev/disk/by-id/${diskID}";
   };
diff --git a/machines/aszlig/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix
index 0fa6c3af..4f9691ca 100644
--- a/machines/aszlig/mmrnmhrm.nix
+++ b/machines/aszlig/mmrnmhrm.nix
@@ -1,7 +1,5 @@
 { pkgs, lib, ... }:
 
-with lib;
-
 {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
@@ -66,11 +64,11 @@ with lib;
 
   vuizvui.user.aszlig.services.i3.workspaces."1" = {
     label = "XMPP";
-    assign = singleton { class = "^(?:Tkabber|Gajim)\$"; };
+    assign = lib.singleton { class = "^(?:Tkabber|Gajim)\$"; };
   };
 
   vuizvui.user.aszlig.services.i3.workspaces."3" = {
     label = "Chromium";
-    assign = singleton { class = "^Chromium(?:-browser)?\$"; };
+    assign = lib.singleton { class = "^Chromium(?:-browser)?\$"; };
   };
 }
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 912b0057..21ba9b3a 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let
   rootUUID = "e33a3dda-a87d-473b-b113-37783aa35667";
   swapUUID = "e9f59283-143c-4c36-978c-c730c6ca27c7";
@@ -19,7 +17,7 @@ in {
   };
 
   networking.hostName = "tishtushi";
-  networking.wireless.enable = mkForce true;
+  networking.wireless.enable = lib.mkForce true;
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/${rootUUID}";
@@ -33,7 +31,7 @@ in {
     options = [ "ssd" "compress-force=zlib" "noatime" ];
   };
 
-  swapDevices = singleton {
+  swapDevices = lib.singleton {
     device = "/dev/disk/by-uuid/${swapUUID}";
   };
 
-- 
cgit 1.4.1