QoL updates
This commit is contained in:
parent
7b58c02f5f
commit
c9fadcb97e
3 changed files with 132 additions and 301 deletions
|
|
@ -1,9 +1,8 @@
|
|||
theme = catppuccin-mocha
|
||||
theme = Catppuccin Mocha
|
||||
background = #000000
|
||||
font-size = 15
|
||||
window-padding-x = 2,2
|
||||
font-size = 16
|
||||
window-padding-x = 12
|
||||
background-opacity = 0.75
|
||||
background-blur = 200
|
||||
macos-titlebar-style = tabs
|
||||
|
||||
|
||||
macos-non-native-fullscreen = true
|
||||
|
|
|
|||
424
aurion/zsh.zshrc
424
aurion/zsh.zshrc
|
|
@ -1,169 +1,128 @@
|
|||
source /opt/homebrew/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh
|
||||
.
|
||||
├── aurion
|
||||
│ ├── config.ghostty
|
||||
│ └── zsh.zshrc
|
||||
├── darkstar
|
||||
│ └── bash.bashrc
|
||||
├── LICENSE
|
||||
└── README.md
|
||||
❯ zed .
|
||||
❯ cat ~/.zshrc
|
||||
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
# === NVM ===
|
||||
# Lazy-load NVM
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
|
||||
nvm() {
|
||||
unset -f nvm
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
nvm "$@"
|
||||
}
|
||||
|
||||
node() {
|
||||
unset -f node npm npx
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
node "$@"
|
||||
}
|
||||
|
||||
npm() {
|
||||
unset -f node npm npx
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
npm "$@"
|
||||
}
|
||||
|
||||
npx() {
|
||||
unset -f node npm npx
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
npx "$@"
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
# POWERLEVEL10K INSTANT PROMPT (must be near top)
|
||||
# =============================================================================
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
|
||||
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your Oh My Zsh installation.
|
||||
# =============================================================================
|
||||
# OH MY ZSH CORE
|
||||
# =============================================================================
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# Set name of the theme to load --- if set to "random", it will
|
||||
# load a random theme each time Oh My Zsh is loaded, in which case,
|
||||
# to know which specific one was loaded, run: echo $RANDOM_THEME
|
||||
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
|
||||
ZSH_THEME="robbyrussell"
|
||||
|
||||
# Set list of themes to pick from when loading at random
|
||||
# Setting this variable when ZSH_THEME=random will cause zsh to load
|
||||
# a theme from this variable instead of looking in $ZSH/themes/
|
||||
# If set to an empty array, this variable will have no effect.
|
||||
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
|
||||
|
||||
# Uncomment the following line to use case-sensitive completion.
|
||||
# CASE_SENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion.
|
||||
# Case-sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="true"
|
||||
|
||||
# Uncomment one of the following lines to change the auto-update behavior
|
||||
# zstyle ':omz:update' mode disabled # disable automatic updates
|
||||
# zstyle ':omz:update' mode auto # update automatically without asking
|
||||
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# zstyle ':omz:update' frequency 13
|
||||
|
||||
# Uncomment the following line if pasting URLs and other text is messed up.
|
||||
# DISABLE_MAGIC_FUNCTIONS="true"
|
||||
|
||||
# Uncomment the following line to disable colors in ls.
|
||||
# DISABLE_LS_COLORS="true"
|
||||
|
||||
# Uncomment the following line to disable auto-setting terminal title.
|
||||
# DISABLE_AUTO_TITLE="true"
|
||||
|
||||
# Uncomment the following line to enable command auto-correction.
|
||||
# ENABLE_CORRECTION="true"
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
||||
# You can also set it to another string to have that shown instead of the default red dots.
|
||||
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
||||
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
||||
# COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
# Uncomment the following line if you want to disable marking untracked files
|
||||
# under VCS as dirty. This makes repository status check for large repositories
|
||||
# much, much faster.
|
||||
# DISABLE_UNTRACKED_FILES_DIRTY="true"
|
||||
|
||||
# Uncomment the following line if you want to change the command execution time
|
||||
# stamp shown in the history command output.
|
||||
# You can set one of the optional three formats:
|
||||
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
|
||||
# or set a custom format using the strftime function format specifications,
|
||||
# see 'man strftime' for details.
|
||||
# HIST_STAMPS="mm/dd/yyyy"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
# ZSH_CUSTOM=/path/to/new-custom-folder
|
||||
|
||||
# Which plugins would you like to load?
|
||||
# Standard plugins can be found in $ZSH/plugins/
|
||||
# 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)
|
||||
|
||||
plugins=(git you-should-use)
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
# You may need to manually set your language environment
|
||||
# export LANG=en_US.UTF-8
|
||||
|
||||
# Preferred editor for local and remote sessions
|
||||
# if [[ -n $SSH_CONNECTION ]]; then
|
||||
# export EDITOR='vim'
|
||||
# else
|
||||
# export EDITOR='nvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch $(uname -m)"
|
||||
|
||||
# Set personal aliases, overriding those provided by Oh My Zsh libs,
|
||||
# plugins, and themes. Aliases can be placed here, though Oh My Zsh
|
||||
# users are encouraged to define aliases within a top-level file in
|
||||
# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
|
||||
# - $ZSH_CUSTOM/aliases.zsh
|
||||
# - $ZSH_CUSTOM/macos.zsh
|
||||
# For a full list of active aliases, run `alias`.
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
export JAVA_HOME="$(brew --prefix openjdk)/libexec/openjdk.jdk/Contents/Home"
|
||||
export PATH="$JAVA_HOME/bin:$PATH"
|
||||
export JAVA_HOME="/opt/homebrew/opt/openjdk/libexec/openjdk.jdk/Contents/Home"
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
export JAVA_HOME="/opt/homebrew/opt/openjdk/libexec/openjdk.jdk/Contents/Home"
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
eval "$(zoxide init zsh)"
|
||||
|
||||
export PATH=$PATH:/Users/mav/.spicetify
|
||||
|
||||
# bun completions
|
||||
[ -s "/Users/mav/.bun/_bun" ] && source "/Users/mav/.bun/_bun"
|
||||
|
||||
# bun
|
||||
export BUN_INSTALL="$HOME/.bun"
|
||||
export PATH="$BUN_INSTALL/bin:$PATH"
|
||||
. "/Users/mav/.deno/env"
|
||||
. "$HOME/.atuin/bin/env"
|
||||
|
||||
eval "$(atuin init zsh)"
|
||||
|
||||
# Added by LM Studio CLI (lms)
|
||||
export PATH="$PATH:/Users/mav/.cache/lm-studio/bin"
|
||||
|
||||
eval "$(fzf --zsh)"
|
||||
|
||||
source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
# history setup
|
||||
# =============================================================================
|
||||
# HISTORY
|
||||
# =============================================================================
|
||||
HISTFILE=$HOME/.zhistory
|
||||
SAVEHIST=1000
|
||||
HISTSIZE=999
|
||||
setopt share_history
|
||||
setopt hist_expire_dups_first
|
||||
setopt hist_ignore_dups
|
||||
setopt hist_verify
|
||||
setopt share_history hist_expire_dups_first hist_ignore_dups hist_verify
|
||||
|
||||
# =============================================================================
|
||||
# JAVA / OPENJDK
|
||||
# =============================================================================
|
||||
export JAVA_HOME="/opt/homebrew/opt/openjdk/libexec/openjdk.jdk/Contents/Home"
|
||||
export PATH="$JAVA_HOME/bin:$PATH"
|
||||
|
||||
# =============================================================================
|
||||
# SHELL INTEGRATIONS & CLI TOOLS
|
||||
# =============================================================================
|
||||
eval "$(zoxide init zsh)"
|
||||
eval "$(fzf --zsh)"
|
||||
eval "$(thefuck --alias)"
|
||||
eval "$(thefuck --alias fk)"
|
||||
|
||||
# =============================================================================
|
||||
# THEMES & PLUGINS
|
||||
# =============================================================================
|
||||
source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme
|
||||
source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
# eza -> ls
|
||||
# =============================================================================
|
||||
# ALIASES
|
||||
# =============================================================================
|
||||
alias ls="eza --color=always -long --git --no-filesize --icons=always --no-time --no-user --no-permissions"
|
||||
alias sqlplus='DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/instantclient-arm64-basic/23.3.0.23.09-1 sqlplus'
|
||||
|
||||
# thefuck
|
||||
eval $(thefuck --alias)
|
||||
eval $(thefuck --alias fk)
|
||||
# =============================================================================
|
||||
# PATH EXPORTS
|
||||
# =============================================================================
|
||||
export PATH="/opt/homebrew/Cellar/instantclient-arm64-sqlplus/23.3.0.23.09/bin:$PATH"
|
||||
export PATH="$PATH:/Users/mav/.spicetify"
|
||||
export PATH="$PATH:/Users/mav/.cache/lm-studio/bin"
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
export PATH="$HOME/bin:$PATH"
|
||||
|
||||
# >>> conda initialize >>>
|
||||
# !! Contents within this block are managed by 'conda init' !!
|
||||
# =============================================================================
|
||||
# BUN
|
||||
# =============================================================================
|
||||
export BUN_INSTALL="$HOME/.bun"
|
||||
export PATH="$BUN_INSTALL/bin:$PATH"
|
||||
[ -s "/Users/mav/.bun/_bun" ] && source "/Users/mav/.bun/_bun"
|
||||
|
||||
# =============================================================================
|
||||
# DENO
|
||||
# =============================================================================
|
||||
[ -f "$HOME/.deno/env" ] && . "$HOME/.deno/env"
|
||||
|
||||
# =============================================================================
|
||||
# ATUIN (shell history)
|
||||
# =============================================================================
|
||||
[ -f "$HOME/.atuin/bin/env" ] && . "$HOME/.atuin/bin/env"
|
||||
eval "$(atuin init zsh)"
|
||||
|
||||
# =============================================================================
|
||||
# CONDA
|
||||
# =============================================================================
|
||||
__conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
|
||||
if [ $? -eq 0 ]; then
|
||||
eval "$__conda_setup"
|
||||
|
|
@ -175,157 +134,30 @@ else
|
|||
fi
|
||||
fi
|
||||
unset __conda_setup
|
||||
# <<< conda initialize <<<
|
||||
|
||||
# shellcheck shell=bash
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Utility functions for zoxide.
|
||||
#
|
||||
|
||||
# pwd based on the value of _ZO_RESOLVE_SYMLINKS.
|
||||
function __zoxide_pwd() {
|
||||
\builtin pwd -L
|
||||
}
|
||||
|
||||
# cd + custom logic based on the value of _ZO_ECHO.
|
||||
function __zoxide_cd() {
|
||||
# shellcheck disable=SC2164
|
||||
\builtin cd -- "$@"
|
||||
}
|
||||
|
||||
# ORACLE INSTANT CLIENT
|
||||
# =============================================================================
|
||||
#
|
||||
# Hook configuration for zoxide.
|
||||
#
|
||||
|
||||
# Hook to add new entries to the database.
|
||||
__zoxide_oldpwd="$(__zoxide_pwd)"
|
||||
|
||||
function __zoxide_hook() {
|
||||
\builtin local -r retval="$?"
|
||||
\builtin local pwd_tmp
|
||||
pwd_tmp="$(__zoxide_pwd)"
|
||||
if [[ ${__zoxide_oldpwd} != "${pwd_tmp}" ]]; then
|
||||
__zoxide_oldpwd="${pwd_tmp}"
|
||||
\command zoxide add -- "${__zoxide_oldpwd}"
|
||||
fi
|
||||
return "${retval}"
|
||||
}
|
||||
|
||||
# Initialize hook.
|
||||
if [[ ${PROMPT_COMMAND:=} != *'__zoxide_hook'* ]]; then
|
||||
PROMPT_COMMAND="__zoxide_hook;${PROMPT_COMMAND#;}"
|
||||
fi
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# When using zoxide with --no-cmd, alias these internal functions as desired.
|
||||
#
|
||||
|
||||
__zoxide_z_prefix='z#'
|
||||
|
||||
# Jump to a directory using only keywords.
|
||||
function __zoxide_z() {
|
||||
# shellcheck disable=SC2199
|
||||
if [[ $# -eq 0 ]]; then
|
||||
__zoxide_cd ~
|
||||
elif [[ $# -eq 1 && $1 == '-' ]]; then
|
||||
__zoxide_cd "${OLDPWD}"
|
||||
elif [[ $# -eq 1 && -d $1 ]]; then
|
||||
__zoxide_cd "$1"
|
||||
elif [[ $# -eq 2 && $1 == '--' ]]; then
|
||||
__zoxide_cd "$2"
|
||||
elif [[ ${@: -1} == "${__zoxide_z_prefix}"?* ]]; then
|
||||
# shellcheck disable=SC2124
|
||||
\builtin local result="${@: -1}"
|
||||
__zoxide_cd "${result:${#__zoxide_z_prefix}}"
|
||||
else
|
||||
\builtin local result
|
||||
# shellcheck disable=SC2312
|
||||
result="$(\command zoxide query --exclude "$(__zoxide_pwd)" -- "$@")" &&
|
||||
__zoxide_cd "${result}"
|
||||
fi
|
||||
}
|
||||
|
||||
# Jump to a directory using interactive search.
|
||||
function __zoxide_zi() {
|
||||
\builtin local result
|
||||
result="$(\command zoxide query --interactive -- "$@")" && __zoxide_cd "${result}"
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Commands for zoxide. Disable these using --no-cmd.
|
||||
#
|
||||
|
||||
\builtin unalias z &>/dev/null || \builtin true
|
||||
function z() {
|
||||
__zoxide_z "$@"
|
||||
}
|
||||
|
||||
\builtin unalias zi &>/dev/null || \builtin true
|
||||
function zi() {
|
||||
__zoxide_zi "$@"
|
||||
}
|
||||
|
||||
# Load completions.
|
||||
# - Bash 4.4+ is required to use `@Q`.
|
||||
# - Completions require line editing. Since Bash supports only two modes of
|
||||
# line editing (`vim` and `emacs`), we check if either them is enabled.
|
||||
# - Completions don't work on `dumb` terminals.
|
||||
if [[ ${BASH_VERSINFO[0]:-0} -eq 4 && ${BASH_VERSINFO[1]:-0} -ge 4 || ${BASH_VERSINFO[0]:-0} -ge 5 ]] &&
|
||||
[[ :"${SHELLOPTS}": =~ :(vi|emacs): && ${TERM} != 'dumb' ]]; then
|
||||
# Use `printf '\e[5n'` to redraw line after fzf closes.
|
||||
\builtin bind '"\e[0n": redraw-current-line' &>/dev/null
|
||||
|
||||
function __zoxide_z_complete() {
|
||||
# Only show completions when the cursor is at the end of the line.
|
||||
[[ ${#COMP_WORDS[@]} -eq $((COMP_CWORD + 1)) ]] || return
|
||||
|
||||
# If there is only one argument, use `cd` completions.
|
||||
if [[ ${#COMP_WORDS[@]} -eq 2 ]]; then
|
||||
\builtin mapfile -t COMPREPLY < <(
|
||||
\builtin compgen -A directory -- "${COMP_WORDS[-1]}" || \builtin true
|
||||
)
|
||||
# If there is a space after the last word, use interactive selection.
|
||||
elif [[ -z ${COMP_WORDS[-1]} ]] && [[ ${COMP_WORDS[-2]} != "${__zoxide_z_prefix}"?* ]]; then
|
||||
\builtin local result
|
||||
# shellcheck disable=SC2312
|
||||
result="$(\command zoxide query --exclude "$(__zoxide_pwd)" --interactive -- "${COMP_WORDS[@]:1:${#COMP_WORDS[@]}-2}")" &&
|
||||
COMPREPLY=("${__zoxide_z_prefix}${result}/")
|
||||
\builtin printf '\e[5n'
|
||||
fi
|
||||
}
|
||||
|
||||
\builtin complete -F __zoxide_z_complete -o filenames -- z
|
||||
\builtin complete -r zi &>/dev/null || \builtin true
|
||||
fi
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# To initialize zoxide, add this to your configuration (usually ~/.bashrc):
|
||||
#
|
||||
# eval "$(zoxide init bash)"
|
||||
|
||||
# ZSH Plugin - zsh-autosuggestions
|
||||
|
||||
source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
echo "source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
|
||||
source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
plugins=(git zsh-autosuggestions zsh-syntax-highlighting you-should-use)
|
||||
|
||||
|
||||
|
||||
# Adding SQLPlus via Homebrew
|
||||
|
||||
export DYLD_LIBRARY_PATH="/opt/homebrew/Cellar/instantclient-arm64-basic/23.3.0.23.09-1:$DYLD_LIBRARY_PATH"
|
||||
export PATH="/opt/homebrew/Cellar/instantclient-arm64-sqlplus/23.3.0.23.09/bin:$PATH"
|
||||
|
||||
alias sqlplus='DYLD_LIBRARY_PATH=$(brew --prefix)/lib sqlplus'
|
||||
# =============================================================================
|
||||
# KIRO SHELL (if available)
|
||||
# =============================================================================
|
||||
[[ "$TERM_PROGRAM" == "kiro" ]] && . "$(kiro --locate-shell-integration-path zsh)"
|
||||
|
||||
alias sqlplus='DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/instantclient-arm64-basic/23.3.0.23.09-1 sqlplus'
|
||||
# =============================================================================
|
||||
# LOCAL ENVIRONMENT
|
||||
# =============================================================================
|
||||
[ -f "$HOME/.local/bin/env" ] && . "$HOME/.local/bin/env"
|
||||
|
||||
## Adding ZSH Syntax Highlighting support (for commands as you type them)
|
||||
source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
# =============================================================================
|
||||
# API KEYS
|
||||
# =============================================================================
|
||||
|
||||
## Z.ai
|
||||
export ZAI_API_KEY=
|
||||
## OpenAI
|
||||
export OPENAI_API_KEY=
|
||||
|
||||
# Added by Antigravity
|
||||
export PATH="/Users/mav/.antigravity/antigravity/bin:$PATH"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue