diff --git a/bash/alias.bash b/bash/alias.bash index 520479c..8d445c2 100644 --- a/bash/alias.bash +++ b/bash/alias.bash @@ -2,14 +2,13 @@ alias ll="ls -lAFh" alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl" -alias sub="subl ." -alias sdot="subl ~/Dotfiles" +alias dedup="awk '!visited[$0]++'" # Git alias git="git-achievements" alias ga="git add -u; git add .; git status -sb" alias gb="git branch -v" -alias gc="git ci -S --allow-empty -m" +alias gc="git ci --allow-empty -m" alias gd="git diff" alias gdc="git diff --cached" alias gl="git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) %C(bold @@ -22,9 +21,12 @@ alias gml="git merge - --no-edit" # Ruby alias bd="bundle install --jobs=8 --path vendor/bundle" +alias b="bundle exec" +alias br="bundle exec rails" # Go alias goi="go install ./..." +alias gg='rg -g "*.go"' # OSX alias hide-desktop="defaults write com.apple.finder CreateDesktop -bool false; killall Finder" diff --git a/bash/bashrc.bash b/bash/bashrc.bash index f82a64f..75c5641 100644 --- a/bash/bashrc.bash +++ b/bash/bashrc.bash @@ -12,9 +12,9 @@ export EDITOR=vim export PROJECTS=$HOME/Code # Go -export GOROOT=/usr/local/golang -export GOPATH=/usr/local/gopath -export CGO_ENABLED=0 +# export GOROOT=$HOME/go/lang +export GOPATH=$HOME/go/path +# export CGO_ENABLED=0 # Bash stuff @@ -40,4 +40,13 @@ fi # Misc # +alias ag=rg # export SSL_CERT_FILE="/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt" + +export PATH="/usr/local/opt/avr-gcc@8/bin:$PATH" + +export LDFLAGS="-L/usr/local/opt/openssl/lib" +export CPPFLAGS="-I/usr/local/opt/openssl/include" +export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig" + +export PATH="$HOME/.cargo/bin:$PATH" diff --git a/bash/path.bash b/bash/path.bash index f6b62a0..9989377 100644 --- a/bash/path.bash +++ b/bash/path.bash @@ -1,6 +1,7 @@ export PATH=/usr/local/bin:$PATH # Homebrew tools export PATH=$PATH:/usr/local/sbin # Homebrew apps export PATH=$PATH:$HOME/Dotfiles/bin # My stuff +export PATH=$PATH:$HOME/.bin # NodeJS # export PATH=$PATH:/usr/local/share/npm/bin @@ -13,9 +14,15 @@ export PATH=$HOME/.rbenv/shims:$PATH # Gem binaries export PATH=$PATH:$PROJECTS/git-achievements # Go -export PATH=$PATH:$GOROOT/bin # Go runtime binaries +# export PATH=$PATH:$GOROOT/bin # Go runtime binaries +export PATH=$PATH:$HOME/go/lang/bin # Go package binaries export PATH=$PATH:$GOPATH/bin # Go package binaries # Python # WTF export PKG_CONFIG_PATH=/usr/local/opt/python3/Frameworks/Python.framework/Versions/3.4/lib/pkgconfig + +export PATH=$PATH:/usr/local/Cellar/llvm/8.0.0_1/bin + +# Rust +export PATH=$PATH:$HOME/.cargo/bin diff --git a/bash/prompt.bash b/bash/prompt.bash index 9918d58..0b9c38e 100644 --- a/bash/prompt.bash +++ b/bash/prompt.bash @@ -2,8 +2,8 @@ GIT="/usr/local/bin/git" function __bash_prompt { local baseDir=$(__bash_basedir) - __iterm_set_title $baseDir __iterm_set_bg_color_by_dir $baseDir + __iterm_set_title $baseDir # Define building blocks local basedir="$_BOLD$_BLUE\W$_RESET_COLOR$_RESET" @@ -45,7 +45,11 @@ function __bash_git_y_u_no_commit_warn { function __bash_git_branch { __bash_is_git_dir && { - $GIT rev-parse --symbolic-full-name --abbrev-ref HEAD + __bash_is_git_new_repo && { + echo -ne "[NEW REPO]" + } || { + $GIT rev-parse --symbolic-full-name --abbrev-ref HEAD + } } } @@ -62,3 +66,8 @@ function __bash_git_is_pushed { function __bash_is_git_dir { if [ -d ".git" ]; then return 0; else return 1; fi } + +# Returns 1 if there are no existing commits in the repo +function __bash_is_git_new_repo { + __bash_is_empty $($GIT rev-list --all --parents --max-count=1) +} diff --git a/git/gitignore b/git/gitignore index 96f0273..0a620d4 100644 --- a/git/gitignore +++ b/git/gitignore @@ -14,3 +14,6 @@ vendor/gems # Vim *.swp *.swo + +# VSCode +*.code-workspace diff --git a/ruby/gemrc b/ruby/gemrc index 6153a6e..154cd47 100644 --- a/ruby/gemrc +++ b/ruby/gemrc @@ -1 +1 @@ -gem: --no-ri --no-rdoc +gem: --no-document diff --git a/sublime/Preferences.sublime-settings b/sublime/Preferences.sublime-settings index a96ede7..a4062a2 100644 --- a/sublime/Preferences.sublime-settings +++ b/sublime/Preferences.sublime-settings @@ -2,7 +2,7 @@ "animation_enabled": false, "caret_style": "phase", "close_windows_when_empty": false, - "color_scheme": "Packages/Colorsublime - Themes/peacocks-in-space.tmTheme", + "color_scheme": "Packages/Colorsublime - Themes/Dracula.tmTheme", "default_line_ending": "unix", "drag_text": false, "draw_minimap_border": false, @@ -20,17 +20,16 @@ ".bundle", ".sass-cache", "__pycache__", - "vendor", "node-modules" ], - "font_face": "Inconsolata", + "font_face": "Hack", "font_options": [ "subpixel_antialias", "no_bold", "no_italic" ], - "font_size": 18.0, + "font_size": 12.0, "gpu_window_buffer": true, "gutter": true, "highlight_line": true,