Compare commits

...

2 Commits

Author SHA1 Message Date
soraefir
150d2f2e07
Cfg updated
All checks were successful
Nix Build / build-nixos (push) Successful in 4m51s
2024-04-17 08:26:08 +02:00
soraefir
b644c87517
Autosys 2024-04-17 00:25:54 +02:00
11 changed files with 116 additions and 125 deletions

View File

@ -30,61 +30,22 @@
};
outputs = inputs:
let gen = import ./generator.nix { inherit inputs; };
in {
devShells = import ./shells { inherit inputs; };
nixosConfigurations = {
valinor = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "valinor";
};
iriy = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "iriy";
};
efir = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "efir";
};
avalon = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "avalon";
};
ci = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "ci";
};
sandbox = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "sandbox";
};
};
darwinConfigurations = {
asgard = gen.generate {
type = "macos";
system = "x86_64-darwin";
host = "asgard";
};
valinor = gen.generate { host = "valinor"; };
iriy = gen.generate { host = "iriy"; };
efir = gen.generate { host = "efir"; };
avalon = gen.generate { host = "avalon"; };
ci = gen.generate { host = "ci"; };
sandbox = gen.generate { host = "sandbox"; };
};
darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
homeConfigurations = {
yomi = gen.generate {
type = "home";
system = "arm-64";
host = "example";
};
example = gen.generate {
type = "home";
system = "-"; # supports any
host = "example";
};
yomi = gen.generate { host = "example"; };
example = gen.generate { host = "example"; };
};
};

View File

@ -1,11 +1,11 @@
{ inputs, ... }: {
generate = { type, system, host }:
generate = { host }:
let
nameValuePair = name: value: { inherit name value; };
syscfg = import ./systems/${host}/cfg.nix;
nameValuePair = name: value: { inherit name value; };
in ({
"nixos" = inputs.nixpkgs.lib.nixosSystem {
system = system;
system = syscfg.syscfg.system;
modules = [
./modules/shared/syscfg
./modules/shared/sops
@ -33,29 +33,33 @@
}
];
};
"macos" = inputs.darwin.lib.darwinSystem {
system = system;
system = syscfg.system;
modules = [
inputs.sops-nix.nixosModules.sops
./modules/shared/syscfg
./modules/shared/sops
syscfg
./systems/${host}
inputs.sops-nix.nixosModules.sops
inputs.home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.sora = {
home-manager.users = builtins.listToAttrs (map (userConfig:
nameValuePair userConfig.username {
imports = [
inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules
./systems/${host}/home.nix
];
};
}) syscfg.syscfg.users);
}
];
};
"home" = inputs.home-manager.lib.homeManagerConfiguration {
modules = [ ./modules/home ./systems/${host}/home.nix ];
modules = [ ./modules/home ];
};
_ = throw "Unsupported system";
}.${type});
}.${syscfg.syscfg.type});
}

View File

@ -63,5 +63,6 @@
XDG_TEMPLATES_DIR="$HOME/media/templates"
XDG_VIDEOS_DIR="$HOME/media/video"
'';
})];
})
];
}

View File

@ -1,4 +1,4 @@
{ ... }:
{
virtualisation.arion.projects.
# virtualisation.arion.projects.
}

View File

@ -98,6 +98,14 @@ in with lib; {
options.usercfg = userOpt;
options.syscfg = {
hostname = mkOption { type = types.str; };
type = mkOption {
type = types.enum [ "nixos" "macos" "home" ];
default = "nixos";
};
system = mkOption {
type = types.enum [ "x86_64-linux" "x86_64-darwin" "-" ];
default = "x86_64-linux";
};
defaultUser = mkOption { type = types.str; };
make = makeOpt;
net = netOpt;

8
systems/asguard/cfg.nix Normal file
View File

@ -0,0 +1,8 @@
{
syscfg = {
hostname = "asguard";
defaultUser = "sora";
type = "macos";
system = "x86_64-darwin";
};
}

View File

@ -1,6 +1,8 @@
{
syscfg = {
hostname = "avalon";
system = "x86_64-linux";
type = "nixos";
defaultUser = "sora";
users = [
{
@ -36,7 +38,6 @@
enable = true;
ip4 = "10.10.1.2/32";
ip6 = "fd10:10:10::2/128";
pk = config.sops.secrets.avalon_wg_priv.path;
};
};
}

View File

@ -1,6 +1,8 @@
{
syscfg = {
hostname = "ci";
type = "nixos";
system = "x86_64-linux";
defaultUser = "ci";
users = [{
username = "ci";

View File

@ -1,6 +1,8 @@
{
syscfg = {
hostname = "iriy";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora";
users = [{
username = "sora";

View File

@ -1,6 +1,8 @@
{
syscfg = {
hostname = "sandbox";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora";
users = [{
username = "sora";

View File

@ -1,6 +1,8 @@
{
syscfg = {
hostname = "valinor";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora";
users = [{
username = "sora";