<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description Hi, Fixes #10838, where before the `date` would be formatted incorrectly, and was not picking `LC_TIME` for time formatting, but it picked the first locale returned by the `sys-locale` crate instead. Now it will format time based on `LC_TIME`. For example, ``` // my locale `nl_NL.UTF-8` ❯ date now | format date '%x %X' 20-02-24 17:17:12 $env.LC_TIME = "en_US.UTF-8" ❯ date now | format date '%x %X' 02/20/2024 05:16:28 PM ``` Note that I also changed the `default_env.nu` as otherwise the Time will show AM/PM twice. Also reason for the `chrono` update is because this relies on a fix to upstream repo, which i initially submitted an [issue](https://github.com/chronotope/chrono/issues/1349#event-11765363286) <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - [X] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - [X] `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - [X] `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
90 lines
3.7 KiB
Plaintext
90 lines
3.7 KiB
Plaintext
# Nushell Environment Config File
|
|
#
|
|
# version = "0.90.2"
|
|
|
|
def create_left_prompt [] {
|
|
let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
|
|
null => $env.PWD
|
|
'' => '~'
|
|
$relative_pwd => ([~ $relative_pwd] | path join)
|
|
}
|
|
|
|
let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
|
|
let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
|
|
let path_segment = $"($path_color)($dir)"
|
|
|
|
$path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
|
|
}
|
|
|
|
def create_right_prompt [] {
|
|
# create a right prompt in magenta with green separators and am/pm underlined
|
|
let time_segment = ([
|
|
(ansi reset)
|
|
(ansi magenta)
|
|
(date now | format date '%x %X') # try to respect user's locale
|
|
] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
|
|
str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
|
|
|
|
let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
|
|
(ansi rb)
|
|
($env.LAST_EXIT_CODE)
|
|
] | str join)
|
|
} else { "" }
|
|
|
|
([$last_exit_code, (char space), $time_segment] | str join)
|
|
}
|
|
|
|
# Use nushell functions to define your right and left prompt
|
|
$env.PROMPT_COMMAND = {|| create_left_prompt }
|
|
# FIXME: This default is not implemented in rust code as of 2023-09-08.
|
|
$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
|
|
|
|
# The prompt indicators are environmental variables that represent
|
|
# the state of the prompt
|
|
$env.PROMPT_INDICATOR = {|| "> " }
|
|
$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
|
|
$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
|
|
$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
|
|
|
|
# If you want previously entered commands to have a different prompt from the usual one,
|
|
# you can uncomment one or more of the following lines.
|
|
# This can be useful if you have a 2-line prompt and it's taking up a lot of space
|
|
# because every command entered takes up 2 lines instead of 1. You can then uncomment
|
|
# the line below so that previously entered commands show with a single `🚀`.
|
|
# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
|
|
# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
|
|
# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
|
|
# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
|
|
# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
|
|
# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
|
|
|
|
# Specifies how environment variables are:
|
|
# - converted from a string to a value on Nushell startup (from_string)
|
|
# - converted from a value back to a string when running external commands (to_string)
|
|
# Note: The conversions happen *after* config.nu is loaded
|
|
$env.ENV_CONVERSIONS = {
|
|
"PATH": {
|
|
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
|
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
|
}
|
|
"Path": {
|
|
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
|
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
|
}
|
|
}
|
|
|
|
# Directories to search for scripts when calling source or use
|
|
# The default for this is $nu.default-config-dir/scripts
|
|
$env.NU_LIB_DIRS = [
|
|
($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
|
|
]
|
|
|
|
# Directories to search for plugin binaries when calling register
|
|
# The default for this is $nu.default-config-dir/plugins
|
|
$env.NU_PLUGIN_DIRS = [
|
|
($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
|
|
]
|
|
|
|
# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
|
|
# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
|