confctl 2.2.2 → 3.0.0

data/nix/lib/default.nix

@@ -1,23 +1,50 @@
-{ confDir, coreLib, corePkgs }:
+{
+  confDir,
+  coreLib,
+  corePkgs,
+}:
 with coreLib;
 let
-  machine = import ./machine { inherit confDir corePkgs coreLib findMetaConfig; };
+  machine = import ./machine {
+    inherit
+      confDir
+      corePkgs
+      coreLib
+      findMetaConfig
+      ;
+  };
 
-  findMetaConfig =
-    { cluster, name }:
-    cluster.${name};
+  findMetaConfig = { cluster, name }: cluster.${name};
 
   makeMachine =
-    { name, metaConfig, carrier ? null, alias ? null, clusterName ? null, extraModules ? [], buildAttribute ? null }:
+    {
+      name,
+      metaConfig,
+      carrier ? null,
+      alias ? null,
+      clusterName ? null,
+      extraModules ? [ ],
+      buildAttribute ? null,
+    }:
     let
       ensuredClusterName = if isNull clusterName then name else clusterName;
-    in {
-      inherit name alias metaConfig carrier extraModules;
+    in
+    {
+      inherit
+        name
+        alias
+        metaConfig
+        carrier
+        extraModules
+        ;
       clusterName = ensuredClusterName;
 
       build = {
         attribute = if isNull buildAttribute then metaConfig.buildAttribute else buildAttribute;
-        toplevel = buildConfig { name = ensuredClusterName; inherit metaConfig; };
+        toplevel = buildConfig {
+          name = ensuredClusterName;
+          inherit metaConfig;
+        };
       };
     };
 
@@ -32,75 +59,105 @@ let
     else
       null;
 
-  expandCarriers = machineAttrs: flatten (mapAttrsToList (name: m:
-    if m.metaConfig.carrier.enable then
-      [ m ] ++ (expandCarrier machineAttrs m)
-    else
-      m
-  ) machineAttrs);
+  expandCarriers =
+    machineAttrs:
+    flatten (
+      mapAttrsToList (
+        name: m: if m.metaConfig.carrier.enable then [ m ] ++ (expandCarrier machineAttrs m) else m
+      ) machineAttrs
+    );
 
-  expandCarrier = machineAttrs: carrierMachine: map (cm:
-    makeMachine {
-      name = "${carrierMachine.name}#${if isNull cm.alias then cm.machine else cm.alias}";
-      alias = cm.alias;
-      clusterName = cm.machine;
-      carrier = carrierMachine.name;
-      extraModules = cm.extraModules;
-      buildAttribute = cm.buildAttribute;
-      metaConfig = coreLib.updateManyAttrsByPath ([
-        {
-          path = [ "labels" ];
-          update = old: old // cm.labels;
-        }
-        {
-          path = [ "tags" ];
-          update = old: old ++ cm.tags;
-        }
-      ] ++ (generationUpdates cm)) machineAttrs.${cm.machine}.metaConfig;
-    }
-  ) carrierMachine.metaConfig.carrier.machines;
+  expandCarrier =
+    machineAttrs: carrierMachine:
+    map (
+      cm:
+      makeMachine {
+        name = "${carrierMachine.name}#${if isNull cm.alias then cm.machine else cm.alias}";
+        alias = cm.alias;
+        clusterName = cm.machine;
+        carrier = carrierMachine.name;
+        extraModules = cm.extraModules;
+        buildAttribute = cm.buildAttribute;
+        metaConfig = coreLib.updateManyAttrsByPath (
+          [
+            {
+              path = [ "labels" ];
+              update = old: old // cm.labels;
+            }
+            {
+              path = [ "tags" ];
+              update = old: old ++ cm.tags;
+            }
+          ]
+          ++ (generationUpdates cm)
+        ) machineAttrs.${cm.machine}.metaConfig;
+      }
+    ) carrierMachine.metaConfig.carrier.machines;
 
-  generationUpdates = cm:
-    flatten (map (generations:
-      map (attr: {
-        path = [ generations attr ];
-        update = old:
-          let v = cm.${generations}.${attr};
-          in if isNull v then old else v;
-      }) [ "min" "max" "maxAge" ]
-    ) [ "buildGenerations" "hostGenerations" ]);
-in rec {
+  generationUpdates =
+    cm:
+    flatten (
+      map
+        (
+          generations:
+          map
+            (attr: {
+              path = [
+                generations
+                attr
+              ];
+              update =
+                old:
+                let
+                  v = cm.${generations}.${attr};
+                in
+                if isNull v then old else v;
+            })
+            [
+              "min"
+              "max"
+              "maxAge"
+            ]
+        )
+        [
+          "buildGenerations"
+          "hostGenerations"
+        ]
+    );
+in
+rec {
   inherit corePkgs coreLib;
 
   mkNetUdevRule = name: mac: ''
-  ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", KERNEL=="eth*", ATTR{address}=="${mac}", NAME="${name}"
+    ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", KERNEL=="eth*", ATTR{address}=="${mac}", NAME="${name}"
   '';
 
-  mkNetUdevRules = rs: concatStringsSep "\n" (mapAttrsToList (name: mac:
-    mkNetUdevRule name mac
-  ) rs);
+  mkNetUdevRules = rs: concatStringsSep "\n" (mapAttrsToList (name: mac: mkNetUdevRule name mac) rs);
 
   inherit findMetaConfig;
 
   # Return all configured machines in a list
-  getClusterMachines = cluster:
+  getClusterMachines =
+    cluster:
     let
-      machineAttrs = mapAttrs (name: metaConfig:
-        makeMachine { inherit name metaConfig; }
-      ) cluster;
-    in expandCarriers machineAttrs;
+      machineAttrs = mapAttrs (name: metaConfig: makeMachine { inherit name metaConfig; }) cluster;
+    in
+    expandCarriers machineAttrs;
 
   # Get IP version addresses from all machines in a cluster
-  getAllAddressesOf = cluster: v:
+  getAllAddressesOf =
+    cluster: v:
     let
       machines = getClusterMachines cluster;
-      addresses = flatten (map (machine:
-        map (addr: machine // addr) machine.metaConfig.addresses.${"v${toString v}"}
-      ) machines);
-    in addresses;
+      addresses = flatten (
+        map (machine: map (addr: machine // addr) machine.metaConfig.addresses.${"v${toString v}"}) machines
+      );
+    in
+    addresses;
 
   mkOptions = {
-    addresses = v:
+    addresses =
+      v:
       { config, ... }:
       {
         options = {
@@ -117,11 +174,7 @@ in rec {
           string = mkOption {
             type = types.nullOr types.str;
             default = null;
-            apply = v:
-              if isNull v then
-                "${config.address}/${toString config.prefix}"
-              else
-                v;
+            apply = v: if isNull v then "${config.address}/${toString config.prefix}" else v;
             description = "Address with prefix as string";
           };
         };

data/nix/lib/machine/default.nix

@@ -1,4 +1,9 @@
-{ confDir, corePkgs, coreLib, findMetaConfig }:
+{
+  confDir,
+  corePkgs,
+  coreLib,
+  findMetaConfig,
+}:
 let
   swpinsFor =
     { name, metaConfig }:
@@ -10,68 +15,83 @@ let
     };
 
   makeModuleArgs =
-    { metaConfig, swpins, spin, name }@args: {
+    {
+      metaConfig,
+      swpins,
+      spin,
+      name,
+    }@args:
+    {
       swpins = swpins.evaluated;
       swpinsInfo = swpins.infos;
       confMachine = import ./info.nix (args // { inherit findMetaConfig; });
     };
 
-  makeImports = spin: extraImports: [
-    ({ config, pkgs, lib, confMachine, ... }:
-    {
-      _file = "confctl/nix/lib/machine/default.nix";
-
-      _module.args = {
-        inherit confDir;
-        confLib = import ../../lib { inherit confDir coreLib corePkgs; };
-        confData = import "${toString confDir}/data/default.nix" { inherit lib; };
-      };
+  makeImports =
+    spin: extraImports:
+    [
+      (
+        {
+          config,
+          pkgs,
+          lib,
+          confMachine,
+          ...
+        }:
+        {
+          _file = "confctl/nix/lib/machine/default.nix";
 
-      networking.hostName =
-        lib.mkIf (confMachine.host != null && confMachine.host.name != null) (lib.mkDefault confMachine.host.name);
+          _module.args = {
+            inherit confDir;
+            confLib = import ../../lib { inherit confDir coreLib corePkgs; };
+            confData = import "${toString confDir}/data/default.nix" { inherit lib; };
+          };
 
-      networking.domain =
-        lib.mkIf (confMachine.host != null) (lib.mkDefault confMachine.host.fullDomain);
-    })
-  ] ++ (import ../../modules/module-list.nix).${spin}
+        }
+      )
+    ]
+    ++ (import ../../modules/module-list.nix).${spin}
     ++ (import ../../modules/system-list.nix).${spin}
     ++ (import "${toString confDir}/modules/module-list.nix").${spin}
     ++ (import "${toString confDir}/cluster/module-list.nix")
     ++ extraImports;
-in rec {
-  nixos = { name, metaConfig }:
+in
+rec {
+  nixos =
+    { name, metaConfig }:
     let
       swpins = swpinsFor { inherit name metaConfig; };
     in
-      { config, pkgs, ... }@args:
-      {
-        _module.args = makeModuleArgs {
-          metaConfig = config;
-          inherit swpins;
-          spin = "nixos";
-          inherit name;
-        };
-
-        imports = makeImports "nixos" [
-          "${toString confDir}/cluster/${name}/config.nix"
-        ];
+    { config, pkgs, ... }@args:
+    {
+      _module.args = makeModuleArgs {
+        metaConfig = config;
+        inherit swpins;
+        spin = "nixos";
+        inherit name;
       };
 
-  vpsadminos = { name, metaConfig }:
+      imports = makeImports "nixos" [
+        "${toString confDir}/cluster/${name}/config.nix"
+      ];
+    };
+
+  vpsadminos =
+    { name, metaConfig }:
     let
       swpins = swpinsFor { inherit name metaConfig; };
     in
-      { config, pkgs, ... }@args:
-      {
-        _module.args = makeModuleArgs {
-          metaConfig = config;
-          inherit swpins;
-          spin = "vpsadminos";
-          inherit name;
-        };
-
-        imports = makeImports "vpsadminos" [
-          "${toString confDir}/cluster/${name}/config.nix"
-        ];
+    { config, pkgs, ... }@args:
+    {
+      _module.args = makeModuleArgs {
+        metaConfig = config;
+        inherit swpins;
+        spin = "vpsadminos";
+        inherit name;
       };
+
+      imports = makeImports "vpsadminos" [
+        "${toString confDir}/cluster/${name}/config.nix"
+      ];
+    };
 }

data/nix/lib/machine/info.nix

@@ -1,5 +1,16 @@
-{ metaConfig, spin, name, findMetaConfig, ... }:
-({ inherit name; } // findMetaConfig {
-  inherit (metaConfig) cluster;
-  inherit name;
-})
+{
+  metaConfig,
+  spin,
+  name,
+  findMetaConfig,
+  ...
+}:
+(
+  {
+    inherit name;
+  }
+  // findMetaConfig {
+    inherit (metaConfig) cluster;
+    inherit name;
+  }
+)

data/nix/lib/swpins/eval.nix

@@ -1,4 +1,11 @@
-{ confDir, name, dir ? "cluster", channels, pkgs, lib }:
+{
+  confDir,
+  name,
+  dir ? "cluster",
+  channels,
+  pkgs,
+  lib,
+}:
 let
   pinFileName = builtins.replaceStrings [ "/" ] [ ":" ] name;
 
@@ -6,11 +13,7 @@ let
 
   pinFileJson = builtins.readFile pinFilePath;
 
-  pinFileSpecs =
-    if builtins.pathExists pinFilePath then
-      builtins.fromJSON pinFileJson
-    else
-      {};
+  pinFileSpecs = if builtins.pathExists pinFilePath then builtins.fromJSON pinFileJson else { };
 
   pinFileSwpins = lib.mapAttrs (k: v: swpin v) pinFileSpecs;
 
@@ -24,47 +27,57 @@ let
 
   allChannelSwpins = map channelSwpins channels;
 
-  allSwpins = (lib.foldl (a: b: a // b) {} allChannelSwpins) // pinFileSwpins;
+  allSwpins = (lib.foldl (a: b: a // b) { } allChannelSwpins) // pinFileSwpins;
 
-  swpin = { fetcher, ... }:
-    fetchers.${fetcher.type} fetcher.options;
+  swpin = { fetcher, ... }: fetchers.${fetcher.type} fetcher.options;
 
   fetchers = rec {
-    directory = opts:
-      opts.path;
+    directory = opts: opts.path;
 
-    git = opts:
+    git =
+      opts:
       let
-        filter = lib.filterAttrs (k: v: builtins.elem k [
-          "url" "rev" "sha256" "fetchSubmodules"
-        ]);
-      in pkgs.fetchgit (filter opts);
+        filter = lib.filterAttrs (
+          k: v:
+          builtins.elem k [
+            "url"
+            "rev"
+            "sha256"
+            "fetchSubmodules"
+          ]
+        );
+      in
+      if opts ? path && builtins.pathExists opts.path then
+        builtins.storePath opts.path
+      else
+        pkgs.fetchgit (filter opts);
 
-    zip = opts:
-      pkgs.fetchzip opts;
+    zip = opts: pkgs.fetchzip opts;
 
-    git-rev = opts:
+    git-rev =
+      opts:
       let
         repo = fetchers.${opts.wrapped_fetcher.type} opts.wrapped_fetcher.options;
         shortRev = lib.substring 0 9 (opts.rev);
       in
-        pkgs.runCommand "git-${shortRev}" {} ''
-          cp -a ${repo} $out
-          chmod 700 $out
-          echo "${opts.rev}" > $out/.git-revision
-          echo ".git.${shortRev}" > $out/.version-suffix
-        '';
+      pkgs.runCommand "git-${shortRev}" { } ''
+        cp -a ${repo} $out
+        chmod 700 $out
+        echo "${opts.rev}" > $out/.git-revision
+        echo ".git.${shortRev}" > $out/.version-suffix
+      '';
   };
 
-  pinFileInfos = lib.mapAttrs (k: v: v.info or {}) pinFileSpecs;
+  pinFileInfos = lib.mapAttrs (k: v: v.info or { }) pinFileSpecs;
 
-  channelInfos = chan: lib.mapAttrs (k: v: v.info or {}) (channelSpecs chan);
+  channelInfos = chan: lib.mapAttrs (k: v: v.info or { }) (channelSpecs chan);
 
   allChannelInfos = map channelInfos channels;
 
-  allInfos = (lib.foldl (a: b: a // b) {} allChannelInfos) // pinFileInfos;
+  allInfos = (lib.foldl (a: b: a // b) { } allChannelInfos) // pinFileInfos;
 
-in {
+in
+{
   evaluated = allSwpins;
 
   infos = allInfos;

data/nix/lib/swpins/options.nix

@@ -6,7 +6,11 @@ rec {
     {
       options = {
         type = mkOption {
-          type = types.enum [ "directory" "git" "git-rev" ];
+          type = types.enum [
+            "directory"
+            "git"
+            "git-rev"
+          ];
           default = "git";
         };
 
@@ -82,7 +86,7 @@ rec {
 
           interval = mkOption {
             type = types.int;
-            default = 60*60;
+            default = 60 * 60;
             description = ''
               Number of seconds from the last update to trigger the next
               auto-update, if auto-update is enabled.

data/nix/machines.nix

@@ -1,31 +1,39 @@
-{ confDir, corePkgs, coreLib }:
+{
+  confDir,
+  corePkgs,
+  coreLib,
+}:
 let
   confLib = import ./lib { inherit confDir coreLib corePkgs; };
 
   userModules = "${toString confDir}/modules/cluster/default.nix";
 
   baseModules = [
-    ({ ... }:
-    {
-      _module.args = {
-        pkgs = corePkgs;
-        inherit confLib;
-        swpins = {};
-        swpinsInfo = {};
-        confMachine = null;
-      };
-    })
+    (
+      { ... }:
+      {
+        _module.args = {
+          pkgs = corePkgs;
+          inherit confLib;
+          swpins = { };
+          swpinsInfo = { };
+          confMachine = null;
+        };
+      }
+    )
 
     ./modules/cluster
-  ] ++ (import "${toString confDir}/cluster/module-list.nix")
-    ++ (coreLib.optional (builtins.pathExists userModules) userModules);
+  ]
+  ++ (import "${toString confDir}/cluster/module-list.nix")
+  ++ (coreLib.optional (builtins.pathExists userModules) userModules);
 
   evalConfig = corePkgs.lib.evalModules {
-    prefix = [];
+    prefix = [ ];
     modules = baseModules;
   };
 
   cluster = evalConfig.config.cluster;
 
   allMachines = confLib.getClusterMachines cluster;
-in allMachines
+in
+allMachines