mirror of https://github.com/Chizi123/Dotfiles.git

Joel Grunbaum
2022-11-17 c45c89cbe3de552b6e673c96b94dfec5e1fc5a79
Move zsh manager from antigen to antidote
3 files modified
2 files added
1 files deleted
43 ■■■■■ changed files
.gitmodules 6 ●●●● patch | view | raw | blame | history
zsh/DICT 4 ●●●● patch | view | raw | blame | history
zsh/antidote @ 602998 1 ●●●● patch | view | raw | blame | history
zsh/antigen 1 ●●●● patch | view | raw | blame | history
zsh/zsh_plugins.txt 5 ●●●●● patch | view | raw | blame | history
zsh/zshrc 26 ●●●●● patch | view | raw | blame | history
.gitmodules
@@ -1,6 +1,6 @@
[submodule "emacs/.emacs.d"]
    path = emacs/emacs.d
    url = https://github.com/Chizi123/.emacs.d.git
[submodule "zsh/.zsh/antigen"]
    path = zsh/antigen
    url = https://github.com/zsh-users/antigen.git
[submodule "zsh/antidote"]
    path = zsh/antidote
    url = https://github.com/mattmc3/antidote.git
zsh/DICT
@@ -1,6 +1,6 @@
DEPS="all-shells"
FILES="zshrc p10k.zsh antigen zprofile"
LOCATIONS="${HOME}/.zshrc ${HOME}/.zsh/p10k.zsh ${HOME}/.zsh/antigen ${HOME}/.zprofile"
FILES="zshrc p10k.zsh antidote zprofile zsh_plugins.txt"
LOCATIONS="${HOME}/.zshrc ${HOME}/.zsh/p10k.zsh ${HOME}/.zsh/antidote ${HOME}/.zprofile ${HOME}/.zsh/zsh_plugins.txt"
custom() {
    git submodule update --init
}
zsh/antidote
New file
@@ -0,0 +1 @@
Subproject commit 602998b05833ce13dc5e87e3b9aae8b0d93bb304
zsh/antigen
File was deleted
zsh/zsh_plugins.txt
New file
@@ -0,0 +1,5 @@
zsh-users/zsh-syntax-highlighting
zsh-users/zsh-autosuggestions
zsh-users/zsh-completions
romkatv/powerlevel10k
zsh/zshrc
@@ -27,6 +27,7 @@
setopt autocd extendedglob correct_all # Automatically cd without cd and expand globs
unsetopt beep notify # Turn off terminal beeps
bindkey -e #Emacs mode
ZDOTDIR=${HOME}/.zsh
# common shell options
source ~/.commonshell
@@ -61,18 +62,23 @@
compinit
# Plugins with antigen
if [ -f ~/.zsh/antigen/bin/antigen.zsh ]; then
if [ -f ~/.zsh/antidote/antidote.zsh ]; then
    ADOTDIR=~/.zsh
    _ANTIGEN_INSTALL_DIR=~/.zsh/antigen
    # ANTIGEN_LOG=~/log
    source ~/.zsh/antigen/bin/antigen.zsh
    _ANTIGEN_INSTALL_DIR=~/.zsh/antidote
    antidote_dir=${ZDOTDIR:-~}/antidote
    plugins_txt=${ZDOTDIR:-~}/zsh_plugins.txt
    static_file=${ZDOTDIR:-~}/zsh_plugins.zsh   # ANTIGEN_LOG=~/log
    antigen bundle zsh-users/zsh-syntax-highlighting
    antigen bundle zsh-users/zsh-autosuggestions
    antigen bundle zsh-users/zsh-completions
    antigen theme romkatv/powerlevel10k
    antigen apply
    if [[  ! $static_file -nt $plugins_txt ]]; then
        (
        source ~/.zsh/antidote/antidote.zsh
            [[ -e $plugins_txt ]] || touch $plugins_txt
            antidote bundle <$plugins_txt >$static_file
    )
    fi
    autoload -Uz $antidote_dir/functions/antidote
    source $static_file
    unset antidote_dir plugins_txt static_file
fi
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.