Skip to content

Commit

Permalink
Update 15/12/24
Browse files Browse the repository at this point in the history
  • Loading branch information
mikekreeki committed Dec 15, 2024
1 parent 95cf3a8 commit ed47f2c
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 8 deletions.
1 change: 1 addition & 0 deletions .aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ alias mvim='nvim'

# NOCORRECT
alias spring='nocorrect spring'
alias expo='nocorrect expo'

# REACT NATIVE
alias packager='./node_modules/react-native/packager/packager.sh'
Expand Down
11 changes: 9 additions & 2 deletions .exports.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ export PATH="/Users/mikekreeki/.dotfiles/bin:$PATH"
# HOMEBREW
export PATH="/usr/local/bin:$PATH"

# OPENSSL
export PATH="/opt/homebrew/opt/[email protected]/bin:$PATH" # have [email protected] first in your PATH

export LDFLAGS="-L/opt/homebrew/opt/[email protected]/lib" # For compilers to find [email protected]
export CPPFLAGS="-I/opt/homebrew/opt/[email protected]/include" # For compilers to find [email protected]

export PKG_CONFIG_PATH="/opt/homebrew/opt/[email protected]/lib/pkgconfig" # For pkg-config to find [email protected]

# RVM
export PATH="$HOME/.rvm/bin:$PATH"

Expand Down Expand Up @@ -31,8 +39,7 @@ export NVIM_TUI_ENABLE_TRUE_COLOR=1
export NVIM_TUI_ENABLE_CURSOR_SHAPE=1

# Java/JRUBY
export JAVA_OPTS="-XX:-UseConcMarkSweepGC"
export JRUBY_OPTS="-J-Xmx4g"
export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home

# notwaldorf/tiny-care-terminal
export TTC_WEATHER='Prague'
Expand Down
4 changes: 2 additions & 2 deletions .nvimrc
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ Plug 'duff/vim-scratch'
" Plug 'xolox/vim-misc'

" Colorschemes
" Plug 'mikekreeki/mikekreeki-colors.vim'
Plug '~/Projects/mikekreeki-colors.vim'
Plug 'mikekreeki/mikekreeki-colors.vim'
" Plug '~/Projects/mikekreeki-colors.vim'


call plug#end()
Expand Down
25 changes: 25 additions & 0 deletions .nvm.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This shell function will install (if needed) and nvm use the specified Node version
# when an .nvmrc is found, and nvm use default otherwise.
autoload -U add-zsh-hook

load-nvmrc() {
local nvmrc_path
nvmrc_path="$(nvm_find_nvmrc)"

if [ -n "$nvmrc_path" ]; then
local nvmrc_node_version
nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")

if [ "$nvmrc_node_version" = "N/A" ]; then
nvm install
elif [ "$nvmrc_node_version" != "$(nvm version)" ]; then
nvm use
fi
elif [ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ] && [ "$(nvm version)" != "$(nvm version default)" ]; then
echo "Reverting to nvm default version"
nvm use default
fi
}

add-zsh-hook chpwd load-nvmrc
load-nvmrc
4 changes: 3 additions & 1 deletion .oh-my-zsh.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ HIST_STAMPS="mm/dd/yyyy"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(git bundler zsh-syntax-highlighting)
plugins=(git bundler zsh-nvm)

source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

# Compilation flags
# export ARCHFLAGS="-arch x86_64"
Expand Down
17 changes: 14 additions & 3 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,37 @@ test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_in

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

# LOAD NVM
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm

source ~/.dotfiles/.nvm.zsh

# heroku autocomplete setup
HEROKU_AC_ZSH_SETUP_PATH=/Users/mikekreeki/Library/Caches/heroku/autocomplete/zsh_setup && test -f $HEROKU_AC_ZSH_SETUP_PATH && source $HEROKU_AC_ZSH_SETUP_PATH;

# export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
export PATH="/usr/local/opt/postgresql@10/bin:$PATH"
# export PATH="/usr/local/opt/postgresql@10/bin:$PATH"

# export LDFLAGS="-L/usr/local/opt/postgresql@10/lib -L/usr/local/opt/[email protected]/lib"
# export CPPFLAGS="-I/usr/local/opt/postgresql@10/include -I/usr/local/opt/[email protected]/include"

export LDFLAGS="-L/usr/local/opt/postgresql@10/lib"
export CPPFLAGS="-I/usr/local/opt/postgresql@10/include"
# export LDFLAGS="-L/usr/local/opt/postgresql@14/lib"
# export CPPFLAGS="-I/usr/local/opt/postgresql@14/include"

# The next line updates PATH for Netlify's Git Credential Helper.
test -f '/Users/mikekreeki/Library/Preferences/netlify/helper/path.zsh.inc' && source '/Users/mikekreeki/Library/Preferences/netlify/helper/path.zsh.inc'

# Set up fzf key bindings and fuzzy completion
eval "$(fzf --zsh)"

# activate the autosuggestions
source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh

export ANDROID_HOME=$HOME/Library/Android/sdk

export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES

export PATH=$PATH:$ANDROID_HOME/emulator
export PATH=$PATH:$ANDROID_HOME/platform-tools
export PATH=$PATH:$ANDROID_HOME/tools
Expand Down

0 comments on commit ed47f2c

Please sign in to comment.