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

Merge branch 'master' into mac-config

Browse source
This commit is contained in:
Nicole Tietz-Sokolskaya 2018-08-15 14:52:48 -04:00
commit eea93fd2fd
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -43,3 +43,6 @@
[submodule "vim/.vim/bundle/elm-vim"] [submodule "vim/.vim/bundle/elm-vim"]
path = vim/.vim/bundle/elm-vim path = vim/.vim/bundle/elm-vim
url = https://github.com/ElmCast/elm-vim url = https://github.com/ElmCast/elm-vim
[submodule "vim/.vim/bundle/bats"]
path = vim/.vim/bundle/bats
url = https://github.com/vim-scripts/bats.vim

5
bash/.profile
View file

@ -29,11 +29,16 @@ export TERM=xterm-256color
# Installed with https://github.com/pyenv/pyenv-installer # Installed with https://github.com/pyenv/pyenv-installer
if [ -x "$(command -v pyenv)" ] if [ -x "$(command -v pyenv)" ]
then then
export PATH="/home/nicholas/.pyenv/bin:$PATH"
eval "$(pyenv init -)" eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
fi fi
if [ -x "$(command -v gcloud)" ]
then
source $HOME/.install/google-cloud-sdk/completion.bash.inc source $HOME/.install/google-cloud-sdk/completion.bash.inc
source $HOME/.install/google-cloud-sdk/path.bash.inc source $HOME/.install/google-cloud-sdk/path.bash.inc
fi
alias iex="iex --erl \"-kernel shell_history enabled\"" alias iex="iex --erl \"-kernel shell_history enabled\""

2
tmux/.tmux.conf
View file

@ -24,7 +24,7 @@ set -g status-attr dim
set -g status-left '#[fg=colour245] #(whoami)@#H > #S ' set -g status-left '#[fg=colour245] #(whoami)@#H > #S '
set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M ' set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M '
set -g status-right-length 50 set -g status-right-length 50
set -g status-left-length 30 set -g status-left-length 40
set -g clock-mode-style 12 set -g clock-mode-style 12
# Use Alt-vim keys without prefix key to switch panes # Use Alt-vim keys without prefix key to switch panes

1
vim/.vim/bundle/bats Submodule

@ -0,0 +1 @@
Subproject commit 3c283f594ff8bc7fb0c25cd07ebef0f17385f94a