14 Commits
natera ... main

7 changed files with 95 additions and 108 deletions

View File

@@ -10,6 +10,18 @@ git() {
}
alias gemini-flash='gemini --model gemini-3-flash-preview'
alias gemini-pro='gemini --model gemini-3-pro-preview'
alias claude-haiku='claude --model claude-haiku-4-5'
alias claude-sonnet='claude --model claude-sonnet-4-6'
alias claude-deep="ANTHROPIC_BASE_URL='https://api.deepseek.com/anthropic' ANTHROPIC_AUTH_TOKEN='$DEEPSEEK_API_KEY' ANTHROPIC_MODEL='deepseek-v4-pro' ANTHROPIC_DEFAULT_HAIKU_MODEL='deepseek-v4-flash' API_TIMEOUT_MS=600000 claude"
alias claude-deeplite="ANTHROPIC_BASE_URL='https://api.deepseek.com/anthropic' ANTHROPIC_AUTH_TOKEN='$DEEPSEEK_API_KEY' ANTHROPIC_MODEL='deepseek-v4-flash' ANTHROPIC_DEFAULT_HAIKU_MODEL='deepseek-v4-flash' API_TIMEOUT_MS=600000 claude"
# Also need to add:
# export CLAUDE_CODE_MAX_TOKENS=4000
# export CLAUDE_CODE_COMPACT_LEVEL=aggressive
# get rid of stupid annoying badges
# ---------------------------------
alias clearbadges='defaults write com.apple.systempreferences AttentionPrefBundleIDs 0 && killall Dock'
@@ -34,8 +46,10 @@ alias uuid="uuidgen"
alias vp="[ -d vp ] || virtualenv -p python3 vp && source vp/bin/activate"
if [[ "${HOSTNAME}" == "aptos" ]]; then
alias vpp="[ -d vpp ] || virtualenv --python ${HOME}/.pyenv/versions/pypy3.9-7.3.9/bin/pypy3 vpp && source vpp/bin/activate"
else
alias vpp="[ -d vpp ] || virtualenv -p pypy3 vpp && source vpp/bin/activate"
elif [[ "${HOSTNAME}" == "maya" ]]; then
alias vpp="[ -d vpp ] || virtualenv --python ${HOME}/.pyenv/versions/pypy3.10-7.3.13/bin/pypy3 vpp && source vpp/bin/activate"
elif [[ "${HOSTNAME}" == "kraken" ]]; then
alias vpp="[ -d vpp ] || virtualenv --python ${HOME}/.pyenv/versions/pypy3.11-7.3.20/bin/pypy3 vpp && source vpp/bin/activate"
fi
# one-letter aliases
@@ -73,34 +87,24 @@ alias mv='mv -i'
# ls aliases
# --------------------
# Detect which `ls` flavor is in use
LS=$(which ls)
if $LS --color > /dev/null 2>&1; then # GNU `ls`
colorflag="--color"
export LS_COLORS='no=00:fi=00:di=01;31:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:'
groupflag="--group-directories-first"
else # macOS `ls`
colorflag="-G"
export LSCOLORS='BxBxhxDxfxhxhxhxhxcxcx'
groupflag="--group-directories-first"
fi
# https://gist.github.com/skyzyx/3438280b18e4f7c490db8a2a2ca0b9da
LSBIN=$(which ls)
alias ls="$LS -1 ${colorflag} ${groupflag}"
# the --color flag works with either verison of ls
alias ls='$LSBIN -lh --color'
alias sl='ls'
# List all files colorized in long format
alias l="$LS -lhAF ${colorflag}"
alias l="ls -lhAF --color"
alias ll="l"
# List all files colorized in long format, including dot files
alias la="l -a"
# List only directories
alias lsd="$LS -lF ${colorflag} | grep --color=never '^d'"
alias lsd="ls -lF --color | grep --color=never '^d'"
alias lr='ls -r' # reverse
@@ -249,16 +253,6 @@ function seawater() {
ssh -p 5778 -Y charles@${IP} # the actual ssh call
}
alias burro="burro"
function burro() {
ssh-agent > ~/ssh.file # env vars in ssh.file
chmod +x ~/ssh.file # execute file
~/ssh.file > /dev/null
rm -f ~/ssh.file
export IP="173.255.210.178"
ssh -p 5778 -Y charles@${IP} # the actual ssh call
}
# tmux shortcuts
# constructed with help from https://robots.thoughtbot.com/a-tmux-crash-course

