Skip to content

Commit

Permalink
Various improvements to tmux, install and bash.
Browse files Browse the repository at this point in the history
  • Loading branch information
hdemers committed Apr 26, 2016
1 parent fdaf337 commit 40b66e4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
10 changes: 8 additions & 2 deletions .bash_env.symlink
Expand Up @@ -10,7 +10,10 @@ if [ -f $VIRTUALENVWRAPPER ]; then
fi

# Autoenv, cf. https://github.com/kennethreitz/autoenv.
source `which activate.sh`
AUTOENV=`which activate.sh`
if [ -f $AUTOENV ]; then
source $AUTOENV
fi

### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"
Expand All @@ -27,7 +30,10 @@ if [ -d $HOME/Private/aws/hdemers ]; then
source $HOME/Private/aws/hdemers/aws.sh
fi

export EC2_AMI=ami-8caa1ce4
# ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-20160406
export EC2_AMI=ami-2b594f41
export EC2_INSTANCE_TYPE=t2.nano
export EC2_SECURITY_GROUP_IDS=sg-f909ec90

export R_LIBS_USER=~/.R/library

Expand Down
3 changes: 2 additions & 1 deletion .tmux.conf.symlink
@@ -1,6 +1,7 @@
# Change prefix key to `
unbind C-b
set-option -g prefix `
set -g prefix C-a
bind C-a send-prefix

# 0 is too far from ` ;)
set -g base-index 1
Expand Down
4 changes: 1 addition & 3 deletions .vimrc.symlink
Expand Up @@ -7,10 +7,9 @@ set guifont=Ubuntu\ Mono\ 12


"=====================================================================
" Load plugins
" Load plugins using plug.vim (https://github.com/junegunn/vim-plug)
"=====================================================================
call plug#begin('~/.vim/plugged')

Plug 'jlanzarotta/bufexplorer'
Plug 'kien/ctrlp.vim'
Plug 'tpope/vim-fugitive'
Expand All @@ -22,7 +21,6 @@ Plug 'scrooloose/syntastic'
Plug 'majutsushi/tagbar'
Plug 'tpope/vim-unimpaired'
Plug 'altercation/vim-colors-solarized'

call plug#end()

"=====================================================================
Expand Down
1 change: 0 additions & 1 deletion install.sh
Expand Up @@ -11,6 +11,5 @@ git clone https://github.com/hdemers/dotfiles.git $HOME/.dotfiles

cd $HOME/.dotfiles
./symlink --create-paths --overwrite-all
git submodule init && git submodule update

cd

0 comments on commit 40b66e4

Please sign in to comment.