kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: add back CI module dependent functionality to CI

Browse source
This commit is contained in:
Kat Inskip 2024-07-13 12:28:19 -07:00
parent c5e8103b6b
commit 9d219f6d63
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
12 changed files with 226 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/system/host.nix
View file

@ -1,10 +1,10 @@
{
name,
config,
meta,
tree,
std,
Std,
lib,
pkgs,
inputs,
...
}: let
@ -28,7 +28,7 @@ in {
};
type = mkOption {
description = "Operating system type of the host";
type = enum ["NixOS" "MacOS" "Darwin" "Linux" "Windows"];
type = enum ["NixOS" "MacOS" "Darwin" "Linux" "Windows" "Home"];
default = "NixOS";
};
folder = mkOption {
@ -64,6 +64,7 @@ in {
macos = "darwin";
darwin = "darwin";
linux = "linux";
home = "linux";
}
.${string.toLower config.type};
in "${config.arch}-${kernel}";
@ -74,13 +75,18 @@ in {
darwin = "darwin";
linux = "linux";
windows = "windows";
home = "home";
}
.${string.toLower config.type};
modules = mkIf (config.folder != "linux") [
modules = with tree; mkIf (config.folder != "linux") [
# per-OS modules
meta.modules.${config.folder}
modules.${config.folder}
# per-OS configuration
meta.${config.folder}.base
tree.${config.folder}.common
# per-OS user definition
home.user.${config.folder}
# true base module
common
];
builder =
{
@ -97,7 +103,18 @@ in {
}
// args);
in
sys;
args: let
nixos = sys args;
in
nixos.extendModules {
modules =
nixos.config.scalpels
++ [
inputs.scalpel.nixosModules.scalpel
];
specialArgs = {prev = nixos;};
};
home = args: inputs.home-manager.lib.homeManagerConfiguration (args // { inherit pkgs; });
darwin = inputs.darwin.lib.darwinSystem;
macos = inputs.darwin.lib.darwinSystem;
}
@ -109,10 +126,9 @@ in {
})
config.builder);
specialArgs = {
inherit name inputs std Std meta;
inherit (inputs.self.lib) gensokyo-zone;
inherit name inputs std tree;
systemType = config.folder;
system = config;
};
};
}
}