pkgs: add clan-autorefresh

This adds a clan-cli shim that always uses nix run to run the pinned
clan-cli version. For this we need to expose the clan-cli via
clanInternals.

clanServices/wifi/default.nix

@@ -39,7 +39,7 @@ in
     };
 
     perInstance =
-      { instanceName, settings, ... }:
+      { settings, ... }:
       {
         nixosModule =
           { pkgs, config, ... }:
@@ -86,7 +86,7 @@ in
 
             # service to generate the environment file containing all secrets, as
             #   expected by the nixos NetworkManager-ensure-profile service
-            systemd.services."NetworkManager-setup-secrets-${instanceName}" = {
+            systemd.services.NetworkManager-setup-secrets = {
               description = "Generate wifi secrets for NetworkManager";
               requiredBy = [ "NetworkManager-ensure-profiles.service" ];
               partOf = [ "NetworkManager-ensure-profiles.service" ];

clanServices/wifi/tests/vm/default.nix

@@ -7,16 +7,8 @@
     inventory = {
 
       machines.test = { };
-      machines.second = { };
 
       instances = {
-        wg-test-all = {
-          module.name = "@clan/wifi";
-          module.input = "self";
-          roles.default.tags.all = { };
-          roles.default.settings.networks.all = { };
-        };
-
         wg-test-one = {
           module.name = "@clan/wifi";
           module.input = "self";

lib/modules/clan/interface.nix

@@ -275,6 +275,8 @@ in
           templates = lib.mkOption { type = lib.types.raw; };
 
           machines = lib.mkOption { type = lib.types.raw; };
+
+          clan-cli = lib.mkOption { type = lib.types.raw; };
         };
       };
     };

lib/modules/clan/module.nix

@@ -273,6 +273,9 @@ in
 
       # machine specifics
       machines = configsPerSystem;
+
+      # export clan-cli in clanInternals to tie the CLI to the flake
+      clan-cli = builtins.mapAttrs (_sys: pkgs: pkgs.clan-cli) clan-core.packages;
     };
   };
 }

pkgs/flake-module.nix

@@ -13,7 +13,12 @@
   ];
 
   perSystem =
-    { config, pkgs, ... }:
+    {
+      config,
+      pkgs,
+      self',
+      ...
+    }:
     {
       packages = {
         agit = pkgs.callPackage ./agit { };
@@ -28,6 +33,25 @@
         classgen = pkgs.callPackage ./classgen { };
         zerotierone = pkgs.callPackage ./zerotierone { };
         update-clan-core-for-checks = pkgs.callPackage ./update-clan-core-for-checks { };
+        clan-autorefresh = pkgs.symlinkJoin {
+          name = "clan";
+          paths = [
+            (pkgs.writeScriptBin "clan" ''
+              #!/bin/sh
+              set -efu
+
+              system=$(nix config show system)
+
+              nix \
+                --extra-experimental-features 'flakes nix-command' \
+                run ".#clanInternals.clan-cli.$system" -- "$@"
+            '')
+            self'.packages.clan-cli
+          ];
+          postBuild = ''
+            rm -r $out/lib
+          '';
+        };
       };
     };
 }

templates/clan/default/flake.nix

@@ -25,7 +25,9 @@
           ]
           (system: {
             default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
-              packages = [ clan-core.packages.${system}.clan-cli ];
+              packages = [
+                clan-core.packages.${system}.clan-autorefresh
+              ];
             };
           });
     };

templates/clan/flake-parts/flake.nix

@@ -28,7 +28,7 @@
       perSystem =
         { pkgs, inputs', ... }:
         {
-          devShells.default = pkgs.mkShell { packages = [ inputs'.clan-core.packages.clan-cli ]; };
+          devShells.default = pkgs.mkShell { packages = [ inputs'.clan-core.packages.clan-autorefresh ]; };
         };
     };
 }