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 =
|
||||
let
|
||||
darwinConfigs = lib.filterAttrs (
|
||||
_: config: config.eval.config.nixpkgs.system == system
|
||||
) inputs.self.darwinConfigurations;
|
||||
# Force garnix to build the config
|
||||
darwinConfigs' = lib.mapAttrs' (name: config: {
|
||||
name = "__darwinConfigurations_${name}";
|
||||
value = config.system;
|
||||
}) 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';
|
||||
packages = {
|
||||
# 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
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
formatter = pkgs.nixfmt-rfc-style;
|
||||
};
|
||||
|
|
|
@ -66,15 +66,9 @@
|
|||
|
||||
darwin =
|
||||
name: module:
|
||||
let
|
||||
eval = baseDarwin._module.args.extendModules {
|
||||
modules = [ module ];
|
||||
specialArgs.configurationName = name;
|
||||
};
|
||||
in
|
||||
{
|
||||
system = eval.config.system.build.toplevel;
|
||||
inherit eval;
|
||||
baseDarwin._module.args.extendModules {
|
||||
modules = [ module ];
|
||||
specialArgs.configurationName = name;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue