From 4a4f6baa8a2d02d14af959f11d1e0ee3e4364713 Mon Sep 17 00:00:00 2001 From: Jeffrey Serio <23226432+hyperreal64@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:24:20 -0600 Subject: [PATCH] liquidprompt is an effing shitshow. Or maybe my brain is a shitshow rn --- config/.config/liquidpromptrc | 251 ---------------------------------- config/.config/starship.toml | 4 +- gitconfig/.gitconfig | 2 +- zsh/.zshrc | 6 +- 4 files changed, 6 insertions(+), 257 deletions(-) delete mode 100644 config/.config/liquidpromptrc diff --git a/config/.config/liquidpromptrc b/config/.config/liquidpromptrc deleted file mode 100644 index 6ed8746..0000000 --- a/config/.config/liquidpromptrc +++ /dev/null @@ -1,251 +0,0 @@ - -#################################### -# LIQUID PROMPT CONFIGURATION FILE # -#################################### - -# This example config file does not contain all possible config options, nor -# does it have detailed option descriptions. See the documentation for that: -# https://liquidprompt.readthedocs.io/en/stable/config.html - -# If you want to use different themes and features, -# you can load the corresponding files here: -#source ~/.config/liquidprompt/nojhan.theme -#LP_PS1_FILE=~/.config/liquidprompt/nojhan.ps1 - -############# -# BEHAVIOUR # -############# - -# Display the battery level in more urgent color when the level is below this threshold. -# Recommended value is 75 -LP_BATTERY_THRESHOLD=75 - -# Display the load average over the past minute when above this threshold. -# This value is scaled per CPU, so on a quad-core machine, the load average -# would need to be 2.40 or greater to be displayed. -# Recommended value is 0.60 -LP_LOAD_THRESHOLD=0.60 - -# Display the temperature when the temperate is above this threshold (in -# degrees Celsius). -# Recommended value is 60 -LP_TEMP_THRESHOLD=60 - -# Use the shorten path feature if the path is too long to fit in the prompt -# line. -# Recommended value is 1 -LP_ENABLE_SHORTEN_PATH=1 - -# The maximum percentage of the screen width used to display the path before -# removing the center portion of the path and replacing with '...'. -# Recommended value is 35 -LP_PATH_LENGTH=35 - -# The number of directories (including '/') to keep at the beginning of a -# shortened path. -# Recommended value is 2 -LP_PATH_KEEP=2 - -# Determine if the hostname should always be displayed, even if not connecting -# through network. -# Defaults to 0 (do not display hostname when locally connected) -# set to 1 if you want to always see the hostname -# set to -1 if you want to never see the hostname -LP_HOSTNAME_ALWAYS=0 - -# When to display the user name: -# 1: always display the user name -# 0: hide the logged user (always display different users) -# -1: never display the user name -# Default value is 1 -LP_USER_ALWAYS=0 - -# Display the actual values of load/batteries along with their -# corresponding marks. Set to 0 to only print the colored marks. -# Defaults to 1 (display percentages) -LP_PERCENTS_ALWAYS=1 - -# Display a user-defined set of environment variables. -# May show if the variables are unset, set, or their actual content -# (see below to configure which variables to watch). -LP_ENABLE_ENV_VARS=1 - -# The set of environment variables that the user wants to watch. -# Items should be a string with three space-separated elements -# of the form `" [ ]"` -# The string used when the variable is set may contain the `%s` mark, -# which is replaced by the actual content of the variable. -LP_ENV_VARS=( -# # Display "V" if VERBOSE is set, nothing if it's unset. -# "VERBOSE V" -# # Display the name of the desktop session, if set, T if unset. -# "DESKTOP_SESSION %s T" -# # Display "ed:" followed the name of the default editor, nothing if unset. -# "EDITOR ed:%s" -) - -# Use the permissions feature and display a red ':' before the prompt to show -# when you don't have write permission to the current directory. -# Recommended value is 1 -LP_ENABLE_PERM=1 - -# Enable the proxy detection feature. -# Recommended value is 1 -LP_ENABLE_PROXY=1 - -# Enable the jobs feature. -# Recommended value is 1 -LP_ENABLE_JOBS=1 - -# Enable the detached sessions feature. -# Default value is 1 -LP_ENABLE_DETACHED_SESSIONS=1 - -# Enable the load feature. -# Recommended value is 1 -LP_ENABLE_LOAD=1 - -# Enable the battery feature. -# Recommended value is 1 -LP_ENABLE_BATT=0 - -# Enable the 'sudo credentials' feature. -# Be warned that this may pollute the syslog if you don't have sudo -# credentials, and the sysadmin might hate you. -LP_ENABLE_SUDO=1 - -# Enable the directory stack support. -LP_ENABLE_DIRSTACK=0 - -# Enable the VCS features with the root account. -# Recommended value is 0 -LP_ENABLE_VCS_ROOT=0 - -# Enable the Git special features. -# Recommended value is 1 -LP_ENABLE_GIT=1 - -# Enable the Subversion special features. -# Recommended value is 1 -LP_ENABLE_SVN=0 - -# Enable the Mercurial special features. -# Recommended value is 1 -LP_ENABLE_HG=0 - -# Enable the Fossil special features. -# Recommended value is 1 -LP_ENABLE_FOSSIL=0 - -# Enable the Bazaar special features. -# Recommended value is 1 -LP_ENABLE_BZR=0 - -# Show time of when the current prompt was displayed. -LP_ENABLE_TIME=1 - -# Show runtime of the previous command if over LP_RUNTIME_THRESHOLD -# Recommended value is 0 -LP_ENABLE_RUNTIME=0 - -# Minimal runtime (in seconds) before the runtime will be displayed -# Recommended value is 2 -LP_RUNTIME_THRESHOLD=2 - -# Ring the terminal bell if the runtime of the previous command exceeded -# LP_RUNTIME_BELL_THRESHOLD -# Recommended value is 0 -LP_ENABLE_RUNTIME_BELL=0 - -# Minimal runtime (in seconds) before the terminal bell will be rung. -# Recommended value is 10 -LP_RUNTIME_BELL_THRESHOLD=10 - -# Display the virtualenv that is currently activated, if any -# Recommended value is 1 -LP_ENABLE_VIRTUALENV=1 - -# Display the ruby virtual env that is currently activated, if any -# Recommended value is 1 -LP_ENABLE_RUBY_VENV=1 - -# If using RVM, personalize the rvm-prompt. -# see http://rvm.io/workflow/prompt for details. -# Warning, this variable must be a shell array. -LP_RUBY_RVM_PROMPT_OPTIONS=(i v g s) - -# Display the terraform workspace that is currently activated, if any -# Recommended value is 0 -LP_ENABLE_TERRAFORM=0 - -# Display the enabled software collections, if any -# Recommended value is 1 -LP_ENABLE_SCLS=1 - -# Show current Kubernetes kubectl context -LP_ENABLE_KUBECONTEXT=0 - -# Delimiter to shorten kubectl context by removing a suffix. -# E.g. when your context names are dev-cluster and test-cluster, set to "-" -# in order to output "dev" and "test" in prompt. -LP_DELIMITER_KUBECONTEXT_SUFFIX= - -# Delimiter to shorten kubectl context by removing a prefix. -# E.g. when your context names are like -# arn:aws:eks:$REGION:$ACCOUNT_ID:cluster/$CLUSTER_NAME, set to "/" -# in order to output "$CLUSTER_NAME" in prompt. -LP_DELIMITER_KUBECONTEXT_PREFIX= - -# Display the current active AWS_PROFILE, if any -# Recommended value is 1 -LP_ENABLE_AWS_PROFILE=0 - -# Show highest system temperature -LP_ENABLE_TEMP=0 - -# When showing the time, use an analog clock instead of numeric values. -# Recommended value is 0 -LP_TIME_ANALOG=0 - -# Use the prompt as the title of the terminal window -# Recommended value is 0 -LP_ENABLE_TITLE=1 - -# Enable Title for screen, byobu, and tmux -LP_ENABLE_SCREEN_TITLE=1 - -# Use different colors for the different hosts you SSH to -LP_ENABLE_SSH_COLORS=1 - -# Show the error code of the last command if it was not 0 -LP_ENABLE_ERROR=1 - -# Show the (guessed) error meaning after the error code. -LP_ENABLE_ERROR_MEANING=1 - -# Extends the list of guessed error meanings (may produce wrong meanings). -LP_ENABLE_ERROR_MEANING_EXTENDED=0 - -# Specify an array of absolute paths in which all vcs will be disabled. -# Ex: ("/root" "/home/me/large-remove-svn-repo") -LP_DISABLED_VCS_PATHS=() - -# Indicate if the shell is running in a container environment. -LP_ENABLE_CONTAINER=1 - -# Don't show the value of $SHLVL -LP_ENABLE_SHLVL=0 - -# Colors -# LP_COLOR_HOST="$BOLD_RED" -# LP_COLOR_USER="$BOLD" -# LP_COLOR_USER_LOGGED="$BOLD" - -# Use a local liquidpromptrc if it exists. -# Can be helpful if you sync your primary config across machines, or if -# there's a system-wide config at /etc/liquidpromptrc from which you'd -# like to make only minor deviations. -#LOCAL_RCFILE=$HOME/.liquidpromptrc.local -#[ -f "$LOCAL_RCFILE" ] && source "$LOCAL_RCFILE" - -# vim: set et sts=4 sw=4 tw=120 ft=sh: diff --git a/config/.config/starship.toml b/config/.config/starship.toml index bcb0012..7cd97ac 100644 --- a/config/.config/starship.toml +++ b/config/.config/starship.toml @@ -50,8 +50,8 @@ disabled = false # Prompt: param 2 [character] format = "$symbol " -success_symbol = " [:](#94e2d5)" -error_symbol = " [:](#d20f39)" +success_symbol = ' [%](#94e2d5)' +error_symbol = ' [%](#d20f39)' vicmd_symbol = " [<](#94e2d5)" # SYMBOLS diff --git a/gitconfig/.gitconfig b/gitconfig/.gitconfig index 5c48585..e07d38f 100644 --- a/gitconfig/.gitconfig +++ b/gitconfig/.gitconfig @@ -28,7 +28,7 @@ untracked = cyan [commit] [core] - editor = nvim + editor = emacs -nw [init] defaultBranch = main [pull] diff --git a/zsh/.zshrc b/zsh/.zshrc index 144cdbd..a1ea545 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -66,9 +66,6 @@ zplug "plugins/systemd", from:oh-my-zsh # Load file from ~/.zshrc.d zplug "~/.zshrc.d", from:local, use:'*' -# Load prompt theme -zplug "nojhan/liquidprompt" - if ! zplug check; then zplug install; exec $SHELL $SHELL_ARGS "$@" @@ -78,3 +75,6 @@ zplug load # lscolors.sh export LS_COLORS=$(cat ~/.lscolors.sh) + +# starship.rs +eval "$(starship init zsh)"