From 6296c29f5d2d7a4acf8816560787527ea980ec1b Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Mon, 15 May 2023 10:10:09 +0200 Subject: [PATCH] Update nu conf --- tree/.config/nushell/config.nu | 376 +++++++++++++++++---------------- tree/.config/nushell/env.nu | 32 ++- 2 files changed, 214 insertions(+), 194 deletions(-) diff --git a/tree/.config/nushell/config.nu b/tree/.config/nushell/config.nu index 8674f56..668c710 100644 --- a/tree/.config/nushell/config.nu +++ b/tree/.config/nushell/config.nu @@ -1,145 +1,46 @@ # Nushell Config File +# +# version = 0.78.0 -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 dowloaded 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-with-lease # require old value of ref to be at this value - --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 leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off header: green_bold empty: blue - bool: white + # 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' } } int: white - filesize: white + filesize: {|e| + if $e == 0b { + 'white' + } else if $e < 1mb { + 'cyan' + } else { 'blue' } + } duration: white - date: white + date: {|| (date now) - $in | + if $in < 1hr { + 'red3b' + } else if $in < 6hr { + 'orange3' + } else if $in < 1day { + 'yellow3b' + } else if $in < 3day { + 'chartreuse2b' + } else if $in < 1wk { + 'green3b' + } else if $in < 6wk { + 'darkturquoise' + } else if $in < 52wk { + 'deepskyblue3b' + } else { 'dark_gray' } + } range: white float: white string: white @@ -152,34 +53,39 @@ let dark_theme = { block: white hints: dark_gray - # shapes are used to change the cli syntax highlighting - shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b} + shape_and: purple_bold shape_binary: purple_bold + shape_block: blue_bold shape_bool: light_cyan - shape_int: purple_bold - shape_float: purple_bold - shape_range: yellow_bold - shape_internalcall: cyan_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan shape_external: cyan shape_externalarg: green_bold + shape_filepath: cyan + 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_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 + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold shape_signature: green_bold shape_string: green shape_string_interpolation: cyan_bold - shape_datetime: cyan_bold - shape_list: cyan_bold shape_table: blue_bold - shape_record: cyan_bold - shape_block: blue_bold - shape_filepath: cyan - shape_directory: cyan - shape_globpattern: cyan_bold shape_variable: purple - shape_flag: blue_bold - shape_custom: green - shape_nothing: light_cyan - shape_matching_brackets: { attr: u } } let light_theme = { @@ -188,11 +94,35 @@ let light_theme = { leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off header: green_bold empty: blue - bool: dark_gray + # 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' } } int: dark_gray - filesize: dark_gray + filesize: {|e| + if $e == 0b { + 'dark_gray' + } else if $e < 1mb { + 'cyan_bold' + } else { 'blue_bold' } + } duration: dark_gray - date: dark_gray + date: {|| (date now) - $in | + if $in < 1hr { + 'red3b' + } else if $in < 6hr { + 'orange3' + } else if $in < 1day { + 'yellow3b' + } else if $in < 3day { + 'chartreuse2b' + } else if $in < 1wk { + 'green3b' + } else if $in < 6wk { + 'darkturquoise' + } else if $in < 52wk { + 'deepskyblue3b' + } else { 'dark_gray' } + } range: dark_gray float: dark_gray string: dark_gray @@ -205,63 +135,129 @@ let light_theme = { block: white hints: dark_gray - # shapes are used to change the cli syntax highlighting - shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b} + shape_and: purple_bold shape_binary: purple_bold + shape_block: blue_bold shape_bool: light_cyan - shape_int: purple_bold - shape_float: purple_bold - shape_range: yellow_bold - shape_internalcall: cyan_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan shape_external: cyan shape_externalarg: green_bold + shape_filepath: cyan + 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_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 + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold shape_signature: green_bold shape_string: green shape_string_interpolation: cyan_bold - shape_datetime: cyan_bold - shape_list: cyan_bold shape_table: blue_bold - shape_record: cyan_bold - shape_block: blue_bold - shape_filepath: cyan - shape_directory: cyan - shape_globpattern: cyan_bold shape_variable: purple - shape_flag: blue_bold - shape_custom: green - shape_nothing: light_cyan - shape_matching_brackets: { attr: u } } # External completer example -# let carapace_completer = {|spans| +# let carapace_completer = {|spans| # carapace $spans.0 nushell $spans | from json # } # 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 # enabler or disable clickable links. Your terminal has to support links. + clickable_links: true # enable or disable clickable links. Your terminal has to support links. } rm: { always_trash: false # always act as if -t was given. Can be overridden with -p } cd: { - abbreviations: true # allows `cd s/o/f` to expand to `cd some/other/folder` + abbreviations: false # allows `cd s/o/f` to expand to `cd some/other/folder` } 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 truncating_suffix: "..." # A suffix used by the 'truncating' methodology } } + + explore: { + help_banner: true + exit_esc: true + + command_bar_text: '#C4C9C6' + # command_bar: {fg: '#C4C9C6' bg: '#223311' } + + status_bar_background: {fg: '#1D1F21' bg: '#C4C9C6' } + # status_bar_text: {fg: '#C4C9C6' bg: '#223311' } + + highlight: {bg: 'yellow' fg: 'black' } + + status: { + # warn: {bg: 'yellow', fg: 'blue'} + # error: {bg: 'yellow', fg: 'blue'} + # info: {bg: 'yellow', fg: 'blue'} + } + + try: { + # border_color: 'red' + # highlighted_color: 'blue' + + # reactive: false + } + + table: { + split_line: '#404040' + + cursor: true + + line_index: true + line_shift: true + line_head_top: true + line_head_bottom: true + + show_head: true + show_index: true + + # selected_cell: {fg: 'white', bg: '#777777'} + # selected_row: {fg: 'yellow', bg: '#C1C2A3'} + # selected_column: blue + + # padding_column_right: 2 + # padding_column_left: 2 + + # padding_index_left: 2 + # padding_index_right: 1 + } + + config: { + cursor_color: {bg: 'yellow' fg: 'black' } + + # border_color: white + # list_color: green + } + } + history: { max_size: 10000 # Session has to be reloaded for this to take effect sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file @@ -282,35 +278,43 @@ 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: vi # 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: [{ - $nothing # replace with source code to run before the prompt is shown + pre_prompt: [{|| + null # replace with source code to run before the prompt is shown }] - pre_execution: [{ - $nothing # replace with source code to run before the repl input is run + pre_execution: [{|| + null # replace with source code to run before the repl input is run }] env_change: { PWD: [{|before, after| - $nothing # replace with source code to run if the PWD environment is different since the last repl input + 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 - # Note the lack of souce parameter + # Note the lack of source parameter { name: completion_menu only_buffer_difference: false @@ -379,8 +383,8 @@ let-env config = { } source: { |buffer, position| $nu.scope.commands - | where command =~ $buffer - | each { |it| {value: $it.command description: $it.usage} } + | where name =~ $buffer + | each { |it| {value: $it.name description: $it.usage} } } } { @@ -422,8 +426,8 @@ let-env config = { } source: { |buffer, position| $nu.scope.commands - | where command =~ $buffer - | each { |it| {value: $it.command description: $it.usage} } + | where name =~ $buffer + | each { |it| {value: $it.name description: $it.usage} } } } ] @@ -432,7 +436,7 @@ let-env config = { name: completion_menu modifier: none keycode: tab - mode: emacs # Options: emacs vi_normal vi_insert + mode: [emacs vi_normal vi_insert] event: { until: [ { send: menu name: completion_menu } @@ -531,7 +535,7 @@ let-env config = { ] } -alias ls = exa +#alias ls = exa alias grep = rg alias find = fd alias e = nvim diff --git a/tree/.config/nushell/env.nu b/tree/.config/nushell/env.nu index 728a7fb..808126e 100644 --- a/tree/.config/nushell/env.nu +++ b/tree/.config/nushell/env.nu @@ -1,10 +1,26 @@ # Nushell Environment Config File +# +# version = 0.78.0 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 @@ -19,15 +35,15 @@ def create_right_prompt [] { } # 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)