diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 196ae85..1d47f55 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -2,80 +2,73 @@ set host (hostname) if string match -q "*turing*" "$host" set -x PATH /Users/scie/.local/nvim-macos-arm64/bin \ - /opt/homebrew/Cellar/universal-ctags/HEAD-43ca055/bin \ - /Users/scie/.local/xonsh-env/xbin \ - /Users/scie/.local/xonsh-env/xbin \ - /opt/homebrew/opt/icu4c@76/sbin \ - /opt/homebrew/opt/icu4c@76/bin \ - /opt/homebrew/opt/llvm/bin \ - /Users/scie/.dotnet/tools \ - /Users/scie/.local/bin \ - /Users/scie/Library/Python/3.9/bin \ - /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/emulators \ - /opt/homebrew/bin/iodine \ - /opt/homebrew/bin \ - /opt/homebrew/opt/zig@0.14/bin \ - /Users/scie/.platformio/penv/bin/ \ - /Users/scie/.cargo/bin \ - /Users/scie/.local/xonsh-env/xbin \ - /Users/scie/go/bin \ - /usr/bin \ - /usr/local/bin \ - /usr/sbin \ - /usr/local/sbin \ - /bin \ - /sbin -else if test "$host" = lovelace + /opt/homebrew/Cellar/universal-ctags/HEAD-43ca055/bin \ + /Users/scie/.local/xonsh-env/xbin \ + /Users/scie/.local/xonsh-env/xbin \ + /opt/homebrew/opt/icu4c@76/sbin \ + /opt/homebrew/opt/icu4c@76/bin \ + /opt/homebrew/opt/llvm/bin \ + /Users/scie/.dotnet/tools \ + /Users/scie/.local/bin \ + /Users/scie/Library/Python/3.9/bin \ + /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/emulators \ + /opt/homebrew/bin/iodine \ + /opt/homebrew/bin \ + /opt/homebrew/opt/zig@0.14/bin \ + /Users/scie/.platformio/penv/bin/ \ + /Users/scie/.cargo/bin \ + /Users/scie/.local/xonsh-env/xbin \ + /Users/scie/go/bin \ + /usr/bin \ + /usr/local/bin \ + /usr/sbin \ + /usr/local/sbin \ + /bin \ + /sbin +else if test "$host" = "lovelace" set -x PATH /home/scie/.local/bin \ - /home/linuxbrew/.linuxbrew/bin \ - /home/linuxbrew/.linuxbrew/sbin \ - /home/scie/.nvm/versions/node/v22.15.0/bin \ - /home/scie/.cargo/bin \ - /usr/local/sbin \ - /usr/local/bin \ - /usr/sbin \ - /usr/bin \ - /sbin \ - /bin \ - /usr/games \ - /usr/local/games \ - /snap/bin -else if test "$host" = lee - fish_add_path ~/.local/bin + /home/linuxbrew/.linuxbrew/bin \ + /home/linuxbrew/.linuxbrew/sbin \ + /home/scie/.nvm/versions/node/v22.15.0/bin \ + /home/scie/.cargo/bin \ + /usr/local/sbin \ + /usr/local/bin \ + /usr/sbin \ + /usr/bin \ + /sbin \ + /bin \ + /usr/games \ + /usr/local/games \ + /snap/bin +else if test "$host" = "lee" + fish_add_path ~/.local/bin end set -gx HOMEBREW_BUNDLE_FILE "~/.config/Brewfile" if test -d /home/linuxbrew/.linuxbrew - # Homebrew is installed on Linux + # Homebrew is installed on Linux + + set -gx HOMEBREW_PREFIX "/home/linuxbrew/.linuxbrew" + set -gx HOMEBREW_CELLAR "/home/linuxbrew/.linuxbrew/Cellar" + set -gx HOMEBREW_REPOSITORY "/home/linuxbrew/.linuxbrew/Homebrew" + set -gx PATH "/home/linuxbrew/.linuxbrew/bin" "/home/linuxbrew/.linuxbrew/sbin" "/home/linuxbrew/.linuxbrew/opt/rustup/bin" $PATH + set -q MANPATH; or set MANPATH '' + set -gx MANPATH "/home/linuxbrew/.linuxbrew/share/man" $MANPATH + set -q INFOPATH; or set INFOPATH '' + set -gx INFOPATH "/home/linuxbrew/.linuxbrew/share/info" $INFOPATH + - set -gx HOMEBREW_PREFIX "/home/linuxbrew/.linuxbrew" - set -gx HOMEBREW_CELLAR "/home/linuxbrew/.linuxbrew/Cellar" - set -gx HOMEBREW_REPOSITORY "/home/linuxbrew/.linuxbrew/Homebrew" - set -gx PATH "/home/linuxbrew/.linuxbrew/bin" "/home/linuxbrew/.linuxbrew/sbin" "/home/linuxbrew/.linuxbrew/opt/rustup/bin" $PATH - set -q MANPATH; or set MANPATH '' - set -gx MANPATH "/home/linuxbrew/.linuxbrew/share/man" $MANPATH - set -q INFOPATH; or set INFOPATH '' - set -gx INFOPATH "/home/linuxbrew/.linuxbrew/share/info" $INFOPATH end -set -gx XDG_CONFIG_HOME $HOME/.config - if status is-interactive + set -g fish_greeting "" + pfetch - if set -q GHOSTTY_RESOURCES_DIR - source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish" - end - set -g fish_greeting "" - pfetch - - fish_vi_key_bindings - - fish_config theme choose "Rosé Pine" - starship init fish | source - zoxide init fish | source - + fish_config theme choose "Rosé Pine" + starship init fish | source + zoxide init fish | source end alias setupidf "source /opt/esp/esp-idf/export.fish" diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index c429bc7..5016bc7 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -4,18 +4,14 @@ clipboard-read = allow clipboard-write = allow copy-on-select = true theme = Rose Pine -font-family = "ComicCode Nerd Font SemiBold" +font-family = "ComicCode Nerd Font" font-style-italic = "ComicCode Nerd Font Light" macos-option-as-alt = left -macos-icon = blueprint +macos-icon = microchip font-feature = -calt font-feature = -liga font-feature = -dlig -cursor-click-to-move = true - keybind = global:cmd+grave_accent=toggle_quick_terminal quick-terminal-position = center quick-terminal-animation-duration = .1 - -keybind = alt+i=inspector:toggle diff --git a/starship.log b/starship.log new file mode 100644 index 0000000..d873d4f --- /dev/null +++ b/starship.log @@ -0,0 +1,520 @@ +[TRACE] - (starship): Parsed arguments: Cli { + command: Prompt { + right: false, + profile: None, + continuation: false, + properties: Properties { + status_code: None, + pipestatus: None, + terminal_width: 200, + path: None, + logical_path: None, + cmd_duration: None, + keymap: "viins", + jobs: 0, + shlvl: None, + }, + }, +} +[TRACE] - (starship::utils): Trying to read from "/Users/scie/.config/starship.toml" +[TRACE] - (starship::utils): File read successfully +[TRACE] - (starship::config): Config file content: " +"$schema" = 'https://starship.rs/config-schema.json' + +format = """ +$hostname\ +$username\ +$directory\ +$git_branch\ +$git_status\ +${custom.jj}\ +$fill\ +$c\ +$elixir\ +$elm\ +$golang\ +$haskell\ +$java\ +$julia\ +$nodejs\ +$nim\ +$rust\ +$scala\ +$conda\ +$python\ +$time\n\ +[❯](fg:iris) \ +""" + +palette = "rose-pine" + +[palettes.rose-pine] +overlay = '#26233a' +love = '#eb6f92' +gold = '#f6c177' +rose = '#ebbcba' +pine = '#31748f' +foam = '#9ccfd8' +iris = '#c4a7e7' + +[directory] +format = "[](fg:overlay)[ $path ]($style)[](fg:overlay) " +style = "bg:overlay fg:pine" +truncation_length = 3 +truncation_symbol = "…/" + +[directory.substitutions] +Documents = "󰈙" +Downloads = " " +Music = " " +Pictures = " " + +[fill] +style = "fg:overlay" +symbol = " " + +[git_branch] +disabled = false +format = "[](fg:overlay)[ $symbol $branch ]($style)[](fg:overlay) " +style = "bg:overlay fg:foam" +symbol = "" + +[git_status] +disabled = false +style = "bg:overlay fg:love" +format = '[](fg:overlay)([$all_status$ahead_behind]($style))[](fg:overlay) ' +up_to_date = '[ ✓ ](bg:overlay fg:iris)' +untracked = '[?\($count\)](bg:overlay fg:gold)' +stashed = '[\$](bg:overlay fg:iris)' +modified = '[!\($count\)](bg:overlay fg:gold)' +renamed = '[»\($count\)](bg:overlay fg:iris)' +deleted = '[✘\($count\)](style)' +staged = '[++\($count\)](bg:overlay fg:gold)' +ahead = '[⇡\(${count}\)](bg:overlay fg:foam)' +diverged = '⇕[\[](bg:overlay fg:iris)[⇡\(${ahead_count}\)](bg:overlay fg:foam)[⇣\(${behind_count}\)](bg:overlay fg:rose)[\]](bg:overlay fg:iris)' +behind = '[⇣\(${count}\)](bg:overlay fg:rose)' + +[custom.jj] +when = "jj root >/dev/null 2>&1" +shell = ["fish", "-c"] +command = ''' +jj log -r @ --no-graph --ignore-working-copy --color=never \ +-T ' "󱗆 " ++ change_id.short() + ++ if(bookmarks.len() > 0, + " (" ++ bookmarks.join(", ") ++ ")", + "" + ) + ++ if(conflict, + " [!]", + "" + )' +''' +format = "[](fg:overlay)[ $output ]($style)[](fg:overlay) " +style = "bg:overlay fg:foam" +[time] +disabled = false +format = " [](fg:overlay)[ $time 󰴈 ]($style)[](fg:overlay)" +style = "bg:overlay fg:rose" +time_format = "%I:%M%P" +use_12hr = true + + +[hostname] +disabled = false +ssh_only = false +trim_at = '' +format = "[](fg:overlay)[ 󰠧 $hostname$ssh_symbol ]($style)[](fg:overlay) " +style = "bg:overlay fg:rose" +ssh_symbol = ' ' + +[username] +disabled = false +format = "[](fg:overlay)[ 󰧱 $user ]($style)[](fg:overlay) " +show_always = true +style_root = "bg:overlay fg:iris" +style_user = "bg:overlay fg:iris" + +# Languages + +[c] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[elixir] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[elm] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[golang] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[haskell] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[java] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[julia] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[nodejs] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = "󰎙 " + +[nim] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = "󰆥 " + +[rust] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[scala] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = " " + +[python] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$version ]($style)[](fg:overlay)" +disabled = false +symbol = ' ' + +[conda] +style = "bg:overlay fg:pine" +format = " [](fg:overlay)[ $symbol$environment ]($style)[](fg:overlay)" +disabled = false +symbol = '🅒 ' +" +[DEBUG] - (starship::config): Config parsed: {"$schema": String("https://starship.rs/config-schema.json"), "format": String("$hostname$username$directory$git_branch$git_status${custom.jj}$fill$c$elixir$elm$golang$haskell$java$julia$nodejs$nim$rust$scala$conda$python$time\n[❯](fg:iris) "), "palette": String("rose-pine"), "palettes": Table({"rose-pine": Table({"overlay": String("#26233a"), "love": String("#eb6f92"), "gold": String("#f6c177"), "rose": String("#ebbcba"), "pine": String("#31748f"), "foam": String("#9ccfd8"), "iris": String("#c4a7e7")})}), "directory": Table({"format": String("[\u{e0b6}](fg:overlay)[ $path ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:pine"), "truncation_length": Integer(3), "truncation_symbol": String("…/"), "substitutions": Table({"Documents": String("\u{f0219}"), "Downloads": String("\u{f019} "), "Music": String("\u{f001} "), "Pictures": String("\u{f03e} ")})}), "fill": Table({"style": String("fg:overlay"), "symbol": String(" ")}), "git_branch": Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ $symbol $branch ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam"), "symbol": String("\u{f418}")}), "git_status": Table({"disabled": Boolean(false), "style": String("bg:overlay fg:love"), "format": String("[\u{e0b6}](fg:overlay)([$all_status$ahead_behind]($style))[\u{e0b4}](fg:overlay) "), "up_to_date": String("[ ✓ ](bg:overlay fg:iris)"), "untracked": String("[?\\($count\\)](bg:overlay fg:gold)"), "stashed": String("[\\$](bg:overlay fg:iris)"), "modified": String("[!\\($count\\)](bg:overlay fg:gold)"), "renamed": String("[»\\($count\\)](bg:overlay fg:iris)"), "deleted": String("[✘\\($count\\)](style)"), "staged": String("[++\\($count\\)](bg:overlay fg:gold)"), "ahead": String("[⇡\\(${count}\\)](bg:overlay fg:foam)"), "diverged": String("⇕[\\[](bg:overlay fg:iris)[⇡\\(${ahead_count}\\)](bg:overlay fg:foam)[⇣\\(${behind_count}\\)](bg:overlay fg:rose)[\\]](bg:overlay fg:iris)"), "behind": String("[⇣\\(${count}\\)](bg:overlay fg:rose)")}), "custom": Table({"jj": Table({"when": String("jj root >/dev/null 2>&1"), "shell": Array([String("fish"), String("-c")]), "command": String("jj log -r @ --no-graph --ignore-working-copy --color=never \\\n-T ' \"\u{f15c6} \" ++ change_id.short()\n ++ if(bookmarks.len() > 0,\n \" (\" ++ bookmarks.join(\", \") ++ \")\",\n \"\"\n )\n ++ if(conflict,\n \" [!]\",\n \"\"\n )'\n"), "format": String("[\u{e0b6}](fg:overlay)[ $output ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam")})}), "time": Table({"disabled": Boolean(false), "format": String(" [\u{e0b6}](fg:overlay)[ $time \u{f0d08} ]($style)[\u{e0b4}](fg:overlay)"), "style": String("bg:overlay fg:rose"), "time_format": String("%I:%M%P"), "use_12hr": Boolean(true)}), "hostname": Table({"disabled": Boolean(false), "ssh_only": Boolean(false), "trim_at": String(""), "format": String("[\u{e0b6}](fg:overlay)[ \u{f0827} $hostname$ssh_symbol ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:rose"), "ssh_symbol": String(" \u{f0ac}")}), "username": Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ \u{f09f1} $user ]($style)[\u{e0b4}](fg:overlay) "), "show_always": Boolean(true), "style_root": String("bg:overlay fg:iris"), "style_user": String("bg:overlay fg:iris")}), "c": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e61e} ")}), "elixir": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e275} ")}), "elm": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e62c} ")}), "golang": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e627} ")}), "haskell": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e777} ")}), "java": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e256} ")}), "julia": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e624} ")}), "nodejs": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f0399} ")}), "nim": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f01a5} ")}), "rust": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e7a8} ")}), "scala": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e737} ")}), "python": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e73c} ")}), "conda": Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$environment ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("🅒 ")})} +[TRACE] - (starship::context): Received completed pipestatus of None +[DEBUG] - (starship::config): Config found for "c": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e61e} ")})) +[DEBUG] - (starship::config): Config found for "c": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e61e} ")})) +[DEBUG] - (starship::config): Config found for "elixir": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e275} ")})) +[DEBUG] - (starship::config): Config found for "elixir": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e275} ")})) +[DEBUG] - (starship::config): Config found for "conda": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$environment ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("🅒 ")})) +[DEBUG] - (starship::config): Config found for "conda": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$environment ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("🅒 ")})) +[DEBUG] - (starship::config): Config found for "haskell": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e777} ")})) +[DEBUG] - (starship::config): Config found for "haskell": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e777} ")})) +[TRACE] - (starship::config): No config found for "custom.jj": Option "custom.jj" not found +[DEBUG] - (starship::config): Config found for "c": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e61e} ")})) +[DEBUG] - (starship::config): Config found for "directory": Some(Table({"format": String("[\u{e0b6}](fg:overlay)[ $path ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:pine"), "truncation_length": Integer(3), "truncation_symbol": String("…/"), "substitutions": Table({"Documents": String("\u{f0219}"), "Downloads": String("\u{f019} "), "Music": String("\u{f001} "), "Pictures": String("\u{f03e} ")})})) +[DEBUG] - (starship::config): Config found for "elixir": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e275} ")})) +[DEBUG] - (starship::config): Config found for "nodejs": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f0399} ")})) +[DEBUG] - (starship::config): Config found for "nodejs": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f0399} ")})) +[DEBUG] - (starship::config): Config found for "elm": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e62c} ")})) +[DEBUG] - (starship::config): Config found for "elm": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e62c} ")})) +[DEBUG] - (starship::config): Custom config found for "jj": Some(Table({"when": String("jj root >/dev/null 2>&1"), "shell": Array([String("fish"), String("-c")]), "command": String("jj log -r @ --no-graph --ignore-working-copy --color=never \\\n-T ' \"\u{f15c6} \" ++ change_id.short()\n ++ if(bookmarks.len() > 0,\n \" (\" ++ bookmarks.join(\", \") ++ \")\",\n \"\"\n )\n ++ if(conflict,\n \" [!]\",\n \"\"\n )'\n"), "format": String("[\u{e0b6}](fg:overlay)[ $output ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam")})) +[TRACE] - (starship::context): Building HashSets of directory files, folders and extensions took 335.791µs +[DEBUG] - (starship::config): Config found for "directory": Some(Table({"format": String("[\u{e0b6}](fg:overlay)[ $path ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:pine"), "truncation_length": Integer(3), "truncation_symbol": String("…/"), "substitutions": Table({"Documents": String("\u{f0219}"), "Downloads": String("\u{f019} "), "Music": String("\u{f001} "), "Pictures": String("\u{f03e} ")})})) +[TRACE] - (starship::modules): Took 4.292µs to compute module "conda" +[DEBUG] - (starship::config): Config found for "nodejs": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f0399} ")})) +[DEBUG] - (starship::config): Config found for "haskell": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e777} ")})) +[DEBUG] - (starship::config): Config found for "elm": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e62c} ")})) +[TRACE] - (starship::modules): Took 1.539875ms to compute module "elm" +[DEBUG] - (starship::config): Config found for "elm": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e62c} ")})) +[DEBUG] - (starship::config): Config found for "fill": Some(Table({"style": String("fg:overlay"), "symbol": String(" ")})) +[DEBUG] - (starship::config): Config found for "fill": Some(Table({"style": String("fg:overlay"), "symbol": String(" ")})) +[DEBUG] - (starship::config): Config found for "fill": Some(Table({"style": String("fg:overlay"), "symbol": String(" ")})) +[TRACE] - (starship::modules): Took 1.332458ms to compute module "nodejs" +[DEBUG] - (starship::config): Config found for "nodejs": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f0399} ")})) +[DEBUG] - (starship::config): Config found for "python": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e73c} ")})) +[DEBUG] - (starship::config): Config found for "python": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e73c} ")})) +[TRACE] - (starship::modules): Took 2.951958ms to compute module "elixir" +[DEBUG] - (starship::config): Config found for "elixir": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e275} ")})) +[DEBUG] - (starship::config): Config found for "git_branch": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ $symbol $branch ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam"), "symbol": String("\u{f418}")})) +[DEBUG] - (starship::config): Config found for "git_branch": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ $symbol $branch ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam"), "symbol": String("\u{f418}")})) +[TRACE] - (starship::modules): Took 3.019125ms to compute module "haskell" +[DEBUG] - (starship::config): Config found for "haskell": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e777} ")})) +[DEBUG] - (starship::config): Config found for "hostname": Some(Table({"disabled": Boolean(false), "ssh_only": Boolean(false), "trim_at": String(""), "format": String("[\u{e0b6}](fg:overlay)[ \u{f0827} $hostname$ssh_symbol ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:rose"), "ssh_symbol": String(" \u{f0ac}")})) +[DEBUG] - (starship::config): Config found for "hostname": Some(Table({"disabled": Boolean(false), "ssh_only": Boolean(false), "trim_at": String(""), "format": String("[\u{e0b6}](fg:overlay)[ \u{f0827} $hostname$ssh_symbol ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:rose"), "ssh_symbol": String(" \u{f0ac}")})) +[DEBUG] - (starship::config): Config found for "directory": Some(Table({"format": String("[\u{e0b6}](fg:overlay)[ $path ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:pine"), "truncation_length": Integer(3), "truncation_symbol": String("…/"), "substitutions": Table({"Documents": String("\u{f0219}"), "Downloads": String("\u{f019} "), "Music": String("\u{f001} "), "Pictures": String("\u{f03e} ")})})) +[DEBUG] - (starship::config): Config found for "git_status": Some(Table({"disabled": Boolean(false), "style": String("bg:overlay fg:love"), "format": String("[\u{e0b6}](fg:overlay)([$all_status$ahead_behind]($style))[\u{e0b4}](fg:overlay) "), "up_to_date": String("[ ✓ ](bg:overlay fg:iris)"), "untracked": String("[?\\($count\\)](bg:overlay fg:gold)"), "stashed": String("[\\$](bg:overlay fg:iris)"), "modified": String("[!\\($count\\)](bg:overlay fg:gold)"), "renamed": String("[»\\($count\\)](bg:overlay fg:iris)"), "deleted": String("[✘\\($count\\)](style)"), "staged": String("[++\\($count\\)](bg:overlay fg:gold)"), "ahead": String("[⇡\\(${count}\\)](bg:overlay fg:foam)"), "diverged": String("⇕[\\[](bg:overlay fg:iris)[⇡\\(${ahead_count}\\)](bg:overlay fg:foam)[⇣\\(${behind_count}\\)](bg:overlay fg:rose)[\\]](bg:overlay fg:iris)"), "behind": String("[⇣\\(${count}\\)](bg:overlay fg:rose)")})) +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::modules::custom): Running 'jj root >/dev/null 2>&1' +[TRACE] - (starship::utils): Creating Command for binary "fish" +[DEBUG] - (starship::config): Config found for "hostname": Some(Table({"disabled": Boolean(false), "ssh_only": Boolean(false), "trim_at": String(""), "format": String("[\u{e0b6}](fg:overlay)[ \u{f0827} $hostname$ssh_symbol ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:rose"), "ssh_symbol": String(" \u{f0ac}")})) +[DEBUG] - (starship::modules::directory): Home dir: "/Users/scie" +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: rose +[TRACE] - (starship::config): Read user-defined color string: rose defined as #ebbcba +[TRACE] - (starship::config): Parsing color_string: #ebbcba +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #ebbcba +[TRACE] - (starship::config): Read RGB color string: 235,188,186 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::modules): Took 5.010625ms to compute module "fill" +[DEBUG] - (starship::config): Config found for "golang": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e627} ")})) +[DEBUG] - (starship::config): Config found for "golang": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e627} ")})) +[DEBUG] - (starship::config): Config found for "golang": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e627} ")})) +[TRACE] - (starship::modules): Took 213.916µs to compute module "golang" +[DEBUG] - (starship::config): Config found for "scala": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e737} ")})) +[DEBUG] - (starship::config): Config found for "scala": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e737} ")})) +[DEBUG] - (starship::config): Config found for "scala": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e737} ")})) +[DEBUG] - (starship::config): Config found for "git_status": Some(Table({"disabled": Boolean(false), "style": String("bg:overlay fg:love"), "format": String("[\u{e0b6}](fg:overlay)([$all_status$ahead_behind]($style))[\u{e0b4}](fg:overlay) "), "up_to_date": String("[ ✓ ](bg:overlay fg:iris)"), "untracked": String("[?\\($count\\)](bg:overlay fg:gold)"), "stashed": String("[\\$](bg:overlay fg:iris)"), "modified": String("[!\\($count\\)](bg:overlay fg:gold)"), "renamed": String("[»\\($count\\)](bg:overlay fg:iris)"), "deleted": String("[✘\\($count\\)](style)"), "staged": String("[++\\($count\\)](bg:overlay fg:gold)"), "ahead": String("[⇡\\(${count}\\)](bg:overlay fg:foam)"), "diverged": String("⇕[\\[](bg:overlay fg:iris)[⇡\\(${ahead_count}\\)](bg:overlay fg:foam)[⇣\\(${behind_count}\\)](bg:overlay fg:rose)[\\]](bg:overlay fg:iris)"), "behind": String("[⇣\\(${count}\\)](bg:overlay fg:rose)")})) +[DEBUG] - (starship::config): Config found for "git_branch": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ $symbol $branch ]($style)[\u{e0b4}](fg:overlay) "), "style": String("bg:overlay fg:foam"), "symbol": String("\u{f418}")})) +[TRACE] - (starship::modules): Took 3.292666ms to compute module "c" +[DEBUG] - (starship::config): Config found for "c": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e61e} ")})) +[DEBUG] - (starship::config): Config found for "java": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e256} ")})) +[DEBUG] - (starship::config): Config found for "java": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e256} ")})) +[DEBUG] - (starship::modules::directory): Physical dir: "/Users/scie/dots" +[DEBUG] - (starship::modules::directory): Display dir: "/Users/scie/dots" +[DEBUG] - (starship::config): Config found for "git_status": Some(Table({"disabled": Boolean(false), "style": String("bg:overlay fg:love"), "format": String("[\u{e0b6}](fg:overlay)([$all_status$ahead_behind]($style))[\u{e0b4}](fg:overlay) "), "up_to_date": String("[ ✓ ](bg:overlay fg:iris)"), "untracked": String("[?\\($count\\)](bg:overlay fg:gold)"), "stashed": String("[\\$](bg:overlay fg:iris)"), "modified": String("[!\\($count\\)](bg:overlay fg:gold)"), "renamed": String("[»\\($count\\)](bg:overlay fg:iris)"), "deleted": String("[✘\\($count\\)](style)"), "staged": String("[++\\($count\\)](bg:overlay fg:gold)"), "ahead": String("[⇡\\(${count}\\)](bg:overlay fg:foam)"), "diverged": String("⇕[\\[](bg:overlay fg:iris)[⇡\\(${ahead_count}\\)](bg:overlay fg:foam)[⇣\\(${behind_count}\\)](bg:overlay fg:rose)[\\]](bg:overlay fg:iris)"), "behind": String("[⇣\\(${count}\\)](bg:overlay fg:rose)")})) +[TRACE] - (starship::modules): Took 2.517667ms to compute module "hostname" +[DEBUG] - (starship::config): Config found for "python": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e73c} ")})) +[TRACE] - (starship::utils): Using "/opt/homebrew/bin/fish" as "fish" +[DEBUG] - (starship::config): Config found for "java": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e256} ")})) +[TRACE] - (starship::modules): Took 1.434708ms to compute module "java" +[DEBUG] - (starship::config): Config found for "java": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e256} ")})) +[DEBUG] - (starship::config): Config found for "julia": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e624} ")})) +[DEBUG] - (starship::config): Config found for "julia": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e624} ")})) +[DEBUG] - (starship::config): Config found for "julia": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e624} ")})) +[TRACE] - (starship::modules): Took 230.958µs to compute module "julia" +[DEBUG] - (starship::config): Config found for "nim": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f01a5} ")})) +[DEBUG] - (starship::config): Config found for "nim": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f01a5} ")})) +[TRACE] - (starship::modules): Took 8.428875ms to compute module "python" +[DEBUG] - (starship::config): Config found for "python": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e73c} ")})) +[DEBUG] - (starship::config): Config found for "time": Some(Table({"disabled": Boolean(false), "format": String(" [\u{e0b6}](fg:overlay)[ $time \u{f0d08} ]($style)[\u{e0b4}](fg:overlay)"), "style": String("bg:overlay fg:rose"), "time_format": String("%I:%M%P"), "use_12hr": Boolean(true)})) +[DEBUG] - (starship::config): Config found for "time": Some(Table({"disabled": Boolean(false), "format": String(" [\u{e0b6}](fg:overlay)[ $time \u{f0d08} ]($style)[\u{e0b4}](fg:overlay)"), "style": String("bg:overlay fg:rose"), "time_format": String("%I:%M%P"), "use_12hr": Boolean(true)})) +[TRACE] - (starship::modules): Took 228.541µs to compute module "scala" +[DEBUG] - (starship::config): Config found for "username": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ \u{f09f1} $user ]($style)[\u{e0b4}](fg:overlay) "), "show_always": Boolean(true), "style_root": String("bg:overlay fg:iris"), "style_user": String("bg:overlay fg:iris")})) +[DEBUG] - (starship::config): Config found for "username": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ \u{f09f1} $user ]($style)[\u{e0b4}](fg:overlay) "), "show_always": Boolean(true), "style_root": String("bg:overlay fg:iris"), "style_user": String("bg:overlay fg:iris")})) +[DEBUG] - (starship::config): Config found for "time": Some(Table({"disabled": Boolean(false), "format": String(" [\u{e0b6}](fg:overlay)[ $time \u{f0d08} ]($style)[\u{e0b4}](fg:overlay)"), "style": String("bg:overlay fg:rose"), "time_format": String("%I:%M%P"), "use_12hr": Boolean(true)})) +[DEBUG] - (starship::config): Config found for "rust": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e7a8} ")})) +[DEBUG] - (starship::config): Config found for "rust": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e7a8} ")})) +[DEBUG] - (starship::config): Config found for "rust": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{e7a8} ")})) +[TRACE] - (starship::modules): Took 172.708µs to compute module "rust" +[DEBUG] - (starship::config): Config found for "nim": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f01a5} ")})) +[DEBUG] - (starship::config): Config found for "username": Some(Table({"disabled": Boolean(false), "format": String("[\u{e0b6}](fg:overlay)[ \u{f09f1} $user ]($style)[\u{e0b4}](fg:overlay) "), "show_always": Boolean(true), "style_root": String("bg:overlay fg:iris"), "style_user": String("bg:overlay fg:iris")})) +[TRACE] - (starship::modules::time): Timer module is enabled with format string: %I:%M%P +[TRACE] - (starship::modules): Took 2.325542ms to compute module "nim" +[DEBUG] - (starship::config): Config found for "nim": Some(Table({"style": String("bg:overlay fg:pine"), "format": String(" [\u{e0b6}](fg:overlay)[ $symbol$version ]($style)[\u{e0b4}](fg:overlay)"), "disabled": Boolean(false), "symbol": String("\u{f01a5} ")})) +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: rose +[TRACE] - (starship::config): Read user-defined color string: rose defined as #ebbcba +[TRACE] - (starship::config): Parsing color_string: #ebbcba +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #ebbcba +[TRACE] - (starship::config): Read RGB color string: 235,188,186 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: iris +[TRACE] - (starship::config): Read user-defined color string: iris defined as #c4a7e7 +[TRACE] - (starship::config): Parsing color_string: #c4a7e7 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #c4a7e7 +[TRACE] - (starship::config): Read RGB color string: 196,167,231 +[TRACE] - (starship::modules::custom): non-zero exit code 'Some(1)' +[TRACE] - (starship::modules::custom): stdout: +[TRACE] - (starship::modules::custom): stderr: fish: -c: option requires an argument + + +[TRACE] - (starship::modules): Took 19.565583ms to compute module "custom.jj" +[TRACE] - (starship::config): No config found for "custom.jj": Option "custom.jj" not found +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::modules): Took 4.504292ms to compute module "time" +[TRACE] - (starship::modules): Took 4.212417ms to compute module "username" +[TRACE] - (starship::context): Found git repo: Repository { kind: WorkTree { is_linked: false }, git_dir: "/Users/scie/dots/.git", workdir: Some("/Users/scie/dots") }, (trust: Full) +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: foam +[TRACE] - (starship::config): Read user-defined color string: foam defined as #9ccfd8 +[TRACE] - (starship::config): Parsing color_string: #9ccfd8 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #9ccfd8 +[TRACE] - (starship::config): Read RGB color string: 156,207,216 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: pine +[TRACE] - (starship::config): Read user-defined color string: pine defined as #31748f +[TRACE] - (starship::config): Parsing color_string: #31748f +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #31748f +[TRACE] - (starship::config): Read RGB color string: 49,116,143 +[TRACE] - (starship::modules): Took 23.9265ms to compute module "git_branch" +[DEBUG] - (starship::modules::git_status): New repo status created +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::modules): Took 27.508625ms to compute module "directory" +[TRACE] - (starship::utils): Creating Command for binary "git" +[TRACE] - (starship::utils): Using "/usr/bin/git" as "git" +[TRACE] - (starship::context): Executing git command: GIT_OPTIONAL_LOCKS="0" "/usr/bin/git" "-C" "/Users/scie/dots" "--git-dir" "/Users/scie/dots/.git" "-c" "core.fsmonitor=" "--work-tree" "/Users/scie/dots" "for-each-ref" "--format" "%(upstream) %(upstream:track)" "refs/heads/main" +[TRACE] - (starship::utils): stdout: "refs/remotes/origin/main \n", stderr: "", exit code: "Some(0)", took 12.70225ms +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: iris +[TRACE] - (starship::config): Read user-defined color string: iris defined as #c4a7e7 +[TRACE] - (starship::config): Parsing color_string: #c4a7e7 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #c4a7e7 +[TRACE] - (starship::config): Read RGB color string: 196,167,231 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: gold +[TRACE] - (starship::config): Read user-defined color string: gold defined as #f6c177 +[TRACE] - (starship::config): Parsing color_string: #f6c177 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #f6c177 +[TRACE] - (starship::config): Read RGB color string: 246,193,119 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: gold +[TRACE] - (starship::config): Read user-defined color string: gold defined as #f6c177 +[TRACE] - (starship::config): Parsing color_string: #f6c177 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #f6c177 +[TRACE] - (starship::config): Read RGB color string: 246,193,119 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: love +[TRACE] - (starship::config): Read user-defined color string: love defined as #eb6f92 +[TRACE] - (starship::config): Parsing color_string: #eb6f92 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #eb6f92 +[TRACE] - (starship::config): Read RGB color string: 235,111,146 +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: overlay +[TRACE] - (starship::config): Read user-defined color string: overlay defined as #26233a +[TRACE] - (starship::config): Parsing color_string: #26233a +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #26233a +[TRACE] - (starship::config): Read RGB color string: 38,35,58 +[TRACE] - (starship::modules): Took 34.624084ms to compute module "git_status" +[TRACE] - (starship::config): Found color palette: rose-pine +[TRACE] - (starship::config): Parsing color_string: iris +[TRACE] - (starship::config): Read user-defined color string: iris defined as #c4a7e7 +[TRACE] - (starship::config): Parsing color_string: #c4a7e7 +[TRACE] - (starship::config): Attempting to read hexadecimal color string: #c4a7e7 +[TRACE] - (starship::config): Read RGB color string: 196,167,231 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 72a4f9b..a6abfa8 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -2,11 +2,8 @@ set-environment -g TMUX_POWERLINE_THEME bubble # Options set -g mouse on -# set -g default-terminal "screen-256color" -set -g default-terminal "xterm-ghostty" -# set-option -sa terminal-overrides ',xterm-256color:Tc,xterm-*:allow-passthrough' -set -ga terminal-overrides ",xterm-ghostty:Tc" - +set -g default-terminal "screen-256color" +set-option -sa terminal-overrides ',xterm-256color:Tc,xterm-*:allow-passthrough' set-window-option -g mode-keys vi set -g status-position top set-option -g set-clipboard on @@ -16,11 +13,6 @@ set -g base-index 1 setw -g pane-base-index 1 -set -g allow-passthrough all -set -as terminal-features ",xterm-ghostty:hyperlinks" - - - # Keybinds set-option -g prefix C-\\ unbind C-b @@ -59,11 +51,6 @@ bind-key "T" run-shell "sesh connect \"$( --preview 'sesh preview {}' )\"" -bind-key -T copy-mode-vi [ send-keys -X previous-prompt -bind-key -T copy-mode-vi M-[ send-keys -X previous-prompt -o -bind-key -T copy-mode-vi ] send-keys -X next-prompt -bind-key -T copy-mode-vi M-] send-keys -X next-prompt -o - # Plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' diff --git a/vim/.config/nvim/.luarc.json b/vim/.config/nvim/.luarc.json deleted file mode 100644 index e69de29..0000000 diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua index 3fa4cb9..21cd978 100644 --- a/vim/.config/nvim/init.lua +++ b/vim/.config/nvim/init.lua @@ -26,9 +26,8 @@ require("remap") if vim.g.is_purdue then - require("westwood-lint") + -- require("westwood-lint") end - require("standard-lint") vim.cmd("source ~/.vim/settings.vim") @@ -119,22 +118,17 @@ vim.api.nvim_create_autocmd("TermOpen", { vim.o.clipboard = "unnamedplus" --- vim.g.clipboard = { --- name = "OSC 52", --- copy = { --- ["+"] = require("vim.ui.clipboard.osc52").copy("+"), --- ["*"] = require("vim.ui.clipboard.osc52").copy("*"), --- }, --- paste = { --- ["+"] = require("vim.ui.clipboard.osc52").paste("+"), --- ["*"] = require("vim.ui.clipboard.osc52").paste("*"), --- }, --- } -vim.g.clipboard = "osc52" -vim.keymap.set("n", "p", '"+p') -vim.keymap.set("n", "P", '"+P') - - +vim.g.clipboard = { + name = "OSC 52", + copy = { + ["+"] = require("vim.ui.clipboard.osc52").copy("+"), + ["*"] = require("vim.ui.clipboard.osc52").copy("*"), + }, + paste = { + ["+"] = require("vim.ui.clipboard.osc52").paste("+"), + ["*"] = require("vim.ui.clipboard.osc52").paste("*"), + }, +} -- stupid hacky workaround to make it so i can paste from tmux with OSC52 -- https://github.com/neovim/neovim/discussions/29350#discussioncomment-10299517 -- tracking issue about tmux behavior: https://github.com/tmux/tmux/issues/4275 diff --git a/vim/.config/nvim/lua/native-lsp.lua b/vim/.config/nvim/lua/native-lsp.lua index ee97f80..33c9c01 100644 --- a/vim/.config/nvim/lua/native-lsp.lua +++ b/vim/.config/nvim/lua/native-lsp.lua @@ -88,10 +88,6 @@ vim.lsp.enable("fish-lsp") -vim.diagnostic.config({ - virtual_text = { priority = 100 }, -}) - -- https://lsp-zero.netlify.app/blog/lsp-client-features.html vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' } diff --git a/vim/.config/nvim/lua/packed.lua b/vim/.config/nvim/lua/packed.lua deleted file mode 100644 index 28a21cc..0000000 --- a/vim/.config/nvim/lua/packed.lua +++ /dev/null @@ -1,127 +0,0 @@ --- --- Packed: a single file, somewhat compatible Packer replacement --- Written by grace --- - -local function resolve_src(s) - if s:match("^https?://") then - return s - end - if s:match("^[%w%-]+/[%w%-_.]+$") then - return "https://github.com/" .. s - end - return s -end - -local function normalize_plugin(p) - if type(p) == "string" then - return { - src = resolve_src(p), - name = p:match(".*/(.*)"), - } - end - - if type(p[1]) == "string" then - p.src = resolve_src(p[1]) - p[1] = nil - end - - if p.src then - p.src = resolve_src(p.src) - end - - if not p.name and p.as then - p.name = p.as - end - - if not p.version then - if p.commit then - p.version = p.commit - elseif p.tag then - p.version = p.tag - elseif p.branch then - p.version = p.branch - end - end - - - - local unsupported = { - 'disable', 'installer', 'updater', 'after', 'rtp', - 'opt', 'bufread', 'lock', 'run', 'requires', 'rocks', 'setup' - } - - for _, field in ipairs(unsupported) do - if p[field] then - vim.notify("Packed does not support `" .. field .. "`: " .. (p.name or p.src), vim.log.levels.WARN) - vim.api.nvim_echo({ { "Press Enter to continue...", "MoreMsg" } }, false, {}) - vim.fn.getchar() - end - end - - if p.cmd or p.ft or p.keys or p.event or p.fn or p.cond or p.module or p.module_pattern then - vim.notify("Packed does not support lazy loading: " .. (p.name or p.src), vim.log.levels.WARN) - vim.api.nvim_echo({ { "Press Enter to continue...", "MoreMsg" } }, false, {}) - vim.fn.getchar() - end - - - - return p -end - -local function setup_plugins(plugs) - local plugins = {} - - if type(plugs) == "function" then - local function use(p) - table.insert(plugins, p) - end - - plugs(use) - else - plugins = plugs - end - local specs = {} - - for _, p in ipairs(plugins) do - p = normalize_plugin(p) - - local spec = vim.deepcopy(p) - spec.config = nil - - table.insert(specs, spec) - end - - vim.pack.add(specs, { confirm = true, load = true }) - - - for _, p in ipairs(plugins) do - if type(p) ~= "string" and p.config then - local ok = pcall(p.config) - if not ok then - vim.notify("Config failed: " .. (p.name or p.src), vim.log.levels.ERROR) - vim.api.nvim_echo({ { "Press Enter to continue...", "MoreMsg" } }, false, {}) - vim.fn.getchar() - end - end - end - - - local unused = vim.iter(vim.pack.get()) - :filter(function(p) - return not p.active - end) - :map(function(p) - return p.spec.name - end) - :totable() - - vim.pack.del(unused) -end - - -local r = {} -r.setup = setup_plugins - -return r diff --git a/vim/.config/nvim/lua/plugins/blink_config.lua b/vim/.config/nvim/lua/plugins/blink_config.lua new file mode 100644 index 0000000..00d5a59 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/blink_config.lua @@ -0,0 +1,11 @@ +require("blink.cmp").setup({ + fuzzy = { + implementation = "lua", + prebuilt_binaries = { + download = true, + force_version = 'v1.2.0', + }, + }, + keymap = { preset = "enter" }, +}) + diff --git a/vim/.config/nvim/lua/plugins.lua b/vim/.config/nvim/lua/plugins/init.lua similarity index 60% rename from vim/.config/nvim/lua/plugins.lua rename to vim/.config/nvim/lua/plugins/init.lua index dcdf5df..574aaf0 100644 --- a/vim/.config/nvim/lua/plugins.lua +++ b/vim/.config/nvim/lua/plugins/init.lua @@ -1,9 +1,39 @@ --- vim.pack.update(nil, { target = 'lockfile' }) +vim.cmd [[packadd packer.nvim]] -return require("packed").setup(function(use) - use 'nvim-lua/plenary.nvim' +local ensure_packer = function() + local fn = vim.fn + local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' + if fn.empty(fn.glob(install_path)) > 0 then + fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) + vim.cmd [[packadd packer.nvim]] + return true + end + return false +end + +local packer_bootstrap = ensure_packer() + +return require('packer').startup(function(use) + use 'wbthomason/packer.nvim' + + -- use "neovim/nvim-lspconfig" + + use { + 'maxmx03/solarized.nvim', + config = function() + vim.o.background = 'dark' + ---@type solarized + local solarized = require('solarized') + vim.o.termguicolors = true + vim.o.background = 'dark' + solarized.setup({}) + -- vim.cmd.colorscheme 'solarized' + end + } use { 'nvim-telescope/telescope.nvim', + requires = { { 'nvim-lua/plenary.nvim' } }, + run = ":TSUpdate", config = function() require('telescope').setup({ defaults = { @@ -28,6 +58,7 @@ return require("packed").setup(function(use) use { 'nvim-treesitter/nvim-treesitter', branch = 'main', + run = ':TSUpdate', config = function() require('nvim-treesitter').setup() @@ -52,38 +83,41 @@ return require("packed").setup(function(use) use 'mbbill/undotree' - use 'nvim-tree/nvim-web-devicons' use 'mfussenegger/nvim-lint' use { 'nvim-lualine/lualine.nvim', - config = function() - require('lualine').setup { - options = { theme = "rose-pine" } - } - end + requires = { 'nvim-tree/nvim-web-devicons', opt = true }, + config = function() require('plugins/lualine-config') end } - - -- grrr why does neovim not have this? + -- use { + -- 'm4xshen/autoclose.nvim', + -- config = function() require("autoclose").setup() end + -- } + -- use { "windwp/nvim-autopairs", + event = "InsertEnter", config = function() require("nvim-autopairs").setup {} end } - use { "akinsho/toggleterm.nvim", config = function() - require("toggleterm").setup { - size = 30 - } - vim.keymap.set({ "n", "t", "v" }, "tt", require("toggleterm").toggle, { desc = "Toggle terminal" }) - end } - use { 'nvim-telescope/telescope.nvim' } + use { + 'CRAG666/betterTerm.nvim', + config = function() require('betterTerm').setup() end + } + use { 'anurag3301/nvim-platformio.lua', + requires = { + { 'akinsho/nvim-toggleterm.lua' }, + { 'nvim-telescope/telescope.nvim' }, + { 'nvim-lua/plenary.nvim' }, + }, config = function() if not vim.g.is_purdue then require('platformio').setup({ - lsp = "ccls" --default: ccls, other option: clangd + lsp = "clangd" --default: ccls, other option: clangd -- If you pick clangd, it also creates compile_commands.json }) end @@ -92,26 +126,30 @@ return require("packed").setup(function(use) use { "chentoast/marks.nvim", - config = function() require('marks').setup() end + config = function() require('plugins/marks-config') end } - -- use { "MunifTanjim/nui.nvim" } + use { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + requires = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information + } + } + + + use { "nvim-tree/nvim-web-devicons" } + use { "MunifTanjim/nui.nvim" } use { 'rafamadriz/friendly-snippets' } use { 'saghen/blink.cmp', - version = 'v1.10.1', + run = 'cargo build --release', config = function() - require("blink.cmp").setup({ - fuzzy = { - implementation = "prefer_rust_with_warning", - prebuilt_binaries = { - download = true, - force_version = "v1.*" - }, - }, - keymap = { preset = "enter" }, - }) + require("plugins/blink_config") end } @@ -124,6 +162,17 @@ return require("packed").setup(function(use) end } + -- use { + -- 'mrcjkb/rustaceanvim', + -- config = function() require('plugins/rust-config') end + -- } + + use { + "NeogitOrg/neogit", + config = function() + require("neogit").setup {} + end + } use { "mfussenegger/nvim-dap", @@ -131,12 +180,12 @@ return require("packed").setup(function(use) config = function() local dap = require("dap") - -- require('dap.ext.vscode').load_launchjs(nil, { - -- node = { 'javascript', 'typescript' }, - -- python = { 'python' }, - -- go = { 'go' }, - -- codelldb = { 'c', 'cpp', 'rust' } - -- }) + require('dap.ext.vscode').load_launchjs(nil, { + node = { 'javascript', 'typescript' }, + python = { 'python' }, + go = { 'go' }, + codelldb = { 'c', 'cpp', 'rust' } + }) vim.keymap.set('n', '', function() dap.continue() end, { desc = 'DAP: Continue' }) vim.keymap.set('n', '', function() dap.step_into() end, { desc = 'DAP: Step Into' }) @@ -175,9 +224,9 @@ return require("packed").setup(function(use) config = function() require('overseer').setup() end } use 'theHamsta/nvim-dap-virtual-text' - use "nvim-neotest/nvim-nio" use { "rcarriga/nvim-dap-ui", + requires = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }, config = function() local dap, dapui = require("dap"), require("dapui") dapui.setup() @@ -198,6 +247,10 @@ return require("packed").setup(function(use) use { "geigerzaehler/tree-sitter-jinja2" } + use "echasnovski/mini.base16" + + use 'rktjmp/lush.nvim' + use { "rose-pine/neovim", as = "rose-pine", @@ -211,32 +264,56 @@ return require("packed").setup(function(use) use { 'chomosuke/typst-preview.nvim', + tag = 'v1.*', config = function() require 'typst-preview'.setup {} end, } + -- use "folke/which-key.nvim" use({ - "iamcco/markdown-preview.nvim", + "andrewferrier/wrapping.nvim", config = function() - vim.api.nvim_create_user_command("MDPreviewInstall", function() - vim.vim.fn["mkdp#util#install"]() - end, {}) + require("wrapping").setup() end, }) + use({ + "iamcco/markdown-preview.nvim", + run = function() vim.fn["mkdp#util#install"]() end, + }) + + + -- use { + -- 'preservim/vim-pencil', + -- config = function() + -- vim.cmd([[ + -- augroup PencilSetup + -- autocmd! + -- autocmd FileType markdown,text,tex,gitcommit setlocal formatoptions+=t + -- autocmd FileType markdown,text,tex,gitcommit PencilHard + -- augroup END augroup END + -- ]]) + -- end + -- } use { 'LukasPietzschmann/telescope-tabs', + requires = { 'nvim-telescope/telescope.nvim' }, config = function() require 'telescope-tabs'.setup { -- Your custom config :^) } end } + use "HiPhish/rainbow-delimiters.nvim" ------------------------ + + if packer_bootstrap then + require('packer').sync() + end end) diff --git a/vim/.config/nvim/lua/plugins/lualine-config.lua b/vim/.config/nvim/lua/plugins/lualine-config.lua new file mode 100644 index 0000000..fe47e43 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/lualine-config.lua @@ -0,0 +1,4 @@ +require('lualine').setup { + options = { theme = "rose-pine" } +} + diff --git a/vim/.config/nvim/lua/plugins/marks-config.lua b/vim/.config/nvim/lua/plugins/marks-config.lua new file mode 100644 index 0000000..d1b4c82 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/marks-config.lua @@ -0,0 +1,36 @@ +require'marks'.setup { + -- whether to map keybinds or not. default true + default_mappings = true, + -- which builtin marks to show. default {} + builtin_marks = { ".", "<", ">", "^" }, + -- whether movements cycle back to the beginning/end of buffer. default true + cyclic = true, + -- whether the shada file is updated after modifying uppercase marks. default false + force_write_shada = false, + -- how often (in ms) to redraw signs/recompute mark positions. + -- higher values will have better performance but may cause visual lag, + -- while lower values may cause performance penalties. default 150. + refresh_interval = 250, + -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase + -- marks, and bookmarks. + -- can be either a table with all/none of the keys, or a single number, in which case + -- the priority applies to all marks. + -- default 10. + sign_priority = { lower=10, upper=15, builtin=8, bookmark=20 }, + -- disables mark tracking for specific filetypes. default {} + excluded_filetypes = {}, + -- disables mark tracking for specific buftypes. default {} + excluded_buftypes = {}, + -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own + -- sign/virttext. Bookmarks can be used to group together positions and quickly move + -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and + -- default virt_text is "". + bookmark_0 = { + sign = "⚑", + virt_text = "hello world", + -- explicitly prompt for a virtual line annotation when setting a bookmark from this group. + -- defaults to false. + annotate = false, + }, + mappings = {} +} diff --git a/vim/.config/nvim/lua/plugins/rust-config.lua b/vim/.config/nvim/lua/plugins/rust-config.lua new file mode 100644 index 0000000..c52d382 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/rust-config.lua @@ -0,0 +1,34 @@ +local bufnr = vim.api.nvim_get_current_buf() +vim.keymap.set( + "n", + "a", + function() + vim.cmd.RustLsp('codeAction') -- supports rust-analyzer's grouping + -- or vim.lsp.buf.codeAction() if you don't want grouping. + end, + { silent = true, buffer = bufnr } +) +vim.keymap.set( + "n", + "K", + function() + if vim.bo.filetype == "rust" then + vim.cmd.RustLsp({'hover', 'actions'}) + else + vim.lsp.buf.hover() + end + end, + { silent = true, buffer = bufnr } +) + +vim.g.rustaceanvim = { + server = { + settings = { + ["rust-analyzer"] = { + checkOnSave = { + command = "clippy", + }, + }, + }, + }, +} diff --git a/vim/.config/nvim/lua/plugins/ts.lua b/vim/.config/nvim/lua/plugins/ts.lua new file mode 100644 index 0000000..5f1b8b0 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/ts.lua @@ -0,0 +1,41 @@ +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the listed parsers MUST always be installed) + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (or "all") + -- ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + -- disable = { "c", "rust" }, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} diff --git a/vim/.config/nvim/lua/remap.lua b/vim/.config/nvim/lua/remap.lua index 0128949..1f8964e 100644 --- a/vim/.config/nvim/lua/remap.lua +++ b/vim/.config/nvim/lua/remap.lua @@ -57,18 +57,45 @@ vim.keymap.set('n', 'u', vim.cmd.UndotreeToggle) -- Better Term --- local betterTerm = require('betterTerm') --- -- toggle firts term --- vim.keymap.set({ "n", "t" }, "tt", betterTerm.open, { desc = "Open terminal" }) --- -- Select term focus --- -- vim.keymap.set({"n"}, "tf", betterTerm.select, { desc = "Select terminal"}) --- -- Create new term --- local current = 2 --- vim.keymap.set( --- { "n" }, "tn", --- function() --- betterTerm.open(current) --- current = current + 1 --- end, --- { desc = "New terminal" } --- ) +local betterTerm = require('betterTerm') +-- toggle firts term +vim.keymap.set({ "n", "t" }, "tt", betterTerm.open, { desc = "Open terminal" }) +-- Select term focus +-- vim.keymap.set({"n"}, "tf", betterTerm.select, { desc = "Select terminal"}) +-- Create new term +local current = 2 +vim.keymap.set( + { "n" }, "tn", + function() + betterTerm.open(current) + current = current + 1 + end, + { desc = "New terminal" } +) + +-- Neotree + +local ntc = require('neo-tree.command') +vim.keymap.set('n', '', function() + local reveal_file = vim.fn.expand('%:p') + if (reveal_file == '') then + reveal_file = vim.fn.getcwd() + else + local f = io.open(reveal_file, "r") + if (f) then + f.close(f) + else + reveal_file = vim.fn.getcwd() + end + end + ntc.execute({ + action = "focus", -- OPTIONAL, this is the default value + source = "filesystem", -- OPTIONAL, this is the default value + position = "right", -- OPTIONAL, this is the default value + reveal_file = reveal_file, -- path to file or folder to reveal + reveal_force_cwd = true, -- change cwd without asking if needed + toggle = true, + }) + end, + { desc = "Show Sidebar" } +) diff --git a/vim/.config/nvim/lua/westwood-lint.lua b/vim/.config/nvim/lua/westwood-lint.lua index 04501b2..0ffc8d8 100644 --- a/vim/.config/nvim/lua/westwood-lint.lua +++ b/vim/.config/nvim/lua/westwood-lint.lua @@ -1,19 +1,18 @@ local lint = require("lint") -local errorformat = -"%WWARNING: %m,%Z%\\s%\\s%\\s%\\s%\\s%\\s%\\s%\\s%\\sat (stdin) from line %l column %c to line %e column %k" +local errorformat = "%WWARNING: %m,%Z%\\s%\\s%\\s%\\s%\\s%\\s%\\s%\\s%\\sat (stdin) from line %l column %c to line %e column %k" lint.linters.westwood = { cmd = '/homes/kkasad/share/westwood', stdin = true, - args = { '-f', 'machine', '-' }, + args = {'-f', 'machine', '-'}, stream = both, ignore_exitcode = false, env = nil, parser = require('lint.parser').from_errorformat(errorformat) } -lint.linters_by_ft.c = { "westwood", "clangtidy" } -lint.linters_by_ft.cpp = { "westwood" } +lint.linters_by_ft.c = {"westwood", "clangtidy"} +lint.linters_by_ft.cpp = {"westwood"} vim.list_extend(lint.linters_by_ft.c, { "westwood", "clangtidy" }) vim.list_extend(lint.linters_by_ft.cpp, { "westwood" }) diff --git a/vim/.config/nvim/nvim-pack-lock.json b/vim/.config/nvim/nvim-pack-lock.json deleted file mode 100644 index ece9140..0000000 --- a/vim/.config/nvim/nvim-pack-lock.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "plugins": { - "blink.cmp": { - "rev": "451168851e8e2466bc97ee3e026c3dcb9141ce07", - "src": "https://github.com/saghen/blink.cmp", - "version": "'v1.10.1'" - }, - "friendly-snippets": { - "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", - "src": "https://github.com/rafamadriz/friendly-snippets" - }, - "git-blame.nvim": { - "rev": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7", - "src": "https://github.com/f-person/git-blame.nvim" - }, - "lualine.nvim": { - "rev": "47f91c416daef12db467145e16bed5bbfe00add8", - "src": "https://github.com/nvim-lualine/lualine.nvim" - }, - "markdown-preview.nvim": { - "rev": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee", - "src": "https://github.com/iamcco/markdown-preview.nvim" - }, - "marks.nvim": { - "rev": "f353e8c08c50f39e99a9ed474172df7eddd89b72", - "src": "https://github.com/chentoast/marks.nvim" - }, - "nvim-autopairs": { - "rev": "59bce2eef357189c3305e25bc6dd2d138c1683f5", - "src": "https://github.com/windwp/nvim-autopairs" - }, - "nvim-dap": { - "rev": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5", - "src": "https://github.com/mfussenegger/nvim-dap" - }, - "nvim-dap-ui": { - "rev": "f5b6673f374626515401c5bc51b005f784a4f252", - "src": "https://github.com/rcarriga/nvim-dap-ui" - }, - "nvim-dap-virtual-text": { - "rev": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6", - "src": "https://github.com/theHamsta/nvim-dap-virtual-text" - }, - "nvim-lint": { - "rev": "606b823a57b027502a9ae00978ebf4f5d5158098", - "src": "https://github.com/mfussenegger/nvim-lint" - }, - "nvim-nio": { - "rev": "21f5324bfac14e22ba26553caf69ec76ae8a7662", - "src": "https://github.com/nvim-neotest/nvim-nio" - }, - "nvim-platformio.lua": { - "rev": "3bc47194d0917a1f174e8c05d90e93824bd5d76f", - "src": "https://github.com/anurag3301/nvim-platformio.lua" - }, - "nvim-treesitter": { - "rev": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849", - "src": "https://github.com/nvim-treesitter/nvim-treesitter", - "version": "'main'" - }, - "nvim-web-devicons": { - "rev": "d7462543c9e366c0d196c7f67a945eaaf5d99414", - "src": "https://github.com/nvim-tree/nvim-web-devicons" - }, - "overseer.nvim": { - "rev": "a2194447f4c5a1baf95139c5c7b539fa7b0d012f", - "src": "https://github.com/stevearc/overseer.nvim" - }, - "plenary.nvim": { - "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", - "src": "https://github.com/nvim-lua/plenary.nvim" - }, - "rainbow-delimiters.nvim": { - "rev": "607a438d8c647a355749973fd295e33505afafde", - "src": "https://github.com/HiPhish/rainbow-delimiters.nvim" - }, - "rose-pine": { - "rev": "cf2a288696b03d0934da713d66c6d71557b5c997", - "src": "https://github.com/rose-pine/neovim" - }, - "telescope-tabs": { - "rev": "777b1f630f3d6a12a2e71635a82581c988d6da2e", - "src": "https://github.com/LukasPietzschmann/telescope-tabs" - }, - "telescope.nvim": { - "rev": "5255aa27c422de944791318024167ad5d40aad20", - "src": "https://github.com/nvim-telescope/telescope.nvim" - }, - "toggleterm.nvim": { - "rev": "9a88eae817ef395952e08650b3283726786fb5fb", - "src": "https://github.com/akinsho/toggleterm.nvim" - }, - "tree-sitter-jinja2": { - "rev": "ecab6215c53da5c1126d81d1bf664b3b5cf87d15", - "src": "https://github.com/geigerzaehler/tree-sitter-jinja2" - }, - "typst-preview.nvim": { - "rev": "a42c86ef1875100c2be92e90a637064efb0eab06", - "src": "https://github.com/chomosuke/typst-preview.nvim" - }, - "undotree": { - "rev": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d", - "src": "https://github.com/mbbill/undotree" - } - } -} \ No newline at end of file