diff --git a/flake.nix b/flake.nix index 12af0b5..9c95a54 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,11 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nixpak = { + url = "github:nixpak/nixpak"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -36,6 +41,7 @@ disko, sops-nix, secrets, + nixpak, ... } @ inputs: let lib = nixpkgs.lib.extend (final: prev: diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix index 8f32775..0b09d09 100644 --- a/modules/nixos/core/nix.nix +++ b/modules/nixos/core/nix.nix @@ -1,8 +1,8 @@ -{ lib, inputs, cfgPath, ... }: +{ pkgs, lib, inputs, cfgPath, ... }: let importOverlays = builtins.map - (overlay: import overlay { inherit lib inputs; }) + (overlay: import overlay { inherit lib inputs pkgs; }) (builtins.filter (file: builtins.match ".*\.nix" (builtins.toString file) != null) (lib.filesystem.listFilesRecursive "${cfgPath}/overlays")); diff --git a/overlays/nixpak/default.nix b/overlays/nixpak/default.nix new file mode 100644 index 0000000..fad7533 --- /dev/null +++ b/overlays/nixpak/default.nix @@ -0,0 +1,6 @@ +{ inputs, pkgs, lib, ... }: final: prev: { + mkNixPak = inputs.nixpak.lib.nixpak { + inherit (pkgs) lib; + inherit pkgs; + }; +}