From 99e57230e5ec6c4e35cf3769bd04c5ce7ea581d1 Mon Sep 17 00:00:00 2001 From: druckdev <63563978+druckdev@users.noreply.github.com> Date: Tue, 25 Aug 2020 05:08:29 +0200 Subject: [PATCH] Update submodules Update p10k to v1.12.0. Update tmux-{continuum,resurrect}, fzf, zsh-syntax-highlighting and dotbot to the latest master commit. --- .config/tmux/plugins/tmux-continuum | 2 +- .config/tmux/plugins/tmux-resurrect | 2 +- .config/zsh/plugins/fzf | 2 +- .config/zsh/plugins/p10k-custom.diff | 17 +++++----- .config/zsh/plugins/p10k.zsh-theme | 35 +++++++++++++-------- .config/zsh/plugins/powerlevel10k | 2 +- .config/zsh/plugins/zsh-syntax-highlighting | 2 +- dotbot | 2 +- 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.config/tmux/plugins/tmux-continuum b/.config/tmux/plugins/tmux-continuum index 4f2bc93..432d243 160000 --- a/.config/tmux/plugins/tmux-continuum +++ b/.config/tmux/plugins/tmux-continuum @@ -1 +1 @@ -Subproject commit 4f2bc93c58aec9175606919f2baf9dfaf195a5cf +Subproject commit 432d243e037e373f8a2740547d9409a3488f0e7d diff --git a/.config/tmux/plugins/tmux-resurrect b/.config/tmux/plugins/tmux-resurrect index 5f5f9d8..123d83c 160000 --- a/.config/tmux/plugins/tmux-resurrect +++ b/.config/tmux/plugins/tmux-resurrect @@ -1 +1 @@ -Subproject commit 5f5f9d8fd5ff9769e5ef08d64a430ee7ab525dc7 +Subproject commit 123d83c6682ccc73d7c7729692a0088a7e5ba333 diff --git a/.config/zsh/plugins/fzf b/.config/zsh/plugins/fzf index e2ae1b2..f2d44ab 160000 --- a/.config/zsh/plugins/fzf +++ b/.config/zsh/plugins/fzf @@ -1 +1 @@ -Subproject commit e2ae1b249cf2d5258b552cfd682c7c0911981e9b +Subproject commit f2d44ab5a793906457f3d3384f09af085096138d diff --git a/.config/zsh/plugins/p10k-custom.diff b/.config/zsh/plugins/p10k-custom.diff index 2704d14..f6c2fde 100644 --- a/.config/zsh/plugins/p10k-custom.diff +++ b/.config/zsh/plugins/p10k-custom.diff @@ -1,5 +1,5 @@ ---- p10k.zsh-theme 2020-06-25 23:34:59.068426001 +0200 -+++ p10k.zsh-theme 2020-06-25 23:41:08.751386193 +0200 +--- p10k.zsh-theme 2020-08-25 04:58:57.523296332 +0200 ++++ p10k.zsh-theme 2020-08-25 04:56:22.351599739 +0200 @@ -45,6 +45,9 @@ # last prompt line gets hidden if it would overlap with left prompt. typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( @@ -15,7 +15,7 @@ midnight_commander # midnight commander shell (https://midnight-commander.org/) nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) - # vpn_ip # virtual private network indicator -+ vpn_ip # virtual private network indicator ++ vpn_ip # virtual private network indicator # load # CPU load # disk_usage # disk usage # ram # free RAM @@ -29,7 +29,7 @@ # ip # ip address and bandwidth usage for a specified network interface # public_ip # public IP address # proxy # system-wide http/https/ftp proxy -@@ -188,11 +188,11 @@ +@@ -188,9 +188,9 @@ # Red prompt symbol if the last command failed. typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 # Default prompt symbol. @@ -39,11 +39,8 @@ - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='<' # Prompt symbol in visual vi mode. -- typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' -+ typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='Ⅴ' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' # Prompt symbol in overwrite vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true @@ -325,7 +325,7 @@ #####################################[ vcs: git status ]###################################### @@ -112,7 +109,7 @@ #######################[ direnv: direnv status (https://direnv.net/) ]######################## # Direnv color. -@@ -1373,16 +1373,16 @@ +@@ -1382,16 +1382,16 @@ typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81 # When on VPN, show just an icon without the IP address. # Tip: To display the private IP address when on VPN, remove the next line. @@ -133,7 +130,7 @@ ###########[ ip: ip address and bandwidth usage for a specified network interface ]########### # IP color. -@@ -1455,13 +1455,13 @@ +@@ -1464,13 +1464,13 @@ ####################################[ time: current time ]#################################### # Current time color. diff --git a/.config/zsh/plugins/p10k.zsh-theme b/.config/zsh/plugins/p10k.zsh-theme index 35c2319..9163791 100644 --- a/.config/zsh/plugins/p10k.zsh-theme +++ b/.config/zsh/plugins/p10k.zsh-theme @@ -1,7 +1,7 @@ -# Generated by Powerlevel10k configuration wizard on 2020-06-25 at 23:31 CEST. -# Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 13668. +# Generated by Powerlevel10k configuration wizard on 2020-08-25 at 04:46 CEST. +# Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 29130. # Wizard options: nerdfont-complete + powerline, small icons, unicode, lean, 24h time, -# 2 lines, disconnected, no frame, sparse, few icons, concise, instant_prompt=verbose. +# 2 lines, disconnected, no frame, sparse, few icons, concise, instant_prompt=quiet. # Type `p10k configure` to generate another config. # # Config for Powerlevel10k with lean prompt style. Type `p10k configure` to generate @@ -23,7 +23,7 @@ # Unset all configuration options. This allows you to apply configuration changes without # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. - unset -m 'POWERLEVEL9K_*|DEFAULT_USER' + unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' # Zsh >= 5.1 is required. autoload -Uz is-at-least && is-at-least 5.1 || return @@ -90,7 +90,7 @@ vim_shell # vim shell indicator (:sh) midnight_commander # midnight commander shell (https://midnight-commander.org/) nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) - vpn_ip # virtual private network indicator + vpn_ip # virtual private network indicator # load # CPU load # disk_usage # disk usage # ram # free RAM @@ -192,7 +192,7 @@ # Prompt symbol in command vi mode. typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='<' # Prompt symbol in visual vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='Ⅴ' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' # Prompt symbol in overwrite vi mode. typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true @@ -460,7 +460,7 @@ # isn't in an svn or hg reposotiry. typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) - # These settings are used for respositories other than Git or when gitstatusd fails and + # 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 @@ -532,6 +532,7 @@ ###############[ 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 # There are four parameters that can be used to hide asdf tools. Each parameter describes @@ -664,6 +665,11 @@ # typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐' # typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar' + # Julia version from asdf. + typeset -g POWERLEVEL9K_ASDF_JULIA_FOREGROUND=70 + # typeset -g POWERLEVEL9K_ASDF_JULIA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_JULIA_SHOW_ON_UPGLOB='*.foo|*.bar' + ##########[ nordvpn: nordvpn connection status, linux only (https://nordvpn.com/) ]########### # NordVPN connection indicator color. typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39 @@ -862,8 +868,9 @@ # Note: '({default_env}) ' is the default value of env_prompt. # # The default value of POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION expands to $CONDA_PROMPT_MODIFIER - # without the leading '(' or the trailing ') '. - typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}' + # without the surrounding parentheses, or to the last path component of CONDA_PREFIX if the former + # is empty. + typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}:-${CONDA_PREFIX:t}}' # Custom icon. # typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION='⭐' @@ -1187,6 +1194,8 @@ # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%fat ' ################[ terraform: terraform workspace (https://www.terraform.io) ]################# + # Don't show terraform workspace if it's literally "default". + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT=false # POWERLEVEL9K_TERRAFORM_CLASSES is an array with even number of elements. The first element # in each pair defines a pattern against which the current terraform workspace gets matched. # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) @@ -1200,7 +1209,7 @@ # typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( # '*prod*' PROD # '*test*' TEST - # '*' DEFAULT) + # '*' OTHER) # # If your current terraform workspace is "project_test", its class is TEST because "project_test" # doesn't match the pattern '*prod*' but does match '*test*'. @@ -1213,9 +1222,9 @@ typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( # '*prod*' PROD # These values are examples that are unlikely # '*test*' TEST # to match your needs. Customize them as needed. - '*' DEFAULT) - typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=38 - # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + '*' OTHER) + typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND=38 + # typeset -g POWERLEVEL9K_TERRAFORM_OTHER_VISUAL_IDENTIFIER_EXPANSION='⭐' #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# # Show aws only when the the command you are typing invokes one of these tools. diff --git a/.config/zsh/plugins/powerlevel10k b/.config/zsh/plugins/powerlevel10k index 801bfbb..0c341b6 160000 --- a/.config/zsh/plugins/powerlevel10k +++ b/.config/zsh/plugins/powerlevel10k @@ -1 +1 @@ -Subproject commit 801bfbb2946b10527e75e77838a3657d78cb92e5 +Subproject commit 0c341b67024642b8f1741920d1ae5d760bc488b0 diff --git a/.config/zsh/plugins/zsh-syntax-highlighting b/.config/zsh/plugins/zsh-syntax-highlighting index 2d60a47..4cf464f 160000 --- a/.config/zsh/plugins/zsh-syntax-highlighting +++ b/.config/zsh/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 2d60a47cc407117815a1d7b331ef226aa400a344 +Subproject commit 4cf464f843902b6e1e2778b85b70f4c098789b6f diff --git a/dotbot b/dotbot index 1d4f434..5294594 160000 --- a/dotbot +++ b/dotbot @@ -1 +1 @@ -Subproject commit 1d4f4348bba8462c247eb63656907556b5da2dd3 +Subproject commit 5294594f5aa9c3affd0d656ba6843c1c0b0bce60