diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 7b13fef..ed0feb4 100755
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -23,9 +23,12 @@
 
         # Programming
         nixd # NixD LSP for .nix files
-        clang
+        gcc
+        (lib.meta.hiPrio clang)
         clang-tools
+        cling
         deno
+        gnumake
 
         # :3
         fastfetch
@@ -43,6 +46,7 @@
         glow # Markdown rendering
         tealdeer # TLDR
         usbutils # `lsusb`
+        unzip
 
         # Process tools
         btop # Process monitor
diff --git a/home-manager/modules/shell/default.nix b/home-manager/modules/shell/default.nix
index cbc7eb4..596315d 100644
--- a/home-manager/modules/shell/default.nix
+++ b/home-manager/modules/shell/default.nix
@@ -2,6 +2,7 @@
 {
     imports = [
         ./btop.nix
+        ./direnv.nix
         ./konsole.nix
         ./starship.nix
         ./zsh.nix
diff --git a/home-manager/modules/shell/direnv.nix b/home-manager/modules/shell/direnv.nix
new file mode 100644
index 0000000..e48b6bc
--- /dev/null
+++ b/home-manager/modules/shell/direnv.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+    programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+    };
+}
\ No newline at end of file
diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix
index 97d1f21..cc07748 100644
--- a/home-manager/modules/vscode.nix
+++ b/home-manager/modules/vscode.nix
@@ -32,6 +32,7 @@
                 # Utilities
                 streetsidesoftware.code-spell-checker # Spellchecking
                 jeanp413.open-remote-ssh              # Remote SSH
+                mkhl.direnv                           # nix-direnv autoloading
             ])
             ++ (with vscode-marketplace; [
                 yy0931.save-as-root                   # Save as root over SSH
@@ -85,6 +86,7 @@
                     };
                 };
             };
+	    "direnv.restart.automatic" = true;
         };
     };
-}
\ No newline at end of file
+}