flake: refactor to differentiate common modules

This commit is contained in:
Bruno BELANYI 2021-03-07 18:26:20 +00:00
parent e09da8505e
commit 21d7604861

View file

@ -9,26 +9,30 @@
outputs = { self, nixpkgs, nur, home-manager }: outputs = { self, nixpkgs, nur, home-manager }:
let let
buildHost = name: system: nixpkgs.lib.nixosSystem { inherit (nixpkgs) lib;
defaultModules = [
({ pkgs, ... }: {
# Let 'nixos-version --json' know about the Git revision
system.configurationRevision =
if self ? rev
then self.rev
else throw "Refusing to build from a dirty Git tree!";
})
{ nixpkgs.overlays = [ nur.overlay ]; }
home-manager.nixosModules.home-manager
{
home-manager.users.ambroisie = import ./home;
# Nix Flakes compatibility
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
];
buildHost = name: system: lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = defaultModules ++ [
({ pkgs, ... }: {
# Let 'nixos-version --json' know about the Git revision
# of this flake.
system.configurationRevision =
if self ? rev
then self.rev
else throw "Refusing to build from a dirty Git tree!";
})
{ nixpkgs.overlays = [ nur.overlay ]; }
(./. + "/${name}.nix") (./. + "/${name}.nix")
home-manager.nixosModules.home-manager
{
home-manager.users.ambroisie = import ./home;
# Nix Flakes compatibility
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
]; ];
}; };
in in