qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

Compare commits

base: qenya:691c180ac1d38548da65be7e76c98e42bf7b1a95
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost
..
compare: qenya:a700ee24457a119fc23a5e333684b71341d6b2b7
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost

No commits in common. "691c180ac1d38548da65be7e76c98e42bf7b1a95" and "a700ee24457a119fc23a5e333684b71341d6b2b7" have entirely different histories.
691c180ac1 ... a700ee2445

6 changed files with 8 additions and 32 deletions
Show stats Expand all files Collapse all files

13
flake.nix
View file

@ -70,7 +70,7 @@
outputs = inputs@{ self, nixpkgs, nixpkgs-small, nixpkgs-unstable, flake-parts, colmena, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
imports = [ ./flake ];
imports = [ ];
systems = [ "x86_64-linux" "aarch64-linux" ];
@ -125,7 +125,9 @@
};
defaults = { config, lib, pkgs, ... }: {
deployment.targetHost = lib.mkDefault config.networking.fqdn;
# disable remote deployment by default
# (can stil build locally with nixos-rebuild)
deployment.targetHost = lib.mkDefault null;
deployment.buildOnTarget = lib.mkDefault true;
imports = [
@ -140,9 +142,10 @@
];
};
kilgharrah.deployment.targetHost = null; # disable remote deployment
tohru.deployment.targetHost = null; # disable remote deployment
elucredassa.deployment.targetHost = "10.127.3.2"; # no fqdn yet
elucredassa.deployment.targetHost = "10.127.3.2";
yevaud.deployment.targetHost = "yevaud.birdsong.network";
orm.deployment.targetHost = "orm.birdsong.network";
kalessin.deployment.targetHost = "kalessin.birdsong.network";
kilgharrah.imports = [ ./hosts/kilgharrah ];
tohru.imports = [ ./hosts/tohru ];

19
flake/colmena.nix
View file

@ -1,19 +0,0 @@
# https://git.lix.systems/the-distro/infra/src/commit/fbb23bf517206175764f154ddfd304b9ec501f87/colmena.nix
{ lib, ... }: {
options.flake.colmena = lib.mkOption {
type = lib.types.submodule {
freeformType = lib.types.attrsOf (lib.mkOptionType {
name = "NixOS module";
description = "module containing NixOS options and/or config";
descriptionClass = "noun";
check = value: builtins.isAttrs value || builtins.isFunction value || builtins.isPath value;
merge = loc: defs: {
imports = map (def: def.value) defs;
};
});
options.meta = lib.mkOption {
type = lib.types.attrs;
};
};
};
}

5
flake/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./colmena.nix
];
}

1
hosts/kalessin/default.nix
View file

@ -12,7 +12,6 @@ in
nixpkgs.hostPlatform = "aarch64-linux";
networking.hostName = "kalessin";
networking.hostId = "534b538e";
networking.domain = "birdsong.network";
fountain.users.qenya.enable = true;
users.users.qenya.extraGroups = [ "wheel" ];

1
hosts/orm/default.nix
View file

@ -9,7 +9,6 @@
nixpkgs.hostPlatform = "x86_64-linux";
networking.hostName = "orm";
networking.hostId = "00000000";
networking.domain = "birdsong.network";
fountain.users.qenya.enable = true;
users.users.qenya.extraGroups = [ "wheel" ];

1
hosts/yevaud/default.nix
View file

@ -13,7 +13,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
networking.hostName = "yevaud";
networking.hostId = "09673d65";
networking.domain = "birdsong.network";
fountain.users.qenya.enable = true;
users.users.qenya.extraGroups = [ "wheel" ];