diff --git a/flake.nix b/flake.nix
index 09f7be5..00a9ad2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,11 +70,11 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        ./flake/dev-shells.nix
+        ./flake/dev-shell.nix
         ./flake/formatter.nix
         ./flake/hosts.nix
         ./flake/modules.nix
-        ./flake/packages.nix
+        ./flake/sops.nix
       ];
     };
 }
diff --git a/flake/dev-shell.nix b/flake/dev-shell.nix
new file mode 100644
index 0000000..a138228
--- /dev/null
+++ b/flake/dev-shell.nix
@@ -0,0 +1,13 @@
+_: {
+  perSystem =
+    { inputs', pkgs, ... }:
+    {
+      devShells.default = pkgs.mkShellNoCC {
+        packages = [
+          pkgs.just
+          pkgs.nh
+          inputs'.deploy-rs.packages.default
+        ];
+      };
+    };
+}
diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix
deleted file mode 100644
index dd4233c..0000000
--- a/flake/dev-shells.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ inputs, self, ... }:
-{
-  perSystem =
-    { pkgs, system, ... }:
-    {
-      devShells = {
-        default = pkgs.mkShell {
-          packages = [
-            pkgs.just
-            pkgs.nh
-            inputs.deploy-rs.packages.${system}.default
-          ];
-        };
-
-        sops = pkgs.mkShell {
-          SOPS_CONFIG = self.packages.${system}.sops-config;
-          packages = [
-            pkgs.sops
-            pkgs.age
-            pkgs.ssh-to-age
-          ];
-        };
-      };
-    };
-}
diff --git a/flake/packages.nix b/flake/sops.nix
similarity index 82%
rename from flake/packages.nix
rename to flake/sops.nix
index a4ff469..ca90fd0 100644
--- a/flake/packages.nix
+++ b/flake/sops.nix
@@ -1,7 +1,12 @@
 { self, ... }:
 {
   perSystem =
-    { pkgs, lib, ... }:
+    {
+      self',
+      pkgs,
+      lib,
+      ...
+    }:
     {
       packages.sops-config =
         let
@@ -32,5 +37,14 @@
         pkgs.runCommand "sops.yaml" { buildInputs = [ pkgs.yj ]; } ''
           echo '${jsonConfig}' | yj -jy > $out
         '';
+
+      devShells.sops = pkgs.mkShellNoCC {
+        SOPS_CONFIG = self'.packages.sops-config;
+        packages = [
+          pkgs.sops
+          pkgs.age
+          pkgs.ssh-to-age
+        ];
+      };
     };
 }