diff --git a/.dotprivate b/.dotprivate index 0aec943..6d63c36 160000 --- a/.dotprivate +++ b/.dotprivate @@ -1 +1 @@ -Subproject commit 0aec943cfe8f7f7574b9d06df50cd968c5f61216 +Subproject commit 6d63c369a68376268302b97226d431261f2825f8 diff --git a/.gitignore b/.gitignore index ad32f9d..0c9a0c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vim/bundle vim/.netrwhist +git/gitconfig.local.symlink diff --git a/git/gitconfig.local.symlink.example b/git/gitconfig.local.symlink.example new file mode 100644 index 0000000..29d6283 --- /dev/null +++ b/git/gitconfig.local.symlink.example @@ -0,0 +1,9 @@ +[user] + name = USER_NAME + email = USER_EMAIL + +[github] + user = GITHUB_USER + +[credential] + helper = CREDENTIAL_HELPER diff --git a/git/gitconfig b/git/gitconfig.symlink similarity index 77% rename from git/gitconfig rename to git/gitconfig.symlink index 1fb4df3..7accfa3 100644 --- a/git/gitconfig +++ b/git/gitconfig.symlink @@ -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 diff --git a/zsh/zshrc b/zsh/zshrc index ab88509..ab81821 100644 --- a/zsh/zshrc +++ b/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 "$@" } -