Use PROMPT_STRING environment variable

CHANGELOG.md

@@ -9,10 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Nushell: upgrade minimum supported version to v0.36.0.
+- Nushell: easier installation instructions.
+
 ### Fixed
 
 - Elvish: unable to `z` into directories by path.
 - Elvish: don't show traceback when `z` or `zi` fails.
+- Elvish: nested shells do not initialize correctly.
 
 ## [0.7.4] - 2020-08-15
 

Cargo.toml

@@ -28,7 +28,7 @@ rand = { version = "0.8.4", features = [
 ], default-features = false }
 
 [dev-dependencies]
-assert_cmd = "1.0.1"
+assert_cmd = "2.0.0"
 rstest = "0.11.0"
 
 [build-dependencies]

README.md

@@ -151,7 +151,7 @@ Add this to your configuration (usually `~/.elvish/rc.elv`):
 eval (zoxide init elvish | slurp)
 ```
 
-Note that zoxide only supports elvish v0.16.0+.
+Note: zoxide only supports elvish v0.16.0 and above.
 
 </details>
 
@@ -172,12 +172,10 @@ zoxide init fish | source
 Add this to your configuration (find it by running `config path` in Nushell):
 
 ```toml
-prompt = "__zoxide_hook;__zoxide_prompt"
 startup = ["zoxide init nushell --hook prompt | save ~/.zoxide.nu", "source ~/.zoxide.nu"]
 ```
 
-You can replace `__zoxide_prompt` with a custom prompt. Note that zoxide only
-supports Nushell v0.33.0+.
+Note: zoxide only supports Nushell v0.36.0 and above.
 
 </details>
 

man/zoxide-init.1

@@ -19,6 +19,7 @@ Add this to your configuration (usually \fI~/.elvish/rc.elv\fR):
 .nf
     \fBeval $(zoxide init elvish | slurp)\fR
 .fi
+Note: zoxide only supports elvish v0.16.0 and above.
 .TP
 .B fish
 Add this to your configuration (usually \fI~/.config/fish/config.fish\fR):
@@ -32,14 +33,14 @@ Add this to your configuration (find it by running \fBconfig path\fR in
 Nushell):
 .sp
 .nf
-    \fBprompt = "__zoxide_hook;__zoxide_prompt"\fR
     \fBstartup = ["zoxide init nushell --hook prompt | save ~/.zoxide.nu", "source ~/.zoxide.nu"]\fR
 .fi
 .sp
-You can replace \fB__zoxide_prompt\fR with a custom prompt.
+Note: zoxide only supports Nushell v0.36.0 and above.
 .TP
 .B powershell
-Add this to your configuration (find it with \fIecho $profile\fR):
+Add this to your configuration (find it by running \fBecho $profile\fR in
+PowerShell):
 .sp
 .nf
     \fBInvoke-Expression (& {

templates/elvish.txt

@@ -95,4 +95,4 @@ edit:add-var zi~ $__zoxide_zi~
 #
 #   eval (zoxide init elvish | slurp)
 #
-# Note that zoxide only supports elvish v0.16.0 and above.
+# Note: zoxide only supports elvish v0.16.0 and above.

templates/nushell.txt

@@ -25,15 +25,25 @@ def __zoxide_prompt [] {
 # Hook to add new entries to the database.
 {%- match hook %}
 {%- when InitHook::None %}
-def __zoxide_hook [] {}
+{{ not_configured }}
 
 {%- when InitHook::Prompt %}
 def __zoxide_hook [] {
     shells | where active == $true && name == filesystem | get path | each { zoxide add -- $it }
 }
 
+# Initialize hook.
+if ($nu.env | select PROMPT_STRING | empty?) {
+    if ($nu.config | select prompt | empty?) {
+        let-env PROMPT_STRING = '__zoxide_hook;__zoxide_prompt'
+    } {
+        let-env PROMPT_STRING = $'__zoxide_hook;($nu.config.prompt)'
+    }
+} {
+    let-env PROMPT_STRING = $'__zoxide_hook;($nu.env.PROMPT_STRING)'
+}
+
 {%- when InitHook::Pwd %}
-def __zoxide_hook [] {}
 $'zoxide: PWD hooks are not supported on Nushell.(char nl)Use (char sq)zoxide init nushell --hook prompt(char sq) instead.(char nl)'
 {%- endmatch %}
 
@@ -98,8 +108,6 @@ alias {{cmd}}i = __zoxide_zi
 # To initialize zoxide, add this to your configuration (find it by running
 # `config path` in Nushell):
 #
-#   prompt = '__zoxide_hook;__zoxide_prompt'
 #   startup = ['zoxide init nushell --hook prompt | save ~/.zoxide.nu', 'source ~/.zoxide.nu']
 #
-# You can replace __zoxide_prompt with a custom prompt. Note that zoxide only
-# supports Nushell v0.33.0+.
+# Note: zoxide only supports Nushell v0.36.0 and above.