diff --git a/.envrc b/.envrc
index d8f5b3d..697ced8 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use_flake . --impure
+use_flake .#develop --impure
diff --git a/flake.nix b/flake.nix
index c6bbc6b..5c9e433 100644
--- a/flake.nix
+++ b/flake.nix
@@ -170,7 +170,8 @@
         inherit systems;
 
         perSystem =
-          { inputs'
+          { self'
+          , inputs'
           , system
           , config
           , lib
@@ -295,11 +296,18 @@
               };
 
             formatter = pkgs.alejandra;
-            devShells.default = import ./nix/devShells.nix {
-              inherit inputs' pkgs;
-              packages' = packages;
-            };
 
+            devShells =
+              let
+                all = import ./nix/devShells.nix {
+                  inherit
+                    self'
+                    inputs'
+                    pkgs
+                    ;
+                };
+              in
+              (all // { default = all.develop; });
           };
 
         flake.nixosModules = {
diff --git a/nix/devShells.nix b/nix/devShells.nix
index d4d5c07..ebd879b 100644
--- a/nix/devShells.nix
+++ b/nix/devShells.nix
@@ -1,70 +1,69 @@
-{ inputs'
-, packages'
+{ self'
+, inputs'
 , pkgs
-,
 }:
-pkgs.stdenv.mkDerivation {
-  name = "infra-env";
-  buildInputs =
-    [
-      (with pkgs.callPackage (pkgs.path + "/nixos") { configuration = { }; };
-      with config.system.build; [
-        nixos-generate-config
-        nixos-install
-        nixos-enter
-        manual.manpages
-      ])
-    ]
-    ++ (with pkgs; [
-      inputs'.colmena.packages.colmena
+
+{
+  install = pkgs.mkShell {
+    name = "infra-install";
+    packages = with pkgs; [
       nixos-install-tools
+      inputs'.disko.packages.disko
+      just
+      git
+      git-crypt
+      gnupg
+    ];
+  };
+
+  develop = pkgs.mkShell {
+    name = "infra-develop";
+    inputsFrom = [
+      self'.devShells.install
+    ];
+    packages = with pkgs; [
+      inputs'.colmena.packages.colmena
       dconf2nix
       inputs'.nixos-anywhere.packages.nixos-anywhere
-      inputs'.disko.packages.default
       nurl
-      just
-      git-crypt
       vcsh
-      gnupg
-      git
       ripgrep
-      lm_sensors
-      pass
-      fuzzel
-      wofi
+      # pass
       age
       age-plugin-yubikey
       ssh-to-age
       yubico-piv-tool
       inputs'.sops-nix.packages.default
       sops
+      nil
 
       apacheHttpd
 
-      vncdo
-      tesseract
-      imagemagick
+      # vncdo
+      # tesseract
+      # imagemagick
 
-      nmap
-      sysstat
-      lshw
-      xxHash
-      linssid
-      wavemon
-      wirelesstools
+      # lm_sensors
 
-      zathura
-      xorg.xwininfo
-      glxinfo
-      autorandr
-      arandr
-      playerctl
-      x11docker
-      fwupd
+      # nmap
+      # sysstat
+      # lshw
+      # xxHash
+      # linssid
+      # wavemon
+      # wirelesstools
 
-      ntfy
+      # zathura
+      # xorg.xwininfo
+      # glxinfo
+      # autorandr
+      # arandr
+      # playerctl
+      # x11docker
+      # fwupd
 
-      hedgedoc-cli
+      # ntfy
+      # hedgedoc-cli
 
       xwayland
 
@@ -75,9 +74,9 @@ pkgs.stdenv.mkDerivation {
       (pkgs.writeShellScriptBin "r11" ''
         exec env NIXOS_OZONE_WL="" WAYLAND_DISPLAY="" $@
       '')
+    ];
 
-    ]);
-
-  # Set Environment Variables
-  RUST_BACKTRACE = 1;
+    # Set Environment Variables
+    RUST_BACKTRACE = 1;
+  };
 }
diff --git a/secrets/steveej-x13s-rmvbl/secrets.yaml b/secrets/steveej-x13s/secrets.yaml
similarity index 100%
rename from secrets/steveej-x13s-rmvbl/secrets.yaml
rename to secrets/steveej-x13s/secrets.yaml