update config for jetbrains compatibility

This commit is contained in:
Alexander Navarro 2025-04-29 11:10:33 -04:00
parent fac9010c68
commit 62518907ed
3 changed files with 31 additions and 68 deletions

View file

@ -41,6 +41,9 @@ deleted = '[ \($count\)](red) '
[golang] [golang]
symbol = " " symbol = " "
[aws]
disabled = true
[palettes.catppuccin_macchiato] [palettes.catppuccin_macchiato]
rosewater = "#f4dbd6" rosewater = "#f4dbd6"
flamingo = "#f0c6c6" flamingo = "#f0c6c6"

View file

@ -18,41 +18,20 @@ update_path "$HOME/bin"
update_path "/usr/local/bin" update_path "/usr/local/bin"
# Dev Stuff # Dev Stuff
{{ #if (is_executable "npm") }}
export NPM_PACKAGES="$HOME/.npm-packages" export NPM_PACKAGES="$HOME/.npm-packages"
export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}"
update_path "$NPM_PACKAGES/bin" update_path "$NPM_PACKAGES/bin"
{{ /if }}
{{ #if (is_executable "pnpm") }}
export PNPM_HOME="$HOME/.local/share/pnpm" export PNPM_HOME="$HOME/.local/share/pnpm"
export ESLINT_USE_FLAT_CONFIG=true
update_path "$PNPM_HOME" update_path "$PNPM_HOME"
{{ /if }}
{{ #if (command_success "[ -d $HOME/.bun ]") }}
export BUN_INSTALL="$HOME/.bun" export BUN_INSTALL="$HOME/.bun"
update_path "$BUN_INSTALL/bin" update_path "$BUN_INSTALL/bin"
# bun completions # bun completions
[ -s "/home/aleidk/.bun/_bun" ] && source "/home/aleidk/.bun/_bun" [ -s "/home/aleidk/.bun/_bun" ] && source "/home/aleidk/.bun/_bun"
{{ /if }}
{{ #if (is_executable "rye") }}
source "$HOME/.rye/env" source "$HOME/.rye/env"
{{ /if }}
{{ #if (is_executable "cargo") }}
# . "$HOME/.cargo/env" # . "$HOME/.cargo/env"
update_path "$HOME/.cargo/bin/" update_path "$HOME/.cargo/bin/"
{{ /if }}
{{~ #if (eq (env_var "OS") "macos") }}
eval "$(/opt/homebrew/bin/brew shellenv)"
{{ /if ~}}
{{ #if (command_success "[ -e /home/linuxbrew/.linuxbrew/bin/brew ]") }}
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
{{ /if ~}}

View file

@ -24,13 +24,12 @@ zinit snippet "https://raw.githubusercontent.com/catppuccin/zsh-syntax-highlight
# │ ZSH plugins │ # │ ZSH plugins │
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
zinit light zsh-users/zsh-syntax-highlighting # BUG: this makes it work funky on some terminals
# zinit light zsh-users/zsh-syntax-highlighting
zinit light zsh-users/zsh-completions zinit light zsh-users/zsh-completions
zinit light zsh-users/zsh-autosuggestions zinit light zsh-users/zsh-autosuggestions
{{ #if dotter.packages.fzf }}
zinit light Aloxaf/fzf-tab zinit light Aloxaf/fzf-tab
{{ /if }}
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
# │ Oh My Zsh snippets │ # │ Oh My Zsh snippets │
@ -71,32 +70,32 @@ zinit cdreplay -q
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
# │ Keybindings │ # │ Keybindings │
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
bindkey -e # bindkey -e
bindkey '^f' auto-suggest-accept # bindkey '^f' auto-suggest-accept
bindkey '^p' history-search-backward # bindkey '^p' history-search-backward
bindkey '^n' history-search-forward # bindkey '^n' history-search-forward
bindkey '^[w' kill-region # bindkey '^[w' kill-region
#
# Set VIM keybindings # # Set VIM keybindings
bindkey -v # # bindkey -v
export KEYTIMEOUT=1 # export KEYTIMEOUT=1
autoload -Uz edit-command-line # # autoload -Uz edit-command-line
zle -N edit-command-line # zle -N edit-command-line
bindkey -M vicmd V edit-command-line # Edits files in vim, hit Shift+v in normal mode # bindkey -M vicmd V edit-command-line # Edits files in vim, hit Shift+v in normal mode
#
# Add vim text objects # # Add vim text objects
autoload -Uz select-bracketed select-quoted # # autoload -Uz select-bracketed select-quoted
zle -N select-quoted # zle -N select-quoted
zle -N select-bracketed # zle -N select-bracketed
for km in viopp visual; do # for km in viopp visual; do
bindkey -M $km -- '-' vi-up-line-or-history # bindkey -M $km -- '-' vi-up-line-or-history
for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do # for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do
bindkey -M $km $c select-quoted # bindkey -M $km $c select-quoted
done # done
for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do # for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do
bindkey -M $km $c select-bracketed # bindkey -M $km $c select-bracketed
done # done
done # done
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
# │ History │ # │ History │
@ -120,8 +119,6 @@ setopt hist_find_no_dups
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
{{ #if dotter.packages.fzf }}
zstyle ':completion:*' menu no zstyle ':completion:*' menu no
zstyle ':fzf-tab:*' show-group full zstyle ':fzf-tab:*' show-group full
zstyle ':fzf-tab:*' continuous-trigger '/' zstyle ':fzf-tab:*' continuous-trigger '/'
@ -160,8 +157,6 @@ zstyle ':fzf-tab:complete:git-checkout:*' fzf-preview \
# TLDR # TLDR
zstyle ':fzf-tab:complete:tldr:argument-1' fzf-preview 'tldr --color always $word' zstyle ':fzf-tab:complete:tldr:argument-1' fzf-preview 'tldr --color always $word'
{{ /if }}
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
# │ ZSH Options │ # │ ZSH Options │
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
@ -173,9 +168,7 @@ setopt GLOB_DOTS
# │ Source other files │ # │ Source other files │
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
{{ #if dotter.packages.fzf }}
source $HOME/.config/fzf/fzfrc source $HOME/.config/fzf/fzfrc
{{ /if }}
# this prevents errors and not loading some files # this prevents errors and not loading some files
for file in $HOME/.config/zsh/**/*.zsh; do for file in $HOME/.config/zsh/**/*.zsh; do
@ -186,18 +179,6 @@ done
# │ Init external programs │ # │ Init external programs │
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
{{ #if dotter.packages.fzf }}
eval "$(fzf --zsh)" eval "$(fzf --zsh)"
{{ /if ~}}
{{ #if (is_executable "zoxide") }}
eval "$(zoxide init --cmd cd zsh)" eval "$(zoxide init --cmd cd zsh)"
{{ /if ~}}
{{ #if dotter.packages.starship }}
eval "$(starship init zsh)" eval "$(starship init zsh)"
{{ /if ~}}
{{ #if (is_executable "mise") }}
eval "$(mise activate zsh)"
{{ /if ~}}