From 02cba770b4a5f0136827f9ea9dcdc24d0b14f2ce Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Wed, 17 Jan 2018 14:51:03 -0500 Subject: [PATCH 01/10] Ignore pycache when searching --- vim/.vim/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index e96d8f4..def810f 100644 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -84,3 +84,5 @@ au CursorHoldI * checktime let g:ctrlp_map = '' let g:ctrlp_cmd = 'CtrlP' +set wildignore +=*/tmp/*,*.pyc,*/__pycache__/* + From 3c7976adf2124714da062e486e8ecc920a106973 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Tue, 23 Jan 2018 15:21:22 -0500 Subject: [PATCH 02/10] Switch back to Terminal.app --- slate/.slate | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/slate/.slate b/slate/.slate index ba802c3..80d9a1b 100644 --- a/slate/.slate +++ b/slate/.slate @@ -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' @@ -70,22 +70,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} From f377ae99a5ef562818bfb1d94b56919f9ebaf04a Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 12 Mar 2018 12:01:41 -0400 Subject: [PATCH 03/10] Enable history in iex, add configuration --- .gitmodules | 3 +++ bash/.profile | 2 ++ config.sh | 1 + iex/.iex.exs | 2 ++ vim/.vim/bundle/elm-vim | 1 + 5 files changed, 9 insertions(+) create mode 100644 iex/.iex.exs create mode 160000 vim/.vim/bundle/elm-vim diff --git a/.gitmodules b/.gitmodules index 173d102..e9ca4df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [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 diff --git a/bash/.profile b/bash/.profile index 2a4441d..58a7698 100644 --- a/bash/.profile +++ b/bash/.profile @@ -66,5 +66,7 @@ source $HOME/.asdf/completions/asdf.bash source $HOME/.install/google-cloud-sdk/completion.bash.inc source $HOME/.install/google-cloud-sdk/path.bash.inc +alias iex="iex --erl \"-kernel shell_history enabled\"" + [ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion diff --git a/config.sh b/config.sh index fc0f38a..20082d0 100755 --- a/config.sh +++ b/config.sh @@ -4,6 +4,7 @@ stow -t ~ bash stow -t ~ screen stow -t ~ vim stow -t ~ slate +stow -t ~ iex #rm -f .screenrc #ln -s ~/Code/config/screenrc .screenrc 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/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 From c4564abf21e3e0c2afd653642439fd6fde4d3632 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 19 Mar 2018 15:06:45 -0400 Subject: [PATCH 04/10] I'm not sure why this is required on my Mac... --- bash/.profile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bash/.profile b/bash/.profile index 58a7698..0ba5db6 100644 --- a/bash/.profile +++ b/bash/.profile @@ -3,6 +3,10 @@ export SHELL=/bin/bash +update_terminal_cwd() { + true; +} + set_prompt() { local BLUE="\[\e[0;34m\]" local DARK_BLUE="\[\e[1;34m\]" From 3fb2a6daf8980050256951d9d7ceb5f83cb2e56b Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 8 Jun 2018 09:36:46 -0400 Subject: [PATCH 05/10] Add pyenv, remove tabbing for Python, add notes alias --- bash/.bashrc | 1 - bash/.profile | 5 +++++ vim/.vim/vimrc | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index f3ca3b7..0b9f8cb 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -7,6 +7,5 @@ then . /etc/bash_completion fi - export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting diff --git a/bash/.profile b/bash/.profile index 0ba5db6..df53b55 100644 --- a/bash/.profile +++ b/bash/.profile @@ -41,6 +41,8 @@ set_prompt # TODO: make this work on both platforms alias ls="ls -G" +alias notes="vim ~/notes.md" + # default editor export EDITOR=vim @@ -72,5 +74,8 @@ source $HOME/.install/google-cloud-sdk/path.bash.inc alias iex="iex --erl \"-kernel shell_history enabled\"" +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" + [ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index def810f..20e599d 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 From 0c1ac3bff23bb0de4283130b6bf8af0c8479d3eb Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 23 Jul 2018 10:24:12 -0400 Subject: [PATCH 06/10] Wrap pyenv in conditional --- bash/.profile | 6 ++++-- slate/.slate | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bash/.profile b/bash/.profile index 6d8b46a..6c2b9cf 100644 --- a/bash/.profile +++ b/bash/.profile @@ -27,8 +27,10 @@ export PATH=$PATH:~/.bin export TERM=xterm-256color # Installed with https://github.com/pyenv/pyenv-installer -eval "$(pyenv init -)" -#eval "$(pyenv virtualenv-init -)" +if [ -x "$(command -v pyenv)" ] +then + eval "$(pyenv init -)" +fi source $HOME/.install/google-cloud-sdk/completion.bash.inc source $HOME/.install/google-cloud-sdk/path.bash.inc diff --git a/slate/.slate b/slate/.slate index 80d9a1b..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} @@ -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} From da58d60002def358b963d8cd5cda6236c26dafda Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Mon, 23 Jul 2018 10:25:50 -0400 Subject: [PATCH 07/10] Wrap pyenv in existence check --- bash/.profile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bash/.profile b/bash/.profile index 670722b..b0a6b7d 100644 --- a/bash/.profile +++ b/bash/.profile @@ -28,9 +28,12 @@ export PATH=$PATH:~/.bin export TERM=xterm-256color # Installed with https://github.com/pyenv/pyenv-installer -export PATH="/home/nicholas/.pyenv/bin:$PATH" -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" +if [ -x "$(command -v pyenv)" ] +then + export PATH="/home/nicholas/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" +fi if [ -f /usr/local/etc/bash_completion ] then From 9aa08fa85b0dede6bd36a1eee0a0917a167eb68d Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Thu, 9 Aug 2018 11:30:41 -0400 Subject: [PATCH 08/10] Make tmux display current directory before pane name --- tmux/.tmux.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index c42f17a..52e0dd0 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -7,11 +7,11 @@ set -g default-terminal "screen-256color" # disable automatic window renaming set-window-option -g automatic-rename on -set-window-option -g allow-rename off +#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 From 69814640319d91cc1e6ff36b3595d66d7a9f8a53 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Thu, 9 Aug 2018 11:38:44 -0400 Subject: [PATCH 09/10] Format correctly --- tmux/.tmux.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 52e0dd0..739001a 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -6,8 +6,10 @@ 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 allow-rename off +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 #(basename #{pane_current_path})/#W " From 65fa1080641efb6bbe390c9f765bbf4237e85581 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Wed, 15 Aug 2018 14:57:35 -0400 Subject: [PATCH 10/10] Fix config when missing files --- bash/.profile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bash/.profile b/bash/.profile index 597e3bd..98bbc52 100644 --- a/bash/.profile +++ b/bash/.profile @@ -31,10 +31,9 @@ if [ -x "$(command -v pyenv)" ] then export PATH="/home/nicholas/.pyenv/bin:$PATH" eval "$(pyenv init -)" - eval "$(pyenv virtualenv-init -)" fi -if [ -x "$(command -v gcloud)" ] +if [ -x "$(command -v gcloud)" ] && [ -f "$HOME/.install/google-cloud-sdk" ] then source $HOME/.install/google-cloud-sdk/completion.bash.inc source $HOME/.install/google-cloud-sdk/path.bash.inc