diff --git a/.gitmodules b/.gitmodules index 483e8b6..73ebea7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,6 +40,9 @@ [submodule "vim/.vim/bundle/vim-gitgutter"] path = vim/.vim/bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter +[submodule "vim/.vim/bundle/elm-vim"] + path = vim/.vim/bundle/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 diff --git a/bash/.profile b/bash/.profile index b0a6b7d..597e3bd 100644 --- a/bash/.profile +++ b/bash/.profile @@ -7,6 +7,8 @@ set_prompt configure_ls configure_completions +alias notes="vim ~/notes.md" + # default editor export EDITOR=vim @@ -15,9 +17,6 @@ export HISTSIZE=1000 # very large history export HISTFILESIZE=10000 # very large history export HISTCONTROL=ignoreboth:erasedups # ignore duplicate history entries shopt -s histappend # append to the history when the shell exits (instead of overwriting) -# save and reload history each time a command is run, to share history between shells - -alias ssh-proxy="ssh -D 8080 galaxy" # disable messaging if `tty -s`; then @@ -35,6 +34,14 @@ then eval "$(pyenv virtualenv-init -)" fi +if [ -x "$(command -v gcloud)" ] +then + source $HOME/.install/google-cloud-sdk/completion.bash.inc + source $HOME/.install/google-cloud-sdk/path.bash.inc +fi + +alias iex="iex --erl \"-kernel shell_history enabled\"" + if [ -f /usr/local/etc/bash_completion ] then . /usr/local/etc/bash_completion diff --git a/config.sh b/config.sh index 7fadf02..4b3c650 100755 --- a/config.sh +++ b/config.sh @@ -4,5 +4,6 @@ stow -t ~ bash stow -t ~ screen stow -t ~ vim stow -t ~ slate +stow -t ~ iex stow -t ~ tmux diff --git a/iex/.iex.exs b/iex/.iex.exs new file mode 100644 index 0000000..2c3eb1a --- /dev/null +++ b/iex/.iex.exs @@ -0,0 +1,2 @@ +IEx.configure(inspect: [limit: 10, pretty: true], history_size: 10_000) +IO.puts "History is enabled, inspect is configured." diff --git a/slate/.slate b/slate/.slate index ba802c3..5639911 100644 --- a/slate/.slate +++ b/slate/.slate @@ -32,7 +32,7 @@ alias bottomHalf move ${originX};${originY}+${oneHalfHeight} ${width};${oneHalfH alias leftOneThird move ${originX};${originY} ${oneThirdWidth};${height} alias leftTwoThirds move ${originX};${originY} ${twoThirdsWidth};${height} -alias centerOneThird move ${originX} + ${oneThirdWidth};${originY} ${oneThirdWidth};${height} +alias centerOneThird move (${originX}+${oneThirdWidth});${originY} ${oneThirdWidth};${height} alias rightTwoThirds move (${originX}+${oneThirdWidth});${originY} ${twoThirdsWidth};${height} alias rightOneThird move (${originX}+${twoThirdsWidth});${originY} ${oneThirdWidth};${height} @@ -49,8 +49,8 @@ alias extramovetrigger shift,cmd,alt alias apptrigger ctrl,shift # quick switching to commonly used apps -bind space:${apptrigger} focus 'iTerm2' -bind t:${apptrigger} focus 'iTerm2' +bind space:${apptrigger} focus 'Terminal' +bind t:${apptrigger} focus 'Terminal' bind c:${apptrigger} focus 'Google Chrome' bind s:${apptrigger} focus 'Slack' @@ -62,6 +62,7 @@ bind up:${movetrigger} ${topHalf} bind down:${movetrigger} ${bottomHalf} bind left:${extramovetrigger} ${leftOneThird} bind right:${extramovetrigger} ${rightOneThird} +bind m:${extramovetrigger} ${centerOneThird} bind up:${extramovetrigger} ${leftTwoThirds} bind down:${extramovetrigger} ${rightTwoThirds} @@ -70,22 +71,22 @@ bind left:shift,ctrl,cmd throw 0 resize bind right:shift,ctrl,cmd throw 1 resize # laptop layout for coding -layout laptop-coding 'iTerm2':REPEAT ${full} +layout laptop-coding 'Terminal':REPEAT ${full} layout laptop-coding 'Google Chrome':REPEAT ${full} layout laptop-coding 'Slack':REPEAT ${full} # laptop layout for code review -layout laptop-code-review 'iTerm2':REPEAT ${rightHalf} +layout laptop-code-review 'Terminal':REPEAT ${rightHalf} layout laptop-code-review 'Google Chrome':REPEAT ${leftHalf} layout laptop-coding 'Slack':REPEAT ${full} # in-the-office layout for coding -layout office-coding 'iTerm2':REPEAT ${monitorFull} +layout office-coding 'Terminal':REPEAT ${monitorFull} layout office-coding 'Google Chrome':REPEAT ${macbookFull} layout office-coding 'Slack':REPEAT ${macbookFull} # in-the-office layout for code review -layout office-code-review 'iTerm2':REPEAT ${monitorRight} +layout office-code-review 'Terminal':REPEAT ${monitorRight} layout office-code-review 'Google Chrome':REPEAT ${monitorLeft} layout office-code-review 'Slack':REPEAT ${macbookFull} diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 618ff52..cee3823 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -6,12 +6,14 @@ set -sg escape-time 0 set -g default-terminal "screen-256color" # disable automatic window renaming +set-window-option -g status-interval 1 set-window-option -g automatic-rename on +set-window-option -g automatic-rename-format "#{pane_current_command}" set-window-option -g allow-rename off # window status -setw -g window-status-format "#[bg=colour241,fg=colour233] #I #W " -setw -g window-status-current-format "#[bg=colour245,fg=colour233] #I #W " +setw -g window-status-format "#[bg=colour241,fg=colour233] #I #(basename #{pane_current_path})/#W " +setw -g window-status-current-format "#[bg=colour245,fg=colour233] #I #(basename #{pane_current_path})/#W " # The statusbar set -g status-interval 2 diff --git a/vim/.vim/bundle/elm-vim b/vim/.vim/bundle/elm-vim new file mode 160000 index 0000000..ae53153 --- /dev/null +++ b/vim/.vim/bundle/elm-vim @@ -0,0 +1 @@ +Subproject commit ae5315396cd0f3958750f10a5f3ad9d34d33f40d diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index d8e4e25..67ee84f 100644 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -34,7 +34,6 @@ SetupTabbing " makes LaTeX use spell checking, word wrapping autocmd FileType tex set wrap spell autocmd FileType make set noexpandtab -"autocmd FileType python SetupTabbing autocmd FileType markdown set wrap let java_allow_cpp_keywords=1 @@ -86,3 +85,5 @@ au CursorHoldI * checktime let g:ctrlp_map = '' let g:ctrlp_cmd = 'CtrlP' +set wildignore +=*/tmp/*,*.pyc,*/__pycache__/* +