diff --git a/users/tao/nushell/extras/alias.nu b/users/tao/nushell/extras/alias.nu index 178b62a..70c922e 100644 --- a/users/tao/nushell/extras/alias.nu +++ b/users/tao/nushell/extras/alias.nu @@ -31,11 +31,11 @@ alias jp = jj git push alias js = jj status alias jw = jj workspace update-stale -def jm [-r: string = "@"] { +def jm --wrapped [-r: string = "@", ...rest] { mut r = $r if (jj log -r @ --no-pager --no-graph --template 'if(empty,"empty")' | $in == "empty") { $r = "@-" } - jj bookmark set main -r $r + jj bookmark set main -r $r ...$rest jj git push } diff --git a/users/vy.nix b/users/vy.nix index 30513d5..768a844 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -41,4 +41,9 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJKLOGhoTauV+yBide0qYQzZ/0rRw7ImfrOTvuZxjIFl" ]; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.verbose = true; + home-manager.backupFileExtension = ".hm-bak"; + home-manager.users.vy = import ./vy/HOME.nix {inherit inputs pkgs lib config;}; } diff --git a/users/vy/HOME.nix b/users/vy/HOME.nix new file mode 100644 index 0000000..45453b1 --- /dev/null +++ b/users/vy/HOME.nix @@ -0,0 +1,116 @@ +{ + config, + pkgs, + inputs, + lib, + ... +}: let + programs = { + bat = { + enable = true; + config = { + theme = "gruvbox-dark"; + }; + }; + + bottom = { + enable = true; + settings = { + color = "gruvbox"; + flags = { + battery = + # if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname) + # then true + # else false; + true; + hide_time = true; + enable_gpu = true; + }; + }; + }; + + nushell = { + enable = true; + configFile.source = ./nushell/config.nu; + envFile.source = ./nushell/env.nu; + # extraConfig = builtins.readFile ./nushell/stuff.nu; + extraConfig = lib.concatStrings (map builtins.readFile (map (x: ./nushell/extras/. + x) (map (x: "/" + x) (builtins.attrNames (builtins.readDir ./nushell/extras))))); + }; + + starship = { + enable = true; + enableNushellIntegration = true; + settings = builtins.fromTOML (builtins.readFile ./starship.toml); + }; + + wezterm = { + enable = true; + extraConfig = builtins.readFile ./wezterm.lua; + }; + + zellij = { + enable = true; + settings = {}; + }; + + zoxide = { + enable = true; + enableNushellIntegration = true; + }; + }; + + # services.syncthing = { + # enable = true; + # # user = "tao"; + # # dataDir = "/home/tao/sync"; + # # configDir = "/home/tao/.config/syncthing"; + # overrideDevices = true; + # overrideFolders = true; + # # openDefaultPorts = true; + # settings = { + # devices = { + # # we do a lil anti-patterns https://github.com/ryantm/agenix?tab=readme-ov-file#builtinsreadfile-anti-pattern + # # bootstrap by commenting out devices first and rebuild switch impurely + # "nocomputer".id = builtins.readFile config.age.secrets.syncthing-NOcomputer.path; + # "nolaptop".id = builtins.readFile config.age.secrets.syncthing-NOlaptop.path; + # "uwuraid".id = builtins.readFile config.age.secrets.syncthing-uwuraid.path; + # }; + # folders = let + # devs = [ + # "nocomputer" + # "nolaptop" + # "uwuraid" + # ]; + # in { + # # "documents" = { + # # path = "/home/tao/documents"; + # # devices = devs; + # # }; + # "pictures" = { + # path = "/home/tao/pictures"; + # devices = devs; + # }; + # "projects" = { + # path = "/home/tao/projects"; + # devices = devs; + # }; + # "school" = { + # path = "/home/tao/school"; + # devices = devs; + # }; + # "sync" = { + # path = "/home/tao/sync"; + # devices = devs; + # }; + # # "work" = { + # # path = "/home/tao/work"; + # # devices = devs; + # # }; + # }; + # }; + # }; + + home.username = "vy"; + home.homeDirectory = "/home/vy"; + home.stateVersion = "23.11"; +} diff --git a/users/vy/nushell/config.nu b/users/vy/nushell/config.nu new file mode 100644 index 0000000..08e88bf --- /dev/null +++ b/users/vy/nushell/config.nu @@ -0,0 +1,826 @@ +# Nushell Config File +# +# version = "0.96.1" + +# 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 + # Closures can be used to choose colors for specific values. + # The value (in this case, a bool) is piped into the closure. + # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } } + bool: light_cyan + int: white + filesize: cyan + duration: white + date: purple + range: white + float: white + string: white + nothing: white + binary: white + cell-path: white + row_index: green_bold + record: white + list: white + block: white + hints: dark_gray + search_result: { bg: red fg: white } + shape_and: purple_bold + 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 + shape_external: cyan + shape_externalarg: green_bold + shape_external_resolved: light_yellow_bold + shape_filepath: cyan + shape_flag: blue_bold + shape_float: purple_bold + # shapes are used to change the cli syntax highlighting + shape_garbage: { fg: white bg: red attr: b } + shape_glob_interpolation: cyan_bold + shape_globpattern: cyan_bold + shape_int: purple_bold + shape_internalcall: cyan_bold + shape_keyword: 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_table: blue_bold + shape_variable: purple + shape_vardecl: purple + shape_raw_string: light_purple +} + +# External completer example +# 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. +$env.config = { + show_banner: false # true or false to enable or disable the welcome banner at startup + + 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. + } + + rm: { + always_trash: true # always act as if -t was given. Can be overridden with -p + } + + 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 + padding: { left: 1, right: 1 } # a left right padding of each column in a table + 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 + } + header_on_separator: false # show header text on separator/border line + # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point + } + + error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages + + # datetime_format determines what a datetime rendered in the shell would look like. + # Behavior without this configuration point will be to "humanize" the datetime display, + # showing something like "a day ago." + datetime_format: { + # normal: '%a, %d %b %Y %H:%M:%S %z' # shows up in displays of variables or other datetime's outside of tables + # table: '%m/%d/%y %I:%M:%S%p' # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format + } + + explore: { + status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" }, + command_bar_text: { fg: "#C4C9C6" }, + highlight: { fg: "black", bg: "yellow" }, + status: { + error: { fg: "white", bg: "red" }, + warn: {} + info: {} + }, + selected_cell: { bg: light_blue }, + } + + history: { + max_size: 100_000 # 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 + file_format: "sqlite" # "sqlite" or "plaintext" + isolation: true # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions. + } + + completions: { + case_sensitive: false # set to true to enable case-sensitive completions + quick: true # set this to false to prevent auto-selecting completions when only one remains + partial: true # set this to false to prevent partial filling of the prompt + algorithm: "fuzzy" # prefix or fuzzy + external: { + enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow + max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options + completer: null # check 'carapace_completer' above as an example + } + use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS + } + + filesize: { + unit: metric + } + + cursor_shape: { + emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default) + vi_insert: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default) + vi_normal: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default) + } + + color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record + # use_grid_icons: true + footer_mode: 25 # always, never, number_of_rows, auto + float_precision: 2 # the precision for displaying floats in tables + buffer_editor: null # 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 + bracketed_paste: true # enable bracketed paste, currently useless on windows + edit_mode: emacs # emacs, vi + shell_integration: { + # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title + osc2: true + # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory + osc7: true + # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8 + osc8: true + # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal + osc9_9: false + # osc133 is several escapes invented by Final Term which include the supported ones below. + # 133;A - Mark prompt start + # 133;B - Mark prompt end + # 133;C - Mark pre-execution + # 133;D;exit - Mark execution finished with exit code + # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is + osc133: true + # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features + # 633;A - Mark prompt start + # 633;B - Mark prompt end + # 633;C - Mark pre-execution + # 633;D;exit - Mark execution finished with exit code + # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce + # 633;P;Cwd= - Mark the current working directory and communicate it to the terminal + # and also helps with the run recent menu in vscode + osc633: true + # reset_application_mode is escape \x1b[?1l and was added to help ssh work better + reset_application_mode: true + } + 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. + use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this. + highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which. + recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it + + plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration. + + plugin_gc: { + # Configuration for plugin garbage collection + default: { + enabled: true # true to enable stopping of inactive plugins + stop_after: 10sec # how long to wait after a plugin is inactive to stop it + } + plugins: { + # alternate configuration for specific plugins, by name, for example: + # + # gstat: { + # enabled: false + # } + } + } + + hooks: { + pre_prompt: [{ null }] # run before the prompt is shown + pre_execution: [{ null }] # run before the repl input is run + env_change: { + PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input + } + display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline + command_not_found: { null } # return an error message when a command is not found + } + + menus: [ + # Configuration for default nushell menus + # Note the lack of source parameter + { + name: completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: columnar + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: ide_completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: ide + min_completion_width: 0, + max_completion_width: 50, + max_completion_height: 10, # will be limited by the available lines in the terminal + padding: 0, + border: true, + cursor_offset: 0, + description_mode: "prefer_right" + min_description_width: 0 + max_description_width: 50 + max_description_height: 10 + description_offset: 1 + # If true, the cursor pos will be corrected, so the suggestions match up with the typed text + # + # C:\> str + # str join + # str trim + # str split + correct_cursor_pos: false + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: history_menu + only_buffer_difference: true + marker: "? " + type: { + layout: list + page_size: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + { + name: help_menu + only_buffer_difference: true + marker: "? " + type: { + layout: description + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + selection_rows: 4 + description_rows: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + ] + + keybindings: [ + { + name: completion_menu + modifier: none + keycode: tab + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: ide_completion_menu + modifier: control + keycode: char_n + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: ide_completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: history_menu + modifier: control + keycode: char_r + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: history_menu } + } + { + name: help_menu + modifier: none + keycode: f1 + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: help_menu } + } + { + name: completion_previous_menu + modifier: shift + keycode: backtab + mode: [emacs, vi_normal, vi_insert] + event: { send: menuprevious } + } + { + name: next_page_menu + modifier: control + keycode: char_x + mode: emacs + event: { send: menupagenext } + } + { + name: undo_or_previous_page_menu + modifier: control + keycode: char_z + mode: emacs + event: { + until: [ + { send: menupageprevious } + { edit: undo } + ] + } + } + { + name: escape + modifier: none + keycode: escape + mode: [emacs, vi_normal, vi_insert] + event: { send: esc } # NOTE: does not appear to work + } + { + name: cancel_command + modifier: control + keycode: char_c + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrlc } + } + { + name: quit_shell + modifier: control + keycode: char_d + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrld } + } + { + name: clear_screen + modifier: control + keycode: char_l + mode: [emacs, vi_normal, vi_insert] + event: { send: clearscreen } + } + { + name: search_history + modifier: control + keycode: char_q + mode: [emacs, vi_normal, vi_insert] + event: { send: searchhistory } + } + { + name: open_command_editor + modifier: control + keycode: char_o + mode: [emacs, vi_normal, vi_insert] + event: { send: openeditor } + } + { + name: move_up + modifier: none + keycode: up + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: move_down + modifier: none + keycode: down + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: move_left + modifier: none + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: none + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: move_one_word_left + modifier: control + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: control + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_to_line_start + modifier: none + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_start + modifier: control + keycode: char_a + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end_or_take_history_hint + modifier: none + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_end_or_take_history_hint + modifier: control + keycode: char_e + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_start + modifier: control + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end + modifier: control + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolineend } + } + { + name: move_up + modifier: control + keycode: char_p + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: move_down + modifier: control + keycode: char_t + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: delete_one_character_backward + modifier: none + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: delete_one_character_forward + modifier: none + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_forward + modifier: control + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_backward + modifier: control + keycode: char_h + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: char_w + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: move_left + modifier: none + keycode: backspace + mode: vi_normal + event: { edit: moveleft } + } + { + name: newline_or_run_command + modifier: none + keycode: enter + mode: emacs + event: { send: enter } + } + { + name: move_left + modifier: control + keycode: char_b + mode: emacs + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: control + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: redo_change + modifier: control + keycode: char_g + mode: emacs + event: { edit: redo } + } + { + name: undo_change + modifier: control + keycode: char_z + mode: emacs + event: { edit: undo } + } + { + name: paste_before + modifier: control + keycode: char_y + mode: emacs + event: { edit: pastecutbufferbefore } + } + { + name: cut_word_left + modifier: control + keycode: char_w + mode: emacs + event: { edit: cutwordleft } + } + { + name: cut_line_to_end + modifier: control + keycode: char_k + mode: emacs + event: { edit: cuttoend } + } + { + name: cut_line_from_start + modifier: control + keycode: char_u + mode: emacs + event: { edit: cutfromstart } + } + { + name: swap_graphemes + modifier: control + keycode: char_t + mode: emacs + event: { edit: swapgraphemes } + } + { + name: move_one_word_left + modifier: alt + keycode: left + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: right + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_one_word_left + modifier: alt + keycode: char_b + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: delete_one_word_forward + modifier: alt + keycode: delete + mode: emacs + event: { edit: deleteword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: backspace + mode: emacs + event: { edit: backspaceword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: char_m + mode: emacs + event: { edit: backspaceword } + } + { + name: cut_word_to_right + modifier: alt + keycode: char_d + mode: emacs + event: { edit: cutwordright } + } + { + name: upper_case_word + modifier: alt + keycode: char_u + mode: emacs + event: { edit: uppercaseword } + } + { + name: lower_case_word + modifier: alt + keycode: char_l + mode: emacs + event: { edit: lowercaseword } + } + { + name: capitalize_char + modifier: alt + keycode: char_c + mode: emacs + event: { edit: capitalizechar } + } + # The following bindings with `*system` events require that Nushell has + # been compiled with the `system-clipboard` feature. + # This should be the case for Windows, macOS, and most Linux distributions + # Not available for example on Android (termux) + # If you want to use the system clipboard for visual selection or to + # paste directly, uncomment the respective lines and replace the version + # using the internal clipboard. + { + name: copy_selection + modifier: control_shift + keycode: char_c + mode: emacs + event: { edit: copyselection } + # event: { edit: copyselectionsystem } + } + { + name: cut_selection + modifier: control_shift + keycode: char_x + mode: emacs + event: { edit: cutselection } + # event: { edit: cutselectionsystem } + } + # { + # name: paste_system + # modifier: control_shift + # keycode: char_v + # mode: emacs + # event: { edit: pastesystem } + # } + { + name: select_all + modifier: control_shift + keycode: char_a + mode: emacs + event: { edit: selectall } + } + ] +} +mkdir ($nu.data-dir | path join "vendor/autoload") +starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu") diff --git a/users/vy/nushell/env.nu b/users/vy/nushell/env.nu new file mode 100644 index 0000000..c7a75b6 --- /dev/null +++ b/users/vy/nushell/env.nu @@ -0,0 +1,88 @@ +# Nushell Environment Config File +# +# version = 0.83.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 $home "~"), + ($env.PWD | str substring ($home | str length)..) + ] | str 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)/($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 | date format '%Y/%m/%d %r') + ] | str join | str replace --all "([/:])" $"(ansi green)${1}(ansi magenta)" | + str replace --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 } +# $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 = {|| " NOR " } +$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " } + +# 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 +$env.NU_LIB_DIRS = [ + # ($nu.default-config-dir | path join 'scripts') # add /scripts +] + +# Directories to search for plugin binaries when calling register +$env.NU_PLUGIN_DIRS = [ + # ($nu.default-config-dir | path join 'plugins') # add /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 '/home/tao/.cargo/bin') + +# $env.GOPATH = '/home/tao/.go' + +# $env.CARAPACE_BRIDGES +mkdir ~/.cache/carapace +# carapace _carapace nushell | save -f ~/.cache/carapace/init.nu diff --git a/users/vy/nushell/extras/alias.nu b/users/vy/nushell/extras/alias.nu new file mode 100644 index 0000000..178b62a --- /dev/null +++ b/users/vy/nushell/extras/alias.nu @@ -0,0 +1,41 @@ +alias xo = xdg-open +# alias h = hx (sk) +alias b = btm +alias cringe = sudo bootctl set-oneshot auto-windows +alias fetch = fastfetch +alias ff = firefox +alias pu = pueue +alias t = task +alias zl = zellij +alias snapper = snapper -c home +alias follow = readlink -f +alias la = ls -a + +alias quiet = sudo ectool fanduty 42 +alias loud = sudo ectool autofanctrl + +alias cp-full = cp +alias cp = cp -prv +alias mv-full = mv +alias mv = mv -pv + +alias j = jj +alias ja = jj log -r 'all()' +alias jc = jj desc +alias jd = jj diff +alias je = jj edit +alias jf = jj git fetch +alias jg = jj git clone --colocate +# alias jm = jj bookmark set main +alias jp = jj git push +alias js = jj status +alias jw = jj workspace update-stale + +def jm [-r: string = "@"] { + mut r = $r + if (jj log -r @ --no-pager --no-graph --template 'if(empty,"empty")' | $in == "empty") { + $r = "@-" + } + jj bookmark set main -r $r + jj git push +} diff --git a/users/vy/nushell/extras/nix.nu b/users/vy/nushell/extras/nix.nu new file mode 100644 index 0000000..a5639db --- /dev/null +++ b/users/vy/nushell/extras/nix.nu @@ -0,0 +1,47 @@ +alias nd = nix develop + +def ns [package] { + nix shell $"nixpkgs#($package)" +} + +def nr [package] { + nix search nixpkgs $package +} + +def rebuild --wrapped [subcommand, --builders: string, ...rest] { + mut builders = $builders; + if (open /etc/hostname --raw) == "NOlaptop\n" and ($builders != "") { + if (ping -c1 -W1 nocomputer | complete | $in.exit_code == 0) { + sudo nix store info --store ssh://nocomputer + } else { + $builders = "" + } + } + if ($builders == "") { + sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders "" + } else { + sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose ...$rest + } + toastify send rebuild done! +} + +def post-rebuild [] { + rm -r ~/.config/helix/runtime/grammars/ + hx --grammar fetch; hx --grammar build + rustup update +} + +def bump --wrapped [...rest] { + cd /home/tao/projects/NOflake/ + jj new -m "bump" + nix flake update + # rc2nix | save -f /home/tao/projects/NOflake/users/tao/plasma.nix; + # sudo nix store ping --store ssh://nocomputer + rebuild boot ...$rest + jj new +} + +alias rb = rebuild boot +alias rs = rebuild switch +alias gc = nh clean all + diff --git a/users/vy/nushell/extras/stuff.nu b/users/vy/nushell/extras/stuff.nu new file mode 100644 index 0000000..d9534ea --- /dev/null +++ b/users/vy/nushell/extras/stuff.nu @@ -0,0 +1,62 @@ +# task + +def h [query?: path] { + (if ($query != null) {sk -1 -q ($query | path basename)} else {sk -1}) + | complete + | if $in.exit_code == 0 { + $in.stdout | str trim | hx $in + } +} + +def --env c [path: path = "~"] { + cd $path + l +} + +def l [ + --all (-a) + --long (-l) + path: path = "." +] { + if $all and $long { + ls -la $path + } else if $all { + ls -a $path + } else if $long { + ls -l $path + } else { + ls $path + } + | sort-by type name -i -n +} + +def srg [] { + sk --ansi -i -c 'rg --color=always --line-number "{}"' +} + + +def "config stuff" [] { + hx ~/projects/NOflake/users/tao/nushell/stuff.nu +} +def deluge-gtk [] { + tsr + deluge-gtk +} +alias deluge = deluge-gtk +def fixme [] { + rg TODO --json + | lines + | each {from json} + | where type == "match" + | get data + | flatten + | each {$"($in.text):($in.line_number)"} + | hx ...$in +} +# source ~/.cache/starship/init.nu +# source ~/.cache/carapace/init.nu +source ~/.zoxide.nu +def --env z [path: string = "~"] { + zo $path + l +} diff --git a/users/vy/nushell/extras/tailscale.nu b/users/vy/nushell/extras/tailscale.nu new file mode 100644 index 0000000..0630ba4 --- /dev/null +++ b/users/vy/nushell/extras/tailscale.nu @@ -0,0 +1,77 @@ +# see if others see us connecting from a mullvad exit node +def check-mullvad [] { + print -n "checking mullvad status" + mut check = false + mut j = null + while not $check { + print -n "." + $j = (http get https://am.i.mullvad.net/json) + $check = $j.mullvad_exit_ip + } + print "" + print $"connected to ($j.city), ($j.country)" +} + +# switch to a specific exit node, or none +def tse [exit_node: string = ""] { + if ($exit_node | is-empty) and (ps | find deluge | is-not-empty) { + return "stop summoning first!" + } else { + tailscale set --exit-node $exit_node + } + if ($exit_node | is-not-empty) { + check-mullvad + } + return "exit node set" +} + +# list all mullvad exit nodes +def tsx [] { +tailscale exit-node list + | lines + | drop 4 + | skip 1 + | to text + | detect columns --guess + | where HOSTNAME =~ mullvad + | reject STATUS +} + +# sort mullvad exit nodes by fastest ping +def tsp [] { +tsx + | where COUNTRY == USA + | par-each { + insert ping { + $in.HOSTNAME + | str replace "mullvad.ts.net" "relays.mullvad.net" + | try { + print $"pinging ($in)" + ping -c5 -q $in + | lines + | last + | split row ' ' + | get 3 + | split row '/' + | get 1 + | into float + } + } + } + | sort-by ping +} + + + +# switch to a random mullvad exit node +def tsr [] { +tsx + | get (random int 0..($in | length)) + | tse $in.IP +} + +alias ts = tailscale +alias tss = tailscale status +alias tsu = tailscale up +alias tsd = tailscale down +alias tsa = tailscale exit-node suggest diff --git a/users/vy/starship.toml b/users/vy/starship.toml new file mode 100644 index 0000000..c06880e --- /dev/null +++ b/users/vy/starship.toml @@ -0,0 +1,119 @@ +"$schema" = 'https://starship.rs/config-schema.json' + +format = """ +[](color_orange)\ +$username\ + +[](bg:color_yellow fg:color_orange)\ +$directory\ + +[](fg:color_yellow bg:color_aqua)\ +${custom.jj}\ + +[](fg:color_aqua bg:color_blue)\ +$rust\ + +[](fg:color_blue bg:color_bg3)\ +$battery\ + +[](fg:color_bg3 bg:color_bg1)\ +$time\ + +[ ](fg:color_bg1)\ +$line_break$character""" + +palette = 'gruvbox_dark' +[palettes.gruvbox_dark] +color_fg0 = '#fbf1c7' +color_bg1 = '#3c3836' +color_bg3 = '#665c54' +color_blue = '#458588' +color_aqua = '#689d6a' +color_green = '#98971a' +color_orange = '#d65d0e' +color_purple = '#b16286' +color_red = '#cc241d' +color_yellow = '#d79921' + +[directory] +style = "fg:color_fg0 bg:color_yellow" +format = "[ $path ]($style)" +truncation_length = 3 +truncation_symbol = "…/" + +[directory.substitutions] +"documents" = "󰈙 " +"downloads" = " " +"music" = "󰝚 " +"pictures" = " " + +[rust] +# # symbol = "" +style = "bg:color_blue" +format = '[[ $symbol($version) ](fg:color_fg0 bg:color_blue)]($style)' + +[time] +disabled = false +time_format = "%R" +style = "bg:color_bg1" +format = '[[  $time ](fg:color_fg0 bg:color_bg1)]($style)' + +[line_break] +disabled = false + +[character] +disabled = false +success_symbol = '[](bold fg:color_green)' +error_symbol = '[](bold fg:color_red)' +vimcmd_symbol = '[](bold fg:color_green)' +vimcmd_replace_one_symbol = '[](bold fg:color_purple)' +vimcmd_replace_symbol = '[](bold fg:color_purple)' +vimcmd_visual_symbol = '[](bold fg:color_yellow)' + +# custom module for jj status +[custom.jj] +ignore_timeout = true +description = "current jj status" +symbol = " 🥋 " +when = "exit ((jj root | complete).exit_code)" +style = "bg:color_aqua" +command = ''' +jj log --no-pager --revisions @ --no-graph --ignore-working-copy --template ' + separate( + " ", + change_id.shortest(), + bookmarks, + "|", + concat( + if(conflict, "💥"), + if(divergent, "🚧"), + if(hidden, "👻"), + if(immutable, "🔒"), + ), + if(empty, + "(empty)" + ), + if(description.first_line().len() == 0, + "(no description set)", + if(description.first_line().substr(0, 29) == description.first_line(), + description.first_line(), + description.first_line().substr(0, 29) ++ "...", + ) + ), + ) +' +''' + + +# disable git modules +[git_state] +disabled = true + +[git_commit] +disabled = true + +[git_metrics] +disabled = true + +[git_branch] +disabled = true diff --git a/users/vy/wezterm.lua b/users/vy/wezterm.lua new file mode 100644 index 0000000..590d908 --- /dev/null +++ b/users/vy/wezterm.lua @@ -0,0 +1,17 @@ +local wezterm = require 'wezterm'; +local config = { + font = wezterm.font 'FiraCode Nerd Font', + color_scheme = 'GruvboxDarkHard', + window_decorations = "NONE", + + warn_about_missing_glyphs = false, + check_for_updates = false, + + hide_tab_bar_if_only_one_tab = true, + + enable_wayland = true, + -- webgpu_power_preference = 'LowPower', + -- front_end = 'WebGpu', +} + +return config