fix garnix
This commit is contained in:
parent
db6d721df6
commit
025e63d1e6
2 changed files with 15 additions and 33 deletions
36
flake.nix
36
flake.nix
|
@ -38,30 +38,18 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
packages =
|
packages = {
|
||||||
let
|
# Re-export it for convenience and for caching
|
||||||
darwinConfigs = lib.filterAttrs (
|
inherit (inputs'.attic.packages) attic-client attic-server;
|
||||||
_: config: config.eval.config.nixpkgs.system == system
|
base-packages = pkgs.symlinkJoin {
|
||||||
) inputs.self.darwinConfigurations;
|
name = "settei-base";
|
||||||
# Force garnix to build the config
|
paths = with self'.packages; [
|
||||||
darwinConfigs' = lib.mapAttrs' (name: config: {
|
helix
|
||||||
name = "__darwinConfigurations_${name}";
|
fish
|
||||||
value = config.system;
|
git-commit-last
|
||||||
}) darwinConfigs;
|
];
|
||||||
in
|
};
|
||||||
{
|
};
|
||||||
# Re-export it for convenience and for caching
|
|
||||||
inherit (inputs'.attic.packages) attic-client attic-server;
|
|
||||||
base-packages = pkgs.symlinkJoin {
|
|
||||||
name = "settei-base";
|
|
||||||
paths = with self'.packages; [
|
|
||||||
helix
|
|
||||||
fish
|
|
||||||
git-commit-last
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// darwinConfigs';
|
|
||||||
|
|
||||||
formatter = pkgs.nixfmt-rfc-style;
|
formatter = pkgs.nixfmt-rfc-style;
|
||||||
};
|
};
|
||||||
|
|
|
@ -66,15 +66,9 @@
|
||||||
|
|
||||||
darwin =
|
darwin =
|
||||||
name: module:
|
name: module:
|
||||||
let
|
baseDarwin._module.args.extendModules {
|
||||||
eval = baseDarwin._module.args.extendModules {
|
modules = [ module ];
|
||||||
modules = [ module ];
|
specialArgs.configurationName = name;
|
||||||
specialArgs.configurationName = name;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
system = eval.config.system.build.toplevel;
|
|
||||||
inherit eval;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue