From d6a336358a1629d262d95e2e147885ca30693673 Mon Sep 17 00:00:00 2001 From: romkatv Date: Sun, 6 Oct 2019 11:38:00 +0200 Subject: [PATCH] replace symbolic links with regular files that "source" --- powerlevel10k.zsh-theme | 45 +++++++++++++++++++++++++++++++++++++- powerlevel9k.zsh-theme | 45 +------------------------------------- prompt_powerlevel10k_setup | 2 +- prompt_powerlevel9k_setup | 2 +- 4 files changed, 47 insertions(+), 47 deletions(-) mode change 120000 => 100644 powerlevel10k.zsh-theme mode change 120000 => 100644 prompt_powerlevel10k_setup mode change 120000 => 100644 prompt_powerlevel9k_setup diff --git a/powerlevel10k.zsh-theme b/powerlevel10k.zsh-theme deleted file mode 120000 index 311575f4..00000000 --- a/powerlevel10k.zsh-theme +++ /dev/null @@ -1 +0,0 @@ -powerlevel9k.zsh-theme \ No newline at end of file diff --git a/powerlevel10k.zsh-theme b/powerlevel10k.zsh-theme new file mode 100644 index 00000000..7bf59736 --- /dev/null +++ b/powerlevel10k.zsh-theme @@ -0,0 +1,44 @@ +# vim:ft=zsh ts=2 sw=2 sts=2 et fenc=utf-8 +################################################################ +# Powerlevel10k Theme +# https://github.com/romkatv/powerlevel10k +# +# Forked from Powerlevel9k Theme +# https://github.com/bhilburn/powerlevel9k +# +# Which in turn was forked from Agnoster Theme +# https://github.com/robbyrussell/oh-my-zsh/blob/74177c5320b2a1b2f8c4c695c05984b57fd7c6ea/themes/agnoster.zsh-theme +################################################################ + +# Temporarily change options. +'builtin' 'local' '-a' '__p9k_src_opts' +[[ ! -o 'aliases' ]] || __p9k_src_opts+=('aliases') +[[ ! -o 'sh_glob' ]] || __p9k_src_opts+=('sh_glob') +[[ ! -o 'no_brace_expand' ]] || __p9k_src_opts+=('no_brace_expand') +'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' + +(( $+__p9k_root_dir )) || typeset -gr __p9k_root_dir=${POWERLEVEL9K_INSTALLATION_DIR:-${${(%):-%x}:A:h}} + +() { + emulate -L zsh + setopt no_hist_expand extended_glob no_prompt_bang no_prompt_subst prompt_percent no_aliases + if (( $+__p9k_sourced )); then + prompt_powerlevel9k_setup + return + fi + typeset -gr __p9k_dump_file=${XDG_CACHE_HOME:-~/.cache}/p10k-dump-${(%):-%n}.zsh + if [[ -z $__p9k_dump_file(.zwc|)(#qNW) ]] && source $__p9k_dump_file 2>/dev/null && (( $+functions[_p9k_preinit] )); then + _p9k_preinit + fi + typeset -gr __p9k_sourced=1 + if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus && ${(%):-%#} == % ]]; then + local f + for f in $__p9k_root_dir/{powerlevel9k.zsh-theme,powerlevel10k.zsh-theme,internal/p10k.zsh,internal/icons.zsh,internal/configure.zsh,gitstatus/gitstatus.plugin.zsh}; do + [[ $f.zwc -nt $f ]] || zcompile $f + done + fi + source $__p9k_root_dir/internal/p10k.zsh || true +} + +(( ${#__p9k_src_opts} )) && setopt ${__p9k_src_opts[@]} +'builtin' 'unset' '__p9k_src_opts' diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 7bf59736..328cd838 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1,44 +1 @@ -# vim:ft=zsh ts=2 sw=2 sts=2 et fenc=utf-8 -################################################################ -# Powerlevel10k Theme -# https://github.com/romkatv/powerlevel10k -# -# Forked from Powerlevel9k Theme -# https://github.com/bhilburn/powerlevel9k -# -# Which in turn was forked from Agnoster Theme -# https://github.com/robbyrussell/oh-my-zsh/blob/74177c5320b2a1b2f8c4c695c05984b57fd7c6ea/themes/agnoster.zsh-theme -################################################################ - -# Temporarily change options. -'builtin' 'local' '-a' '__p9k_src_opts' -[[ ! -o 'aliases' ]] || __p9k_src_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || __p9k_src_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || __p9k_src_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -(( $+__p9k_root_dir )) || typeset -gr __p9k_root_dir=${POWERLEVEL9K_INSTALLATION_DIR:-${${(%):-%x}:A:h}} - -() { - emulate -L zsh - setopt no_hist_expand extended_glob no_prompt_bang no_prompt_subst prompt_percent no_aliases - if (( $+__p9k_sourced )); then - prompt_powerlevel9k_setup - return - fi - typeset -gr __p9k_dump_file=${XDG_CACHE_HOME:-~/.cache}/p10k-dump-${(%):-%n}.zsh - if [[ -z $__p9k_dump_file(.zwc|)(#qNW) ]] && source $__p9k_dump_file 2>/dev/null && (( $+functions[_p9k_preinit] )); then - _p9k_preinit - fi - typeset -gr __p9k_sourced=1 - if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus && ${(%):-%#} == % ]]; then - local f - for f in $__p9k_root_dir/{powerlevel9k.zsh-theme,powerlevel10k.zsh-theme,internal/p10k.zsh,internal/icons.zsh,internal/configure.zsh,gitstatus/gitstatus.plugin.zsh}; do - [[ $f.zwc -nt $f ]] || zcompile $f - done - fi - source $__p9k_root_dir/internal/p10k.zsh || true -} - -(( ${#__p9k_src_opts} )) && setopt ${__p9k_src_opts[@]} -'builtin' 'unset' '__p9k_src_opts' +'builtin' 'source' "${POWERLEVEL9K_INSTALLATION_DIR:-${${(%):-%x}:A:h}}/powerlevel10k.zsh-theme" diff --git a/prompt_powerlevel10k_setup b/prompt_powerlevel10k_setup deleted file mode 120000 index 866a1f4a..00000000 --- a/prompt_powerlevel10k_setup +++ /dev/null @@ -1 +0,0 @@ -prompt_powerlevel9k_setup \ No newline at end of file diff --git a/prompt_powerlevel10k_setup b/prompt_powerlevel10k_setup new file mode 100644 index 00000000..328cd838 --- /dev/null +++ b/prompt_powerlevel10k_setup @@ -0,0 +1 @@ +'builtin' 'source' "${POWERLEVEL9K_INSTALLATION_DIR:-${${(%):-%x}:A:h}}/powerlevel10k.zsh-theme" diff --git a/prompt_powerlevel9k_setup b/prompt_powerlevel9k_setup deleted file mode 120000 index 311575f4..00000000 --- a/prompt_powerlevel9k_setup +++ /dev/null @@ -1 +0,0 @@ -powerlevel9k.zsh-theme \ No newline at end of file diff --git a/prompt_powerlevel9k_setup b/prompt_powerlevel9k_setup new file mode 100644 index 00000000..328cd838 --- /dev/null +++ b/prompt_powerlevel9k_setup @@ -0,0 +1 @@ +'builtin' 'source' "${POWERLEVEL9K_INSTALLATION_DIR:-${${(%):-%x}:A:h}}/powerlevel10k.zsh-theme"