diff --git a/chezmoi/.chezmoiexternal.toml b/chezmoi/.chezmoiexternal.toml index 8c85e83..58916b9 100644 --- a/chezmoi/.chezmoiexternal.toml +++ b/chezmoi/.chezmoiexternal.toml @@ -1,3 +1,8 @@ +[".local/share/zinit"] + type = "git-repo" + url = "https://github.com/zdharma-continuum/zinit.git" + refreshPeriod = "168h" + [".config/alacritty/themes/catppuccin/catppuccin-macchiato.toml"] type = "file" url = "https://github.com/catppuccin/alacritty/raw/main/catppuccin-macchiato.toml" diff --git a/chezmoi/dot_config/nvim/lua/aleidk/options.lua b/chezmoi/dot_config/nvim/lua/aleidk/options.lua index 5facef5..cd69bcc 100644 --- a/chezmoi/dot_config/nvim/lua/aleidk/options.lua +++ b/chezmoi/dot_config/nvim/lua/aleidk/options.lua @@ -11,7 +11,7 @@ local opt = vim.opt opt.autowrite = true -- Enable auto write opt.clipboard = "unnamedplus" -- Sync with system clipboard opt.completeopt = "menu,menuone,noselect" -opt.conceallevel = 3 -- Hide * markup for bold and italic +opt.conceallevel = 2 -- Hide * markup for bold and italic opt.confirm = true -- Confirm to save changes before exiting modified buffer opt.cursorline = true -- Enable highlighting of the current line opt.expandtab = true -- Use spaces instead of tabs diff --git a/chezmoi/dot_config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh b/chezmoi/dot_config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh deleted file mode 100644 index 37284d0..0000000 --- a/chezmoi/dot_config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# Catppuccin Frappe 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=#626880' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[function]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[command]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6d189,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#ef9f76,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#ef9f76' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#ca9ee6' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6d189' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6d189' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#e78284' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#e78284' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#e5c890' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#e5c890' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#c6d0f5' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ea999c' -ZSH_HIGHLIGHT_STYLES[path]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#c6d0f5,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#e78284,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#ca9ee6' -#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=#ea999c' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[default]='fg=#c6d0f5' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#c6d0f5' diff --git a/chezmoi/dot_config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh b/chezmoi/dot_config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh deleted file mode 100644 index 09b4cf9..0000000 --- a/chezmoi/dot_config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# Catppuccin Latte 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=#acb0be' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[function]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[command]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#40a02b,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fe640b,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fe640b' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fe640b' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#8839ef' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#40a02b' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#40a02b' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#d20f39' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#d20f39' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#df8e1d' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#df8e1d' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#4c4f69' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[path]='fg=#4c4f69,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#d20f39,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#4c4f69,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#d20f39,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#8839ef' -#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=#e64553' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[default]='fg=#4c4f69' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#4c4f69' diff --git a/chezmoi/dot_config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh b/chezmoi/dot_config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh deleted file mode 100644 index de6f512..0000000 --- a/chezmoi/dot_config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# 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' diff --git a/chezmoi/dot_config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh b/chezmoi/dot_config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh deleted file mode 100644 index 3958790..0000000 --- a/chezmoi/dot_config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh +++ /dev/null @@ -1,74 +0,0 @@ -# Catppuccin Mocha 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=#585b70' -## Constants -## Entitites -## Functions/methods -ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[function]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[command]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6e3a1,italic' -ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fab387,italic' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fab387' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fab387' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#cba6f7' -## Keywords -## Built ins -ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6e3a1' -ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6e3a1' -## Punctuation -ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#f38ba8' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#f38ba8' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#f38ba8' -ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#f38ba8' -## Serializable / Configuration Languages -## Storage -## Strings -ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#f9e2af' -ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#f9e2af' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#f9e2af' -ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#f9e2af' -ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#f9e2af' -## Variables -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[assign]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cdd6f4' -## No category relevant in spec -ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553' -ZSH_HIGHLIGHT_STYLES[path]='fg=#cdd6f4,underline' -ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#f38ba8,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cdd6f4,underline' -ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#f38ba8,underline' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#cba6f7' -#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=#e64553' -ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[default]='fg=#cdd6f4' -ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cdd6f4' diff --git a/chezmoi/executable_dot_zshrc b/chezmoi/executable_dot_zshrc index 1b685e1..69fc545 100644 --- a/chezmoi/executable_dot_zshrc +++ b/chezmoi/executable_dot_zshrc @@ -1,11 +1,54 @@ -# Start measuring bottlenecks -if [[ "$ZPROF" = true ]]; then - zmodload zsh/zprof -fi -#--------------------------------------------------------------------# -# ZSH Config # -#--------------------------------------------------------------------# +# ╭──────────────────────────────────────────────────────────╮ +# │ ZSH Config │ +# ╰──────────────────────────────────────────────────────────╯ + +# ╭──────────────────────────────────────────────────────────╮ +# │ Preoload stuff │ +# ╰──────────────────────────────────────────────────────────╯ +# Set the directory we want to store zinit and plugins +ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit" + +# Source/Load zinit, installation is handle by chezmoi external script +source "${ZINIT_HOME}/zinit.zsh" + +# source catppuccin theme for zsh-syntax-highlighting +zinit snippet "https://raw.githubusercontent.com/catppuccin/zsh-syntax-highlighting/main/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh" + +# ╭──────────────────────────────────────────────────────────╮ +# │ ZSH plugins │ +# ╰──────────────────────────────────────────────────────────╯ + +zinit light zsh-users/zsh-syntax-highlighting +zinit light zsh-users/zsh-completions +zinit light zsh-users/zsh-autosuggestions +zinit light Aloxaf/fzf-tab + +# ╭──────────────────────────────────────────────────────────╮ +# │ Oh My Zsh snippets │ +# ╰──────────────────────────────────────────────────────────╯ +zinit snippet OMZP::git +zinit snippet OMZP::sudo +zinit snippet OMZP::command-not-found + +# ╭──────────────────────────────────────────────────────────╮ +# │ Load completions │ +# ╰──────────────────────────────────────────────────────────╯ +# Custom completions +fpath+=${XDG_CONFIG_HOME:-$HOME/.config}/zsh/completions +autoload -Uz ${XDG_CONFIG_HOME:-$HOME/.config}/zsh/completions/* + +autoload -Uz compinit && compinit +zinit cdreplay -q + +# ╭──────────────────────────────────────────────────────────╮ +# │ Keybindings │ +# ╰──────────────────────────────────────────────────────────╯ +bindkey -e +bindkey '^f' auto-suggest-accept +bindkey '^p' history-search-backward +bindkey '^n' history-search-forward +bindkey '^[w' kill-region # Set VIM keybindings bindkey -v @@ -28,90 +71,41 @@ for km in viopp visual; do done done -# History -export HISTFILE="$HOME/.zsh_history" # History filepath -export HISTSIZE=10000 # Maximum events for internal history -export SAVEHIST=10000 # Maximum events in history file -setopt EXTENDED_HISTORY +# ╭──────────────────────────────────────────────────────────╮ +# │ History │ +# ╰──────────────────────────────────────────────────────────╯ +HISTSIZE=5000 +HISTFILE=~/.zsh_history +SAVEHIST=$HISTSIZE +HISTDUP=erase +setopt appendhistory +setopt sharehistory +setopt hist_ignore_space +setopt hist_ignore_all_dups +setopt hist_save_no_dups +setopt hist_ignore_dups +setopt hist_find_no_dups -# Navigation -setopt AUTO_CD -setopt AUTO_PUSHD -setopt CDABLE_VARS -setopt PUSHD_SILENT +# ╭──────────────────────────────────────────────────────────╮ +# │ Completion styling │ +# ╰──────────────────────────────────────────────────────────╯ +# case insensitive completion +zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' +zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" +zstyle ':completion:*' menu no +zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' +zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' -# Completion -setopt AUTO_LIST # Automatically list choices on ambiguous completion. -# setopt CORRECT # Turn on spelling correction for command. -setopt COMPLETE_IN_WORD # Complete from both ends of a word. -setopt GLOB_COMPLETE # Show autocompletion menu with globs -setopt MENU_COMPLETE # Automatically highlight first element of completion menu - -# fpath+=${ZSH_CUSTOM:-${ZSH:-$XDG_DATA_HOME/oh-my-zsh}/custom}/plugins/zsh-completions/src -fpath+=${XDG_CONFIG_HOME:-$HOME/.config}/zsh/completions -autoload -Uz ${XDG_CONFIG_HOME:-$HOME/.config}/zsh/completions/* - -zstyle ':completion:*:descriptions' format '%U%B%d%b%u' -zstyle ':completion:*:warnings' format '%F{cyan}%BSorry, no matches for: %d%b%f' -zstyle ':completion:*' rehash true -zstyle ':completion:*' use-cache on - -# Autocomplete: https://github.com/marlonrichert/zsh-autocomplete/blob/main/.zshrc -zstyle ':autocomplete:*' fzf-completion yes -zstyle ':autocomplete:*' min-input 1 -zstyle ':autocomplete:*' widget-style menu-select # Tab select instead of autocomplete - -setopt autocd beep extendedglob notify - -zstyle ':completion:*' group-name '' -zstyle :compinstall filename '/home/aleidk/.zshrc' - -zmodload zsh/complist -bindkey -M menuselect 'h' vi-backward-char -bindkey -M menuselect 'k' vi-up-line-or-history -bindkey -M menuselect 'l' vi-forward-char -bindkey -M menuselect 'j' vi-down-line-or-history - -# FZF config -source /usr/share/fzf/shell/key-bindings.zsh - -autoload -U compinit -compinit - -setopt GLOB_DOTS - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -#--------------------------------------------------------------------# -# Start Stuff # -#--------------------------------------------------------------------# - -# File directories that are needed to source -files=( - # zsh - $HOME/.config/zsh/**/*.zsh - # fzf scripts that need to be sourced - # $HOME/scripts/fzf-flatpak - # fzf config file - $HOMES/.config/fzf/fzfrc -) - -for file in $files; do - if [[ -f $file ]]; then - emulate -L zsh - source $file - fi -done - -if [[ "$ZPROF" = true ]]; then - zprof -fi +# ╭──────────────────────────────────────────────────────────╮ +# │ Source other files │ +# ╰──────────────────────────────────────────────────────────╯ +source $HOME/.config/zsh/**/*.zsh +source $HOME/.config/fzf/fzfrc +# ╭──────────────────────────────────────────────────────────╮ +# │ Init external programs │ +# ╰──────────────────────────────────────────────────────────╯ +source /usr/share/fzf/shell/key-bindings.zsh # change to the following line when <= v0.48 +# eval "$(fzf --zsh)" +eval "$(zoxide init --cmd cd zsh)" eval "$(starship init zsh)" -eval "$(zoxide init zsh)" -eval "$(mise activate zsh)" - -# Load syntax highlight at the end so other configurations can use it -# Color scheme for syntax highlighting -source ~/.config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh