changed "dev_profile" to "environment"
parent
4a5f0ee5ed
commit
b1ee323b3d
|
|
@ -16,18 +16,16 @@ shopt -s histappend # Append to the history file, not over
|
|||
export LESS='-iMR' # Case insensite search, verbose prompting and raw output
|
||||
export PAGER=less # Used to display text / man files
|
||||
|
||||
|
||||
# setup go paths
|
||||
export GOPATH="$HOME/projects/go"
|
||||
export GOROOT="/usr/local/go"
|
||||
export ANSIBLE_HOSTS="~/.ansible/hosts"
|
||||
|
||||
|
||||
export POWERLINE_CONFIG_COMMAND=~/Tools/modules/powerline/scripts/powerline-config
|
||||
export LANG="en_US.UTF-8"
|
||||
export BOOT2DOCKER=/usr/local/Cellar/boot2docker/1.6.0/bin
|
||||
|
||||
export LANG="en_US.UTF-8"
|
||||
export WINDOWS="FALSE"
|
||||
export GIT_EDITOR=vim
|
||||
export POWERLINE_CONFIG_COMMAND=~/Tools/modules/powerline/scripts/powerline-config
|
||||
|
||||
if [ -d "${HOME}/.bin" ] ; then
|
||||
PATH=${HOME}/.bin:${PATH}
|
||||
|
|
@ -41,16 +39,12 @@ if [ -d "/c/Windows" ]; then
|
|||
GOPATH="/d/Projects/Programming/go"
|
||||
BOOT2DOCKER=/c/Program\ Files/Boot2Docker\ for\ Windows/
|
||||
GIT_EDITOR=~/Tools/vim/gvim.exe
|
||||
export FORTUNE=fortune.exe
|
||||
|
||||
# if there is a C:/Projects folder on this box then I'm using my work computer, which runs in a VM and is setup differently
|
||||
if [ -d "/c/Projects" ]; then
|
||||
export WORK="TRUE"
|
||||
. ~/.work_profile
|
||||
if [ -f ~/.windows ]; then
|
||||
. ~/.windows
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
export EDITOR=$GIT_EDITOR
|
||||
export VISUAL=$EDITOR
|
||||
|
||||
12
.profile
12
.profile
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
# source development settings
|
||||
if [ -f ~/.dev_profile ]; then
|
||||
. ~/.dev_profile
|
||||
# source environment settings
|
||||
if [ -f ~/.environment ]; then
|
||||
. ~/.environment
|
||||
fi
|
||||
|
||||
# Load any extra aliases
|
||||
|
|
@ -30,9 +30,9 @@ if [ -f /etc/bash_completion ]; then
|
|||
. /etc/bash_completion
|
||||
fi
|
||||
|
||||
if [ -d ~/.nvm ]; then
|
||||
. ~/.nvm/nvm.sh
|
||||
# for when you want to do custom junk
|
||||
if [ -d ~/.extensions ]; then
|
||||
. ~/.extensions
|
||||
fi
|
||||
|
||||
printmotd
|
||||
b2dinit
|
||||
|
|
|
|||
Loading…
Reference in New Issue