diff --git a/configuration.nix b/configuration.nix
index 5d2d132..1d26757 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -169,7 +169,11 @@
   # Lets zsh completions work
   environment.pathsToLink = [ "/share/zsh" ];
 
-  programs.zsh.enable = true;
+  programs.zsh = {
+    enable = true;
+    enableCompletion = false;
+    enableGlobalCompInit = false;
+  };
 
   security.polkit.enable = true;
 
diff --git a/shell/zsh.nix b/shell/zsh.nix
index 6bb2a61..0129c7c 100644
--- a/shell/zsh.nix
+++ b/shell/zsh.nix
@@ -29,16 +29,19 @@ in
       (lib.mkOrder 1000 keybindings)
     ];
 
-    # Plugin manager
-    zplug = {
-      enable = true;
-      plugins = [
-        { name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; }
-        { name = "plugins/sudo"; tags = [ "from:oh-my-zsh" ]; }
-        { name = "MichaelAquilina/zsh-you-should-use"; }
-        { name = "zsh-users/zsh-completions"; }
-      ];
-    };
+    # Load plugins manually
+    plugins = [
+      {
+        name = "sudo";
+        file = "plugins/sudo/sudo.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "ohmyzsh";
+          repo = "ohmyzsh";
+          rev = "beadd56dd75e8a40fe0a7d4a5d63ed5bf9efcd48";
+          sha256 = "sha256-e3zTM3rj4z6RwDai9i7KKrz6imTGmZiSAqcS9Mw2LZU=";
+        };
+      }
+    ];
 
     syntaxHighlighting.enable = true;
   };