View File

@@ -5,6 +5,7 @@
# to add your own non-committed machine-specific settings,
# use ~/.extra
# Must
EDITOR="vim"
GIT_EDITOR="vim"
@@ -16,6 +17,7 @@ PAGER="most"
GOROOT=$HOME/go
GOPATH=$HOME/go
# Set $PATH here
PATH="${HOME}/scripts:${PATH}"
PATH="/usr/local/bin:$PATH"
@@ -23,45 +25,28 @@ PATH="/usr/local/sbin:${PATH}" # homebrew admin tools
PATH="${PATH}:${GOROOT}/bin"
PATH="/usr/local/opt/coreutils/libexec/gnubin:${PATH}"
PATH="${HOME}/bin:${PATH}"
if [[ ("$HOSTNAME" == "seawater") || ("$HOSTNAME" == "bascom") ]]; then
PATH="${HOME}/bin/elasticsearch-5.4.2/bin:${PATH}"
# assume-role cli util:
# Add homebrew-installed ruby to path:
# (WARNING: THIS CAN CAUSE PROBLEMS!)
export PATH="/usr/local/opt/ruby/bin:$PATH"
# claude code
export PATH="$HOME/.local/bin:$PATH"
export ANTHROPIC_DEFAULT_OPUS_MODEL="claude-opus-4-6"
export ANTHROPIC_MODEL="claude-opus-4-6"
# Add homebrew-ruby-gem-installed packages to path:
export PATH="/usr/local/lib/ruby/gems/2.6.0/bin:$PATH"
# gemini
source $HOME/.gemini_api_key
# aws - load config file when using assume-role
export AWS_SDK_LOAD_CONFIG="1"
fi
# deepseek
source $HOME/.deepseek_api_key
# Tell git not to look for getext.sh
# since pyenv has trouble with that
export GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=1
if [[ "$HOSTNAME" == "bascom" ]]; then
# git tab completion
source ${HOME}/.git-completion.bash
fi
if [[ "$HOSTNAME" == "maya" ]]; then
# Setting PATH for homebrew
PATH="$HOME/.local/bin:$PATH"
PATH="$HOME/Library/Python/3.6/bin:$PATH"
# pypy
# this should go after /usr/local/bin
PATH="${PATH}:/usr/local/share/pypy3"
### # some weird new homebrew thing??
### # this is where python -> python3 lives now
### # https://stackoverflow.com/a/45228901
### PATH="/usr/local/opt/python/libexec/bin:${PATH}"
# Set up google cloud SDK
F1="/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.bash.inc"
F2="/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.bash.inc"
@@ -81,17 +66,21 @@ if [[ "$HOSTNAME" == "maya" ]]; then
fi;
fi
if [[ "$HOSTNAME" == "kraken" ]]; then
# goenv installer
export GOENV_ROOT="$HOME/.goenv"
export PATH="$GOENV_ROOT/bin:$PATH"
# homebrew
eval "$(/usr/local/bin/brew shellenv)"
# Only enable this if you are using go.
# This will add half a second every time you
# open a new shell.
#eval "$(goenv init -)"
### # node
### export NVM_DIR="$HOME/.nvm"
### [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
### [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
# pyenv installer
# spicetify
export PATH=$PATH:/Users/charles/.spicetify
fi
# pyenv
# https://github.com/pyenv/pyenv-installer
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
@@ -168,9 +157,7 @@ if [ -f /etc/bash_completion ]; then
source /etc/bash_completion;
fi;
if [[ "$HOSTNAME" == "bascom" ]]; then
# Enable tab completion for `g` by marking it as an alias for `git`
if type _git &> /dev/null && [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then
complete -o default -o nospace -F _git g;
fi;
fi
# shut up
touch ${HOME}/.hushlogin
export BASH_SILENCE_DEPRECATION_WARNING=1
export FILTER_BRANCH_SQUELCH_WARNING=1

View File

@@ -50,6 +50,8 @@ elif [[ "${HOSTNAME}" == "cronus" ]]; then
userStyle="${yellow}"
elif [[ "${HOSTNAME}" == "aptos" ]]; then
userStyle="${blue}"
elif [[ "${HOSTNAME}" == "kraken" ]]; then
userStyle="${cyan}"
else
userStyle="${green}"
fi

View File

@@ -44,3 +44,5 @@ export MANPAGER='less -X';
# https://stackoverflow.com/a/42265848/96656
export GPG_TTY=$(tty);
# custom ls colors - use light blue for directories
export LSCOLORS=Gxfxcxdxbxegedabagacad

View File

@@ -5,18 +5,15 @@
## replace any git@github stuff with gh:
## replace any ssh://git@g.... with cmr:
[commit]
gpgsign = true
#[commit]
# gpgsign = true
[user]
email = charlesreid1@gmail.com
name = Charles Reid
signingkey = 078B7759B68B353A # aptos
[includeIf "gitdir:~/codes/"]
[includeIf "gitdir:~/code/"]
path = .gitconfig_charlesreid1
# path = ~/.gitconfig_charlesreid1
[includeIf "gitdir:~/golly/"]
path = .gitconfig_ch4zm
# path = ~/.gitconfig_ch4zm
[credential]
helper = cache

View File

@@ -108,6 +108,11 @@ bind _ split-window -v -c "#{pane_current_path}"
# because we were using this before
bind % split-window -h -c "#{pane_current_path}"
# Control-T plus K kills the window
# Kill immediately
bind k kill-window
## Prompt before killing
#bind k confirm-before -p "kill-window #W? (y/n)" kill-window
# Status Bar
set-option -g status-interval 1

62
.vimrc
View File

@@ -152,7 +152,7 @@ let &guicursor = &guicursor . ",a:blinkon0"
"
" now you need to "infect" yourself
" (questionable word choices...)
execute pathogen#infect()
" execute pathogen#infect()
@@ -250,17 +250,17 @@ set textwidth=115
" end up driving you mad.
" Set textwidth to 0 or a different number for known (code) filetypes.
" > Bugbear's documentation explains 88 vs 80:
" > "it's like highway speed limits, we won't bother
" > you if you overdo it by a few km/h".
"
" Turn character 80/88 red
" (for visibility conforming to
" coding standards)
" https://stackoverflow.com/questions/23246962/vim-highlight-a-single-character-at-column-80#23247938
hi Bang ctermfg=red guifg=red
"match Bang /\%>87v.*\%<89v/
match Bang /\%>79v.*\%<81v/
""" " > Bugbear's documentation explains 88 vs 80:
""" " > "it's like highway speed limits, we won't bother
""" " > you if you overdo it by a few km/h".
""" "
""" " Turn character 80/88 red
""" " (for visibility conforming to
""" " coding standards)
""" " https://stackoverflow.com/questions/23246962/vim-highlight-a-single-character-at-column-80#23247938
""" hi Bang ctermfg=red guifg=red
""" "match Bang /\%>87v.*\%<89v/
""" match Bang /\%>79v.*\%<81v/
@@ -340,25 +340,25 @@ function! DisableIndent()
set indentexpr&
endfunction
" fix latex highlighting in markdown
function! MathAndLiquid()
"" Define certain regions
" Block math. Look for "$$[anything]$$"
syn region math start=/\$\$/ end=/\$\$/
" inline math. Look for "$[not $][anything]$"
syn match math_block '\$[^$].\{-}\$'
" Fenced code blocks, used in GitHub Flavored Markdown (GFM)
syn region highlight_block start='```' end='```'
"" Actually highlight those regions.
hi link math Statement
hi link math_block Function
hi link highlight_block Function
endfunction
" Call everytime we open a Markdown file
autocmd BufRead,BufNewFile,BufEnter *.md,*.markdown call MathAndLiquid()
""" " fix latex highlighting in markdown
""" function! MathAndLiquid()
""" "" Define certain regions
""" " Block math. Look for "$$[anything]$$"
""" syn region math start=/\$\$/ end=/\$\$/
""" " inline math. Look for "$[not $][anything]$"
""" syn match math_block '\$[^$].\{-}\$'
"""
""" " Fenced code blocks, used in GitHub Flavored Markdown (GFM)
""" syn region highlight_block start='```' end='```'
"""
""" "" Actually highlight those regions.
""" hi link math Statement
""" hi link math_block Function
""" hi link highlight_block Function
""" endfunction
"""
""" " Call everytime we open a Markdown file
""" autocmd BufRead,BufNewFile,BufEnter *.md,*.markdown call MathAndLiquid()