Compare commits
2 Commits
0cfb02df6c
...
b2b8ba1252
Author | SHA1 | Date |
---|---|---|
Sandro - | b2b8ba1252 | |
Sandro - | bc56014b83 |
|
@ -33,9 +33,8 @@
|
||||||
# Config, and utilities
|
# Config, and utilities
|
||||||
lib = nixpkgs.lib.extend (_final: _prev:
|
lib = nixpkgs.lib.extend (_final: _prev:
|
||||||
import ./nix/lib {
|
import ./nix/lib {
|
||||||
inherit self;
|
inherit self openwrt;
|
||||||
inherit openwrt;
|
inherit (nixpkgs.legacyPackages.x86_64-linux) lib pkgs;
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
# Everything that can be built locally outside of NixOS
|
# Everything that can be built locally outside of NixOS
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ self, pkgs, openwrt }:
|
{ self, lib, openwrt, pkgs }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
config = (import ./config { inherit self pkgs; }).config;
|
inherit (import ./config { inherit self pkgs; }) config;
|
||||||
|
|
||||||
netmasks = import ./netmasks.nix;
|
netmasks = import ./netmasks.nix;
|
||||||
|
|
||||||
subnet = import ./subnet { inherit pkgs; };
|
subnet = import ./subnet { inherit pkgs; };
|
||||||
|
|
||||||
dns = import ./dns.nix { inherit pkgs config; };
|
dns = import ./dns.nix { inherit config lib; };
|
||||||
|
|
||||||
openwrtModels = import ./openwrt-models.nix { inherit self openwrt; };
|
openwrtModels = import ./openwrt-models.nix { inherit self openwrt; };
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
{ pkgs, config }:
|
{ config, lib }:
|
||||||
|
|
||||||
let
|
|
||||||
lib = pkgs.lib;
|
|
||||||
in
|
|
||||||
rec {
|
rec {
|
||||||
ns = "dns.serv.zentralwerk.org";
|
ns = "dns.serv.zentralwerk.org";
|
||||||
internalNS = [ ns ];
|
internalNS = [ ns ];
|
||||||
|
@ -20,7 +17,6 @@ rec {
|
||||||
"78.20.172.in-addr.arpa"
|
"78.20.172.in-addr.arpa"
|
||||||
"79.20.172.in-addr.arpa"
|
"79.20.172.in-addr.arpa"
|
||||||
"99.22.172.in-addr.arpa"
|
"99.22.172.in-addr.arpa"
|
||||||
"99.22.172.in-addr.arpa"
|
|
||||||
"22.10.in-addr.arpa"
|
"22.10.in-addr.arpa"
|
||||||
];
|
];
|
||||||
dynamicReverseZones6 = [
|
dynamicReverseZones6 = [
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Pulls together NixOS configuration modules according to the
|
# Pulls together NixOS configuration modules according to the
|
||||||
# name/role of the host to be built.
|
# name/role of the host to be built.
|
||||||
{ hostName, config, lib, ... }:
|
{ hostName, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) optionals;
|
inherit (lib) optionals;
|
||||||
|
|
||||||
hostConfig = lib.config.site.hosts.${hostName};
|
hostConfig = lib.config.site.hosts.${hostName};
|
||||||
in {
|
in {
|
||||||
site = lib.config.site;
|
inherit (lib.config) site;
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../lib/config/options.nix
|
../lib/config/options.nix
|
||||||
|
|
Loading…
Reference in New Issue