diff --git a/home/private_dot_config/zsh/conf.d/aliases.zsh b/home/private_dot_config/zsh/conf.d/aliases.zsh index dd7ca55..7afcd7a 100644 --- a/home/private_dot_config/zsh/conf.d/aliases.zsh +++ b/home/private_dot_config/zsh/conf.d/aliases.zsh @@ -42,3 +42,5 @@ alias lexid-inc="python -c \"import sys;build=(sys.argv[1] if len(sys.argv) ==2 alias task="./do" alias task="./task" alias t="./task" + +alias micromamba-fhs="nix-shell -E 'with import {}; (pkgs.buildFHSUserEnv {name = \"fhs\"; runScript=\"zsh\";}).env'" diff --git a/home/private_dot_config/zsh/dot_zplugins b/home/private_dot_config/zsh/dot_zplugins index 6cc9634..20f5a9c 100644 --- a/home/private_dot_config/zsh/dot_zplugins +++ b/home/private_dot_config/zsh/dot_zplugins @@ -3,9 +3,9 @@ ${ZDOTDIR}/plugins/p10k-instant mattmc3/zephyr path:plugins/zfunctions # general use-plugins -mattmc3/zephyr path:plugins/clipboard mattmc3/zephyr path:plugins/history mattmc3/zephyr path:plugins/utility + ohmyzsh/ohmyzsh path:plugins/copybuffer ohmyzsh/ohmyzsh path:plugins/copyfile ohmyzsh/ohmyzsh path:plugins/extract @@ -21,14 +21,14 @@ wfxr/forgit romkatv/powerlevel10k kind:fpath ${ZDOTDIR}/plugins/prompt +# start compinit before +# fzf-tab and zexists +belak/zsh-utils path:completion + # wrap-up mattmc3/zephyr path:plugins/confd ${ZDOTDIR}/plugins/zexists -# start compinit before fzf-tab -belak/zsh-utils path:completion - - # deferred zdharma-continuum/fast-syntax-highlighting kind:defer Aloxaf/fzf-tab kind:defer diff --git a/home/private_dot_config/zsh/zexists.d/cmd/micromamba.zsh b/home/private_dot_config/zsh/zexists.d/cmd/micromamba.zsh index 59ef364..4b24d2a 100644 --- a/home/private_dot_config/zsh/zexists.d/cmd/micromamba.zsh +++ b/home/private_dot_config/zsh/zexists.d/cmd/micromamba.zsh @@ -1,20 +1,17 @@ - +#!/usr/bin/env zsh alias umamba=micromamba alias um=micromamba # >>> mamba initialize >>> # !! Contents within this block are managed by 'mamba init' !! -export MAMBA_EXE="$HOME/bin/micromamba"; +# not really I manage it myself... +export MAMBA_EXE="$(command -v micromamba)" export MAMBA_ROOT_PREFIX="$HOME/.micromamba"; -__mamba_setup="$("$MAMBA_EXE" shell hook --shell zsh --prefix "$MAMBA_ROOT_PREFIX" 2> /dev/null)" +__mamba_setup="$("$MAMBA_EXE" shell hook --shell zsh --root-prefix "$MAMBA_ROOT_PREFIX" 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__mamba_setup" else - if [ -f "$HOME/.micromamba/etc/profile.d/micromamba.sh" ]; then - . "$HOME/.micromamba/etc/profile.d/micromamba.sh" - else - export PATH="$HOME/.micromamba/bin:$PATH" # extra space after export prevents interference from conda init - fi + alias micromamba="$MAMBA_EXE" # Fallback on help from mamba activate fi unset __mamba_setup # <<< mamba initialize <<< diff --git a/home/private_dot_config/zsh/zexists.d/cmd/zoxide.zsh b/home/private_dot_config/zsh/zexists.d/cmd/zoxide.zsh index 6f0192e..abedf12 100644 --- a/home/private_dot_config/zsh/zexists.d/cmd/zoxide.zsh +++ b/home/private_dot_config/zsh/zexists.d/cmd/zoxide.zsh @@ -1,5 +1,8 @@ -eval "$(zoxide init zsh --cmd cd)" +#!/usr/bin/env zsh if is-exe lsd; then export _ZO_FZF_OPTS="--preview 'command lsd --tree --color always --icon always {2..}'" fi + +eval "$(zoxide init zsh --cmd cd)" +