From 078365e5765079982f9355f91e7ad99a8d608793 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Mon, 24 Jul 2023 09:10:34 +0200
Subject: [PATCH] lib: Use sources.nixpkgs instead of <nixpkgs>

---
 lib/default.nix                        | 4 +++-
 machines/compute01/secrets/secrets.nix | 4 ++--
 machines/storage01/secrets/secrets.nix | 4 ++--
 machines/web01/secrets/secrets.nix     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 7947fed..74b426f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,6 +1,8 @@
-{ lib, ... }:
+_:
 
 let
+  inherit ((import sources.nixpkgs { })) lib;
+
   sources = import ../npins;
 in
 
diff --git a/machines/compute01/secrets/secrets.nix b/machines/compute01/secrets/secrets.nix
index 2ee797d..b7de844 100644
--- a/machines/compute01/secrets/secrets.nix
+++ b/machines/compute01/secrets/secrets.nix
@@ -1,6 +1,6 @@
 let
-  lib = import ../../../lib { inherit (import <nixpkgs> { }) lib; };
-  publicKeys = lib.getNodeKeys "compute01";
+  lib = import ../../../lib { };
+  publicKeys = lib.getNodeKeys "web01";
 in
 
 lib.setDefault { inherit publicKeys; } [
diff --git a/machines/storage01/secrets/secrets.nix b/machines/storage01/secrets/secrets.nix
index 17c20cd..b7de844 100644
--- a/machines/storage01/secrets/secrets.nix
+++ b/machines/storage01/secrets/secrets.nix
@@ -1,6 +1,6 @@
 let
-  lib = import ../../../lib { inherit (import <nixpkgs> { }) lib; };
-  publicKeys = lib.getNodeKeys "storage01";
+  lib = import ../../../lib { };
+  publicKeys = lib.getNodeKeys "web01";
 in
 
 lib.setDefault { inherit publicKeys; } [
diff --git a/machines/web01/secrets/secrets.nix b/machines/web01/secrets/secrets.nix
index 7fa74f7..384b505 100644
--- a/machines/web01/secrets/secrets.nix
+++ b/machines/web01/secrets/secrets.nix
@@ -1,5 +1,5 @@
 let
-  lib = import ../../../lib { inherit (import <nixpkgs> { }) lib; };
+  lib = import ../../../lib { };
   publicKeys = lib.getNodeKeys "web01";
 in