about summary refs log tree commit diff
path: root/modules/shell
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-17 11:59:31 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-17 11:59:31 +0000
commit8036761410de2d9fb9f22a3d28639c58efa904bd (patch)
tree7f3ef21f9c40bc7fecf7b26554207e5078ca512f /modules/shell
parentf8197bcd223f498ead041c97100facdae8b57366 (diff)
downloadnixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar.gz
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar.bz2
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar.lz
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar.xz
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.tar.zst
nixlib-8036761410de2d9fb9f22a3d28639c58efa904bd.zip
modules/zsh: zsh-nix-shell -> any-nix-shell
zsh-nix-shell package was never upstreamed, so delete. No point
upstreaming now.
Diffstat (limited to 'modules/shell')
-rw-r--r--modules/shell/zsh/zshrc.nix6
1 files changed, 3 insertions, 3 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%# "
 
 ''