Move from antigen to antidot

This commit is contained in:
2023-07-10 11:11:16 +02:00
parent 1c9ed29c1c
commit 03228283c5
8 changed files with 36 additions and 39 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.history/*

8
.zsh_plugins.txt Normal file
View File

@@ -0,0 +1,8 @@
# Themes
romkatv/powerlevel10k
# Plugins
MichaelAquilina/zsh-you-should-use # Reminds of aliases
zsh-users/zsh-syntax-highlighting # Fish like Syntax highlighting
zsh-users/zsh-completions # Additional completion definitions for Zsh
zsh-users/zsh-autosuggestions # Fish-like fast/unobtrusive autosuggestions for zsh
supercrabtree/k # Nice directory listening

View File

@@ -1,5 +1,5 @@
## Aliases ## Aliases
alias ll='ls -la' alias ll='k'
alias grep='grep --color=auto' alias grep='grep --color=auto'
alias ports='netstat -an | grep LISTEN' alias ports='netstat -an | grep LISTEN'
alias df='df -h' alias df='df -h'
@@ -23,11 +23,6 @@ alias dstart="docker-compose up -d "
alias drestart="docker-compose stop && docker-compose up -d" alias drestart="docker-compose stop && docker-compose up -d"
alias drestartl="docker-compose stop && docker-compose up -d && docker-compose logs -f" alias drestartl="docker-compose stop && docker-compose up -d && docker-compose logs -f"
alias dstats="docker stats" alias dstats="docker stats"
if [ "$(uname)" = "Darwin" ]; then
alias ls='ls -G'
else
alias ls='ls --color=auto'
fi
alias plextraktsync="cd /opt/plextraktsync/ && docker-compose run --rm plextraktsync" alias plextraktsync="cd /opt/plextraktsync/ && docker-compose run --rm plextraktsync"
alias plexmetamanager="cd /opt/plexmetamanger/ && docker-compose run --rm plex-meta-manager --run" alias plexmetamanager="cd /opt/plexmetamanger/ && docker-compose run --rm plex-meta-manager --run"
## Aliases with parameters ## Aliases with parameters

35
install.sh Executable file → Normal file
View File

@@ -2,7 +2,7 @@
## Define Arrays ## Define Arrays
packages=( "zsh" "htop" "figlet" "tmux" "curl" "net-tools" "dnsutils" "tree" ) packages=( "zsh" "htop" "figlet" "tmux" "curl" "net-tools" "dnsutils" "tree" )
configfiles=( ".zshrc" ".antigen.zsh" ".p10k.zsh" ".tmux.conf" ".config/htop/htoprc" "/usr/share/nano/yaml.nanorc" ) configfiles=( ".zshrc" ".zsh_plugins.txt" ".p10k.zsh" ".tmux.conf" ".config/htop/htoprc" "/usr/share/nano/yaml.nanorc" )
configfileslinux=( "/etc/nanorc" ) configfileslinux=( "/etc/nanorc" )
motdfiles=( "/etc/update-motd.d/00-header" "/etc/update-motd.d/10-uname" "/etc/update-motd.d/10-sysinfo" "/etc/update-motd.d/90-footer" ) motdfiles=( "/etc/update-motd.d/00-header" "/etc/update-motd.d/10-uname" "/etc/update-motd.d/10-sysinfo" "/etc/update-motd.d/90-footer" )
@@ -15,9 +15,7 @@ else
mkdir ~/.config/htop mkdir ~/.config/htop
fi fi
## Install packages ## Install packages
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
echo MacOS found - no installation of packages needed. echo MacOS found - no installation of packages needed.
else else
@@ -36,7 +34,6 @@ echo $i is installed - skipping.
fi fi
## Remove Config Files ## Remove Config Files
for j in "${configfiles[@]}" for j in "${configfiles[@]}"
do do
rm $j rm $j
@@ -49,7 +46,6 @@ if [ "$(uname)" != "Darwin" ]; then
done done
fi fi
## Remove Motd Files ## Remove Motd Files
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
echo MacOS found - no motd files to remove. echo MacOS found - no motd files to remove.
@@ -62,8 +58,21 @@ do
done done
fi fi
## Install Antigen ## Remove Antigen if installed
curl -L git.io/antigen > .antigen.zsh if [ -d ~/.antigen ]; then
echo Antigen is installed. Removing...
rm -R ~/.antigen
rm ~/.antigen.zsh
fi
## Install Antidote - replacement of Antigen
if test -f ~/.antidote; then
echo "Antidote allready installed."
else
echo "Installing antidote..."
git clone --depth=1 https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antidote
fi
## Create Symlinks ## Create Symlinks
ln -s ~/.zshconfig/zshrc .zshrc ln -s ~/.zshconfig/zshrc .zshrc
@@ -71,21 +80,11 @@ ln -s ~/.zshconfig/yaml.nanorc /usr/share/nano/yaml.nanorc
ln -s ~/.zshconfig/tmux .tmux.conf ln -s ~/.zshconfig/tmux .tmux.conf
ln -s ~/.zshconfig/htoprc .config/htop/htoprc ln -s ~/.zshconfig/htoprc .config/htop/htoprc
ln -s ~/.zshconfig/p10k.zsh .p10k.zsh ln -s ~/.zshconfig/p10k.zsh .p10k.zsh
if [ "$(uname)" != "Darwin" ]; then ln -s ~/.zshconfig/.zsh_plugins.txt .zsh_plugins.txt
ln -s ~/.zshconfig/nanorc /etc/nanorc ln -s ~/.zshconfig/nanorc /etc/nanorc
else
echo MacOS found - No linking of Nanorc needed.
fi
## Make ZSH as default Shell ## Make ZSH as default Shell
if [ "$(uname)" = "Darwin" ]; then
echo MacOS found - ZSH is already default shell.
else
chsh -s $(which zsh) chsh -s $(which zsh)
fi
## Copy Files, fix permissions ## Copy Files, fix permissions
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then

0
motd/00-header Executable file → Normal file
View File

0
motd/10-sysinfo Executable file → Normal file
View File

0
motd/90-footer Executable file → Normal file
View File

22
zshrc
View File

@@ -1,20 +1,14 @@
# source antidote
source ${ZDOTDIR:-~}/.antidote/antidote.zsh
# initialize plugins statically with ${ZDOTDIR:-~}/.zsh_plugins.txt
antidote load
# Aliases # Aliases
source ~/.zshconfig/aliases source ~/.zshconfig/aliases
# Themes & Plugins autoload -Uz promptinit && promptinit && prompt powerlevel10k
#autoload -Uz promptinit && promptinit && prompt powerlevel10k
source ~/.antigen.zsh
antigen bundle agkozak/zsh-z
antigen theme romkatv/powerlevel10k
antigen bundle "MichaelAquilina/zsh-you-should-use"
antigen bundle zsh-users/zsh-syntax-highlighting
# Shit for OSX
if [ "$(uname)" != "Darwin" ]; then
antigen bundle brew
fi
antigen apply
autoload -U compinit && compinit
zstyle ':completion:*' menu select zstyle ':completion:*' menu select
### Settings fuer History ### Settings fuer History