diff --git a/flake.nix b/flake.nix
index 7f4b95a..3e668aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,27 +27,28 @@
     };
   };
 
-  outputs =
-    { self, nixpkgs, ... }@inputs:
-    {
-      nixosConfigurations = {
-        drew-desktop = (import ./system/hosts/drew-desktop) {
-          inherit inputs;
-          inherit self;
-          inherit nixpkgs;
-        };
-        mcp = (import ./system/hosts/mcp) {
-          inherit inputs;
-          inherit self;
-          inherit nixpkgs;
-        };
+  outputs = { self, nixpkgs, ... }@inputs: {
+    nixosConfigurations = {
+      drew-desktop = (import ./system/hosts/drew-desktop) {
+        inherit inputs;
+        inherit self;
+        inherit nixpkgs;
       };
-      darwinConfigurations = {
-        DGVGYQLQP5 = (import ./system/hosts/tarro-mbp) {
-          inherit inputs;
-          inherit self;
-          inherit nixpkgs;
-        };
+      mcp = (import ./system/hosts/mcp) {
+        inherit inputs;
+        inherit self;
+        inherit nixpkgs;
       };
     };
+    darwinConfigurations = {
+      DGVGYQLQP5 = (import ./system/hosts/tarro-mbp) {
+        inherit inputs;
+        inherit self;
+        inherit nixpkgs;
+      };
+    };
+    features = {
+      development = (import ./home-manager/features/development/development.nix);
+    };
+  };
 }
diff --git a/home-manager/features/development/development.nix b/home-manager/features/development/development.nix
index b1d271c..2c081f7 100644
--- a/home-manager/features/development/development.nix
+++ b/home-manager/features/development/development.nix
@@ -13,7 +13,31 @@
   ];
 
   home.packages = with pkgs; [
-    direnv
+    # System
+    htop
+    btop
+    neofetch
+    killall
+
+    # Files
+    zip
+    xz
+    unzip
+    p7zip
+    file
+    tree
+    ranger
+
+    # Networking
+    dnsutils
     inetutils
+    socat
+    httpie
+
+    # Other
+    jq
+
+    # Dev helpers
+    direnv
   ];
 }
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index 0848193..4bc2b89 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -7,29 +7,6 @@
   # a system or working with other shell commands.  Packages more specific to
   # development can be in development configs.
   home.packages = with pkgs; [
-    # System
-    htop
-    btop
-    neofetch
-    killall
-
-    # Files
-    zip
-    xz
-    unzip
-    p7zip
-    file
-    tree
-    ranger
-
-    # Networking
-    dnsutils
-    inetutils
-    socat
-    httpie
-
-    # Other
-    jq
   ];
 
   home.shellAliases = {