From 93713fdf613c62fca53bfd128377706e351c89c9 Mon Sep 17 00:00:00 2001 From: Warren Hood Date: Sat, 22 Apr 2023 23:21:18 +0200 Subject: [PATCH] Fix nushell configs after the 0.78 update --- nushell/.config/nushell/config.nu | 200 +++++++----------------------- nushell/.config/nushell/env.nu | 56 ++++++--- 2 files changed, 87 insertions(+), 169 deletions(-) diff --git a/nushell/.config/nushell/config.nu b/nushell/.config/nushell/config.nu index e7c06ce..6d0f2e4 100644 --- a/nushell/.config/nushell/config.nu +++ b/nushell/.config/nushell/config.nu @@ -1,133 +1,11 @@ # Nushell Config File +# +# version = 0.78.1 -module completions { - # Custom completions for external commands (those outside of Nushell) - # Each completions has two parts: the form of the external command, including its flags and parameters - # and a helper command that knows how to complete values for those flags and parameters - # - # This is a simplified version of completions for git branches and git remotes - def "nu-complete git branches" [] { - ^git branch | lines | each { |line| $line | str replace '[\*\+] ' '' | str trim } - } - - def "nu-complete git remotes" [] { - ^git remote | lines | each { |line| $line | str trim } - } - - # Download objects and refs from another repository - export extern "git fetch" [ - repository?: string@"nu-complete git remotes" # name of the repository to fetch - branch?: string@"nu-complete git branches" # name of the branch to fetch - --all # Fetch all remotes - --append(-a) # Append ref names and object names to .git/FETCH_HEAD - --atomic # Use an atomic transaction to update local refs. - --depth: int # Limit fetching to n commits from the tip - --deepen: int # Limit fetching to n commits from the current shallow boundary - --shallow-since: string # Deepen or shorten the history by date - --shallow-exclude: string # Deepen or shorten the history by branch/tag - --unshallow # Fetch all available history - --update-shallow # Update .git/shallow to accept new refs - --negotiation-tip: string # Specify which commit/glob to report while fetching - --negotiate-only # Do not fetch, only print common ancestors - --dry-run # Show what would be done - --write-fetch-head # Write fetched refs in FETCH_HEAD (default) - --no-write-fetch-head # Do not write FETCH_HEAD - --force(-f) # Always update the local branch - --keep(-k) # Keep downloaded pack - --multiple # Allow several arguments to be specified - --auto-maintenance # Run 'git maintenance run --auto' at the end (default) - --no-auto-maintenance # Don't run 'git maintenance' at the end - --auto-gc # Run 'git maintenance run --auto' at the end (default) - --no-auto-gc # Don't run 'git maintenance' at the end - --write-commit-graph # Write a commit-graph after fetching - --no-write-commit-graph # Don't write a commit-graph after fetching - --prefetch # Place all refs into the refs/prefetch/ namespace - --prune(-p) # Remove obsolete remote-tracking references - --prune-tags(-P) # Remove any local tags that do not exist on the remote - --no-tags(-n) # Disable automatic tag following - --refmap: string # Use this refspec to map the refs to remote-tracking branches - --tags(-t) # Fetch all tags - --recurse-submodules: string # Fetch new commits of populated submodules (yes/on-demand/no) - --jobs(-j): int # Number of parallel children - --no-recurse-submodules # Disable recursive fetching of submodules - --set-upstream # Add upstream (tracking) reference - --submodule-prefix: string # Prepend to paths printed in informative messages - --upload-pack: string # Non-default path for remote command - --quiet(-q) # Silence internally used git commands - --verbose(-v) # Be verbose - --progress # Report progress on stderr - --server-option(-o): string # Pass options for the server to handle - --show-forced-updates # Check if a branch is force-updated - --no-show-forced-updates # Don't check if a branch is force-updated - -4 # Use IPv4 addresses, ignore IPv6 addresses - -6 # Use IPv6 addresses, ignore IPv4 addresses - --help # Display the help message for this command - ] - - # Check out git branches and files - export extern "git checkout" [ - ...targets: string@"nu-complete git branches" # name of the branch or files to checkout - --conflict: string # conflict style (merge or diff3) - --detach(-d) # detach HEAD at named commit - --force(-f) # force checkout (throw away local modifications) - --guess # second guess 'git checkout ' (default) - --ignore-other-worktrees # do not check if another worktree is holding the given ref - --ignore-skip-worktree-bits # do not limit pathspecs to sparse entries only - --merge(-m) # perform a 3-way merge with the new branch - --orphan: string # new unparented branch - --ours(-2) # checkout our version for unmerged files - --overlay # use overlay mode (default) - --overwrite-ignore # update ignored files (default) - --patch(-p) # select hunks interactively - --pathspec-from-file: string # read pathspec from file - --progress # force progress reporting - --quiet(-q) # suppress progress reporting - --recurse-submodules: string # control recursive updating of submodules - --theirs(-3) # checkout their version for unmerged files - --track(-t) # set upstream info for new branch - -b: string # create and checkout a new branch - -B: string # create/reset and checkout a branch - -l # create reflog for new branch - --help # Display the help message for this command - ] - - # Push changes - export extern "git push" [ - remote?: string@"nu-complete git remotes", # the name of the remote - ...refs: string@"nu-complete git branches" # the branch / refspec - --all # push all refs - --atomic # request atomic transaction on remote side - --delete(-d) # delete refs - --dry-run(-n) # dry run - --exec: string # receive pack program - --follow-tags # push missing but relevant tags - --force(-f) # force updates - --ipv4(-4) # use IPv4 addresses only - --ipv6(-6) # use IPv6 addresses only - --mirror # mirror all refs - --no-verify # bypass pre-push hook - --porcelain # machine-readable output - --progress # force progress reporting - --prune # prune locally removed refs - --push-option(-o): string # option to transmit - --quiet(-q) # be more quiet - --receive-pack: string # receive pack program - --recurse-submodules: string # control recursive pushing of submodules - --repo: string # repository - --set-upstream(-u) # set upstream for git pull/status - --signed: string # GPG sign the push - --tags # push tags (can't be used with --all or --mirror) - --thin # use thin pack - --verbose(-v) # be more verbose - --help # Display the help message for this command - ] -} - -# Get just the extern definitions without the custom completion commands -use completions * - -# For more information on themes, see +# For more information on defining custom themes, see # https://www.nushell.sh/book/coloring_and_theming.html +# And here is the theme collection +# https://github.com/nushell/nu_scripts/tree/main/themes let dark_theme = { # color for nushell primitives separator: white @@ -136,7 +14,7 @@ let dark_theme = { empty: blue # Closures can be used to choose colors for specific values. # The value (in this case, a bool) is piped into the closure. - bool: { if $in { 'light_cyan' } else { 'light_gray' } } + bool: {|| if $in { 'light_cyan' } else { 'light_gray' } } int: white filesize: {|e| if $e == 0b { @@ -146,22 +24,22 @@ let dark_theme = { } else { 'blue' } } duration: white - date: { (date now) - $in | + date: {|| (date now) - $in | if $in < 1hr { - '#e61919' + 'purple' } else if $in < 6hr { - '#e68019' + 'red' } else if $in < 1day { - '#e5e619' + 'yellow' } else if $in < 3day { - '#80e619' + 'green' } else if $in < 1wk { - '#19e619' + 'light_green' } else if $in < 6wk { - '#19e5e6' + 'cyan' } else if $in < 52wk { - '#197fe6' - } else { 'light_gray' } + 'blue' + } else { 'dark_gray' } } range: white float: white @@ -179,6 +57,7 @@ let dark_theme = { shape_binary: purple_bold shape_block: blue_bold shape_bool: light_cyan + shape_closure: green_bold shape_custom: green shape_datetime: cyan_bold shape_directory: cyan @@ -188,12 +67,13 @@ let dark_theme = { shape_flag: blue_bold shape_float: purple_bold # shapes are used to change the cli syntax highlighting - shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b} + shape_garbage: { fg: white bg: red attr: b} shape_globpattern: cyan_bold shape_int: purple_bold shape_internalcall: cyan_bold shape_list: cyan_bold shape_literal: blue + shape_match_pattern: green shape_matching_brackets: { attr: u } shape_nothing: light_cyan shape_operator: yellow @@ -207,6 +87,7 @@ let dark_theme = { shape_string_interpolation: cyan_bold shape_table: blue_bold shape_variable: purple + shape_vardecl: purple } let light_theme = { @@ -217,7 +98,7 @@ let light_theme = { empty: blue # Closures can be used to choose colors for specific values. # The value (in this case, a bool) is piped into the closure. - bool: { if $in { 'dark_cyan' } else { 'dark_gray' } } + bool: {|| if $in { 'dark_cyan' } else { 'dark_gray' } } int: dark_gray filesize: {|e| if $e == 0b { @@ -227,21 +108,21 @@ let light_theme = { } else { 'blue_bold' } } duration: dark_gray - date: { (date now) - $in | + date: {|| (date now) - $in | if $in < 1hr { - 'red3b' + 'purple' } else if $in < 6hr { - 'orange3' + 'red' } else if $in < 1day { - 'yellow3b' + 'yellow' } else if $in < 3day { - 'chartreuse2b' + 'green' } else if $in < 1wk { - 'green3b' + 'light_green' } else if $in < 6wk { - 'darkturquoise' + 'cyan' } else if $in < 52wk { - 'deepskyblue3b' + 'blue' } else { 'dark_gray' } } range: dark_gray @@ -260,6 +141,7 @@ let light_theme = { shape_binary: purple_bold shape_block: blue_bold shape_bool: light_cyan + shape_closure: green_bold shape_custom: green shape_datetime: cyan_bold shape_directory: cyan @@ -269,12 +151,13 @@ let light_theme = { shape_flag: blue_bold shape_float: purple_bold # shapes are used to change the cli syntax highlighting - shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b} + shape_garbage: { fg: white bg: red attr: b} shape_globpattern: cyan_bold shape_int: purple_bold shape_internalcall: cyan_bold shape_list: cyan_bold shape_literal: blue + shape_match_pattern: green shape_matching_brackets: { attr: u } shape_nothing: light_cyan shape_operator: yellow @@ -288,6 +171,7 @@ let light_theme = { shape_string_interpolation: cyan_bold shape_table: blue_bold shape_variable: purple + shape_vardecl: purple } # External completer example @@ -298,6 +182,8 @@ let light_theme = { # The default config record. This is where much of your global configuration is setup. let-env config = { + # true or false to enable or disable the welcome banner at startup + show_banner: true ls: { use_ls_colors: true # use the LS_COLORS environment variable to colorize output clickable_links: true # enable or disable clickable links. Your terminal has to support links. @@ -311,6 +197,7 @@ let-env config = { table: { mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column + show_empty: true # show 'empty list' and 'empty record' placeholders for command output trim: { methodology: wrapping # wrapping or truncating wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology @@ -395,22 +282,26 @@ let-env config = { metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto } + cursor_shape: { + emacs: line # block, underscore, line (line is the default) + vi_insert: block # block, underscore, line (block is the default) + vi_normal: underscore # block, underscore, line (underscore is the default) + } color_config: $dark_theme # if you want a light theme, replace `$dark_theme` to `$light_theme` use_grid_icons: true footer_mode: "25" # always, never, number_of_rows, auto - float_precision: 2 + float_precision: 2 # the precision for displaying floats in tables # buffer_editor: "emacs" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL use_ansi_coloring: true edit_mode: emacs # emacs, vi shell_integration: true # enables terminal markers and a workaround to arrow keys stop working issue - show_banner: false # true or false to enable or disable the banner render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. hooks: { - pre_prompt: [{ + pre_prompt: [{|| null # replace with source code to run before the prompt is shown }] - pre_execution: [{ + pre_execution: [{|| null # replace with source code to run before the repl input is run }] env_change: { @@ -418,9 +309,12 @@ let-env config = { null # replace with source code to run if the PWD environment is different since the last repl input }] } - display_output: { + display_output: {|| if (term size).columns >= 100 { table -e } else { table } } + command_not_found: {|| + null # replace with source code to return an error message when a command is not found + } } menus: [ # Configuration for default nushell menus diff --git a/nushell/.config/nushell/env.nu b/nushell/.config/nushell/env.nu index 8f1d535..e419e0e 100644 --- a/nushell/.config/nushell/env.nu +++ b/nushell/.config/nushell/env.nu @@ -1,10 +1,26 @@ # Nushell Environment Config File +# +# version = 0.78.1 def create_left_prompt [] { + mut home = "" + try { + if $nu.os-info.name == "windows" { + $home = $env.USERPROFILE + } else { + $home = $env.HOME + } + } + + let dir = ([ + ($env.PWD | str substring 0..($home | str length) | str replace -s $home "~"), + ($env.PWD | str substring ($home | str length)..) + ] | str join) + let path_segment = if (is-admin) { - $"(ansi red_bold)($env.PWD)" + $"(ansi red_bold)($dir)" } else { - $"(ansi green_bold)($env.PWD)" + $"(ansi green_bold)($dir)" } $path_segment @@ -12,22 +28,30 @@ def create_left_prompt [] { def create_right_prompt [] { let time_segment = ([ + (ansi reset) + (ansi magenta) (date now | date format '%m/%d/%Y %r') ] | str join) - $time_segment + 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 -let-env PROMPT_COMMAND = { create_left_prompt } -let-env PROMPT_COMMAND_RIGHT = { create_right_prompt } +let-env PROMPT_COMMAND = {|| create_left_prompt } +let-env PROMPT_COMMAND_RIGHT = {|| create_right_prompt } # The prompt indicators are environmental variables that represent # the state of the prompt -let-env PROMPT_INDICATOR = { "〉" } -let-env PROMPT_INDICATOR_VI_INSERT = { ": " } -let-env PROMPT_INDICATOR_VI_NORMAL = { "〉" } -let-env PROMPT_MULTILINE_INDICATOR = { "::: " } +let-env PROMPT_INDICATOR = {|| "> " } +let-env PROMPT_INDICATOR_VI_INSERT = {|| ": " } +let-env PROMPT_INDICATOR_VI_NORMAL = {|| "> " } +let-env PROMPT_MULTILINE_INDICATOR = {|| "::: " } # Specifies how environment variables are: # - converted from a string to a value on Nushell startup (from_string) @@ -47,19 +71,19 @@ let-env ENV_CONVERSIONS = { # Directories to search for scripts when calling source or use # # By default, /scripts is added -let-env NU_LIB_DIRS = [ - ($nu.config-path | path dirname | path join 'scripts') -] +# let-env NU_LIB_DIRS = [ + # ($nu.default-config-dir | path join 'scripts') +# ] # Directories to search for plugin binaries when calling register # # By default, /plugins is added -let-env NU_PLUGIN_DIRS = [ - ($nu.config-path | path dirname | path join 'plugins') -] +# let-env NU_PLUGIN_DIRS = [ + # ($nu.default-config-dir | path join 'plugins') +# ] # To add entries to PATH (on Windows you might use Path), you can use the following pattern: -# let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path') +# let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path') let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path') mkdir ~/.cache/starship starship init nu | save -f ~/.cache/starship/init.nu