From b2f3bc955c0f83bc9a40d3f663963ea318d6bf37 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 8 Mar 2023 17:47:47 +0000 Subject: [PATCH] flake: lib: convert to 'flake-parts' --- flake/default.nix | 3 +-- flake/lib.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flake/default.nix b/flake/default.nix index f3219e3..9134085 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -71,8 +71,6 @@ let }; systemIndependant = { - lib = import ./lib.nix inputs; - nixosConfigurations = import ./nixos.nix inputs; }; in @@ -80,6 +78,7 @@ flake-parts.lib.mkFlake { inherit inputs; } { systems = mySystems; imports = [ + ./lib.nix ./overlays.nix ]; diff --git a/flake/lib.nix b/flake/lib.nix index 083c56c..12e89c3 100644 --- a/flake/lib.nix +++ b/flake/lib.nix @@ -1,7 +1,11 @@ -{ self, nixpkgs, ... } @ inputs: +{ self, inputs, ... }: let + inherit (inputs) nixpkgs; + lib = nixpkgs.lib.extend (final: _: { my = import "${self}/lib" { inherit inputs; pkgs = nixpkgs; lib = final; }; }); in -lib +{ + flake.lib = lib; +}