From 62518907ed5cb8ae5f83acb7fbe416f9a57b023b Mon Sep 17 00:00:00 2001 From: aleidk Date: Tue, 29 Apr 2025 11:10:33 -0400 Subject: [PATCH] update config for jetbrains compatibility --- Configs/starship/.config/starship.toml | 3 ++ Configs/zsh/{zprofile => .zprofile} | 21 -------- Configs/zsh/{zshrc => .zshrc} | 75 ++++++++++---------------- 3 files changed, 31 insertions(+), 68 deletions(-) rename Configs/zsh/{zprofile => .zprofile} (62%) rename Configs/zsh/{zshrc => .zshrc} (89%) diff --git a/Configs/starship/.config/starship.toml b/Configs/starship/.config/starship.toml index cf03107..4f1fe65 100644 --- a/Configs/starship/.config/starship.toml +++ b/Configs/starship/.config/starship.toml @@ -41,6 +41,9 @@ deleted = '[ \($count\)](red) ' [golang] symbol = " " +[aws] +disabled = true + [palettes.catppuccin_macchiato] rosewater = "#f4dbd6" flamingo = "#f0c6c6" diff --git a/Configs/zsh/zprofile b/Configs/zsh/.zprofile similarity index 62% rename from Configs/zsh/zprofile rename to Configs/zsh/.zprofile index dd20b5a..141af37 100644 --- a/Configs/zsh/zprofile +++ b/Configs/zsh/.zprofile @@ -18,41 +18,20 @@ update_path "$HOME/bin" update_path "/usr/local/bin" # Dev Stuff -{{ #if (is_executable "npm") }} export NPM_PACKAGES="$HOME/.npm-packages" export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" - update_path "$NPM_PACKAGES/bin" -{{ /if }} -{{ #if (is_executable "pnpm") }} export PNPM_HOME="$HOME/.local/share/pnpm" -export ESLINT_USE_FLAT_CONFIG=true update_path "$PNPM_HOME" -{{ /if }} -{{ #if (command_success "[ -d $HOME/.bun ]") }} export BUN_INSTALL="$HOME/.bun" update_path "$BUN_INSTALL/bin" # bun completions [ -s "/home/aleidk/.bun/_bun" ] && source "/home/aleidk/.bun/_bun" -{{ /if }} - -{{ #if (is_executable "rye") }} source "$HOME/.rye/env" -{{ /if }} -{{ #if (is_executable "cargo") }} # . "$HOME/.cargo/env" 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 ~}} diff --git a/Configs/zsh/zshrc b/Configs/zsh/.zshrc similarity index 89% rename from Configs/zsh/zshrc rename to Configs/zsh/.zshrc index 2650df6..8a282c3 100644 --- a/Configs/zsh/zshrc +++ b/Configs/zsh/.zshrc @@ -24,13 +24,12 @@ zinit snippet "https://raw.githubusercontent.com/catppuccin/zsh-syntax-highlight # │ 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-autosuggestions -{{ #if dotter.packages.fzf }} zinit light Aloxaf/fzf-tab -{{ /if }} # ╭──────────────────────────────────────────────────────────╮ # │ Oh My Zsh snippets │ @@ -71,32 +70,32 @@ 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 -export KEYTIMEOUT=1 -autoload -Uz 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 - -# Add vim text objects -autoload -Uz select-bracketed select-quoted -zle -N select-quoted -zle -N select-bracketed -for km in viopp visual; do - bindkey -M $km -- '-' vi-up-line-or-history - for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do - bindkey -M $km $c select-quoted - done - for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do - bindkey -M $km $c select-bracketed - done -done +# 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 +# export KEYTIMEOUT=1 +# # autoload -Uz 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 +# +# # Add vim text objects +# # autoload -Uz select-bracketed select-quoted +# zle -N select-quoted +# zle -N select-bracketed +# for km in viopp visual; do +# bindkey -M $km -- '-' vi-up-line-or-history +# for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do +# bindkey -M $km $c select-quoted +# done +# for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do +# bindkey -M $km $c select-bracketed +# done +# done # ╭──────────────────────────────────────────────────────────╮ # │ History │ @@ -120,8 +119,6 @@ setopt hist_find_no_dups zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" -{{ #if dotter.packages.fzf }} - zstyle ':completion:*' menu no zstyle ':fzf-tab:*' show-group full zstyle ':fzf-tab:*' continuous-trigger '/' @@ -160,8 +157,6 @@ zstyle ':fzf-tab:complete:git-checkout:*' fzf-preview \ # TLDR zstyle ':fzf-tab:complete:tldr:argument-1' fzf-preview 'tldr --color always $word' -{{ /if }} - # ╭──────────────────────────────────────────────────────────╮ # │ ZSH Options │ # ╰──────────────────────────────────────────────────────────╯ @@ -173,9 +168,7 @@ setopt GLOB_DOTS # │ Source other files │ # ╰──────────────────────────────────────────────────────────╯ -{{ #if dotter.packages.fzf }} source $HOME/.config/fzf/fzfrc -{{ /if }} # this prevents errors and not loading some files for file in $HOME/.config/zsh/**/*.zsh; do @@ -186,18 +179,6 @@ done # │ Init external programs │ # ╰──────────────────────────────────────────────────────────╯ -{{ #if dotter.packages.fzf }} eval "$(fzf --zsh)" -{{ /if ~}} - -{{ #if (is_executable "zoxide") }} eval "$(zoxide init --cmd cd zsh)" -{{ /if ~}} - -{{ #if dotter.packages.starship }} eval "$(starship init zsh)" -{{ /if ~}} - -{{ #if (is_executable "mise") }} -eval "$(mise activate zsh)" -{{ /if ~}}