From 711377040b8cd9ac6aae19f9f175ccc37d8df6ab Mon Sep 17 00:00:00 2001
From: Enno Richter <enno@nerdworks.de>
Date: Sat, 4 Jan 2025 14:48:19 +0100
Subject: [PATCH] macos: add clan-cli

---
 flake.lock                  | 52 +++++++++++++++++++++++++++++++++++++
 flake.nix                   |  9 +++++++
 modules/flake/overlays.nix  |  1 +
 modules/home/macos-enno.nix |  1 +
 4 files changed, 63 insertions(+)

diff --git a/flake.lock b/flake.lock
index fece2e70..509de77a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,6 +31,42 @@
         "type": "github"
       }
     },
+    "clan-core": {
+      "inputs": {
+        "disko": [
+          "disko"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixos-facter-modules": "nixos-facter-modules",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "sops-nix": [
+          "sops-nix"
+        ],
+        "systems": [
+          "systems"
+        ],
+        "treefmt-nix": [
+          "treefmt-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735930566,
+        "narHash": "sha256-KD2mbQ+Z6SvHBTQvJzIPgMvrZ1iaXvcE1obfLREIaso=",
+        "ref": "refs/heads/main",
+        "rev": "2b1f6ef3746e955fbe7f75e9eafabb88910d9986",
+        "revCount": 5368,
+        "type": "git",
+        "url": "https://git.clan.lol/clan/clan-core"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.clan.lol/clan/clan-core"
+      }
+    },
     "colmena": {
       "inputs": {
         "flake-compat": [
@@ -395,6 +431,21 @@
         "type": "github"
       }
     },
+    "nixos-facter-modules": {
+      "locked": {
+        "lastModified": 1734596637,
+        "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=",
+        "owner": "numtide",
+        "repo": "nixos-facter-modules",
+        "rev": "536472754982bf03079b4b4e0261838a760587c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nixos-facter-modules",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1734352517,
@@ -574,6 +625,7 @@
     "root": {
       "inputs": {
         "attic": "attic",
+        "clan-core": "clan-core",
         "colmena": "colmena",
         "devshell": "devshell",
         "disko": "disko",
diff --git a/flake.nix b/flake.nix
index 993f361c..6da46601 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,15 @@
       inputs.nixpkgs-stable.follows = "nixpkgs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    clan-core = {
+      url = "git+https://git.clan.lol/clan/clan-core";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.disko.follows = "disko";
+      inputs.sops-nix.follows = "sops-nix";
+      inputs.systems.follows = "systems";
+      inputs.treefmt-nix.follows = "treefmt-nix";
+    };
     colmena = {
       url = "github:zhaofengli/colmena";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix
index 3d4f5c4d..cd9d6134 100644
--- a/modules/flake/overlays.nix
+++ b/modules/flake/overlays.nix
@@ -10,6 +10,7 @@
           "E501"
         ];
       } ../../scripts/borg2prom.py;
+      clan-cli = inputs.clan-core.packages.${final.system}.clan-cli;
       hashPassword = final.callPackage ../../packages/hashPassword { };
       hl = final.callPackage ../../packages/hl { };
       httpserve = final.writers.writePython3Bin "httpserve" {
diff --git a/modules/home/macos-enno.nix b/modules/home/macos-enno.nix
index 74470060..110a0b85 100644
--- a/modules/home/macos-enno.nix
+++ b/modules/home/macos-enno.nix
@@ -49,6 +49,7 @@ in
     ]
     ++ (with pkgs; [
       attic-client
+      clan-cli
       colmena
       deno
       diceware