hosts/carbon: Don't make kea depend on non existend network-setup.service anymore

flake.lock

@@ -532,6 +532,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-carbon": {
+      "locked": {
+        "lastModified": 1751206202,
+        "narHash": "sha256-VjK8pEv4cfDpCTh4KW1go98kP25j7KdTNEce342Bh/Y=",
+        "owner": "clerie",
+        "repo": "nixpkgs",
+        "rev": "ac4ac98609c1b30c378458ab7207a9a5b5148457",
+        "type": "github"
+      },
+      "original": {
+        "owner": "clerie",
+        "ref": "clerie/always-setup-netdevs",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -731,6 +747,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-0dc1c7": "nixpkgs-0dc1c7",
+        "nixpkgs-carbon": "nixpkgs-carbon",
         "nurausstieg": "nurausstieg",
         "rainbowrss": "rainbowrss",
         "scan-to-gpg": "scan-to-gpg",

flake.nix

@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-carbon.url = "github:clerie/nixpkgs/clerie/always-setup-netdevs";
     # for etesync-dav
     nixpkgs-0dc1c7.url = "github:NixOS/nixpkgs/0dc1c7294c13f5d1dd6eccab4f75d268d7296efe";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -70,7 +71,6 @@
   };
   outputs = { self, nixpkgs, nixos-hardware, chaosevents, fernglas, nixos-exporter, solid-xmpp-alarm, ssh-to-age, ... }@inputs: let
     lib = import ./lib inputs;
-    localNixpkgs = import ./flake/nixpkgs.nix inputs;
   in {
     clerie.hosts = {
       aluminium = {
@@ -140,14 +140,17 @@
       clerie-overrides = import ./pkgs/overrides/overlay.nix;
     };
 
+    nixpkgs = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
+      lib.mkNixpkgs {
+        inherit system;
+      }
+    );
+
     packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
-      let
-       pkgs = localNixpkgs.${system};
-      in
       nixpkgs.lib.genAttrs (
         (builtins.attrNames (self.overlays.clerie-pkgs null null))
         ++ (builtins.attrNames (self.overlays.clerie-overrides null null))
-      ) (name: pkgs."${name}")
+      ) (name: self.nixpkgs."${system}"."${name}")
     );
 
     inherit lib self;

flake/nixosConfigurations.nix

@@ -10,8 +10,10 @@ let
     group ? null,
     modules ? [],
   }: let
+    localNixpkgs = nixpkgs.lib.attrByPath [ "nixpkgs-${name}" ] nixpkgs inputs;
   in self.lib.nixosSystem {
     system = system;
+    nixpkgs = localNixpkgs;
     modules = modules ++ [
       ({ config, lib, ... }: {
         # Set hostname

flake/nixpkgs.nix

@@ -1,19 +0,0 @@
-{ self
-, nixpkgs
-, ...
-}@inputs:
-
-let
-  mkNixpkgs = { system, ... }@args: 
-    import nixpkgs {
-      inherit system;
-      overlays = [
-        self.overlays.clerie-inputs
-        self.overlays.clerie-pkgs
-        self.overlays.clerie-build-support
-        self.overlays.clerie-overrides
-      ];
-    };
-
-in
-  nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: mkNixpkgs { inherit system; })

hosts/carbon/configuration.nix

@@ -63,10 +63,10 @@
 
   systemd.services.kea-dhcp4-server = {
     after = [
-      "network-setup.service"
+      "network.target"
     ];
-    requires = [
+    wants = [
-      "network-setup.service"
+      "network.target"
     ];
   };
 

lib/default.nix

@@ -8,6 +8,7 @@ let
 
   lib = {
     clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix;
+    mkNixpkgs = callLibs ./mkNixpkgs.nix;
     nixosSystem = callLibs ./nixosSystem.nix;
   };
 

lib/mkNixpkgs.nix

@@ -0,0 +1,27 @@
+{
+  inputs,
+  self,
+  ...
+}:
+
+/*
+
+  Loads a version of nixpkgs with nixfiles overlays loaded
+
+*/
+{
+  system,
+  nixpkgs ? inputs.nixpkgs,
+  overlays ? [],
+  ...
+}@args:
+
+import nixpkgs {
+  inherit system;
+  overlays = [
+    self.overlays.clerie-inputs
+    self.overlays.clerie-pkgs
+    self.overlays.clerie-build-support
+    self.overlays.clerie-overrides
+  ] ++ overlays;
+}

lib/nixosSystem.nix

@@ -12,16 +12,17 @@
 */
 {
   system ? null,
+  nixpkgs ? inputs.nixpkgs,
   pkgs ? null,
   modules ? [],
   ...
 }@args:
 
-let
+nixpkgs.lib.nixosSystem ({
-  localNixpkgs = import ../flake/nixpkgs.nix inputs;
-in inputs.nixpkgs.lib.nixosSystem ({
   system = system;
-  pkgs = if pkgs != null then pkgs else localNixpkgs.${system};
+  pkgs = if pkgs != null then pkgs else (self.lib.mkNixpkgs {
+    inherit system nixpkgs;
+  });
   modules = [
     self.nixosModules.nixfilesInputs
     self.nixosModules.clerie
@@ -38,4 +39,4 @@ in inputs.nixpkgs.lib.nixosSystem ({
       };
     })
   ] ++ modules;
-} // builtins.removeAttrs args [ "system" "pkgs" "modules" ] )
+} // builtins.removeAttrs args [ "system" "nixpkgs" "pkgs" "modules" ] )