Doing shit while in Linux

Moving away from submodules they still fucking suck. Stealing a bit from
@holman because I love his *.symlink and how he's doing *.local files.
xoxo
This commit is contained in:
Josh Sherman 2016-10-09 22:19:23 -05:00
parent 4e4ab9dbdf
commit 50a1fe9c94
5 changed files with 20 additions and 9 deletions

@ -1 +1 @@
Subproject commit 0aec943cfe8f7f7574b9d06df50cd968c5f61216 Subproject commit 6d63c369a68376268302b97226d431261f2825f8

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
vim/bundle vim/bundle
vim/.netrwhist vim/.netrwhist
git/gitconfig.local.symlink

View file

@ -0,0 +1,9 @@
[user]
name = USER_NAME
email = USER_EMAIL
[github]
user = GITHUB_USER
[credential]
helper = CREDENTIAL_HELPER

View file

@ -1,5 +1,5 @@
[include] [include]
path = ~/.dotfiles/.dotprivate/git/gitconfig path = ~/.gitconfig.local
[color] [color]
branch = auto branch = auto
@ -23,6 +23,3 @@
clean = git-lfs clean %f clean = git-lfs clean %f
smudge = git-lfs smudge %f smudge = git-lfs smudge %f
required = true required = true
[credential]
helper = osxkeychain

View file

@ -31,7 +31,8 @@ antigen-theme $DOTFILES_DIR/zsh joshtronic-2015
antigen-apply antigen-apply
# Git aliases # Git aliases
alias git="hub" # TODO Need to figure out how to install this in linux
#alias git="hub"
alias gdb="git delete-branch" alias gdb="git delete-branch"
alias gmm="git merge master" alias gmm="git merge master"
alias gmv="git mv" alias gmv="git mv"
@ -56,7 +57,8 @@ function uuid() {
} }
# Vim aliases # Vim aliases
alias v="/usr/local/bin/vim" # TODO: Broken in Linux
#alias v="/usr/local/bin/vim"
alias vd="vimdiff" alias vd="vimdiff"
# Inf # Inf
@ -68,7 +70,10 @@ alias vd="vimdiff"
export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules --exclude-dir=.sass-cache" export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules --exclude-dir=.sass-cache"
# I dunno about all of this either # I dunno about all of this either
export PATH=~/.dotfiles/bin:/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH #export PATH=~/.dotfiles/bin:/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
# v Alias is all fucked in Linux, remove dotfiles bin path
export PATH=/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
# May not need this now, moved it to mux # May not need this now, moved it to mux
export NODE_ENV=development export NODE_ENV=development
@ -100,4 +105,3 @@ man() {
LESS_TERMCAP_us=$'\e[1;32m' \ LESS_TERMCAP_us=$'\e[1;32m' \
man "$@" man "$@"
} }