From 10e4db7c193bd8482185b6681e80934138146021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 30 Aug 2023 16:12:18 +0200
Subject: [PATCH 1/2] clan-cli: fix error message

---
 pkgs/clan-cli/clan_cli/secrets/groups.py  | 6 +++---
 pkgs/clan-cli/clan_cli/secrets/secrets.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/secrets/groups.py b/pkgs/clan-cli/clan_cli/secrets/groups.py
index 37b3cb2a1..92b85fed3 100644
--- a/pkgs/clan-cli/clan_cli/secrets/groups.py
+++ b/pkgs/clan-cli/clan_cli/secrets/groups.py
@@ -71,7 +71,7 @@ def list_command(args: argparse.Namespace) -> None:
 
 def list_directory(directory: Path) -> str:
     if not directory.exists():
-        return "{directory} does not exist"
+        return f"{directory} does not exist"
     msg = f"\n{directory} contains:"
     for f in directory.iterdir():
         msg += f"\n  {f.name}"
@@ -81,7 +81,7 @@ def list_directory(directory: Path) -> str:
 def add_member(group_folder: Path, source_folder: Path, name: str) -> None:
     source = source_folder / name
     if not source.exists():
-        msg = f"{name} does not exist in {source_folder}"
+        msg = f"{name} does not exist in {source_folder}: "
         msg += list_directory(source_folder)
         raise ClanError(msg)
     group_folder.mkdir(parents=True, exist_ok=True)
@@ -98,7 +98,7 @@ def add_member(group_folder: Path, source_folder: Path, name: str) -> None:
 def remove_member(group_folder: Path, name: str) -> None:
     target = group_folder / name
     if not target.exists():
-        msg = f"{name} does not exist in group in {group_folder}"
+        msg = f"{name} does not exist in group in {group_folder}: "
         msg += list_directory(group_folder)
         raise ClanError(msg)
     os.remove(target)
diff --git a/pkgs/clan-cli/clan_cli/secrets/secrets.py b/pkgs/clan-cli/clan_cli/secrets/secrets.py
index 6c4295f7d..89925755c 100644
--- a/pkgs/clan-cli/clan_cli/secrets/secrets.py
+++ b/pkgs/clan-cli/clan_cli/secrets/secrets.py
@@ -113,7 +113,7 @@ def groups_folder(group: str) -> Path:
 
 def list_directory(directory: Path) -> str:
     if not directory.exists():
-        return "{directory} does not exist"
+        return f"{directory} does not exist"
     msg = f"\n{directory} contains:"
     for f in directory.iterdir():
         msg += f"\n  {f.name}"
@@ -125,7 +125,7 @@ def allow_member(
 ) -> None:
     source = source_folder / name
     if not source.exists():
-        msg = f"{name} does not exist in {source_folder}"
+        msg = f"{name} does not exist in {source_folder}: "
         msg += list_directory(source_folder)
         raise ClanError(msg)
     group_folder.mkdir(parents=True, exist_ok=True)
@@ -148,7 +148,7 @@ def allow_member(
 def disallow_member(group_folder: Path, name: str) -> None:
     target = group_folder / name
     if not target.exists():
-        msg = f"{name} does not exist in group in {group_folder}"
+        msg = f"{name} does not exist in group in {group_folder}: "
         msg += list_directory(group_folder)
         raise ClanError(msg)
 

From 1d496c6363b1a660172be330be36638c731509b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 30 Aug 2023 16:41:10 +0200
Subject: [PATCH 2/2] buildClan: also import clanCore module

---
 lib/build-clan/default.nix | 3 ++-
 lib/default.nix            | 4 ++--
 lib/flake-module.nix       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index fc6c465f2..4da48dafd 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, lib }:
+{ nixpkgs, clan, lib }:
 { directory  # The directory containing the machines subdirectory
 , specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
 , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
@@ -18,6 +18,7 @@ let
     (name: _:
       nixpkgs.lib.nixosSystem {
         modules = [
+          clan.nixosModules.clanCore
           (machineSettings name)
           (machines.${name} or { })
         ];
diff --git a/lib/default.nix b/lib/default.nix
index 066e88eff..89ac0cc3f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, nixpkgs, ... }:
+{ lib, clan, nixpkgs, ... }:
 {
   findNixFiles = folder:
     lib.mapAttrs'
@@ -14,5 +14,5 @@
 
   jsonschema = import ./jsonschema { inherit lib; };
 
-  buildClan = import ./build-clan { inherit lib nixpkgs; };
+  buildClan = import ./build-clan { inherit lib clan nixpkgs; };
 }
diff --git a/lib/flake-module.nix b/lib/flake-module.nix
index 64369ec24..13855fbc6 100644
--- a/lib/flake-module.nix
+++ b/lib/flake-module.nix
@@ -7,6 +7,6 @@
   ];
   flake.lib = import ./default.nix {
     inherit lib;
-    inherit (inputs) nixpkgs;
+    inherit (inputs) nixpkgs clan;
   };
 }