From f5bd48d6730375e44226e7d69ee8dd8909451073 Mon Sep 17 00:00:00 2001 From: Dominic DiTaranto Date: Sun, 5 Apr 2026 12:17:40 -0400 Subject: [PATCH] more zsh stuff --- .config/shell/alias | 71 ++++++++++++++++++++++++++++ .zshrc | 111 +++++++++++--------------------------------- 2 files changed, 99 insertions(+), 83 deletions(-) create mode 100644 .config/shell/alias diff --git a/.config/shell/alias b/.config/shell/alias new file mode 100644 index 0000000..821d593 --- /dev/null +++ b/.config/shell/alias @@ -0,0 +1,71 @@ +export VISUAL=vim +export EDITOR="$VISUAL" + +#generic +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias hg='history | grep' +alias pg='ps aux | grep' +alias k9='kill -9' + +# git +alias gs="git status" +alias gc="git commit -m" +alias ga="git add" +alias gcc="git checkout -b" + +alias activate="source venv/bin/activate" + +alias dmenu="dmenu -nf '#BBBBBB' -nb '#3A515D' -sb '#83C092' -sf '#000000' -fn 'monospace-16'" + +alias dotfiles='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' + +# PYWAL --------------------- +# Import colorscheme from 'wal' asynchronously +# & # Run the process in the background. +# ( ) # Hide shell job control messages. +# Not supported in the "fish" shell. +alias wal="wal -o $HOME/.config/wal/done.sh" +(cat ~/.cache/wal/sequences &) + +# Alternative (blocks terminal for 0-3ms) +cat ~/.cache/wal/sequences + +# To add support for TTYs this line can be optionally added. +source ~/.cache/wal/colors-tty.sh + + +nvm() { + unset -f nvm + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + nvm "$@" +} + +# pnpm +export PNPM_HOME="/home/dominic/.local/share/pnpm" +case ":$PATH:" in + *":$PNPM_HOME:"*) ;; + *) export PATH="$PNPM_HOME:$PATH" ;; +esac +# pnpm end + +# Created by `pipx` on 2025-11-23 18:01:25 +export PATH="$PATH:/home/dominic/.local/bin" + +GTK_IM_MODULE=fcitx +QT_IM_MODULE=fcitx +XMODIFIERS=@im=fcitx +SDL_IM_MODULE=fcitx +INPUT_METHOD=fcitx +GLFW_IM_MODULE=ibus + +if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then + startx +fi + +export TERM="xterm-kitty" +export PICO_SDK_PATH=/usr/share/pico-sdk + +export PATH="$HOME/bin:$PATH" diff --git a/.zshrc b/.zshrc index cc34602..cf36bbb 100644 --- a/.zshrc +++ b/.zshrc @@ -1,11 +1,27 @@ -# Lines configured by zsh-newuser-install +[ -f "$HOME/.config/shell/alias" ] && source "$HOME/.config/shell/alias" + +bindkey -e + HISTFILE=~/.histfile HISTSIZE=1000000 SAVEHIST=1000000 -setopt autocd extendedglob nomatch notify -unsetopt beep -bindkey -e -# End of lines configured by zsh-newuser-install +HISTCONTROL=ignoreboth + +setopt append_history +setopt inc_append_history +setopt share_history +setopt autocd +setopt extendedglob +setopt nomatch +setopt notify +setopt auto_param_slash +setopt auto_menu +setopt menu_complete +unsetopt beep +unsetopt prompt_sp + +autoload -U colors && colors + # The following lines were added by compinstall zstyle :compinstall filename '/home/dominic/.zshrc' @@ -17,7 +33,7 @@ else fi # End of lines added by compinstall -# THEME +# THEME ######################################## # 1. Enable Git branch info autoload -Uz vcs_info precmd() { vcs_info } @@ -35,86 +51,15 @@ python_venv() { # 4. Set the prompt (e.g., [venv] path (branch) %) PROMPT=$'%F{2}$(python_venv)%f%F{4}%n@%m:%~%f %F{1}${vcs_info_msg_0_}%f \n>>> %F{white}' -# END THEME +# END THEME ###################################### + + +# custom stuff +zstyle ':completion:*' menu select +zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} ma=0\;33 # plugins source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh ZSH_AUTOSUGGEST_USE_ASYNC=1 ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 - -# custom stuff -zstyle ':completion:*' menu select - -export VISUAL=vim -export EDITOR="$VISUAL" - -#generic -alias ls='ls --color=auto' -alias grep='grep --color=auto' -alias hg='history | grep' -alias pg='ps aux | grep' -alias k9='kill -9' - -# git -alias gs="git status" -alias gc="git commit -m" -alias ga="git add" -alias gcc="git checkout -b" - -alias activate="source venv/bin/activate" - -alias dmenu="dmenu -nf '#BBBBBB' -nb '#3A515D' -sb '#83C092' -sf '#000000' -fn 'monospace-16'" - -alias dotfiles='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' - -# PYWAL --------------------- -# Import colorscheme from 'wal' asynchronously -# & # Run the process in the background. -# ( ) # Hide shell job control messages. -# Not supported in the "fish" shell. -alias wal="wal -o $HOME/.config/wal/done.sh" -(cat ~/.cache/wal/sequences &) - -# Alternative (blocks terminal for 0-3ms) -cat ~/.cache/wal/sequences - -# To add support for TTYs this line can be optionally added. -source ~/.cache/wal/colors-tty.sh - - -nvm() { - unset -f nvm - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm "$@" -} - -# pnpm -export PNPM_HOME="/home/dominic/.local/share/pnpm" -case ":$PATH:" in - *":$PNPM_HOME:"*) ;; - *) export PATH="$PNPM_HOME:$PATH" ;; -esac -# pnpm end - -# Created by `pipx` on 2025-11-23 18:01:25 -export PATH="$PATH:/home/dominic/.local/bin" - -GTK_IM_MODULE=fcitx -QT_IM_MODULE=fcitx -XMODIFIERS=@im=fcitx -SDL_IM_MODULE=fcitx -INPUT_METHOD=fcitx -GLFW_IM_MODULE=ibus - -if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then - startx -fi - -export TERM="xterm-kitty" -export PICO_SDK_PATH=/usr/share/pico-sdk - -export PATH="$HOME/bin:$PATH" -