diff --git a/README.md b/README.md index 0a63d68..392d09b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Each directory in this repository corresponds to a specific application or tool, > ```bash > stow bash > stow i3 -> stow polybar > ``` ### đŸ§© Included Tools & Configurations @@ -22,6 +21,7 @@ This repository contains my configuration files for the following tools: - **Shells & Prompt** - `bash` (Oh My Bash) + - `starship` - **Terminal Emulators & Multiplexer** - `alacritty` - `tmux` diff --git a/bash/.bashrc b/bash/.bashrc index 3f799f7..848f637 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -9,7 +9,7 @@ export OSH='/home/fscotto/.oh-my-bash' # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-bash is loaded. -OSH_THEME="robbyrussell" +# OSH_THEME="robbyrussell" # If you set OSH_THEME to "random", you can ignore themes you don't like. # OMB_THEME_RANDOM_IGNORED=("powerbash10k" "wanelo") @@ -78,7 +78,7 @@ OSH_THEME="robbyrussell" OMB_USE_SUDO=true # To enable/disable display of Python virtualenv and condaenv -OMB_PROMPT_SHOW_PYTHON_VENV=true # enable +# OMB_PROMPT_SHOW_PYTHON_VENV=true # enable # OMB_PROMPT_SHOW_PYTHON_VENV=false # disable # To enable/disable Spack environment information @@ -178,3 +178,9 @@ alias paths='echo -e ${PATH//:/\\n}' # path: Echo all executable alias userlist="cut -d: -f1 /etc/passwd | sort" alias ip='ip -color' alias stow='stow -d $DOTFILES ' + +# Starship prompt +if command -v starship > /dev/null 2>&1; then + eval "$(starship init bash)" +fi + diff --git a/bash/.profile b/bash/.profile index 9ce7774..f3600eb 100644 --- a/bash/.profile +++ b/bash/.profile @@ -8,6 +8,7 @@ function appendpath() { appendpath "$HOME/.local/bin" appendpath "$HOME/.cargo/bin" +appendpath "/home/linuxbrew/.linuxbrew/bin" unset appendpath # XDG variables @@ -34,20 +35,21 @@ export HELPDIR=/usr/share/zsh/"${ZSH_VERSION}"/help # SSH socket export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh" -export FZF_DEFAULT_COMMAND="fdfind --hidden --type file --strip-cwd-prefix --exclude .git" -export FZF_CTRL_T_COMMAND="fdfind --hidden --type file --strip-cwd-prefix --exclude .git" -export FZF_ALT_C_COMMAND="fdfind --hidden --type directory --strip-cwd-prefix --exclude .git" -# Export Catppuccin Mocha theme for FZF -export FZF_DEFAULT_OPTS=" \ ---height 60% --layout=reverse --border \ ---color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \ ---color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \ ---color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \ ---color=selected-bg:#45475A \ ---color=border:#313244,label:#CDD6F4" -export FZF_TMUX_OPTS=" -p90%,70%" +# export FZF_DEFAULT_COMMAND="fdfind --hidden --type file --strip-cwd-prefix --exclude .git" +# export FZF_CTRL_T_COMMAND="fdfind --hidden --type file --strip-cwd-prefix --exclude .git" +# export FZF_ALT_C_COMMAND="fdfind --hidden --type directory --strip-cwd-prefix --exclude .git" +# # Export Catppuccin Mocha theme for FZF +# export FZF_DEFAULT_OPTS=" \ +# --height 60% --layout=reverse --border \ +# --color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \ +# --color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \ +# --color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \ +# --color=selected-bg:#45475A \ +# --color=border:#313244,label:#CDD6F4" +# export FZF_TMUX_OPTS=" -p90%,70%" export VIRTUAL_ENV_DISABLE_PROMPT=1 +source "$HOME/.profile.d/homebrew.sh" source "$HOME/.profile.d/mise.sh" source "$HOME/.profile.d/golang.sh" source "$HOME/.profile.d/java.sh" diff --git a/bash/.profile.d/homebrew.sh b/bash/.profile.d/homebrew.sh new file mode 100644 index 0000000..c615732 --- /dev/null +++ b/bash/.profile.d/homebrew.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +if command -v brew > /dev/null 2>&1; then + eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +fi diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml new file mode 100644 index 0000000..e667550 --- /dev/null +++ b/starship/.config/starship.toml @@ -0,0 +1,392 @@ +format = """ +$username\ +$directory\ +$vcsh\ +$git_branch\ +$git_commit\ +$git_state\ +$git_metrics\ +$git_status\ +$hg_branch\ +$package\ +$bun\ +$c\ +$cmake\ +$elixir\ +$erlang\ +$gleam\ +$golang\ +$gradle\ +$haskell\ +$haxe\ +$helm\ +$java\ +$kotlin\ +$lua\ +$nodejs\ +$ocaml\ +$perl\ +$php\ +$python\ +$ruby\ +$rust\ +$scala\ +$swift\ +$terraform\ +$vagrant\ +$zig\ +$docker_context\ +$buf\ +$guix_shell\ +$nix_shell\ +$conda\ +$meson\ +$spack\ +$memory_usage\ +$direnv\ +$env_var\ +$custom\ +$sudo\ +$cmd_duration\ +$line_break\ +$jobs\ +$time\ +$status\ +$container\ +$os\ +$shell\ +$character +""" + +right_format = """ +$localip\ +$shlvl\ +$kubernetes\ +$aws\ +$gcloud\ +$openstack\ +$azure +""" + +# Sets user-defined palette +palette = "catppuccin_mocha" + +# palette tables should be last in the config ⚓ +[palettes.catppuccin_macchiato] +rosewater = "#f4dbd6" +flamingo = "#f0c6c6" +pink = "#f5bde6" +mauve = "#c6a0f6" +red = "#ed8796" +maroon = "#ee99a0" +peach = "#f5a97f" +yellow = "#eed49f" +green = "#a6da95" +teal = "#8bd5ca" +sky = "#91d7e3" +sapphire = "#7dc4e4" +blue = "#8aadf4" +lavender = "#b7bdf8" +text = "#cad3f5" +subtext1 = "#b8c0e0" +subtext0 = "#a5adcb" +overlay2 = "#939ab7" +overlay1 = "#8087a2" +overlay0 = "#6e738d" +surface2 = "#5b6078" +surface1 = "#494d64" +surface0 = "#363a4f" +base = "#24273a" +mantle = "#1e2030" +crust = "#181926" + +[palettes.catppuccin_frappe] +rosewater = "#f2d5cf" +flamingo = "#eebebe" +pink = "#f4b8e4" +mauve = "#ca9ee6" +red = "#e78284" +maroon = "#ea999c" +peach = "#ef9f76" +yellow = "#e5c890" +green = "#a6d189" +teal = "#81c8be" +sky = "#99d1db" +sapphire = "#85c1dc" +blue = "#8caaee" +lavender = "#babbf1" +text = "#c6d0f5" +subtext1 = "#b5bfe2" +subtext0 = "#a5adce" +overlay2 = "#949cbb" +overlay1 = "#838ba7" +overlay0 = "#737994" +surface2 = "#626880" +surface1 = "#51576d" +surface0 = "#414559" +base = "#303446" +mantle = "#292c3c" +crust = "#232634" + +[palettes.catppuccin_latte] +rosewater = "#dc8a78" +flamingo = "#dd7878" +pink = "#ea76cb" +mauve = "#8839ef" +red = "#d20f39" +maroon = "#e64553" +peach = "#fe640b" +yellow = "#df8e1d" +green = "#40a02b" +teal = "#179299" +sky = "#04a5e5" +sapphire = "#209fb5" +blue = "#1e66f5" +lavender = "#7287fd" +text = "#4c4f69" +subtext1 = "#5c5f77" +subtext0 = "#6c6f85" +overlay2 = "#7c7f93" +overlay1 = "#8c8fa1" +overlay0 = "#9ca0b0" +surface2 = "#acb0be" +surface1 = "#bcc0cc" +surface0 = "#ccd0da" +base = "#eff1f5" +mantle = "#e6e9ef" +crust = "#dce0e8" + +[palettes.catppuccin_mocha] +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" + +[character] +# Note the use of Catppuccin color 'maroon' +success_symbol = "[[♄](peach) ❯](maroon)" +error_symbol = "[❯](red)" +vimcmd_symbol = "[❼](green)" + +[aws] +symbol = " " + +[azure] +disabled = false + +[buf] +symbol = " " + +[c] +symbol = " " + +[conda] +symbol = " " + +[crystal] +symbol = " " + +[dart] +symbol = " " + +[directory] +read_only = " 󰌟" +truncate_to_repo = false +truncation_length = 4 +style = "bold lavender" + +[directory.substitutions] +"Documents" = "󰈙 " +"Downloads" = " " +"Music" = "󰝚 " +"Pictures" = " " +"Projects" = "ó°Č‹ " +"Videos" = " " + +[docker_context] +symbol = " " + +[elixir] +symbol = " " + +[elm] +symbol = " " + +[env_var.VIMSHELL] # vim subshell +format = "[$env_value]($style)" +style = 'green italic' + +[fennel] +symbol = " " + +[fossil_branch] +symbol = " " + +[git_branch] +symbol = " " + +[git_status] +ahead = "⇡${count}" +behind = "⇣${count}" +deleted = "x" +diverged = "⇕⇡${ahead_count}⇣${behind_count}" +style = "bold yellow" + +[golang] +symbol = " " + +[guix_shell] +symbol = " " + +[haskell] +symbol = " " + +[haxe] +symbol = " " + +[hg_branch] +symbol = " " + +[hostname] +ssh_symbol = " " + +[kubernetes] +format = "on [$symbol$context( \\($namespace\\))]($style) " +disabled = false + +[java] +symbol = " " + +[julia] +symbol = " " + +[kotlin] +symbol = " " + +[lua] +symbol = " " + +[memory_usage] +symbol = "󰍛 " + +[meson] +symbol = "󰔷 " + +[nim] +symbol = "󰆄 " + +[nix_shell] +symbol = " " + +[nodejs] +symbol = " " + +[ocaml] +symbol = "î™ș " + +[os] +disabled = false +format = "[$symbol ]($style)" + +[os.symbols] +Alpaquita = "îȘą " +Alpine = " " +AlmaLinux = " " +Amazon = " " +Android = " " +Arch = " " +Artix = " " +CentOS = " " +Debian = " " +DragonFly = " " +Emscripten = " " +EndeavourOS = " " +Fedora = " " +FreeBSD = " " +Garuda = "󰛓 " +Gentoo = " " +HardenedBSD = "󰞌 " +Illumos = "󰈞 " +Kali = " " +Linux = " " +Mabox = " " +Macos = " " +Manjaro = " " +Mariner = " " +MidnightBSD = " " +Mint = " " +NetBSD = " " +NixOS = " " +OpenBSD = "ó°ˆș " +openSUSE = " " +OracleLinux = "󰌷 " +Pop = "ïŒȘ " +Raspbian = " " +Redhat = " " +RedHatEnterprise = " " +RockyLinux = " " +Redox = "󰀘 " +Solus = "ó° ł " +SUSE = " " +Ubuntu = " " +Unknown = " " +Void = "ïŒź " +Windows = "ó°Č " + +[package] +symbol = "󰏗 " + +[perl] +symbol = " " + +[php] +symbol = " " + +[pijul_channel] +symbol = " " + +[python] +symbol = " " + +[rlang] +symbol = "󰟔 " + +[ruby] +symbol = " " + +[rust] +symbol = " " + +[scala] +symbol = " " + +[swift] +symbol = " " + +[username] +show_always = true + +[zig] +symbol = " "