nicole/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:ntietz/config

Browse source
This commit is contained in:
Nicole Tietz-Sokolskaya 2017-03-13 11:50:46 -04:00
commit 7eefca4eda
2 changed files with 11 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config.sh
View file

@ -10,13 +10,13 @@ ln -s ~/Code/config/bashrc .bashrc
rm -f .screenrc rm -f .screenrc
ln -s ~/Code/config/screenrc .screenrc ln -s ~/Code/config/screenrc .screenrc
rm -f .vimrc #rm -f .vimrc
ln -s ~/Code/config/vimrc .vimrc #ln -s ~/Code/config/vimrc .vimrc
# set up the default branch for git # set up the default branch for git
git config --global branch.master.remote origin #git config --global branch.master.remote origin
git config --global branch.master.merge refs/heads/master #git config --global branch.master.merge refs/heads/master
mkdir -f ~/.vim #mkdir -f ~/.vim
git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim #git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim

55
profile
View file

@ -25,20 +25,15 @@ set_prompt() {
PS1="${TITLEBAR}$BLUE[\t]\`$FAILURE_COLOR\` \u@\h> $NO_COLOR" PS1="${TITLEBAR}$BLUE[\t]\`$FAILURE_COLOR\` \u@\h> $NO_COLOR"
} }
restart_network_manager() {
sudo service network-manager restart
}
# sets the PS1 prompt # sets the PS1 prompt
set_prompt set_prompt
# makes ls print pretty # makes ls print pretty
unamestr=`uname` alias ls="ls --color=auto"
if [[ "$unamestr" == 'Linux' ]]; then
alias ls="ls --color=auto"
elif [[ "$unamestr" == 'Darwin' ]]; then
alias ls="ls -G"
fi
if [[ "$unamestr" == 'Darwin' ]]; then
alias update_terminal_cwd=:
fi
# default editor # default editor
export EDITOR=vim export EDITOR=vim
@ -55,50 +50,10 @@ if `tty -s`; then
mesg n mesg n
fi fi
# set the path for Hadoop
# export HADOOP_VERSION=hadoop-1.0.1
# export HADOOP=~/hadoop/$HADOOP_VERSION
# export PATH=$PATH:$HADOOP/bin
#export JAVA_HOME=/usr
# add the rubygem location
#export PATH=$PATH:/var/lib/gems/1.8/bin/
#export PATH=~/.rbenv/bin:~/.rbenv/shims:$PATH
##
# Your previous /Users/nicholas/.profile file was backed up as /Users/nicholas/.profile.macports-saved_2012-06-19_at_15:40:04
##
# MacPorts Installer addition on 2012-06-19_at_15:40:04: adding an appropriate PATH variable for use with MacPorts.
export PATH=/opt/local/bin:/opt/local/sbin:$PATH
# Finished adapting your PATH environment variable for use with MacPorts.
#export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/
#export JAVA_HOME="$(/usr/libexec/java_home)"
#export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
#### ALIAS SECTION
# servers
alias sshneptune="ssh ntietz@neptune.cs.kent.edu"
alias sshposeidon="ssh ntietz@poseidon.cs.kent.edu"
alias sshntietz="ssh nicholas@ntietz.com"
alias sshacm="ssh ntietz@acm.cs.kent.edu"
# commands
alias cls='clear && ls'
alias doit='sudo $(history -p !-1)'
alias f="pushd"
alias b="popd"
alias screen_pwd='screen -X eval "chdir $PWD"'
alias href="history -a; history -c; history -r" alias href="history -a; history -c; history -r"
macos_magic_fix() {
killall Dock
}
export PATH=$PATH:~/.bin export PATH=$PATH:~/.bin
export HISTCONTROL=ignorespace export HISTCONTROL=ignorespace
export TERM=xterm-256color export TERM=xterm-256color
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64