updates

Signed-off-by: Jess Frazelle <[email protected]>

.bash_prompt

@@ -1,133 +1,4 @@
 #!/bin/bash
-# Shell prompt based on the Solarized Dark theme.
-# Screenshot: http://i.imgur.com/EkEtphC.png
-# Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
-# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
-# vim: set filetype=sh :
-
-if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
-	export TERM='gnome-256color';
-elif infocmp rxvt-unicode-256color >/dev/null 2>&1; then
-	export TERM='rxvt-unicode';
-elif infocmp xterm-256color >/dev/null 2>&1; then
-	export TERM='xterm-256color';
-fi;
-
-prompt_git() {
-	local s='';
-	local branchName='';
-
-	# Check if the current directory is in a Git repository.
-	if [ "$(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}")" == '0' ]; then
-
-		# check if the current directory is in .git before running git checks
-		if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
-
-			if [[ -O "$(git rev-parse --show-toplevel)/.git/index" ]]; then
-				git update-index --really-refresh -q &> /dev/null;
-			fi;
-
-			# Check for uncommitted changes in the index.
-			if ! git diff --quiet --ignore-submodules --cached; then
-				s+='+';
-			fi;
-
-			# Check for unstaged changes.
-			if ! git diff-files --quiet --ignore-submodules --; then
-				s+='!';
-			fi;
-
-			# Check for untracked files.
-			if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-				s+='?';
-			fi;
-
-			# Check for stashed files.
-			if git rev-parse --verify refs/stash &>/dev/null; then
-				s+='$';
-			fi;
-
-		fi;
-
-		# Get the short symbolic ref.
-		# If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
-		# Otherwise, just give up.
-		branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
-			git rev-parse --short HEAD 2> /dev/null || \
-			echo '(unknown)')";
-
-		[ -n "${s}" ] && s=" [${s}]";
-
-		echo -e "${1}${branchName}${blue}${s}";
-	else
-		return;
-	fi;
-}
-
-cloud=""
-if [[ -f /proc/cpuinfo ]] && grep -q "^flags.* hypervisor" /proc/cpuinfo && [[ ! -d "/mnt/c/Windows/" ]]; then
-	cloud="☁️ "
-fi
-
-if tput setaf 1 &> /dev/null; then
-	tput sgr0; # reset colors
-	bold=$(tput bold);
-	reset=$(tput sgr0);
-	# Solarized colors, taken from http://git.io/solarized-colors.
-	black=$(tput setaf 0);
-	blue=$(tput setaf 33);
-	cyan=$(tput setaf 37);
-	green=$(tput setaf 64);
-	orange=$(tput setaf 166);
-	purple=$(tput setaf 125);
-	red=$(tput setaf 124);
-	violet=$(tput setaf 61);
-	white=$(tput setaf 15);
-	yellow=$(tput setaf 136);
-else
-	bold='';
-	reset="\\e[0m";
-	# shellcheck disable=SC2034
-	black="\\e[1;30m";
-	blue="\\e[1;34m";
-	cyan="\\e[1;36m";
-	green="\\e[1;32m";
-	# shellcheck disable=SC2034
-	orange="\\e[1;33m";
-	# shellcheck disable=SC2034
-	purple="\\e[1;35m";
-	red="\\e[1;31m";
-	violet="\\e[1;35m";
-	white="\\e[1;37m";
-	yellow="\\e[1;33m";
-fi;
-
-# Highlight the user name when logged in as root.
-if [[ "${USER}" == "root" ]]; then
-	userStyle="${red}";
-else
-	userStyle="${blue}";
-fi;
-
-# Highlight the hostname when connected via SSH.
-if [[ "${SSH_TTY}" ]]; then
-	hostStyle="${bold}${cyan}";
-else
-	hostStyle="${cyan}";
-fi;
-
-# Set the terminal title to the current working directory.
-PS1="\\[\\033]0;\\w\\007\\]";
-PS1+="\\[${bold}\\]\\n"; # newline
-PS1+="\\[${userStyle}\\]\\u"; # username
-PS1+="\\[${white}\\] at ";
-PS1+="\\[${hostStyle}\\]${cloud}\\h"; # host
-PS1+="\\[${white}\\] in ";
-PS1+="\\[${green}\\]\\w"; # working directory
-PS1+="\$(prompt_git \"${white} on ${violet}\")"; # Git repository details
-PS1+="\\n";
-PS1+="\\[${white}\\]\$ \\[${reset}\\]"; # `$` (and reset color)
-export PS1;
-
-PS2="\\[${yellow}\\]→ \\[${reset}\\]";
-export PS2;
+STARSHIP_CONFIG="${HOME}/.config/starship.toml"
+export STARSHIP_CONFIG
+eval "$(starship init bash)"

.bashrc

@@ -124,7 +124,7 @@ fi
 unset hbfile
 
 # We do this before the following so that all the paths work.
-for file in ~/.{bash_prompt,aliases,functions,path,dockerfunc,extra,exports}; do
+for file in ~/.{aliases,functions,path,dockerfunc,extra,exports,bash_prompt}; do
 	if [[ -r "$file" ]] && [[ -f "$file" ]]; then
 		if [[ -n $BASHRC_BENCH ]]; then
 			TIMEFORMAT="$file: %R"

.config/starship.toml

@@ -0,0 +1,119 @@
+# Get editor completions based on the config schema
+"$schema" = 'https://starship.rs/config-schema.json'
+
+format = """
+$username\
+$hostname\
+$localip\
+$shlvl\
+$singularity\
+$kubernetes\
+$directory\
+$vcsh\
+$fossil_branch\
+$fossil_metrics\
+$git_branch\
+$git_commit\
+$git_state\
+$git_metrics\
+$git_status\
+$hg_branch\
+$pijul_channel\
+$docker_context\
+$package\
+$c\
+$cmake\
+$cobol\
+$daml\
+$dart\
+$deno\
+$dotnet\
+$elixir\
+$elm\
+$erlang\
+$fennel\
+$gleam\
+$golang\
+$guix_shell\
+$haskell\
+$haxe\
+$helm\
+$java\
+$julia\
+$kotlin\
+$gradle\
+$lua\
+$nim\
+$nodejs\
+$ocaml\
+$opa\
+$perl\
+$php\
+$pulumi\
+$purescript\
+$python\
+$quarto\
+$raku\
+$rlang\
+$red\
+$ruby\
+$rust\
+$scala\
+$solidity\
+$swift\
+$terraform\
+$typst\
+$vlang\
+$vagrant\
+$zig\
+$buf\
+$nix_shell\
+$conda\
+$meson\
+$spack\
+$memory_usage\
+$aws\
+$gcloud\
+$openstack\
+$azure\
+$nats\
+$direnv\
+$env_var\
+$crystal\
+$custom\
+$sudo\
+$cmd_duration\
+$line_break\
+$jobs\
+$battery\
+$time\
+$status\
+$os\
+$container\
+$shell\
+$character"""
+
+# Inserts a blank line between shell prompts
+add_newline = true
+
+# Replace the '❯' symbol in the prompt with '$'
+[character] # The name of the module we are configuring is 'character'
+success_symbol = '[\$](bold white)'
+
+[directory]
+style = 'bold green'
+
+[hostname]
+ssh_only = false
+disabled = false
+style = 'bold cyan'
+
+# Disable the package module, hiding it from the prompt completely
+[package]
+disabled = true
+
+[username]
+disabled = false
+show_always = true
+style_user = 'bold blue'
+format = '[$user]($style) at '