stable place

This commit is contained in:
ari committed 2025-12-31 14:38:31 -05:00
1 parent 5632f1fbe5
commit ca67bcd0c6
23 files changed
+281 -378

No files matched your search

+55 -35
View File
@@ -7,28 +7,37 @@
, nix-flatpak
, specialArgs
, stylix
,
}:
let
skygUtils = import ./skyg-utils.nix;
makeImports =
{ attrs
, extraConfiguration ? [ ]
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
,
}:
(if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
(import ./main.nix attrs)
] ++ extraConfiguration;
]
++ extraConfiguration;
eachSystem = nixpkgs.lib.genAttrs (import systems);
allPkgs = eachSystem (system:
allPkgs = eachSystem (
system:
import nixpkgs {
system = system;
config = { allowUnfree = true; };
});
config = {
allowUnfree = true;
};
}
);
makeNixOsModuleMaker =
masterAttrs:
{ system ? masterAttrs.system ? "x86_64-linux"
, ...
}@attrs:
let joinedttrs = masterAttrs // attrs;
let
joinedttrs = masterAttrs // attrs;
in
nixpkgs.lib.nixosSystem {
specialArgs = specialArgs // {
@@ -38,16 +47,17 @@ let
modules = [
determinate.nixosModules.default
stylix.nixosModules.stylix
] ++ (makeImports {
]
++ (makeImports {
attrs = joinedttrs;
extraConfiguration = [
home-manager.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
specialArgs.dms.nixosModules.dankMaterialShell
];
});
};
makeNixOsModule =
makeNixOsModuleMaker { };
makeNixOsModule = makeNixOsModuleMaker { };
makeHLService = makeNixOsModuleMaker hlCommonSettings;
makeDarwinModule =
{ system ? "x86_64-darwin"
@@ -55,36 +65,42 @@ let
, ...
}@attrs:
nix-darwin.lib.darwinSystem {
modules = (makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
}) ++ [
(import ./macos.nix {
user = user;
system = system;
modules =
(makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
})
];
++ [
(import ./macos.nix {
user = user;
system = system;
})
];
};
makeHomeManagerUsers =
{ modules ? [ ]
, homeManagerVersion
, user
, system ? "x86_64-linux"
,
}:
let
hm = (import ./home {
stateVersion = homeManagerVersion;
});
hm = (
import ./home {
stateVersion = homeManagerVersion;
}
);
pkgs = allPkgs."${system}";
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(hm.makeCommonUser user)
] ++ modules;
]
++ modules;
};
in
{
@@ -98,14 +114,18 @@ in
{ nodeNames ? [ ]
, systemStateVersion ? "24.05"
, user
}: builtins.listToAttrs (builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames);
,
}:
builtins.listToAttrs (
builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames
);
}