Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4c1d5a8dac39
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8fb7ab9b32b6
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 5, 2018

  1. nix-zsh-completions: install nix.plugin.zsh and init.zsh as well

    These files feature simple aliases and a nix-shell detector when using
    `nix-shell --run zsh`. The package itself contains the completion scripts in
    `$out/share/zsh/site-functions` (to keep it compatible with ZSH-only
    setups) and the plugins in `$out/share/zsh/plugins` for oh-my-zsh.
    Ma27 committed Aug 5, 2018
    Copy the full SHA
    1922b43 View commit details
    Browse the repository at this point in the history
  2. lambda-mod-zsh-theme: add hooks and patch shebangs

    This ensures that no impurity exists due to implicitly depending
    on`/usr/bin/env`.
    
    It stores the theme into `$out/share/zsh/themes` to make it possible to
    find theme using `buildEnv` and remain consistent with other ZSH
    extensions.
    Ma27 committed Aug 5, 2018
    Copy the full SHA
    efc9511 View commit details
    Browse the repository at this point in the history
  3. nixos/oh-my-zsh: add customPkgs option to allow multiple derivation…

    …s for `ZSH_CUSTOM`
    
    If multiple third-party modules shall be used for `oh-my-zsh` it has to
    be possible to create another env which composes all the packages.
    
    Now it can be done like this:
    
    ```
    { pkgs, ... }:
    {
      programs.zsh.enable = true;
      programs.zsh.ohMyZsh = {
        enable = true;
        customPkgs = with pkgs; [
          lambda-mod-zsh-theme
          nix-zsh-completions
        ];
        theme = "lambda-mod";
        plugins = [ "nix" ];
      };
    }
    ```
    
    Please keep in mind that this is not compatible with
    `programs.zsh.ohMyZsh.custom`, only one of these options can be used
    ATM.
    
    Each package should store its outputs into
    `$out/share/zsh/<output-name>`. Completions (and ZSH-only) extensions
    should live in the `fpath` (`$out/share/zsh/site-functions`), plugins in
    `.../plugins` and themes in `.../themes` (please refer to
    fdb6bf6ed68c2f089ae6c729dfeaa3eddea2ce6a and 406d64aad162b3a4881747be4e24705fb5182573).
    
    All scripts in `customPkgs` will be linked together using `linkFarm` to
    provide a single directory for all scripts from all derivations in
    `customPkgs` as suggested in #43282 (comment).
    Ma27 committed Aug 5, 2018
    Copy the full SHA
    39b8545 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. nixos/oh-my-zsh: add documentation

    In the last year `programs.oh-my-zsh` gained more complexity and since
    the introduction of features like `customPkgs` which builds a
    `ZSH_CUSTOM` path from a sequence of derivation a documentation may be
    fairly helpful to make the knowledge how to use the module and how to
    package new ZSH plugins visible.
    
    See #43282 (comment)
    Ma27 committed Aug 7, 2018
    Copy the full SHA
    bd40c92 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2018

  1. Merge pull request #43282 from Ma27/support-external-zsh-plugins

    nixos/ohMyZsh: allow multiple derivations in `ZSH_CUSTOM`
    infinisil committed Aug 12, 2018
    Copy the full SHA
    8fb7ab9 View commit details
    Browse the repository at this point in the history