diff --git a/clan.nix b/clan.nix
new file mode 100644
index 0000000..27d7768
--- /dev/null
+++ b/clan.nix
@@ -0,0 +1,11 @@
+{
+  meta.name = "amarth-services";
+
+  inventory = {
+    machines = {
+      "test-darwin-machine" = {
+        machineClass = "darwin";
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/devShells/flake-module.nix b/devShells/flake-module.nix
new file mode 100644
index 0000000..6fa23fd
--- /dev/null
+++ b/devShells/flake-module.nix
@@ -0,0 +1,12 @@
+{
+  perSystem = { pkgs, inputs', ... }: {
+    devShells.default = pkgs.mkShellNoCC {
+      packages = with pkgs; [
+        bash
+        sops
+        
+        inputs'.clan-core.packages.clan-cli
+      ];
+    };
+  };
+}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index fe81cfb..3f19c1b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,24 +56,6 @@
         "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": [
@@ -165,22 +147,6 @@
       }
     },
     "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=",
@@ -199,9 +165,8 @@
     "root": {
       "inputs": {
         "clan-core": "clan-core",
-        "devshell": "devshell",
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "systems": "systems_2"
       }
     },
@@ -251,8 +216,9 @@
         "type": "github"
       },
       "original": {
-        "id": "systems",
-        "type": "indirect"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "treefmt-nix": {
diff --git a/flake.nix b/flake.nix
index 3633f9c..abfce2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,24 +15,22 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
-    devshell = {
-      url = "github:numtide/devshell";
+    systems = {
+      url = "github:nix-systems/default";
     };
   };
 
   outputs =
-    inputs@{ flake-parts, systems, ... }:
+    inputs@{ flake-parts, clan-core, systems, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
-      systems = [
-        "x86_64-linux"
-      ];
+      systems = import systems;
 
       imports = [
         flake-parts.flakeModules.modules
-        inputs.clan-core.flakeModules.default
-        inputs.clan-core.flakeModules.testModule
-        inputs.devshell.flakeModule
+        clan-core.flakeModules.default
+        clan-core.flakeModules.testModule
 
+        ./devShells/flake-module.nix
         ./clanServices/flake-module.nix
       ];
 
@@ -40,27 +38,6 @@
         modules = {};
       };
 
-      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
-            ];
-          };
-        };
-      };
+      clan = import ./clan.nix;
     });
 }