diff --git a/common/home.nix b/common/home.nix index df4f0c4..c45439f 100644 --- a/common/home.nix +++ b/common/home.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ pkgs, ... }: { home = { username = "avery"; homeDirectory = "/home/avery"; diff --git a/common/zsh.nix b/common/zsh.nix new file mode 100644 index 0000000..5016573 --- /dev/null +++ b/common/zsh.nix @@ -0,0 +1,42 @@ +{ config, ... }: { + programs = { + zsh = { + enable = true; + initExtra = '' + bindkey "^[OA" history-beginning-search-backward-end + bindkey "^[OB" history-beginning-search-forward-end + bindkey "^r" history-incremental-search-backward + + zstyle ':completion::complete:*' use-cache on + zstyle ':completion::complete:*' cache-path ~/.zsh/cache/$HOST + zstyle ':completion:*' menu select=1 _complete _ignored _approximate + zstyle ':completion:*' verbose yes + zstyle ':completion:*:descriptions' format '%B%d%b' + zstyle ':completion:*:messages' format '%d' + zstyle ':completion:*:warnings' format 'No matches for: %d' + zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' + zstyle ':completion:*' group-name \'\' + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' + + fastfetch + ''; + initExtraFirst = '' + setopt AUTO_PUSHD + setopt SHARE_HISTORY + setopt MENUCOMPLETE + autoload -U history-search-end + zle -N history-beginning-search-backward-end history-search-end + zle -N history-beginning-search-forward-end history-search-end + ''; + history.path = "${config.xdg.dataHome}/zhistory"; + syntaxHighlighting.enable = true; + }; + starship = { + enable = true; + settings = { + add_newline = true; + + }; + }; + }; +} diff --git a/common/zsh/default.nix b/common/zsh/default.nix deleted file mode 100644 index cabddc4..0000000 --- a/common/zsh/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, pkgs, ...}: -let - normalTheme = ./powerline10k/p10k.zsh; - ttyTheme = ./powerline10k/p10k-tty.zsh; -in { - programs.zsh = { - enable = true; - initExtra = '' - bindkey "^[OA" history-beginning-search-backward-end - bindkey "^[OB" history-beginning-search-forward-end - bindkey "^r" history-incremental-search-backward - - zstyle ':completion::complete:*' use-cache on - zstyle ':completion::complete:*' cache-path ~/.zsh/cache/$HOST - zstyle ':completion:*' menu select=1 _complete _ignored _approximate - zstyle ':completion:*' verbose yes - zstyle ':completion:*:descriptions' format '%B%d%b' - zstyle ':completion:*:messages' format '%d' - zstyle ':completion:*:warnings' format 'No matches for: %d' - zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' - zstyle ':completion:*' group-name \'\' - zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' - - if zmodload zsh/terminfo && (( terminfo[colors] >= 256 )); then - [[ ! -f ${normalTheme} ]] || source ${normalTheme} - else - [[ ! -f ${ttyTheme} ]] || source ${ttyTheme} - fi - - fastfetch - ''; - initExtraFirst = '' - setopt AUTO_PUSHD - setopt SHARE_HISTORY - setopt MENUCOMPLETE - autoload -U history-search-end - zle -N history-beginning-search-backward-end history-search-end - zle -N history-beginning-search-forward-end history-search-end - ''; - history.path = "${config.xdg.dataHome}/zhistory"; - plugins = [ - { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - } - ]; - syntaxHighlighting.enable = true; - }; -} diff --git a/common/zsh/powerline10k/p10k-tty.zsh b/common/zsh/powerline10k/p10k-tty.zsh deleted file mode 100644 index 02f8436..0000000 --- a/common/zsh/powerline10k/p10k-tty.zsh +++ /dev/null @@ -1,583 +0,0 @@ - -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -() { - emulate -L zsh -o extended_glob - - unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' - - autoload -Uz is-at-least && is-at-least 5.1 || return - - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( - dir # current directory - vcs # git status - newline # \n - prompt_char # prompt symbol - ) - - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( - status # exit code of the last command - command_execution_time # duration of the last command - background_jobs # presence of background jobs - direnv # direnv status (https://direnv.net/) - asdf # asdf version manager (https://github.com/asdf-vm/asdf) - virtualenv # python virtual environment (https://docs.python.org/3/library/venv.html) - anaconda # conda environment (https://conda.io/) - pyenv # python environment (https://github.com/pyenv/pyenv) - goenv # go environment (https://github.com/syndbg/goenv) - nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) - nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) - nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) - rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) - rvm # ruby version from rvm (https://rvm.io) - fvm # flutter version management (https://github.com/leoafarias/fvm) - luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) - jenv # java version from jenv (https://github.com/jenv/jenv) - plenv # perl version from plenv (https://github.com/tokuhirom/plenv) - phpenv # php version from phpenv (https://github.com/phpenv/phpenv) - scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) - haskell_stack # haskell version from stack (https://haskellstack.org/) - kubecontext # current kubernetes context (https://kubernetes.io/) - terraform # terraform workspace (https://www.terraform.io) - aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) - aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) - azure # azure account name (https://docs.microsoft.com/en-us/cli/azure) - gcloud # google cloud cli account and project (https://cloud.google.com/) - google_app_cred # google application credentials (https://cloud.google.com/docs/authentication/production) - toolbox # toolbox name (https://github.com/containers/toolbox) - context # user@hostname - nordvpn # nordvpn connection status, linux only (https://nordvpn.com/) - ranger # ranger shell (https://github.com/ranger/ranger) - nnn # nnn shell (https://github.com/jarun/nnn) - xplr # xplr shell (https://github.com/sayanarijit/xplr) - 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) - todo # todo items (https://github.com/todotxt/todo.txt-cli) - timewarrior # timewarrior tracking status (https://timewarrior.net/) - taskwarrior # taskwarrior task count (https://taskwarrior.org/) - time # current time - newline # \n - ) - - typeset -g POWERLEVEL9K_MODE=ascii - typeset -g POWERLEVEL9K_ICON_PADDING=none - - typeset -g POWERLEVEL9K_BACKGROUND= # transparent background - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE= # no surrounding whitespace - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' ' # separate segments with a space - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR= # no end-of-line symbol - - typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT=true - - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false - - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX= - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX= - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX= - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX= - - typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= - typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL= - - typeset -g POWERLEVEL9K_SHOW_RULER=false - typeset -g POWERLEVEL9K_RULER_CHAR='-' # reasonable alternative: '·' - typeset -g POWERLEVEL9K_RULER_FOREGROUND=7 - - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='.' - if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=7 - typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' - typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL=' ' - typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' - typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}' - fi - - typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND= - - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=2 - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=1 - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='>' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='<' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='^' - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='' - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= - - typeset -g POWERLEVEL9K_DIR_FOREGROUND=4 - typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique - typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= - typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=4 - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=4 - typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false - local anchor_files=( - .bzr - .citc - .git - .hg - .node-version - .python-version - .go-version - .ruby-version - .lua-version - .java-version - .perl-version - .php-version - .tool-version - .shorten_folder_marker - .svn - .terraform - CVS - Cargo.toml - composer.json - go.mod - package.json - stack.yaml - ) - typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})" - typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false - typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 - typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80 - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40 - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50 - typeset -g POWERLEVEL9K_DIR_HYPERLINK=false - - typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v2 - - typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v3 - - - typeset -g POWERLEVEL9K_DIR_CLASSES=() - - - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= - - typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?' - - function my_git_formatter() { - emulate -L zsh - - if [[ -n $P9K_CONTENT ]]; then - typeset -g my_git_format=$P9K_CONTENT - return - fi - - if (( $1 )); then - local meta='%f' # default foreground - local clean='%2F' # green foreground - local modified='%3F' # yellow foreground - local untracked='%4F' # blue foreground - local conflicted='%1F' # red foreground - else - local meta='%f' # default foreground - local clean='%f' # default foreground - local modified='%f' # default foreground - local untracked='%f' # default foreground - local conflicted='%f' # default foreground - fi - - local res - - if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then - local branch=${(V)VCS_STATUS_LOCAL_BRANCH} - (( $#branch > 32 )) && branch[13,-13]=".." # <-- this line - res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}" - fi - - if [[ -n $VCS_STATUS_TAG - && -z $VCS_STATUS_LOCAL_BRANCH # <-- this line - ]]; then - local tag=${(V)VCS_STATUS_TAG} - (( $#tag > 32 )) && tag[13,-13]=".." # <-- this line - res+="${meta}#${clean}${tag//\%/%%}" - fi - - [[ -z $VCS_STATUS_LOCAL_BRANCH && -z $VCS_STATUS_TAG ]] && # <-- this line - res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" - - if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then - res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" - fi - - if [[ $VCS_STATUS_COMMIT_SUMMARY == (|*[^[:alnum:]])(wip|WIP)(|[^[:alnum:]]*) ]]; then - res+=" ${modified}wip" - fi - - (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}<${VCS_STATUS_COMMITS_BEHIND}" - (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}>${VCS_STATUS_COMMITS_AHEAD}" - (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}<-${VCS_STATUS_PUSH_COMMITS_BEHIND}" - (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}->${VCS_STATUS_PUSH_COMMITS_AHEAD}" - (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" - [[ -n $VCS_STATUS_ACTION ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}" - (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}" - (( VCS_STATUS_NUM_STAGED )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}" - (( VCS_STATUS_NUM_UNSTAGED )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}" - (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" - (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}-" - - typeset -g my_git_format=$res - } - functions -M my_git_formatter 2>/dev/null - - typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1 - - typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~' - - typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 - - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=2 - typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR= - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= - - typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) - - typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=2 - typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=2 - typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=3 - - typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true - - typeset -g POWERLEVEL9K_STATUS_OK=false - typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=2 - typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='ok' - - typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=2 - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='ok' - - typeset -g POWERLEVEL9K_STATUS_ERROR=false - typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=1 - typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='err' - - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=1 - typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION= - - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=1 - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='err' - - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=3 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION= - - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=1 - - typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=3 - - typeset -g POWERLEVEL9K_ASDF_FOREGROUND=6 - - - typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global) - - typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false - - typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB= - - typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=1 - - typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=6 - - typeset -g POWERLEVEL9K_ASDF_GOLANG_FOREGROUND=6 - - typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=2 - - typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=4 - - typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=5 - - typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=4 - - typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=4 - - typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=4 - - typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=6 - - typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=1 - - typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=5 - - typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=6 - - typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=5 - - typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=3 - - typeset -g POWERLEVEL9K_ASDF_JULIA_FOREGROUND=2 - - typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=6 - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION= - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION= - - typeset -g POWERLEVEL9K_RANGER_FOREGROUND=3 - - typeset -g POWERLEVEL9K_NNN_FOREGROUND=3 - - typeset -g POWERLEVEL9K_XPLR_FOREGROUND=3 - - typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=3 - - typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=3 - - typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=4 - - - - typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=2 - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=3 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=1 - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95 - typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false - - typeset -g POWERLEVEL9K_RAM_FOREGROUND=2 - - typeset -g POWERLEVEL9K_SWAP_FOREGROUND=3 - - typeset -g POWERLEVEL9K_LOAD_WHICH=5 - typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=2 - typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=3 - typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=1 - - typeset -g POWERLEVEL9K_TODO_FOREGROUND=4 - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false - - - - typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=4 - typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+..}' - - - typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=6 - - - - typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=1 - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=7 - typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=7 - - typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m' - typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m' - - typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION= - - - typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=6 - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false - typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= - - typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=6 - - typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}:-${CONDA_PREFIX:t}}' - - - typeset -g POWERLEVEL9K_PYENV_FOREGROUND=6 - typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}' - - - typeset -g POWERLEVEL9K_GOENV_FOREGROUND=6 - typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_GOENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_NODENV_FOREGROUND=2 - typeset -g POWERLEVEL9K_NODENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_NODENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_NVM_FOREGROUND=2 - - typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=2 - typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false - typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER= - - typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=2 - typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=6 - typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=4 - typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=5 - typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=5 - typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=1 - - typeset -g POWERLEVEL9K_JAVA_VERSION_FOREGROUND=4 - typeset -g POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY=true - typeset -g POWERLEVEL9K_JAVA_VERSION_FULL=false - - typeset -g POWERLEVEL9K_PACKAGE_FOREGROUND=6 - - typeset -g POWERLEVEL9K_RBENV_FOREGROUND=1 - typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_RBENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_RVM_FOREGROUND=1 - typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false - typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false - - typeset -g POWERLEVEL9K_FVM_FOREGROUND=4 - - typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=4 - typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_LUAENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_JENV_FOREGROUND=4 - typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_JENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PLENV_FOREGROUND=6 - typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PLENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=5 - typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PHPENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_SCALAENV_FOREGROUND=1 - typeset -g POWERLEVEL9K_SCALAENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_SCALAENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_SCALAENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_HASKELL_STACK_FOREGROUND=3 - typeset -g POWERLEVEL9K_HASKELL_STACK_SOURCES=(shell local) - typeset -g POWERLEVEL9K_HASKELL_STACK_ALWAYS_SHOW=true - - typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern' - - typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=5 - - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION= - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}' - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' - - - typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT=false - typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( - '*' OTHER) - typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND=4 - - typeset -g POWERLEVEL9K_TERRAFORM_VERSION_FOREGROUND=4 - - typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi|terragrunt' - - typeset -g POWERLEVEL9K_AWS_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=3 - - typeset -g POWERLEVEL9K_AWS_CONTENT_EXPANSION='${P9K_AWS_PROFILE//\%/%%}${P9K_AWS_REGION:+ ${P9K_AWS_REGION//\%/%%}}' - - typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=2 - - typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi|terragrunt' - typeset -g POWERLEVEL9K_AZURE_FOREGROUND=4 - - typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs|gsutil' - typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=4 - - typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}' - typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}' - - typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60 - - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi|terragrunt' - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=5 - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}' - - typeset -g POWERLEVEL9K_TOOLBOX_FOREGROUND=3 - typeset -g POWERLEVEL9K_TOOLBOX_CONTENT_EXPANSION='${P9K_TOOLBOX_NAME:#fedora-toolbox-*}' - - typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=6 - - typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=3 - typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= - typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun)|tailscale)[0-9]*' - typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false - - typeset -g POWERLEVEL9K_IP_FOREGROUND=4 - typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %2F<$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %3F>$P9K_IP_TX_RATE}' - typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*' - - typeset -g POWERLEVEL9K_PROXY_FOREGROUND=2 - - typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20 - typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=1 - typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=2 - typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=3 - typeset -g POWERLEVEL9K_BATTERY_STAGES=('battery') - typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false - - typeset -g POWERLEVEL9K_WIFI_FOREGROUND=4 - - - typeset -g POWERLEVEL9K_TIME_FOREGROUND=6 - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' - typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false - typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION= - - function prompt_example() { - p10k segment -f 2 -i '*' -t 'hello, %n' - } - - function instant_prompt_example() { - prompt_example - } - - - typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always - - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose - - typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true - - (( ! $+functions[p10k] )) || p10k reload -} - -typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts' diff --git a/common/zsh/powerline10k/p10k.zsh b/common/zsh/powerline10k/p10k.zsh deleted file mode 100644 index 5b3f90b..0000000 --- a/common/zsh/powerline10k/p10k.zsh +++ /dev/null @@ -1,573 +0,0 @@ - -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -() { - emulate -L zsh -o extended_glob - - unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' - - autoload -Uz is-at-least && is-at-least 5.1 || return - - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( - context - dir # current directory - vcs # git status - vi_mode # vi mode (you don't need this if you've enabled prompt_char) - newline # \n - ) - - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( - direnv # direnv status (https://direnv.net/) - virtualenv # python virtual environment (https://docs.python.org/3/library/venv.html) - pyenv # python environment (https://github.com/pyenv/pyenv) - goenv # go environment (https://github.com/syndbg/goenv) - nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) - nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) - nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) - rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) - rvm # ruby version from rvm (https://rvm.io) - fvm # flutter version management (https://github.com/leoafarias/fvm) - luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) - jenv # java version from jenv (https://github.com/jenv/jenv) - plenv # perl version from plenv (https://github.com/tokuhirom/plenv) - phpenv # php version from phpenv (https://github.com/phpenv/phpenv) - scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) - haskell_stack # haskell version from stack (https://haskellstack.org/) - kubecontext # current kubernetes context (https://kubernetes.io/) - terraform # terraform workspace (https://www.terraform.io) - vim_shell # vim shell indicator (:sh) - midnight_commander # midnight commander shell (https://midnight-commander.org/) - newline # \n - ) - - typeset -g POWERLEVEL9K_MODE=nerdfont-complete - typeset -g POWERLEVEL9K_ICON_PADDING=none - - typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT= - - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=true - - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%F{#bac2de}╭─' - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%F{#bac2de}├─' - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%F{#bac2de}╰─' - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX= - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX= - - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' ' - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND= - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND= - if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=240 - typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' - typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}' - fi - - typeset -g POWERLEVEL9K_BACKGROUND="black" - - typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='' - typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='' - typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='' - typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='' - typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B4' - typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B6' - typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B6' - typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B4' - typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= - - typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=004 - - typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND= - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=002 - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=001 - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_{LEFT,RIGHT}_WHITESPACE= - - typeset -g POWERLEVEL9K_DIR_FOREGROUND="blue" - typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique - typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= - typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND="blue" - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND="blue" - typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true - local anchor_files=( - .bzr - .citc - .git - .hg - .node-version - .python-version - .go-version - .ruby-version - .lua-version - .java-version - .perl-version - .php-version - .tool-version - .shorten_folder_marker - .svn - .terraform - CVS - Cargo.toml - composer.json - go.mod - package.json - stack.yaml - ) - typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})" - typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false - typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 - typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80 - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40 - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50 - typeset -g POWERLEVEL9K_DIR_HYPERLINK=true - - typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v3 - - - - - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON='\uF126 ' - - typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?' - - function my_git_formatter() { - emulate -L zsh - - if [[ -n $P9K_CONTENT ]]; then - typeset -g my_git_format=$P9K_CONTENT - return - fi - - if (( $1 )); then - local meta='%7F' # grey foreground - local clean='%2F' # green foreground - local modified='%3F' # yellow foreground - local untracked='%4F' # blue foreground - local conflicted='%1F' # red foreground - else - local meta='%244F' # grey foreground - local clean='%244F' # grey foreground - local modified='%244F' # grey foreground - local untracked='%244F' # grey foreground - local conflicted='%244F' # grey foreground - fi - - local res - - if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then - local branch=${(V)VCS_STATUS_LOCAL_BRANCH} - (( $#branch > 32 )) && branch[13,-13]="…" # <-- this line - res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}" - fi - - if [[ -n $VCS_STATUS_TAG - && -z $VCS_STATUS_LOCAL_BRANCH # <-- this line - ]]; then - local tag=${(V)VCS_STATUS_TAG} - (( $#tag > 32 )) && tag[13,-13]="…" # <-- this line - res+="${meta}#${clean}${tag//\%/%%}" - fi - - [[ -z $VCS_STATUS_LOCAL_BRANCH && -z $VCS_STATUS_TAG ]] && # <-- this line - res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" - - if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then - res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" - fi - - if [[ $VCS_STATUS_COMMIT_SUMMARY == (|*[^[:alnum:]])(wip|WIP)(|[^[:alnum:]]*) ]]; then - res+=" ${modified}wip" - fi - - (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" - (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}" - (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}" - (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}" - (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" - [[ -n $VCS_STATUS_ACTION ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}" - (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}" - (( VCS_STATUS_NUM_STAGED )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}" - (( VCS_STATUS_NUM_UNSTAGED )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}" - (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" - (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─" - - typeset -g my_git_format=$res - } - functions -M my_git_formatter 2>/dev/null - - typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1 - - typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~' - - typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 - - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR='#bac2de' - typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 - typeset -g POWERLEVEL9K_VCS_PREFIX='%F{#cdd6f4}on ' - - typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) - - typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=6 - typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=7 - typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=3 - - typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true - - typeset -g POWERLEVEL9K_STATUS_OK=true - typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=2 - typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔' - - typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70 - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔' - - typeset -g POWERLEVEL9K_STATUS_ERROR=true - typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘' - - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘' - - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘' - - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=248 - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%246Ftook ' - - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=37 - - typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178 - - typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66 - - - typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global) - - typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false - - typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB= - - typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=168 - - typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=37 - - typeset -g POWERLEVEL9K_ASDF_GOLANG_FOREGROUND=37 - - typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=70 - - typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=37 - - typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=134 - - typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=38 - - typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=32 - - typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=32 - - typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=67 - - typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=125 - - typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=129 - - typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=31 - - typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=99 - - typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172 - - typeset -g POWERLEVEL9K_ASDF_JULIA_FOREGROUND=70 - - typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39 - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION= - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION= - - typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178 - - typeset -g POWERLEVEL9K_NNN_FOREGROUND=72 - - typeset -g POWERLEVEL9K_XPLR_FOREGROUND=72 - - typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=34 - - typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=178 - - typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 - - - - typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35 - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=220 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=160 - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95 - typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false - - typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING=NORMAL - typeset -g POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND=106 - typeset -g POWERLEVEL9K_VI_VISUAL_MODE_STRING=VISUAL - typeset -g POWERLEVEL9K_VI_MODE_VISUAL_FOREGROUND=68 - typeset -g POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVERTYPE - typeset -g POWERLEVEL9K_VI_MODE_OVERWRITE_FOREGROUND=172 - typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING= - typeset -g POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND=66 - - - typeset -g POWERLEVEL9K_RAM_FOREGROUND=66 - - typeset -g POWERLEVEL9K_SWAP_FOREGROUND=96 - - typeset -g POWERLEVEL9K_LOAD_WHICH=5 - typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=66 - typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=178 - typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=166 - - typeset -g POWERLEVEL9K_TODO_FOREGROUND=110 - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false - - - - typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110 - typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}' - - - typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74 - - - - typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=001 - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=004 - typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=004 - - typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%n@%m' - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m' - typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m' - - typeset -g POWERLEVEL9K_CONTEXT_PREFIX='' - - typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=37 - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false - typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= - - typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37 - - typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}:-${CONDA_PREFIX:t}}' - - - typeset -g POWERLEVEL9K_PYENV_FOREGROUND=37 - typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}' - - - typeset -g POWERLEVEL9K_GOENV_FOREGROUND=37 - typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_GOENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_NODENV_FOREGROUND=70 - typeset -g POWERLEVEL9K_NODENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_NODENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_NVM_FOREGROUND=70 - - typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=70 - typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false - typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER= - - typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=70 - typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37 - typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37 - typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=134 - typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=99 - typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true - - typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=161 - - typeset -g POWERLEVEL9K_JAVA_VERSION_FOREGROUND=32 - typeset -g POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY=true - typeset -g POWERLEVEL9K_JAVA_VERSION_FULL=false - - typeset -g POWERLEVEL9K_PACKAGE_FOREGROUND=117 - - typeset -g POWERLEVEL9K_RBENV_FOREGROUND=168 - typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_RBENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_RVM_FOREGROUND=168 - typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false - typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false - - typeset -g POWERLEVEL9K_FVM_FOREGROUND=38 - - typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=32 - typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_LUAENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_JENV_FOREGROUND=32 - typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_JENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PLENV_FOREGROUND=67 - typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PLENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=99 - typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_PHPENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_SCALAENV_FOREGROUND=160 - typeset -g POWERLEVEL9K_SCALAENV_SOURCES=(shell local global) - typeset -g POWERLEVEL9K_SCALAENV_PROMPT_ALWAYS_SHOW=false - typeset -g POWERLEVEL9K_SCALAENV_SHOW_SYSTEM=true - - typeset -g POWERLEVEL9K_HASKELL_STACK_FOREGROUND=172 - typeset -g POWERLEVEL9K_HASKELL_STACK_SOURCES=(shell local) - typeset -g POWERLEVEL9K_HASKELL_STACK_ALWAYS_SHOW=true - - typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT=false - typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( - '*' OTHER) - typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND=38 - - typeset -g POWERLEVEL9K_TERRAFORM_VERSION_FOREGROUND=38 - - typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern' - - typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=134 - - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION= - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}' - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' - - typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%246Fat ' - - typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi|terragrunt' - - typeset -g POWERLEVEL9K_AWS_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=208 - - typeset -g POWERLEVEL9K_AWS_CONTENT_EXPANSION='${P9K_AWS_PROFILE//\%/%%}${P9K_AWS_REGION:+ ${P9K_AWS_REGION//\%/%%}}' - - typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=70 - - typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi|terragrunt' - typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32 - - typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs|gsutil' - typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32 - - typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}' - typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}' - - typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60 - - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi|terragrunt' - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( - '*' DEFAULT) - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=32 - - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}' - - typeset -g POWERLEVEL9K_TOOLBOX_FOREGROUND=178 - typeset -g POWERLEVEL9K_TOOLBOX_CONTENT_EXPANSION='${P9K_TOOLBOX_NAME:#fedora-toolbox-*}' - typeset -g POWERLEVEL9K_TOOLBOX_PREFIX='%246Fin ' - - typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94 - - typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81 - typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= - typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun)|tailscale)[0-9]*' - typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false - - typeset -g POWERLEVEL9K_IP_FOREGROUND=38 - typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+%70F⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+%215F⇡$P9K_IP_TX_RATE }%38F$P9K_IP_IP' - typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*' - - typeset -g POWERLEVEL9K_PROXY_FOREGROUND=68 - - typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20 - typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160 - typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70 - typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178 - typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578' - typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false - - typeset -g POWERLEVEL9K_WIFI_FOREGROUND=68 - - - typeset -g POWERLEVEL9K_TIME_FOREGROUND="white" - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' - typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false - typeset -g POWERLEVEL9K_TIME_PREFIX='%F{#bac2de}at ' - - function prompt_example() { - p10k segment -f 208 -i '⭐' -t 'hello, %n' - } - - function instant_prompt_example() { - prompt_example - } - - - typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always - - typeset -g POWERLEVEL9K_INSTANT_PROMPT=off - - typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true - - (( ! $+functions[p10k] )) || p10k reload -} - -typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts' diff --git a/flake.lock b/flake.lock index 60d4bf9..39991f1 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1728385805, + "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -277,17 +277,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725545729, - "narHash": "sha256-FDremRVZu/qxpz9s0ESBC62U1IF2VuYvVFaY6MyqqFE=", + "lastModified": 1728485062, + "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", "owner": "nix-community", "repo": "nixvim", - "rev": "849c2da9d78eb6e6a258b3961df0f2ea1cb1e994", + "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixvim", - "rev": "849c2da9d78eb6e6a258b3961df0f2ea1cb1e994", "type": "github" } }, @@ -300,11 +299,11 @@ ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1728423244, + "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", "type": "github" }, "original": { @@ -321,11 +320,11 @@ ] }, "locked": { - "lastModified": 1725327224, - "narHash": "sha256-+cMfiE+zigDuChOFlhUH3yN7Yll9hr1LRBHsO09pqjY=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "3f1589c38428bd8121fd5deebd86ce4108b29d6e", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { @@ -352,11 +351,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725540166, - "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -403,11 +402,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5a5483..1a84086 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = - "github:nix-community/nixvim/849c2da9d78eb6e6a258b3961df0f2ea1cb1e994"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { @@ -46,7 +45,7 @@ inputs.nixvim.homeManagerModules.nixvim inputs.plasma-manager.homeManagerModules.plasma-manager ./common/home.nix - ./common/zsh + ./common/zsh.nix ./hosts/totsugeki/home-manager ]; };