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:
parent
4e4ab9dbdf
commit
50a1fe9c94
5 changed files with 20 additions and 9 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 0aec943cfe8f7f7574b9d06df50cd968c5f61216
|
||||
Subproject commit 6d63c369a68376268302b97226d431261f2825f8
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
vim/bundle
|
||||
vim/.netrwhist
|
||||
|
||||
git/gitconfig.local.symlink
|
||||
|
|
9
git/gitconfig.local.symlink.example
Normal file
9
git/gitconfig.local.symlink.example
Normal file
|
@ -0,0 +1,9 @@
|
|||
[user]
|
||||
name = USER_NAME
|
||||
email = USER_EMAIL
|
||||
|
||||
[github]
|
||||
user = GITHUB_USER
|
||||
|
||||
[credential]
|
||||
helper = CREDENTIAL_HELPER
|
|
@ -1,5 +1,5 @@
|
|||
[include]
|
||||
path = ~/.dotfiles/.dotprivate/git/gitconfig
|
||||
path = ~/.gitconfig.local
|
||||
|
||||
[color]
|
||||
branch = auto
|
||||
|
@ -23,6 +23,3 @@
|
|||
clean = git-lfs clean %f
|
||||
smudge = git-lfs smudge %f
|
||||
required = true
|
||||
|
||||
[credential]
|
||||
helper = osxkeychain
|
12
zsh/zshrc
12
zsh/zshrc
|
@ -31,7 +31,8 @@ antigen-theme $DOTFILES_DIR/zsh joshtronic-2015
|
|||
antigen-apply
|
||||
|
||||
# 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 gmm="git merge master"
|
||||
alias gmv="git mv"
|
||||
|
@ -56,7 +57,8 @@ function uuid() {
|
|||
}
|
||||
|
||||
# Vim aliases
|
||||
alias v="/usr/local/bin/vim"
|
||||
# TODO: Broken in Linux
|
||||
#alias v="/usr/local/bin/vim"
|
||||
alias vd="vimdiff"
|
||||
|
||||
# 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"
|
||||
|
||||
# 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
|
||||
export NODE_ENV=development
|
||||
|
@ -100,4 +105,3 @@ man() {
|
|||
LESS_TERMCAP_us=$'\e[1;32m' \
|
||||
man "$@"
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue