From 56a029331b3cbeef5be8a45c52e049a01ecb8220 Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Tue, 16 Sep 2025 14:06:04 +0200
Subject: [PATCH] kaas

---
 .envrc     |  2 ++
 flake.lock | 17 +----------------
 flake.nix  | 31 +++++++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..0f94eed
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,2 @@
+# shellcheck shell=bash
+use flake
diff --git a/flake.lock b/flake.lock
index 38c01a0..1bae4ca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -183,8 +183,7 @@
         "nixpkgs": [
           "clan-core",
           "nixpkgs"
-        ],
-        "systems": "systems_2"
+        ]
       }
     },
     "sops-nix": {
@@ -223,20 +222,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "id": "systems",
-        "type": "indirect"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index a41bc8e..2a21e11 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,16 +12,39 @@
     };
   };
 
-  outputs = inputs@{ flake-parts, clan-core, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ self, lib, ... }: {
+  outputs = inputs@{ self, flake-parts, clan-core, nixpkgs, ... }:
+  let
+    # clan = clan-core.lib.clan {
+    #   inherit self;
+    #   imports = [];
+    #   specialArgs = { inherit inputs; };
+    # };
+  in
+  {
+    # inherit (clan.config) nixosConfigurations nixosModules clanInternals;
+    # clan = clan.config;
+    
     imports = [
       clan-core.flakeModules.default
       # ./clanServices/flake-module.nix
     ];
 
     clan.modules = {
-      "@amarth/k3s" = lib.importApply ./clanServices/k3s/default.nix {};
+      "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
     };
 
-    systems = import systems;
-  });
+    devShells =
+      nixpkgs.lib.genAttrs
+        [
+          "x86_64-linux"
+          "aarch64-linux"
+          "aarch64-darwin"
+          "x86_64-darwin"
+        ]
+        (system: {
+          default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
+            packages = [ clan-core.packages.${system}.clan-cli ];
+          };
+        });
+  };
 }
\ No newline at end of file