From 7e426472887a22a01bd1f0211d5c28afc03c1abe Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sat, 11 Jun 2022 23:51:37 +0100 Subject: [PATCH] Move lib to subdirectory --- flake.nix | 2 +- lib.nix => lib/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename lib.nix => lib/default.nix (99%) diff --git a/flake.nix b/flake.nix index 65478a7..fa1f48d 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ # Extend a lib with extras that _must not_ internally reference private nixpkgs. flake-utils doesn't, but many # other flakes (e.g. home-manager) probably do internally. libOverlay = final: prev: { - my = import ./lib.nix { lib = final; }; + my = import ./lib { lib = final; }; flake = flake-utils.lib; }; pkgsLibOverlay = final: prev: { lib = prev.lib.extend libOverlay; }; diff --git a/lib.nix b/lib/default.nix similarity index 99% rename from lib.nix rename to lib/default.nix index c4cdb4d..9bdfac4 100644 --- a/lib.nix +++ b/lib/default.nix @@ -213,7 +213,7 @@ rec { }; }; sshKeyFiles = { - me = .keys/me.pub; - deploy = .keys/deploy.pub; + me = ../.keys/me.pub; + deploy = ../.keys/deploy.pub; }; }