From 40274cbd9b9a894dd3c1558c0ff2bd104ac6ba21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Fri, 23 Oct 2020 11:23:15 -0400 Subject: Revert to regular zsh-syntax-highlighting --- .gitmodules | 3 +++ zsh/.zsh/syntax-highlighting | 1 + zsh/.zshrc | 12 +++++++----- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 160000 zsh/.zsh/syntax-highlighting diff --git a/.gitmodules b/.gitmodules index 89907ae..58f5385 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "zsh/.zsh/powerlevel10k"] path = zsh/.zsh/powerlevel10k url = https://github.com/romkatv/powerlevel10k.git +[submodule "zsh/syntax-highlighting"] + path = zsh/.zsh/syntax-highlighting + url = https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/zsh/.zsh/syntax-highlighting b/zsh/.zsh/syntax-highlighting new file mode 160000 index 0000000..2ebfa6a --- /dev/null +++ b/zsh/.zsh/syntax-highlighting @@ -0,0 +1 @@ +Subproject commit 2ebfa6a59879b66b02712693731c84831255601d diff --git a/zsh/.zshrc b/zsh/.zshrc index 6e31142..ffc9641 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -59,11 +59,13 @@ if (( $+commands[zoxide] )); then eval "$(zoxide init zsh)" fi -source ~/.zsh/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh -if [[ ! -f ~/.zsh/fast-syntax-highlighting/current_theme.zsh ]]; then - fpath+=$HOME/.zsh/fast-syntax-highlighting - fast-theme clean -fi +# Issues when typing 'ssh root@' with fast syntax hilighting. +source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh +# source ~/.zsh/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh +# if [[ ! -f ~/.zsh/fast-syntax-highlighting/current_theme.zsh ]]; then +# fpath+=$HOME/.zsh/fast-syntax-highlighting +# fast-theme clean +# fi # allow editing of command line autoload -U edit-command-line -- cgit v1.2.3