export nixos configurations as standard flake outputs

This commit is contained in:
Katherina Walshe-Grey 2024-09-18 03:49:56 +01:00
parent f6010a968c
commit a938b33679

View file

@ -27,30 +27,7 @@
};
outputs = inputs@{ self, nixpkgs, home-manager, plasma-manager, nur, agenix, birdsong, ... }: {
# The name of this output type is not standardised. I have picked
# "homeManagerModules" as the discussion here suggests it's the most common:
# https://github.com/nix-community/home-manager/issues/1783
#
# However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules":
# https://github.com/NixOS/nix/pull/10858
homeManagerModules = {
"qenya".imports = [
plasma-manager.homeManagerModules.plasma-manager
./home/qenya
];
"qenya@shaw".imports = [ ./hosts/shaw/home.nix ];
};
colmena = {
meta = {
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
nodeNixpkgs = {
kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
};
};
defaults = { name, nodes, ... }: {
nixosModules.default = {
nix.settings.experimental-features = "nix-command flakes";
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
nixpkgs.config.allowUnfree = true;
@ -71,37 +48,55 @@
];
};
# TODO: simplify
nixosConfigurations = {
"kilgharrah" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/kilgharrah self.nixosModules.default ]; };
"tohru" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/tohru self.nixosModules.default ]; };
"yevaud" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/yevaud self.nixosModules.default ]; };
"orm" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/orm self.nixosModules.default ]; };
"kalessin" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/kalessin self.nixosModules.default ]; };
};
# The name of this output type is not standardised. I have picked
# "homeManagerModules" as the discussion here suggests it's the most common:
# https://github.com/nix-community/home-manager/issues/1783
#
# However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules":
# https://github.com/NixOS/nix/pull/10858
homeManagerModules = {
"qenya".imports = [
plasma-manager.homeManagerModules.plasma-manager
./home/qenya
];
"qenya@shaw".imports = [ ./hosts/shaw/home.nix ];
};
colmena = {
meta = {
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
nodeNixpkgs = builtins.mapAttrs (name: value: value.pkgs) self.nixosConfigurations;
};
# TODO: eliminate duplication with nixosConfigurations
defaults.imports = [ self.nixosModules.default ];
kilgharrah.imports = [ ./hosts/kilgharrah ];
tohru.imports = [ ./hosts/tohru ];
yevaud.imports = [ ./hosts/yevaud ];
orm.imports = [ ./hosts/orm ];
kalessin.imports = [ ./hosts/kalessin ];
kilgharrah.deployment = {
defaults.deployment = {
allowLocalDeployment = true;
targetHost = null; # disallow remote deployment
};
tohru.deployment = {
allowLocalDeployment = true;
targetHost = null; # disallow remote deployment
};
yevaud.deployment = {
targetHost = "yevaud.birdsong.network";
targetUser = null;
};
orm.deployment = {
targetHost = "orm.birdsong.network";
targetUser = null;
};
kalessin.deployment = {
targetHost = "kalessin.birdsong.network";
targetUser = null;
buildOnTarget = true;
targetUser = null;
};
kilgharrah.deployment.targetHost = null;
tohru.deployment.targetHost = null;
yevaud.deployment.targetHost = "yevaud.birdsong.network";
orm.deployment.targetHost = "orm.birdsong.network";
kalessin.deployment.targetHost = "kalessin.birdsong.network";
};
# TODO: have this work on other systems too