There's no reason for networks to be functions

This commit is contained in:
niten 2021-10-07 19:20:43 -07:00
parent 30c37b0798
commit 5a48c78b48
3 changed files with 8 additions and 12 deletions

View File

@ -1,5 +1,3 @@
{ config, lib, ... }:
let local-domain = "sea.fudo.org";
in {
aliases = {

View File

@ -1,9 +1,9 @@
{ hostname, build-timestamp, ... }:
{ hostname, site, domain, profile, build-timestamp, ... }:
{ config, lib, pkgs, ... }:
let
# Get info on this host so we know what to load
host-config = import (./. + "/config/hosts/${hostname}.nix");
config-dir = ./. + "/config";
in {
imports = [
@ -12,16 +12,16 @@ in {
#home-manager-module
(./. + "/config/hardware/${hostname}.nix")
(./. + "/config/host-config/${hostname}.nix")
(./. + "/config/profile-config/${host-config.profile}.nix")
(./. + "/config/domain-config/${host-config.domain}.nix")
(./. + "/config/site-config/${host-config.site}.nix")
(config-dir + /hardware/${hostname}.nix)
(config-dir + /host-config/${hostname}.nix)
(config-dir + /profile-config/${profile}.nix)
(config-dir + /domain-config/${domain}.nix)
(config-dir + /site-config/${site}.nix)
];
config = {
instance = {
inherit hostname build-timestamp;
inherit hostname site domain profile build-timestamp;
};
nixpkgs.pkgs = pkgs;

View File

@ -6,8 +6,6 @@ with lib; {
./instance.nix
# ./fudo-lib.nix
./fudo/acme-for-hostname.nix
./fudo/authentication.nix
./fudo/backplane