From 8cb6424504dc5bd832462f8030522f9ad2c8228d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 30 May 2025 19:08:57 +0200
Subject: [PATCH] templates: unify specialArgs across examples

---
 templates/clan/flake-parts/flake.nix | 13 +++++++------
 templates/clan/new-clan/flake.nix    |  8 +++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/templates/clan/flake-parts/flake.nix b/templates/clan/flake-parts/flake.nix
index 18a1bb00d..303293d1c 100644
--- a/templates/clan/flake-parts/flake.nix
+++ b/templates/clan/flake-parts/flake.nix
@@ -7,11 +7,10 @@
   outputs =
     inputs@{
       self,
-      clan-core,
       flake-parts,
       ...
     }:
-    flake-parts.lib.mkFlake { inherit inputs; } ({
+    flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -23,10 +22,12 @@
       clan = {
         meta.name = "__CHANGE_ME__"; # Ensure this is unique among all clans you want to use.
 
-        # Make flake available in modules
-        specialArgs.self = {
-          inherit (self) inputs nixosModules packages;
+        # This makes flake inputs available in NixOS modules.
+        specialArgs = {
+          self = self;
+          inputs = self.inputs;
         };
+
         inherit self;
         machines = {
           # "jon" will be the hostname of the machine
@@ -109,5 +110,5 @@
         {
           devShells.default = pkgs.mkShell { packages = [ inputs'.clan-core.packages.clan-cli ]; };
         };
-    });
+    };
 }
diff --git a/templates/clan/new-clan/flake.nix b/templates/clan/new-clan/flake.nix
index 3459ee14c..8e4d304de 100644
--- a/templates/clan/new-clan/flake.nix
+++ b/templates/clan/new-clan/flake.nix
@@ -3,7 +3,7 @@
   inputs.nixpkgs.follows = "clan-core/nixpkgs";
 
   outputs =
-    { self, clan-core, ... }:
+    { self, clan-core, ... } @ inputs:
     let
       # Usage see: https://docs.clan.lol
       clan = clan-core.clanLib.buildClan {
@@ -11,6 +11,12 @@
         # Ensure this is unique among all clans you want to use.
         meta.name = "__CHANGE_ME__";
 
+        # This makes flake inputs available in NixOS modules.
+        specialArgs = {
+          self = self;
+          inputs = inputs;
+        };
+
         # All machines in ./machines will be imported.
 
         # Prerequisite: boot into the installer.