diff --git a/home-manager/features/development/development.nix b/home-manager/features/development/development.nix
index 223bc25..ae4a373 100644
--- a/home-manager/features/development/development.nix
+++ b/home-manager/features/development/development.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
     # Dev apps
@@ -12,4 +12,8 @@
     ./nix.nix
     ./lua.nix
   ];
+
+  home.packages = with pkgs; [
+    direnv
+  ];
 }
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index de938cd..e79f8aa 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -1,6 +1,32 @@
-# Set up the user's prompt as ZSH with Starship
+# Set up the user's prompt as ZSH, Starship and some useful utilities
 { pkgs, ... }:
 {
+
+  home.packages = with pkgs; [
+    # System
+    htop
+    btop
+    neofetch
+    killall
+
+    # Files
+    zip
+    xz
+    unzip
+    p7zip
+    file
+    tree
+    ranger
+
+    # Networking
+    dnsutils
+    socat
+    httpie
+
+    # Other
+    jq
+  ];
+
   programs.zsh = {
     enable = true;
     envExtra = ''
diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix
index 8844df4..6fb54e0 100644
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -1,31 +1,8 @@
 # Configure my terminal of choice
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
 
   home.packages = with pkgs; [
-    # System
-    htop
-    btop
-    neofetch
-    killall
-
-    # Files
-    zip
-    xz
-    unzip
-    p7zip
-    file
-    tree
-    ranger
-
-    # Networking
-    dnsutils
-    socat
-    httpie
-
-    # Other
-    jq
-
     # Font
     nerd-fonts.inconsolata
     nerd-fonts.fira-code
@@ -96,5 +73,3 @@
     };
   };
 }
-
-