feat(shell): switched to antidote, asdf changes

This commit is contained in:
2024-11-22 17:53:46 +02:00
parent 6e69ec6410
commit 746646ae55
20 changed files with 132 additions and 72 deletions

View File

@@ -1 +1,2 @@
use node
use asdf

1
base/nvmrc Normal file
View File

@@ -0,0 +1 @@
lts/*

View File

@@ -1,7 +1,5 @@
asdf-plugin-manager 1.4.0
nodejs 23.1.0
golang 1.23.3
python 3.12.7
ruby 3.3.4
rust 1.82.0
direnv 2.35.0
@@ -14,7 +12,6 @@ editorconfig-checker 2.8.0
github-cli 2.61.0
hadolint 2.12.0
kubectl 1.31.2
pipx 1.7.1
pre-commit 4.0.1
ripgrep 14.1.1
shellcheck 0.10.0
@@ -26,3 +23,5 @@ yq 4.44.3
bats 1.11.0
gitleaks 8.18.4
delta 0.18.1
eza 0.20.8
sops 3.9.1

View File

@@ -13,17 +13,34 @@ export SHARED_SCRIPTS_SOURCED=0
source "$DOTFILES/config/shared.sh"
source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
export ZDOTDIR="$DOTFILES/zsh"
ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
load_antidote()
{
[[ ! -d "$ANTIDOTE_DIR" ]] && {
git submodule add \
--name antidote \
--depth=1 \
-f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
git config -f .gitmodules submodule.antidote.shallow true
}
zstyle ':antidote:bundle' use-friendly-names 'yes'
zsh_plugins=${ANTIDOTE_PLUGINS}
[[ -f ${zsh_plugins}.txt ]] || touch ${zsh_plugins}.txt
# Lazy-load antidote from its functions directory.
FPATH="$ANTIDOTE_DIR/functions:$FPATH"
autoload -Uz antidote
# Generate a new static file whenever .zsh_plugins.txt is updated.
if [[ ! ${zsh_plugins}.zsh -nt ${zsh_plugins}.txt ]]; then
antidote bundle <${zsh_plugins}.txt >|${zsh_plugins}.zsh
fi
# Source your static plugins file.
source ${zsh_plugins}.zsh
}
# Function to load antigen if available
load_antigen()
{
@@ -55,10 +72,15 @@ load_antigen()
zstyle :omz:plugins:ssh-agent lazy yes
zstyle :omz:plugins:ssh-agent quiet yes
# nvm
zstyle ':omz:plugins:nvm' autoload yes
# z, the zsh version
export ZSHZ_DATA="$XDG_STATE_HOME/z"
antigen bundle z
antigen bundle nvm
# these should be always available
antigen bundle jreese/zsh-titles
antigen bundle brew
@@ -99,15 +121,11 @@ setup_tmux_window_name_plugin()
fi
}
load_antigen
# load_antigen
load_antidote
source_fzf_config
setup_tmux_window_name_plugin
if x-have antidot; then
eval "$(antidot init)"
fi
# Lando
export PATH="$HOME/.lando/bin${PATH+:$PATH}"; #landopath
x-have antidot && eval "$(antidot init)"
autoload -Uz compinit bashcompinit
compinit -d $ZSH_COMPDUMP