~thecatster/.files

21681cf51420925bc64b1dda252b916002b4eff7 — Daniil Rose 2 years ago 6de7398
Update various shell configs
3 files changed, 33 insertions(+), 7 deletions(-)

M .config/aliasrc
M .zprofile
M .zshrc
M .config/aliasrc => .config/aliasrc +1 -1
@@ 12,7 12,7 @@ done; unset command
alias \
  cp="cp -iv" \
  mv="mv -iv" \
  rm="rm -vI" \
  rm="rm -vi" \
  bc="bc -ql" \
  mkd="mkdir -pv" \
  ffmpeg="ffmpeg -hide_banner" \

M .zprofile => .zprofile +28 -4
@@ 1,7 1,18 @@
#!/bin/zsh

# profile file. Runs on login. Environmental variables are set here.
export PATH="/opt/homebrew/opt/openjdk/bin:$PYENV_ROOT/bin:$HOME/.emacs.d/bin:/opt/homebrew/sbin:/opt/homebrew/bin:/opt/homebrew/opt/grep/libexec/gnubin/:$PATH"

# Path defined across multiple lines
# Easier to read and reorder
PATH+="$PATH:/opt/homebrew/opt/openjdk/bin"
PATH+="$PATH:$PYENV_ROOT/bin"
PATH+="$PATH:$HOME/.emacs.d/bin"
PATH+="$PATH:/opt/homebrew/sbin"
PATH+="$PATH:/opt/homebrew/bin"
PATH+="$PATH:/opt/homebrew/opt/grep/libexec/gnubin/"
PATH+="$PATH:$HOME/projects/src/zls"

export PATH="$PATH"

# Basics
export LANG="en_US.UTF-8"


@@ 9,14 20,24 @@ export EDITOR="emacsclient -cna=''"

# Many build scripts expect CC to contain the compiler command
export CC="gcc-11"
export CPPFLAGS="-I/opt/homebrew/opt/openjdk/include -I/opt/homebrew/opt/libusb/include"
export CPPFLAGS="-I/opt/homebrew/opt/openjdk/include -I/opt/homebrew/opt/libusb/include -I/opt/homebrew/opt/zlib/include"

export LDFLAGS="-L/opt/homebrew/opt/zlib/lib"
export LD_LIBRARY_PATH="/opt/homebrew/lib:/opt/homebrew/include:/Applications/Postgres.app/Contents/Versions/latest/lib/:/Applications/Postgres.app/Contents/Versions/latest/include/:$LD_LIBRARY_PATH"

export C_INCLUDE_PATH="/opt/homebrew/include:/opt/homebrew/lib:/Applications/Postgres.app/Contents/Versions/latest/lib/:$C_INCLUDE_PATH"
export CPATH="/opt/homebrew/include:/Applications/Postgres.app/Contents/Versions/latest/lib:/$CPATH"

export LIBRARY_PATH="/opt/homebrew/lib:$LIBRARY_PATH"
export NDLESS_HOME="$HOME/projects/src/Ndless"
export PKG_CONFIG_PATH="/opt/homebrew/opt/zlib/lib/pkgconfig"

# Cleanup
export DOOMDIR="$HOME/.doom.d"
export PYENV_ROOT="$HOME/.pyenv"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_CACHE_HOME="$HOME/.cache"
export LESSHISTFILE="-"
export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison"


@@ 30,5 51,8 @@ export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
export HOMEBREW_NO_AUTO_UPDATE=1
export CALIBRE_USE_DARK_PALETTE="YES"

# Pyenv startup
# Scripts
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
[ -f "$HOME/.fzf.zsh" ] && source "$HOME/.fzf.zsh"
[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env"
eval "$(pyenv init --path)"

M .zshrc => .zshrc +4 -2
@@ 2,6 2,7 @@
export ZSH="/Users/danya/.oh-my-zsh"

# ZSH custom variables
ZSH_DISABLE_COMPFIX=true
HYPHEN_INSENSITIVE="true"
ENABLE_CORRECTION="true"
DISABLE_UNTRACKED_FILES_DIRTY="true"


@@ 14,7 15,7 @@ plugins=(brew
         iterm2
         macos
         pyenv
         rustup
         rust
         xcode
         zoxide
         you-should-use


@@ 22,6 23,7 @@ plugins=(brew
         $plugins)

source $ZSH/oh-my-zsh.sh
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/aliasrc"

eval "$(starship init zsh)"