1 files changed, 6 insertions, 24 deletions

diff --git a/common/commandline/zsh.nix b/common/commandline/zsh.nix
index f2a052b..8f818dc 100644
--- a/common/commandline/zsh.nix
+++ b/common/commandline/zsh.nix
@@ -13,14 +13,11 @@ in
   programs.zsh = {
     enable = true;
 
-    interactiveShellInit = ''
+    interactiveShellInit = lib.mkBefore ''
       # Use cache file as is, to speed-up start time
       # This does mean we have to run once in a while:
       #     compinit -d .config/zsh/.zcompdump
-      zstyle ':grml:completion:compinit' arguments -C
-
-      source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
-      is4 && xsource "${pkgs.grml-zsh-config}/etc/zsh/keephack"
+          autoload -U compinit && compinit -C
 
       source "${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
 
@@ -29,22 +26,14 @@ in
         local dim_fg_escape_code="${fgEscapeCode config.theme.colors.dimForeground}"
 
         ${builtins.readFile ../../dotfiles/zshrc}
-
-        autoload -Uz shmart-prompt-dir
-        zstyle -e ':prompt:grml*:*:items:path' token shmart-prompt-dir
-      }
-
-      # Grml's ZSH config overrides less variables
-      export ${
-        lib.concatStringsSep " " (
-          lib.mapAttrsToList (variable: value: "${variable}=\"${value}\"") config.programs.less.envVariables
-        )
       }
     '';
 
-    # otherwise it'll override the grml prompt
+    # not needed, since we're using starship
     promptInit = "";
-    # Grml handles that, and supports cache (faster!!!)
+    # Use cache file as is, to speed-up start time
+    # This does mean we have to run once in a while:
+    #     compinit -d .config/zsh/.zcompdump
     enableGlobalCompInit = false;
 
     syntaxHighlighting = {
@@ -94,13 +83,6 @@ in
           dotDir = ".config/zsh";
           history.path = "${config.xdg.dataHome}/zsh/zsh_history";
 
-          plugins = [
-            {
-              name = "shmart-prompt-dir";
-              src = inputs.shmart-prompt-dir;
-              file = "none";
-            }
-          ];
         };
       }
     )