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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f69a5b291c20
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31e69100426e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2020

  1. nixos/zsh-syntax-highlighting: Fix highlighting when ohMyZsh is enabled 

    From https://github.com/zsh-users/zsh-syntax-highlighting#faq:

"It must be sourced after all custom widgets have been created
(i.e., after all zle -N calls and after running compinit)."

zsh-syntax-highlighting must be sourced to the end.

(cherry picked from commit 35ae47e)
    @AIDEA775 @infinisil
    AIDEA775 authored and infinisil committed Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31e6910 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
4 changes: 2 additions & 2 deletions nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ in
];

programs.zsh.interactiveShellInit = with pkgs;
lib.concatStringsSep "\n" ([
lib.mkAfter (lib.concatStringsSep "\n" ([
"source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
] ++ optional (length(cfg.highlighters) > 0)
"ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
@@ -95,6 +95,6 @@ in
styles: design:
"ZSH_HIGHLIGHT_STYLES[${styles}]='${design}'"
) cfg.styles)
);
));
};
}