diff --git a/machines/shinobu/services/router/common.nix b/machines/shinobu/services/router/common.nix index a1a4d76..9cae934 100644 --- a/machines/shinobu/services/router/common.nix +++ b/machines/shinobu/services/router/common.nix @@ -1,3 +1,4 @@ +{ ... }: { domain = "home.sbruder.de"; tc = { diff --git a/machines/shinobu/services/router/default.nix b/machines/shinobu/services/router/default.nix index 1cc8f36..6dcc197 100644 --- a/machines/shinobu/services/router/default.nix +++ b/machines/shinobu/services/router/default.nix @@ -27,7 +27,7 @@ # Thanks to Intel’s wisdom, it’s not possible to use 5GHz in AP mode. { config, lib, pkgs, ... }: let - cfg = import ./common.nix; + cfg = pkgs.callPackage ./common.nix { }; in { imports = [ diff --git a/machines/shinobu/services/router/dnsmasq.nix b/machines/shinobu/services/router/dnsmasq.nix index 867f946..84b2ee1 100644 --- a/machines/shinobu/services/router/dnsmasq.nix +++ b/machines/shinobu/services/router/dnsmasq.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, pkgs, ... }: let - cfg = import ./common.nix; + cfg = pkgs.callPackage ./common.nix { }; in { services.dnsmasq = { diff --git a/machines/shinobu/services/router/nft.nix b/machines/shinobu/services/router/nft.nix index dce4ecf..af5c516 100644 --- a/machines/shinobu/services/router/nft.nix +++ b/machines/shinobu/services/router/nft.nix @@ -1,6 +1,6 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let - cfg = import ./common.nix; + cfg = pkgs.callPackage ./common.nix { }; mkKeyValue = lib.generators.mkKeyValueDefault rec { diff --git a/machines/shinobu/services/router/tc.nix b/machines/shinobu/services/router/tc.nix index ac5c2a2..33074a7 100644 --- a/machines/shinobu/services/router/tc.nix +++ b/machines/shinobu/services/router/tc.nix @@ -8,7 +8,7 @@ # I averaged a longer iperf3 run to around 509 Kbit/s ≈ 4.17 Mbit/s (excluding the initial burst). { lib, pkgs, utils, ... }: let - cfg = ((import ./common.nix).tc); + cfg = ((pkgs.callPackage ./common.nix { }).tc); mkClass = { minor