From 0a1b261c8f86704df75df21e2bbe2454d8071663 Mon Sep 17 00:00:00 2001 From: marc Date: Fri, 5 Feb 2021 21:24:50 +0100 Subject: [PATCH] better colors for powerlevel10k --- .p10k.zsh | 31 +++++++++++++++++-------------- aliases.sh | 13 ++++++++----- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.p10k.zsh b/.p10k.zsh index 972dab7..c849380 100644 --- a/.p10k.zsh +++ b/.p10k.zsh @@ -179,7 +179,7 @@ ################################[ prompt_char: prompt symbol ]################################ # Green prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76 + typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=83 # Red prompt symbol if the last command failed. typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 # Default prompt symbol. @@ -198,17 +198,17 @@ ##################################[ dir: current directory ]################################## # Default current directory color. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=31 + typeset -g POWERLEVEL9K_DIR_FOREGROUND=141 # If directory is too long, shorten some of its segments to the shortest possible unique # prefix. The shortened directory can be tab-completed to the original. typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique # Replace removed segment suffixes with this symbol. typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= # Color of the shortened directory segments. - typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103 + typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=135 # Color of the anchor directory segments. Anchor segments are never shortened. The first # segment is always an anchor. - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39 + typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=141 # Display anchor directory segments in bold. typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true # Don't shorten directories that contain any of these files. They are anchors. @@ -352,9 +352,9 @@ if (( $1 )); then # Styling for up-to-date Git status. local meta='%f' # default foreground - local clean='%76F' # green foreground + local clean='%228F' # green foreground local modified='%178F' # yellow foreground - local untracked='%39F' # blue foreground + local untracked='%141F' # blue foreground local conflicted='%196F' # red foreground else # Styling for incomplete and stale Git status. @@ -449,7 +449,7 @@ typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 # Icon color. - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=111 typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 # Custom icon. typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= @@ -463,8 +463,8 @@ # These settings are used for repositories other than Git or when gitstatusd fails and # Powerlevel10k has to fall back to using vcs_info. - typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76 - typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76 + typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=177 + typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=177 typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178 ##########################[ status: exit code of the last command ]########################### @@ -509,7 +509,7 @@ # Show this many fractional digits. Zero means round to seconds. typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 # Execution time color. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=101 + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=250 # Duration format: 1d 2h 3m 4s. typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' # Custom icon. @@ -527,14 +527,14 @@ #######################[ direnv: direnv status (https://direnv.net/) ]######################## # Direnv color. - typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178 + typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=237 # Custom icon. # typeset -g POWERLEVEL9K_DIRENV_VISUAL_IDENTIFIER_EXPANSION='⭐' ###############[ asdf: asdf version manager (https://github.com/asdf-vm/asdf) ]############### # Default asdf color. Only used to display tools for which there is no color override (see below). # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_FOREGROUND. - typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66 + typeset -g POWERLEVEL9K_ASDF_FOREGROUND=99 # There are four parameters that can be used to hide asdf tools. Each parameter describes # conditions under which a tool gets hidden. Parameters can hide tools but not unhide them. If at @@ -809,12 +809,15 @@ ##################################[ context: user@hostname ]################################## # Context color when running with privileges. - typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178 + typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=219 # Context color in SSH without privileges. typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=180 # Default context color (no privileges, no SSH). typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=180 + # typeset -g POWERLEVEL9K_HOST_ICON="\uF109 " + # typeset -g POWERLEVEL9K_SSH_ICON="\uF489 " + # Context format when running with privileges: bold user@hostname. typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' # Context format when in SSH without privileges: user@hostname. @@ -846,7 +849,7 @@ #####################[ anaconda: conda environment (https://conda.io/) ]###################### # Anaconda environment color. - typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37 + typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=141 # Anaconda segment format. The following parameters are available within the expansion. # diff --git a/aliases.sh b/aliases.sh index 44beb89..6fbc75a 100644 --- a/aliases.sh +++ b/aliases.sh @@ -5,15 +5,18 @@ alias dotmain="v $DOTFILES_PATH/main.sh" alias dotaliases="v $DOTFILES_PATH/aliases.sh" alias dotfunctions="v $DOTFILES_PATH/functions.sh" alias dotexports="v $DOTFILES_PATH/exports.sh" +alias dotzshenv="v $DOTFILES_PATH/.zshenv" alias dota="dotaliases" alias dotm="dotmain" alias dotf="dotfunctions" -alias doto="dotexports" +alias dote="dotexports" +alias dotz="dotzshenv" alias esclave="cd ~/discordbot/esclave" alias servant="cd ~/discordbot/servant-de-marc" -alias esclave-aws="ssh -i 'discordbotofmarcpartensky.pem' ubuntu@ec2-15-236-33-61.eu-west-3.compute.amazonaws.com" -alias startmamp='cd /Applications/MAMP/bin && ./start.sh' -alias stopmamp='cd /Applications/MAMP/bin && ./stop.sh' -alias json-beautifer="chrome https://jsonformatter.curiousconcept.com/" +alias esclaveaws="ssh -i 'discordbotofmarcpartensky.pem' ubuntu@ec2-15-236-33-61.eu-west-3.compute.amazonaws.com" +alias mampstart='~/Library/Applications/MAMP/bin/start.sh' +alias mampstop='~/Library/Applications/MAMP/bin/stop.sh' +alias jsonbeautify="chrome https://jsonformatter.curiousconcept.com/" alias github="chrome https://github.com/MarcPartensky/" alias finder="open ." +alias automation="cd $PROGRAMS_PATH/automation"