diff options
| -rw-r--r-- | modules/shell/zsh/zshrc.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix | 25 |
2 files changed, 3 insertions, 28 deletions
diff --git a/modules/shell/zsh/zshrc.nix b/modules/shell/zsh/zshrc.nix index a91236d900cb..9328f7fb363d 100644 --- a/modules/shell/zsh/zshrc.nix +++ b/modules/shell/zsh/zshrc.nix @@ -1,8 +1,8 @@ { stdenv, lib +, any-nix-shell , coreutils , zsh-autosuggestions , zsh-history-substring-search -, zsh-nix-shell , zsh-syntax-highlighting }: @@ -116,7 +116,7 @@ zle -N self-insert url-quote-magic autoload -Uz compinit compinit -d "$XDG_CACHE_HOME/zsh/zcompdump" -source ${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh +eval "$(${any-nix-shell}/bin/any-nix-shell zsh --info-right)" source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ${zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh source ${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh @@ -188,6 +188,6 @@ done # Prompt nl=$'\n' -PS1="%F{yellow}%(?..[exit %?]$nl)''${IN_NIX_SHELL+[nix-shell''${NIX_SHELL_PACKAGES:+($NIX_SHELL_PACKAGES)}] }%1(j.[%j job%2(j.s.)] .)%f%# " +PS1="%F{yellow}%(?..[exit %?]$nl)%1(j.[%j job%2(j.s.)] .)%f%# " '' diff --git a/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix deleted file mode 100644 index 33d6c5a4a5cb..000000000000 --- a/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation { - name = "zsh-nix-shell-unstable-2019-01-07"; - - src = fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "03a1487655c96a17c00e8c81efdd8555829715f8"; - sha256 = "1avnmkjh0zh6wmm87njprna1zy4fb7cpzcp8q7y03nw3aq22q4ms"; - }; - - installPhase = '' - mkdir -p "$out/share/zsh-nix-shell" - cp -r nix-shell.plugin.zsh scripts "$out/share/zsh-nix-shell" - ''; - - meta = with lib; { - description = "Zsh plugin to use Zsh as default nix-shell shell"; - homepage = https://github.com/chisui/zsh-nix-shell; - license = licenses.bsd3; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.unix; - }; -} |