Cleanup

flake.nix

@@ -33,9 +33,8 @@
       # Config, and utilities
       lib = nixpkgs.lib.extend (_final: _prev:
         import ./nix/lib {
-          inherit self;
-          inherit openwrt;
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          inherit self openwrt;
+          inherit (nixpkgs.legacyPackages.x86_64-linux) lib pkgs;
         });
 
       # Everything that can be built locally outside of NixOS

nix/lib/default.nix

@@ -1,13 +1,13 @@
-{ self, pkgs, openwrt }:
+{ self, lib, openwrt, pkgs }:
 
 rec {
-  config = (import ./config { inherit self pkgs; }).config;
+  inherit (import ./config { inherit self pkgs; }) config;
 
   netmasks = import ./netmasks.nix;
 
   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; };
 

nix/lib/dns.nix

@@ -1,8 +1,5 @@
-{ pkgs, config }:
+{ config, lib }:
 
-let
-  lib = pkgs.lib;
-in
 rec {
   ns = "dns.serv.zentralwerk.org";
   internalNS = [ ns ];

nix/nixos-module/default.nix

@@ -1,13 +1,13 @@
 # Pulls together NixOS configuration modules according to the
 # name/role of the host to be built.
-{ hostName, config, lib, ... }:
+{ hostName, lib, ... }:
 
 let
   inherit (lib) optionals;
 
   hostConfig = lib.config.site.hosts.${hostName};
 in {
-  site = lib.config.site;
+  inherit (lib.config) site;
 
   imports = [
     ../lib/config/options.nix