Merge pull request #52485 from pablode/master

nixos/oh-my-zsh: fix wrong manual information
This commit is contained in:
Maximilian Bosch 2018-12-18 23:18:27 +01:00 committed by GitHub
commit 83fe20e57f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,7 +19,7 @@
configuration format of <literal>oh-my-zsh</literal>. configuration format of <literal>oh-my-zsh</literal>.
<programlisting> <programlisting>
{ {
programs.ohMyZsh = { programs.zsh.ohMyZsh = {
enable = true; enable = true;
plugins = [ "git" "python" "man" ]; plugins = [ "git" "python" "man" ];
theme = "agnoster"; theme = "agnoster";
@ -51,7 +51,7 @@
The module can do this as well: The module can do this as well:
<programlisting> <programlisting>
{ {
programs.ohMyZsh.custom = "~/path/to/custom/scripts"; programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";
} }
</programlisting> </programlisting>
</para> </para>
@ -73,7 +73,7 @@
<programlisting> <programlisting>
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.ohMyZsh.customPkgs = with pkgs; [ programs.zsh.ohMyZsh.customPkgs = with pkgs; [
pkgs.nix-zsh-completions pkgs.nix-zsh-completions
# and even more... # and even more...
]; ];
@ -87,7 +87,7 @@
<para> <para>
<emphasis>Please keep in mind that this is not compatible with <emphasis>Please keep in mind that this is not compatible with
<literal>programs.ohMyZsh.custom</literal> as it requires an immutable store <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store
path while <literal>custom</literal> shall remain mutable! An evaluation path while <literal>custom</literal> shall remain mutable! An evaluation
failure will be thrown if both <literal>custom</literal> and failure will be thrown if both <literal>custom</literal> and
<literal>customPkgs</literal> are set.</emphasis> <literal>customPkgs</literal> are set.</emphasis>