Update stuff
This commit is contained in:
parent
dce4d97dc8
commit
94f6b92dab
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,8 +45,12 @@ function __bash_git_y_u_no_commit_warn {
|
|||
|
||||
function __bash_git_branch {
|
||||
__bash_is_git_dir && {
|
||||
__bash_is_git_new_repo && {
|
||||
echo -ne "[NEW REPO]"
|
||||
} || {
|
||||
$GIT rev-parse --symbolic-full-name --abbrev-ref HEAD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function __bash_git_is_clean {
|
||||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,3 +14,6 @@ vendor/gems
|
|||
# Vim
|
||||
*.swp
|
||||
*.swo
|
||||
|
||||
# VSCode
|
||||
*.code-workspace
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
gem: --no-ri --no-rdoc
|
||||
gem: --no-document
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue