Permalink
Browse files

Merge branch 'master' of github.com:cpdean/cpd.dotfiles

Conflicts:
	.vimrc
  • Loading branch information...
2 parents 8a3c55c + d5bd817 commit c6421e7291768a68aff1429950f77c58ccd56e26 @cpdean committed May 7, 2014
Showing with 52 additions and 5 deletions.
  1. +1 −0 .bash_aliases
  2. +6 −0 .bashrc
  3. +8 −0 .pythonrc
  4. +36 −5 .vimrc
  5. +1 −0 install.sh
View
@@ -1,4 +1,5 @@
# Add git-dropbox alias
alias git-dropbox=~/.dotfiles/custom-scripts/git-dropbox.sh
+
alias reset-net="echo \"add State:/Network/Interface/en0/RefreshConfiguration temporary\" | sudo scutil"
alias gs="git status"
View
@@ -109,6 +109,9 @@ NODE_FOR_OSX=/usr/local/share/npm/bin
AWS_STUFF=~/.dotfiles/custom-scripts/aws/eb/macosx/python2.7
export PATH=$AWS_STUFF:$CUSTOM_SCRIPTS:$PYTHON_FOR_OSX:$NODE_FOR_OSX:$PATH
+#android path things for fennec
+export PATH=$PATH:$HOME/android/adt-bundle-mac-x86_64-20130729/sdk/tools:$HOME/android/adt-bundle-mac-x86_64-20130729/sdk/build-tools:$HOME/android/adt-bundle-mac-x86_64-20130729ac/sdk/platform-tools
+
#PS1='\h:\W \u\$ '
PS1='\h:\e[0;31m\W \e[0;32m\$\[\e[0m\] ' # Why is this guy broken?
PS1='\h:\W \$ '
@@ -123,6 +126,9 @@ if [ -f ~/.dotfiles/.git-completion.bash ]; then
. ~/.dotfiles/.git-completion.bash
fi
+# tab completion for python, and maybe other stuff
+export PYTHONSTARTUP=~/.pythonrc
+
# virtualenvwrapper stuff
export WORKON_HOME=$HOME/.virtualenvs
export PROJECT_HOME=$HOME/dev
View
@@ -0,0 +1,8 @@
+# tab completion
+try:
+ import readline
+except ImportError:
+ print("readline not available. setting tab completion for python not possible")
+else:
+ import rlcompleter
+ readline.parse_and_bind("tab:complete")
View
@@ -53,6 +53,8 @@ Bundle 'vim-scripts/VimClojure'
Bundle 'kchmck/vim-coffee-script'
Bundle 'repos-scala/scala-vundle'
Bundle 'digitaltoad/vim-jade'
+Bundle 'chase/vim-ansible-yaml'
+Bundle 'wting/rust.vim'
Bundle 'tpope/vim-markdown'
" ui features
@@ -62,6 +64,8 @@ Bundle 'Lokaltog/vim-powerline'
Bundle 'scrooloose/syntastic'
Bundle 'rking/ag.vim'
Bundle 'goldfeld/vim-seek'
+Bundle 'davidhalter/jedi-vim'
+Bundle 'benmills/vimux'
"Bundle 'klen/python-mode'
filetype plugin indent on
@@ -80,10 +84,6 @@ set laststatus=2 " Always show the statusline
set encoding=utf-8 " Necessary to show Unicode glyphs
" ctrl p stuff
-let g:ctrlp_custom_ignore = {
- \ 'dir': '\.git$\|\.hg$\|.svn$\|node_modules$\|\.bin$',
- \ 'file': '\v\.(exe|so|dll|class|)$',
- \ }
let g:ctrlp_user_command = {
\ 'types': {
@@ -93,14 +93,45 @@ let g:ctrlp_user_command = {
\ 'fallback': 'find %s -type f'
\ }
+let g:ctrlp_custom_ignore = {
+ \ 'dir': '\.git$\|\.hg$\|.svn$\|node_modules$\|\.bin$',
+ \ 'file': '\v\.(exe|so|dll|class|)$',
+ \ }
+
+" jedi vim
+"
+" don't spawn a new tab. keep it in buffer
+" so i maintain jumpstack for moving back/forth
+let g:jedi#use_tabs_not_buffers = 0
+
+" tmuxing
+"
+" init new window to the side
+let g:VimuxHeight = "40"
+let g:VimuxOrientation = "h"
+
+" basic control mappings
+nmap <leader>tt :call VimuxRunCommand("py.test ".expand("%:@"))
+map <leader>tq :VimuxCloseRunner<CR>
+
+" mad rerun skills
+nmap <silent> <CR> :call VimuxRunLastCommand()<CR>
+
+" more savings
+nmap <silent> <leader>w :w<CR>
+
" Unfuck my screen
noremap <leader>r :syntax sync fromstart<cr>:redraw!<cr>
" add <F6> binding for running python code
" should eventually update it so that I can make <F6> run things based on filetype
nmap <F6> :w<CR>:!python %<CR>
nmap <leader>f :vim <C-R><C-W> **/*.py
-nmap <leader>s :Ag
+
+" mapping for ag.vim silver_searcher
+nmap <leader>s :Ag
+
+" auto insert a breakpoint
nmap <leader>b Oimport pytest; pytest.set_trace()<ESC>
"noremap j <NOP>
View
@@ -18,4 +18,5 @@ if [ -d ~/.olddotfiles ]
installFile .bash_profile
installFile .bash_aliases
installFile .vimrc
+ installFile .pythonrc
fi

0 comments on commit c6421e7

Please sign in to comment.