Redo p10k, add zsh syntax highlighting
This commit is contained in:
parent
e5025c6a39
commit
eabcb6f615
7
Makefile
7
Makefile
|
@ -18,6 +18,8 @@ PACKER_REPO := https://github.com/wbthomason/packer.nvim
|
|||
PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim
|
||||
POWERLEVEL_REPO := https://github.com/romkatv/powerlevel10k.git
|
||||
POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
|
||||
ZSH_SYNTAX_REPO := https://github.com/zsh-users/zsh-syntax-highlighting.git
|
||||
ZSH_SYNTAX_DIR := $(ZSH_CUSTOM_DIR)/plugins/zsh-syntax-highlighting
|
||||
TPM_REPO := https://github.com/tmux-plugins/tpm
|
||||
TPM_DIR := $(HOME)/.tmux/plugins/tpm
|
||||
|
||||
|
@ -35,7 +37,7 @@ unlink:
|
|||
for link in $(SSH_TARGETS); do rm "$$link"; done
|
||||
rmdir $(HOME)/.ssh/sockets
|
||||
|
||||
install: $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR)
|
||||
install: $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_SYNTAX_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR)
|
||||
python3 -m pip list | grep -E "libtmux.*0\.16\.1" > /dev/null ||\
|
||||
python3 -m pip install --user libtmux==0.16.1
|
||||
|
||||
|
@ -61,6 +63,9 @@ $(PACKER_DIR):
|
|||
$(POWERLEVEL_DIR): $(ZSH_DIR)
|
||||
git clone --depth 1 $(POWERLEVEL_REPO) $@
|
||||
|
||||
$(ZSH_SYNTAX_DIR): $(ZSH_DIR)
|
||||
git clone --depth 1 $(ZSH_SYNTAX_REPO) $@
|
||||
|
||||
$(TPM_DIR):
|
||||
git clone --depth 1 $(TPM_REPO) $@
|
||||
|
||||
|
|
626
home/p10k.zsh
626
home/p10k.zsh
File diff suppressed because it is too large
Load diff
|
@ -74,7 +74,7 @@ HIST_STAMPS="yyyy-mm-dd"
|
|||
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(git fzf safe-paste colored-man-pages archlinux brew macos)
|
||||
plugins=(git fzf safe-paste colored-man-pages archlinux brew macos zsh-syntax-highlighting)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
|
@ -82,6 +82,10 @@ source $ZSH/oh-my-zsh.sh
|
|||
|
||||
export EDITOR="nvim"
|
||||
export VISUAL="nvim"
|
||||
export FZF_DEFAULT_OPTS=" \
|
||||
--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \
|
||||
--color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 \
|
||||
--color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796"
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
|
74
ohmyzsh/catppuccin_macchiato-zsh-syntax-highlighting.zsh
Normal file
74
ohmyzsh/catppuccin_macchiato-zsh-syntax-highlighting.zsh
Normal file
|
@ -0,0 +1,74 @@
|
|||
# Catppuccin Macchiato Theme (for zsh-syntax-highlighting)
|
||||
#
|
||||
# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
|
||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
|
||||
typeset -gA ZSH_HIGHLIGHT_STYLES
|
||||
|
||||
# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
|
||||
#
|
||||
## General
|
||||
### Diffs
|
||||
### Markup
|
||||
## Classes
|
||||
## Comments
|
||||
ZSH_HIGHLIGHT_STYLES[comment]='fg=#5b6078'
|
||||
## Constants
|
||||
## Entitites
|
||||
## Functions/methods
|
||||
ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[function]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[command]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6da95,italic'
|
||||
ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#f5a97f,italic'
|
||||
ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#f5a97f'
|
||||
ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#f5a97f'
|
||||
ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#c6a0f6'
|
||||
## Keywords
|
||||
## Built ins
|
||||
ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6da95'
|
||||
ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6da95'
|
||||
## Punctuation
|
||||
ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#ed8796'
|
||||
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ed8796'
|
||||
ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ed8796'
|
||||
ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ed8796'
|
||||
## Serializable / Configuration Languages
|
||||
## Storage
|
||||
## Strings
|
||||
ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#eed49f'
|
||||
ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#eed49f'
|
||||
ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#eed49f'
|
||||
ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ee99a0'
|
||||
ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#eed49f'
|
||||
ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ee99a0'
|
||||
ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#eed49f'
|
||||
## Variables
|
||||
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ee99a0'
|
||||
ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[assign]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cad3f5'
|
||||
## No category relevant in spec
|
||||
ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ee99a0'
|
||||
ZSH_HIGHLIGHT_STYLES[path]='fg=#cad3f5,underline'
|
||||
ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#ed8796,underline'
|
||||
ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cad3f5,underline'
|
||||
ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#ed8796,underline'
|
||||
ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#c6a0f6'
|
||||
#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
|
||||
#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
|
||||
#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
|
||||
#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
|
||||
ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ee99a0'
|
||||
ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[default]='fg=#cad3f5'
|
||||
ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cad3f5'
|
Loading…
Reference in a new issue