From a3eb26d26832f137f8ab5e7a7cc4aafbc5e16696 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Wed, 3 Jan 2018 11:49:50 -0500 Subject: [PATCH] Quick commit before reformatting --- aliases | 1 + gitconfig | 2 +- vimrc | 7 +++++-- zshrc | 7 +++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/aliases b/aliases index 1a5af83..1a29372 100644 --- a/aliases +++ b/aliases @@ -80,6 +80,7 @@ alias pf="port-forward" alias t="tmux new-session -A -s" alias tf="tail -f" alias tls="tmux list-sessions" +alias ts="tmuxinator start" alias v="$EDITOR" alias w="python -m SimpleHTTPServer" alias wo="curl http://wttr.in/48912?m" diff --git a/gitconfig b/gitconfig index 475bde9..a5f58eb 100644 --- a/gitconfig +++ b/gitconfig @@ -45,5 +45,5 @@ showUntrackedFiles = all # show all files instead of just directories [transfer] - fsckobjects = true + fsckobjects = false # https://groups.google.com/forum/#!topic/binary-transparency/f-BI4o8HZW0 diff --git a/vimrc b/vimrc index 972f517..398175f 100644 --- a/vimrc +++ b/vimrc @@ -24,6 +24,9 @@ Plug 'tpope/vim-markdown' Plug 'tpope/vim-rails' Plug 'vim-ruby/vim-ruby' +" Testing +" Plug 'w0rp/ale' + call plug#end() filetype plugin indent on @@ -59,7 +62,7 @@ set showcmd " Show command as you type set ruler " Show cursor position set autoindent " autoindent AND be smart about it set smartindent -set colorcolumn=80 " Ruler at line 80 +set colorcolumn=80,120 " Ruler at line 80, 120 set nomodeline set relativenumber " Relative line numbers set number @@ -90,7 +93,7 @@ set list listchars=tab:\ \ ,trail:ยท " Ignore stuff set wildignore+=*/\.git/* " Java -set wildignore+=*/build/*,*/grade/*,*\.class +" set wildignore+=*/build/*,*/grade/*,*\.class " Frontend set wildignore+=*/node_modules/*,*/bower_components/*,*/dist/* " Persistent undo stuff diff --git a/zshrc b/zshrc index d7f8038..7b38820 100644 --- a/zshrc +++ b/zshrc @@ -54,3 +54,10 @@ setopt auto_cd # better word definition autoload -U select-word-style select-word-style bash + +# tabtab source for serverless package +# uninstall by removing these lines or running `tabtab uninstall serverless` +[[ -f /Users/atomaka/Source/tweet-africa/node_modules/tabtab/.completions/serverless.zsh ]] && . /Users/atomaka/Source/tweet-africa/node_modules/tabtab/.completions/serverless.zsh +# tabtab source for sls package +# uninstall by removing these lines or running `tabtab uninstall sls` +[[ -f /Users/atomaka/Source/tweet-africa/node_modules/tabtab/.completions/sls.zsh ]] && . /Users/atomaka/Source/tweet-africa/node_modules/tabtab/.completions/sls.zsh \ No newline at end of file