zsh: add support for prezto configuration framework (nix-community#655)

malte-v · Feb 24, 2021 · c5313f6 · c5313f6
1 parent b54955c
commit c5313f6
Show file tree

Hide file tree

Showing 7 changed files with 573 additions and 2 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -135,6 +135,8 @@
 
 /modules/programs/zoxide.nix                          @marsam
 
+/modules/programs/zsh/prezto.nix                      @NickHu
+
 /modules/services/cbatticon.nix                       @pmiddend
 
 /modules/services/clipmenu.nix                        @DamienCassou

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
@@ -1697,6 +1697,14 @@ in
           module should be used instead.
         '';
       }
+
+      {
+        time = "2020-10-12T00:12:23+00:00";
+        condition = config.programs.zsh.enable;
+        message = ''
+          A new zsh submodule is available: 'programs.zsh.prezto'.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
@@ -130,6 +130,7 @@ let
     (loadModule ./programs/zoxide.nix { })
     (loadModule ./programs/zplug.nix { })
     (loadModule ./programs/zsh.nix { })
+    (loadModule ./programs/zsh/prezto.nix { })
     (loadModule ./services/blueman-applet.nix { })
     (loadModule ./services/cbatticon.nix { condition = hostPlatform.isLinux; })
     (loadModule ./services/clipmenu.nix { condition = hostPlatform.isLinux; })

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
@@ -424,10 +424,10 @@ in
           fpath+="$HOME/${pluginsDir}/${plugin.name}"
         '') cfg.plugins)}
 
-        # Oh-My-Zsh calls compinit during initialization,
+        # Oh-My-Zsh/Prezto calls compinit during initialization,
         # calling it twice causes sight start up slowdown
         # as all $fpath entries will be traversed again.
-        ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable)
+        ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
           "autoload -U compinit && compinit"
         }
 
@@ -455,6 +455,9 @@ in
             source $ZSH/oh-my-zsh.sh
         ''}
 
+        ${optionalString cfg.prezto.enable
+            (builtins.readFile "${pkgs.zsh-prezto}/runcoms/zshrc")}
+
         ${concatStrings (map (plugin: ''
           if [ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]; then
             source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"