mob next [ci-skip] [ci skip] [skip ci]

lastFile:machines/gw-cnx-1/configuration.nix

flake.nix

@@ -8,37 +8,16 @@
   inputs.nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
 
   inputs.flake-parts.follows = "clan-core/flake-parts";
+  inputs.nix-lib-net.url = "github:reo101/nix-lib-net";
 
   outputs =
     inputs@{
       self,
       clan-core,
-      nixpkgs,
       flake-parts,
       ...
     }:
     let
-      # Usage see: https://docs.clan.lol
-      clan = clan-core.lib.clan {
-        inherit self;
-        imports = [ ./clan.nix ];
-        specialArgs = { inherit inputs; };
-
-        # Customize nixpkgs
-        # pkgsForSystem =
-        #   system:
-        #   import nixpkgs {
-        #     inherit system;
-        #     config = {
-        #       allowUnfree = true;
-        #     };
-        #     overlays = [];
-        #   };
-        secrets.age.plugins = [
-          "age-plugin-yubikey"
-          "age-plugin-fido2-hmac"
-        ];
-      };
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -48,10 +27,14 @@
         "x86_64-darwin"
       ];
 
-      flake = {
-        inherit (clan.config) nixosConfigurations nixosModules clanInternals;
-        clan = clan.config;
-      };
+      imports = [
+        inputs.clan-core.flakeModules.default
+
+        ./clan.nix
+        ./modules/clan/flake-module.nix
+      ];
+
+      _module.args.libNet = inputs.nixpkgs.lib.extend inputs.nix-lib-net.overlays.raw;
 
       perSystem =
         { system, ... }: