Some massive changes to make flakiness better

Renamed the @inputs to @top. This was a misguided attempt to make a
different change, but it's going to stick, now.
Began moving packages to their own folder rather than being intermingled
with overlays
Created a local overlay that just includes my personal packages
Cleaned up some dead code
Moved to just using the raw 'imports' instead of needing to explicitly
call out the `foo = import foo.nix {};` syntax
This commit is contained in:
Greg Hellings
2024-10-11 12:28:53 -05:00
parent d9a5f7968a
commit 8d752032ae
17 changed files with 355 additions and 288 deletions
+14 -13
View File
@@ -1,30 +1,31 @@
{ inputs, overlays, ... }:
{ top, overlays, ... }:
let
mac =
{ system ? "aarch64-darwin"
, name
, channel ? inputs.nixunstable
, hm ? inputs.hmunstable
, extraMods ? [ ]
{
system ? "aarch64-darwin",
name,
channel ? top.nixunstable,
hm ? top.hmunstable,
extraMods ? [ ],
}:
let
nixpkgs = import channel {
inherit system overlays;
};
nixpkgs = import channel { inherit system overlays; };
in
inputs.darwin.lib.darwinSystem {
top.darwin.lib.darwinSystem {
inherit system;
specialArgs = { inherit nixpkgs; };
specialArgs = {
inherit nixpkgs;
};
modules = [
{
nixpkgs.overlays = overlays;
home-manager.extraSpecialArgs = {
inherit inputs;
inherit top;
host = name;
};
}
hm.darwinModules.home-manager
inputs.self.modules.darwinModule
top.self.modules.darwinModule
./${name}
] ++ extraMods;
};