clan.nix

@@ -1,11 +0,0 @@
-{
-  meta.name = "amarth-services";
-
-  inventory = {
-    machines = {
-      "test-darwin-machine" = {
-        machineClass = "darwin";
-      };
-    };
-  };
-}

devShells/flake-module.nix

@@ -1,12 +0,0 @@
-{
-  perSystem = { pkgs, inputs', ... }: {
-    devShells.default = pkgs.mkShellNoCC {
-      packages = with pkgs; [
-        bash
-        sops
-        
-        inputs'.clan-core.packages.clan-cli
-      ];
-    };
-  };
-}

flake.lock

@@ -56,6 +56,24 @@
         "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -147,6 +165,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1722073938,
+        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1757745802,
         "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
@@ -165,8 +199,9 @@
     "root": {
       "inputs": {
         "clan-core": "clan-core",
+        "devshell": "devshell",
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "systems": "systems_2"
       }
     },
@@ -216,9 +251,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "id": "systems",
-        "repo": "default",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "treefmt-nix": {

flake.nix

@@ -15,22 +15,24 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
-    systems = {
+    devshell = {
-      url = "github:nix-systems/default";
+      url = "github:numtide/devshell";
     };
   };
 
   outputs =
-    inputs@{ flake-parts, clan-core, systems, ... }:
+    inputs@{ flake-parts, systems, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
-      systems = import systems;
+      systems = [
+        "x86_64-linux"
+      ];
 
       imports = [
         flake-parts.flakeModules.modules
-        clan-core.flakeModules.default
+        inputs.clan-core.flakeModules.default
-        clan-core.flakeModules.testModule
+        inputs.clan-core.flakeModules.testModule
+        inputs.devshell.flakeModule
 
-        ./devShells/flake-module.nix
         ./clanServices/flake-module.nix
       ];
 
@@ -38,6 +40,27 @@
         modules = {};
       };
 
-      clan = import ./clan.nix;
+      clan = {
+        meta.name = "amarth-services";
+
+        inventory = {
+          machines = {
+            "test-darwin-machine" = {
+              machineClass = "darwin";
+            };
+          };
+        };
+      };
+
+      perSystem = { system, pkgs, ... }: {
+        devshells = {
+          default = {
+            packages = [
+              pkgs.just
+              inputs.clan-core.packages.${system}.clan-cli
+            ];
+          };
+        };
+      };
     });
 }