Rename *our* lib to ``gridlib`` to avoid confusing with nixpkgs.lib

morph/grid/local/grid.nix

 let
   pkgs = import <nixpkgs> { };
 
-  lib = import ../../lib;
+  gridlib = import ../../lib;
   config = pkgs.lib.trivial.importJSON ./config.json;
   sshUsers = import ./secrets/users.nix;
 
@@ -10,33 +10,33 @@ let
 
   payments = let publicIPv4 = "192.168.67.21"; in {
     imports = [
-      lib.issuer
+      gridlib.issuer
       (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
-      (lib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
+      (gridlib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
     ];
   };
 
   storage1 = let publicIPv4 = "192.168.67.22"; in {
     imports = [
-      lib.storage
+      gridlib.storage
       (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
-      (lib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.09")
+      (gridlib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.09")
     ];
   };
 
   storage2 = let publicIPv4 = "192.168.67.23"; in {
     imports = [
-      lib.storage
+      gridlib.storage
       (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
-      (lib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.13" "19.09")
+      (gridlib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.13" "19.09")
     ];
   };
 
   monitoring = let publicIPv4 = "192.168.67.24"; in {
     imports = [
-      lib.monitoring
+      gridlib.monitoring
       (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      (gridlib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
 

morph/grid/production/grid.nix

@@ -2,7 +2,7 @@
 let
   pkgs = import <nixpkgs> { };
 
-  lib = import ../../lib;
+  gridlib = import ../../lib;
   config = pkgs.lib.trivial.importJSON ./config.json;
   sshUsers = import ./secrets/users.nix;
 
@@ -11,17 +11,17 @@ let
 
   "payments.privatestorage.io" = {
     imports = [
-      lib.issuer
-      lib.hardware-aws
-      (lib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
+      gridlib.issuer
+      gridlib.hardware-aws
+      (gridlib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
     ];
   };
 
   monitoring = let publicIPv4 = "monitoring.private.storage"; in {
     imports = [
-      lib.monitoring
-      lib.hardware-aws
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      gridlib.monitoring
+      gridlib.hardware-aws
+      (gridlib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
 
@@ -36,10 +36,10 @@ let
       ../../../nixos/modules/100tb.nix
 
       # Get all of the configuration that is common across all storage nodes.
-      lib.storage
+      gridlib.storage
 
       # Then customize the storage system a little bit based on this node's particulars.
-      (lib.customize-storage config sshUsers nodecfg.publicIPv4 monitoringvpnKeyDir vpnIP stateVersion)
+      (gridlib.customize-storage config sshUsers nodecfg.publicIPv4 monitoringvpnKeyDir vpnIP stateVersion)
     ];
 
     # And supply configuration for those hardware / network / bootloader

morph/grid/testing/grid.nix

@@ -2,7 +2,7 @@
 let
   pkgs = import <nixpkgs> { };
 
-  lib = import ../../lib;
+  gridlib = import ../../lib;
   config = pkgs.lib.trivial.importJSON ./config.json;
   sshUsers = import ./secrets/users.nix;
 
@@ -11,25 +11,25 @@ let
 
   payments = {
     imports = [
-      lib.issuer
-      lib.hardware-aws
-      (lib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
+      gridlib.issuer
+      gridlib.hardware-aws
+      (gridlib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
     ];
   };
 
   storage001 = let publicIPv4 = "3.120.26.190"; in {
     imports = [
-      lib.storage
+      gridlib.storage
       ./testing001-hardware.nix
-      (lib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.03")
+      (gridlib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.03")
     ];
   };
 
   monitoring = let publicIPv4 = "18.156.171.217"; in {
     imports = [
-      lib.monitoring
-      lib.hardware-aws
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      gridlib.monitoring
+      gridlib.hardware-aws
+      (gridlib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };