From bae17dfdc5d3f2f09464fe673eebe5c01776b395 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 13 Dec 2022 17:43:38 +0100 Subject: [PATCH] Migrate from zplug to zim --- .zimrc | 15 +++++++++++++++ bindings.zsh | 19 +++++++++++++++++++ .../highlight-config.plugin.zsh | 2 ++ zshrc | 16 +++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 .zimrc diff --git a/.zimrc b/.zimrc new file mode 100644 index 0000000..c10e6d7 --- /dev/null +++ b/.zimrc @@ -0,0 +1,15 @@ +zmodule jreese/zsh-titles + +zmodule crater2150-zsh/fzf-widgets +zmodule crater2150-zsh/conf +zmodule crater2150-zsh/chroma-z + +zmodule $ZDOTDIR/plugins/tmpsrc +zmodule $ZDOTDIR/plugins/pyenv + +zmodule $ZDOTDIR/plugins/highlight-config +zmodule zsh-users/zsh-syntax-highlighting + +zmodule ohmyzsh/ohmyzsh --root plugins/ng + +zmodule urbainvaes/fzf-marks diff --git a/bindings.zsh b/bindings.zsh index 441fd6c..5e7bdee 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -92,3 +92,22 @@ fi zle-venv() { zle push-line; BUFFER="venv"; zle accept-line } zle -N zle-venv bindkey "\ev" zle-venv + +# Map widgets to key +bindkey "\ec" fzf-change-directory +bindkey "^r" fzf-insert-history +bindkey "^xf" fzf-insert-files +bindkey "^xd" fzf-insert-directory +bindkey "^xn" fzf-insert-named-directory + +# Start fzf in a tmux pane +FZF_WIDGET_TMUX=1 + +# use fd for finding directories and files +FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" +FZF_INSERT_DIR_COMMAND="fd -t d" +FZF_INSERT_FILES_COMMAND="fd -t f" +FZF_EDIT_FILES_COMMAND="fd -t f" + +# modify history command to remove duplicates +FZF_HISTORY_COMMAND="fc -l 1 | sed s/ *[0-9]* //g | awk !seen[\$0]++" diff --git a/plugins/highlight-config/highlight-config.plugin.zsh b/plugins/highlight-config/highlight-config.plugin.zsh index de7bf31..dec3ff9 100644 --- a/plugins/highlight-config/highlight-config.plugin.zsh +++ b/plugins/highlight-config/highlight-config.plugin.zsh @@ -1,3 +1,5 @@ +typeset -gA ZSH_HIGHLIGHT_STYLES + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then diff --git a/zshrc b/zshrc index 93832b6..f7b0042 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,5 @@ +typeset -U path + HISTFILE=~/.histfile HISTSIZE=100000 SAVEHIST=100000 @@ -57,7 +59,19 @@ function(){ . $(zdotfile completion.zsh) -source $(zdotfile zplug.zsh) + +ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim +if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then + curl -fsSL --create-dirs -o ${ZIM_HOME}/zimfw.zsh \ + https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh +fi +if [[ ! ${ZIM_HOME}/init.zsh -nt ${ZDOTDIR:-${HOME}}/.zimrc ]]; then + source ${ZIM_HOME}/zimfw.zsh init -q +fi +source ${ZIM_HOME}/init.zsh + + +#source $(zdotfile zplug.zsh) . $(zdotfile bindings.zsh)