diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
index 41494b561..f01ac83f3 100644
--- a/Droidnix/generated/system/applications/terminal_shell/zsh.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/zsh.nix
@@ -15,40 +15,33 @@
 
   # --- Home Manager Configuration ---
   home-manager.users.henrov = {
-    # Enable the zshPlugins overlay
-    nixpkgs.config = {
-      overlays = [
-        (import (fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz") { })
-      ];
-    };
-
     programs.zsh = {
       enable = true;
       enableCompletion = true;
 
-      # Enable oh-my-zsh
+      # Enable oh-my-zsh and use its plugins
       oh-my-zsh = {
         enable = true;
+        plugins = [
+          "git"
+          "docker"
+          "direnv"
+          "zsh-autosuggestions"
+          "zsh-syntax-highlighting"
+          "zsh-completions"
+          "zsh-history-substring-search"
+        ];
         theme = "agnoster"; # Fallback, overridden below
       };
 
-      # Declare all plugins via Nixpkgs for reproducibility
-      plugins = with pkgs; [
-        zsh-autosuggestions
-        zsh-syntax-highlighting
-        zsh-completions
-        zsh-history-substring-search
-      ];
-
-      # Source plugins and set custom theme
+      # Source Nixpkgs-provided plugins explicitly
       initExtra = ''
-        # Source plugins
+        # Source plugins installed by Nix
         source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
         source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
         source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
 
         # Catppuccin Mocha theme for oh-my-zsh
-        # Colors
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
         local mocha_text="#CDD6F4"
@@ -93,7 +86,7 @@
       '';
     };
 
-    # Home Manager packages (optional, if not already in systemPackages)
+    # Home Manager packages (optional)
     home.packages = with pkgs; [
       direnv
       git-extras