Skip to content

Commit

Permalink
ensure using the pkgs with custom config set
Browse files Browse the repository at this point in the history
  • Loading branch information
moni-dz committed Jul 3, 2023
1 parent 12c7f16 commit c5e3818
Showing 1 changed file with 17 additions and 18 deletions.
35 changes: 17 additions & 18 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,37 @@
nixpkgs-fmt.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = inputs@{ self, parts, nixpkgs, emacs, nixpkgs-fmt, ... }:
parts.lib.mkFlake { inherit inputs; } {
imports = [ ./overlays ];
systems = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
outputs = inputs@{ self, parts, ... }: parts.lib.mkFlake { inherit inputs; } {
imports = [ ./overlays ];
systems = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];

_module.args.getPackage = pname: pkgs: (pkgs.callPackage ./_sources/generated.nix { }).${pname};
_module.args.getPackage = pname: pkgs: (pkgs.callPackage ./_sources/generated.nix { }).${pname};

perSystem = { lib, system, pkgs, ... }: {
_module.args.pkgs = import nixpkgs {
perSystem = { lib, system, ... }:
let
pkgs = import inputs.nixpkgs {
inherit system;
allowUnfree = true;
allowUnsupportedSystem = true;

overlays = [
self.overlays.default
emacs.overlay
];
overlays = [ self.overlays.default inputs.emacs.overlay ];
};
in
{
_module.args.pkgs = pkgs;

packages =
if lib.hasSuffix "darwin" system
then builtins.removeAttrs (self.overlays.darwin pkgs pkgs) [ "lib" ]
else builtins.removeAttrs (self.overlays.linux pkgs pkgs) [ "lib" ];

formatter = nixpkgs-fmt.defaultPackage.${system};
formatter = inputs.nixpkgs-fmt.defaultPackage.${system};
};

flake = {
nixosModules = {
nvidia-exec = import ./modules/nvidia-exec.nix;
stevenblack = import ./modules/stevenblack.nix;
};
flake = {
nixosModules = {
nvidia-exec = import ./modules/nvidia-exec.nix;
stevenblack = import ./modules/stevenblack.nix;
};
};
};
}

0 comments on commit c5e3818

Please sign in to comment.