From b1758bf417bb5eadfc48f70c364e861fb6511832 Mon Sep 17 00:00:00 2001 From: ReachableCEO Date: Wed, 16 Jul 2025 10:51:35 -0500 Subject: [PATCH] rollup commit --- zshrc/reachableceo-zshrc | 54 +++++++++++++++++----- zshrc/reachableceo-zshrc-variables.sh | 3 +- zshrc/zshrc-include-cnw.sh | 66 --------------------------- 3 files changed, 45 insertions(+), 78 deletions(-) delete mode 100644 zshrc/zshrc-include-cnw.sh diff --git a/zshrc/reachableceo-zshrc b/zshrc/reachableceo-zshrc index ab5a46d..5296136 100644 --- a/zshrc/reachableceo-zshrc +++ b/zshrc/reachableceo-zshrc @@ -1,8 +1,10 @@ -# ~/.zshrc file for zsh interactive shells. -# see /usr/share/doc/zsh/examples/zshrc for examples +#Customized zshrc +# CNW +# Last updated 07/11/2025 +# merging my own bits and some stuff from oh-my-zsh, powerline etc setopt autocd # change directory just by typing its name -#setopt correct # auto correct mistakes +setopt correct # auto correct mistakes setopt interactivecomments # allow comments in interactive mode setopt magicequalsubst # enable filename expansion for arguments of the form ‘anything=expression’ setopt nonomatch # hide error message if there is no match for the pattern @@ -10,13 +12,14 @@ setopt notify # report the status of background jobs immediately setopt numericglobsort # sort filenames numerically when it makes sense setopt promptsubst # enable command substitution in prompt + WORDCHARS=${WORDCHARS//\/} # Don't consider certain characters part of the word # hide EOL sign ('%') PROMPT_EOL_MARK="" # configure key keybindings -bindkey -v # emacs key bindings +bindkey -v # vi key bindings bindkey ' ' magic-space # do history expansion on space bindkey '^U' backward-kill-line # ctrl + U bindkey '^[[3;5~' kill-word # ctrl + Supr @@ -49,18 +52,23 @@ zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd' # History configurations HISTFILE=~/.zsh_history HISTSIZE=10000 -SAVEHIST=200000 +SAVEHIST=50000000 #Number of history entries to save to disk +HIST_STAMPS="mm/dd/yyyy" setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE setopt hist_ignore_dups # ignore duplicated commands history list -setopt hist_ignore_space # ignore commands that start with space +HISTDUP=erase #Erase duplicates in the history file setopt hist_verify # show command with history expansion to user before running it -#setopt share_history # share command history data +setopt appendhistory #Append history to the history file (no overwriting) +setopt incappendhistory #Immediately append to the history file, not just when a term is killed -# force zsh to show the complete history -alias history="history 0" +alias history="history 0" # force zsh to show the complete history + +#DO NOT Share history across terminals +setopt no_share_history +unsetopt sharehistory + +TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P' # configure `time` format -# configure `time` format -TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P' # make less more friendly for non-text input files, see lesspipe(1) #[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" @@ -257,3 +265,27 @@ if [ -f /etc/zsh_command_not_found ]; then . /etc/zsh_command_not_found fi +############### +# Creature comforts +############### + +#vi 24x7 yo, this isn't a holiday inn (last night, it is now) +# +bindkey -v +set -o vi + + +if [[ -n $SSH_CONNECTION ]]; then + export EDITOR='vim' +else + export EDITOR='vim' +fi + +################################### +# MISE +################################### +eval "$(mise activate zsh)" +################################### + +source ~/Env/dotfiles/zshrc/reachableceo-zshrc-variables.sh +source ~/Env/dotfiles/zshrc/reachableceo-zshrc-aliases.sh \ No newline at end of file diff --git a/zshrc/reachableceo-zshrc-variables.sh b/zshrc/reachableceo-zshrc-variables.sh index 13a45cf..9820617 100644 --- a/zshrc/reachableceo-zshrc-variables.sh +++ b/zshrc/reachableceo-zshrc-variables.sh @@ -10,4 +10,5 @@ PERSONAL_OOB_USER="root" PERSONAL_INBAND_USER="root" ##################################################### -export ATUIN_SYNC_ADDRESS=http://charlesdevserver.knel.net:2003 \ No newline at end of file +export ATUIN_SYNC_ADDRESS=http://charlesdevserver.knel.net:2003 +export LANG=en_US.UTF-8 \ No newline at end of file diff --git a/zshrc/zshrc-include-cnw.sh b/zshrc/zshrc-include-cnw.sh deleted file mode 100644 index c6b0f18..0000000 --- a/zshrc/zshrc-include-cnw.sh +++ /dev/null @@ -1,66 +0,0 @@ -#Customized zshrc -# CNW -# Last updated 07/11/2025 -# merging my own bits and some stuff from oh-my-zsh, powerline etc - -################################### -# MISE -################################### -eval "$(mise activate zsh)" -################################### - - - -############### -#My path is where I walk, not where you walk -############### - -PATHDIRS=( -/usr/local/go/bin -~/bin -~/bin/apps/habitctl/target/release -~/dotfiles-git/bin -~/dotfiles-git/3rdparty/git-scripts -) - -for dir in $PATHDIRS; do - if [ -d $dir ]; then - path+=$dir - fi -done - -############### -# Creature comforts -############### - -#vi 24x7 yo, this isn't a holiday inn (last night, it is now) -# -bindkey -v -set -o vi - -if [[ -n $SSH_CONNECTION ]]; then - export EDITOR='vim' -else - export EDITOR='vim' -fi - -####################### -# All things history... -####################### - - -HISTSIZE=5000 #How many lines of history to keep in memory -HIST_STAMPS="mm/dd/yyyy" -HISTFILE=~/.zsh_history #Where to save history to disk -SAVEHIST=50000000 #Number of history entries to save to disk -HISTDUP=erase #Erase duplicates in the history file -setopt appendhistory #Append history to the history file (no overwriting) -setopt incappendhistory #Immediately append to the history file, not just when a term is killed -#DO NOT Share history across terminals -unsetopt sharehistory -setopt no_share_history - -ENABLE_CORRECTION="true" -COMPLETION_WAITING_DOTS="true" -DISABLE_UNTRACKED_FILES_DIRTY="true" -export LANG=en_US.UTF-8 \ No newline at end of file