diff --git a/modules/default.nix b/modules/default.nix
index 82fa27f..c5d16cb 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -77,6 +77,7 @@ in
       # Set zsh as default shell
       programs.zsh.enable = true;
       users.defaultUserShell = pkgs.zsh;
+      environment.etc."zshrc.local".source = "${pkgs.grml-zsh-config}/etc/zsh/zshrc";
 
       # command-not-found does not work without channels
       programs.command-not-found.enable = false;
diff --git a/users/simon/modules/zsh.nix b/users/simon/modules/zsh.nix
index 878f6c6..72054e4 100644
--- a/users/simon/modules/zsh.nix
+++ b/users/simon/modules/zsh.nix
@@ -45,9 +45,6 @@ in
       envExtra = ''
         export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
       '';
-      initExtraBeforeCompInit = ''
-        source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
-      '';
       initExtra = ''
         eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)