|
@@ -6,51 +6,29 @@
|
|
# but WITHOUT ANY WARRANTY
|
|
# but WITHOUT ANY WARRANTY
|
|
#
|
|
#
|
|
|
|
|
|
-### Workaround for https://github.com/zplug/zplug/issues/397
|
|
|
|
-COMPINIT_ARGS=
|
|
|
|
-if [ "${UID}" = 0 ] && [ -n "${SUDO_UID}" ] ; then
|
|
|
|
- if ! grep -q COMPINIT_ARGS ~/.zplug/base/core/load.zsh ; then
|
|
|
|
- sed -i -r 's/^(\s+)compinit -d/\1compinit $COMPINIT_ARGS -d/' ~/.zplug/base/core/load.zsh
|
|
|
|
- fi
|
|
|
|
- COMPINIT_ARGS="-u"
|
|
|
|
-fi
|
|
|
|
-export COMPINIT_ARGS
|
|
|
|
-###
|
|
|
|
-
|
|
|
|
-source ~/.zplug/init.zsh
|
|
|
|
-
|
|
|
|
export ZSHDOTDIR=~/.zsh
|
|
export ZSHDOTDIR=~/.zsh
|
|
|
|
|
|
-zplug "modules/archive", from:prezto
|
|
|
|
-zplug "modules/completion", from:prezto
|
|
|
|
-zplug "modules/directory", from:prezto
|
|
|
|
-zplug "modules/dpkg", from:prezto
|
|
|
|
-zplug "modules/editor", from:prezto
|
|
|
|
-zplug "modules/environment", from:prezto
|
|
|
|
-zplug "modules/terminal", from:prezto, defer:2
|
|
|
|
-zplug "modules/git", from:prezto
|
|
|
|
-zplug "modules/history", from:prezto
|
|
|
|
-zplug "modules/spectrum", from:prezto
|
|
|
|
-zplug "modules/rsync", from:prezto
|
|
|
|
-zplug "modules/autosuggestions", from:prezto
|
|
|
|
-zplug "modules/syntax-highlighting", from:prezto, defer:2
|
|
|
|
-zplug "modules/history-substring-search", from:prezto
|
|
|
|
-zplug "mafredri/zsh-async"
|
|
|
|
-zplug "chrissicool/zsh-256color"
|
|
|
|
-zplug "spaceship-prompt/spaceship-prompt", use:spaceship.zsh, from:github, as:theme
|
|
|
|
-
|
|
|
|
-if [[ -d "${ZSHDOTDIR}/config" ]]; then
|
|
|
|
- zplug "${ZSHDOTDIR}/config", from:local, defer:1
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-if ! zplug check --verbose; then
|
|
|
|
- zplug install
|
|
|
|
|
|
+if [[ ! -f "${HOME}/.zcomet/bin/zcomet.zsh" ]]; then
|
|
|
|
+ command git clone https://github.com/agkozak/zcomet.git "${HOME}/.zcomet/bin"
|
|
fi
|
|
fi
|
|
|
|
|
|
-zplug load
|
|
|
|
|
|
+source "${HOME}/.zcomet/bin/zcomet.zsh"
|
|
|
|
+
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/directory
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/dpkg
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/editor
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/environment
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/terminal
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/history
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/spectrum
|
|
|
|
+zcomet load sorin-ionescu/prezto modules/completion
|
|
|
|
+zcomet load zsh-users/zsh-syntax-highlighting
|
|
|
|
+zcomet load zsh-users/zsh-history-substring-search
|
|
|
|
+zcomet load zsh-users/zsh-autosuggestions
|
|
|
|
+zcomet load spaceship-prompt/spaceship-prompt
|
|
|
|
|
|
-# Fixing zplug permissions while using 'sudo zsh'
|
|
|
|
-if [ "${UID}" = 0 ] && [ -n "${SUDO_UID}" ] ; then
|
|
|
|
- find ~/.zplug/ -not -user "${SUDO_UID}" -exec chown -R "${SUDO_UID}:${SUDO_GID}" {} \;
|
|
|
|
|
|
+if [[ -d "${ZSHDOTDIR}/config" ]]; then
|
|
|
|
+ zcomet load "${ZSHDOTDIR}"
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
+zcomet compinit
|