Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: timwraight/Dotfiles
base: 59077c7b7f
...
head fork: timwraight/Dotfiles
compare: 2bb83f20b0
Checking mergeability… Don't worry, you can still create the pull request.
  • 13 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
33 .gitconfig
@@ -0,0 +1,33 @@
+[.user]
+ name = Tim Wraight
+ email = <email>
+[color]
+ diff = auto
+ status = auto
+ branch = auto
+ interactive = auto
+ ui = true
+ pager = true
+[color "branch"]
+ current = yellow reverse
+ local = yellow
+ remote = green
+[color "diff"]
+ meta = yellow bold
+ frag = magenta bold
+ old = red bold
+ new = green bold
+[color "status"]
+ added = yellow
+ changed = green
+ untracked = cyan
+[core]
+ excludesfile = /Users/twraight/.gitignore_global
+ pager = less -FRSX
+ whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+ editor = mvim --remote-tab-wait
+[alias]
+ co = checkout
+ sta = status
+[github]
+ user = timwraight
View
45 .gitignore_global
@@ -0,0 +1,45 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Temp Files #
+##############
+~*
+.*.un~
+.*.un
+.netrwhist
+
+# TeX Temp Files #
+##################
+.top
View
70 .vimrc
@@ -28,7 +28,9 @@ Bundle 'ornicar/vim-ragtag'
Bundle 'tpope/vim-repeat'
Bundle 'tpope/vim-surround'
Bundle 'chrismetcalf/vim-yankring'
-Bundle 'cschlueter/vim-mustang'
+Bundle 'michaeljsmith/vim-indent-object'
+Bundle 'bkad/CamelCaseMotion'
+Bundle 'altercation/vim-colors-solarized'
Bundle 'betamike/cocoa.vim'
Bundle 'vim-scripts/matchit.zip'
Bundle 'timwraight/Vim-Noweb'
@@ -37,12 +39,23 @@ Bundle 'veselosky/vim-rst'
Bundle 'nvie/vim-rst-tables'
Bundle 'vim-scripts/django.vim'
Bundle 'majutsushi/tagbar'
-Bundle 'vim-scripts/LustyJuggler'
-
-" Non github
-Bundle 'git://git.wincent.com/command-t.git'
+Bundle 'vim-scripts/argtextobj.vim'
+Bundle 'sjl/gundo.vim'
+Bundle 'tomtom/checksyntax_vim/'
+Bundle 'croaker/mustang-vim'
+"Bundle 'laurentb/vim-cute-php'
+Bundle 'wincent/Command-T'
+"Bundle 'kevinw/pyflakes-vim'
+"Bundle 'fs111/pydoc.vim'
+Bundle 'nvie/vim-pep8'
filetype plugin indent on " required!
+
+set backspace=indent,eol,start " allow backspacing over everything in insert mode
+set history=1000 " keep 1000 lines of command line history
+set undolevels=1000 " allow 1000 levels of undo
+set ruler " show the cursor position all the time
+set showcmd " display incomplete commands
set ofu=syntaxcomplete#Complete " Turn on OmniComplete
set completeopt=longest,menuone " Complete as much as possible of the word,
" and show menu even if there's only one match
@@ -53,7 +66,7 @@ set wrap " Line wrapping on
set linebreak " wrap words instead of characters
set textwidth=79
set formatoptions=qrnl
-set colorcolumn=80
+"set colorcolumn=80
set timeoutlen=250 " Time to wait after ESC (default causes an annoying delay)
set backupdir=~/.vim/backups " Where backups will go.
set directory=~/.vim/tmp " Where temporary files will g
@@ -73,7 +86,7 @@ set smartcase " ignore case if search pattern is all lowercase,
" case-sensitive otherwise
set smarttab " insert tabs on the start of a line according to
" shiftwidth, not tabstop
-set wildignore=*.swp
+set wildignore=*.swp,*.bak,*.pyc,*.class
set title " change the terminal's title
set visualbell " don't beep
set noerrorbells " don't beep
@@ -90,13 +103,14 @@ set backspace=indent,eol,start
set laststatus=2 " last window will always have a status line
set gdefault " by default, all subsitutions happen globally (no need to put /g)
set formatprg=par\ -w79" use Par (http://www.nicemice.net/par/) to format paragraphs
-colorscheme mustang
set undofile " Allows undo for closed files. only for Vim 7,3
set undoreload=10000
set shell=/usr/local/bin/zsh
set undodir=~/.vim/tmp/undo
set autoread
-syntax on
+syntax enable
+colorscheme solarized
+set background=dark
" statusline
" cf the default statusline: %<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
@@ -137,6 +151,7 @@ let mapleader=","
inoremap <silent> kj <ESC>
nnoremap <silent> <leader>f :NERDTreeToggle<CR>
nnoremap <silent> <leader>o :NERDTreeFind<CR>
+let NERDTreeIgnore = ['\.pyc$']
" Requires Scratch plugin:
nnoremap <silent> <leader>s :Sscratch<CR>
inoremap <silent> <leader>b <C-^>
@@ -145,7 +160,6 @@ nnoremap <silent> <leader>l :set number!<CR>
nnoremap <silent> <leader>y :YRShow<CR>
inoremap <silent> <leader>y <ESC>:YRShow<CR>
nnoremap <leader>a :Ack
-nnoremap <d-j> :LustyJuggler<CR>
nnoremap <leader><leader>t :TagbarToggle<CR>
nnoremap <silent> <leader>/ :noh<CR>
@@ -154,10 +168,19 @@ nnoremap <leader>' ysw'
" Split windows easily, and switch immediately
nnoremap <leader>p <C-w>v<C-w>l
+" Fugitive Mappings
+nnoremap <leader>gs :Gstatus<CR>
+nnoremap <leader>gc :Gcommit<CR>
+nnoremap <leader>gd :Gdiff<CR>
+nnoremap <leader>gb <C-w>h:bd<cr>
+nnoremap <leader>gr :Gread<CR>
+
" Let space skip through the jump list
-nnoremap <space> <Tab>
+nnoremap <space> <C-o>
" and shift-space skip backwards through it
-nnoremap <S-space> <C-o>
+nnoremap <S-space> <Tab>
+" Set shift-return to skip to tag
+nnoremap <S-CR> <C-]>
" Save us some keystrokes:
nnoremap \ ;
@@ -170,22 +193,31 @@ cnoremap w!! w !sudo tee % >/dev/null
" Fold current tag
nnoremap <leader>ft Vatzf
+" Terminal-like movement between splits
+nnoremap <D-M-left> <C-w>h
+nnoremap <D-M-right> <C-w>l
+nnoremap <D-M-down> <C-w>j
+nnoremap <D-M-up> <C-k>j
+
let g:sparkupExecuteMapping = '<d-e>'
let g:sparkupNextMapping = '<d-r>'
let g:sparkupArgs = '--no-last-newline --post-tag-guides'
+" Gundo settings
+nnoremap <leader>u :GundoToggle<CR>
+let g:gundo_right = 1
+
"improve autocomplete menu color
highlight Pmenu ctermbg=238 gui=bold
" Save when focus is lost
au FocusLost * :wa
-" Filetype plugins
-filetype plugin indent on
" Some older versions of Vim can't do autocmd, so to remain compatible
if has('autocmd')
" Set php files to be html as well
autocmd FileType php set ft=php.html
+ autocmd FileType php nmap <leader><leader>l :w!<CR>:! php -l % <CR>
autocmd filetype html,xml set listchars-=tab:>.
endif
@@ -196,6 +228,8 @@ au BufRead,BufNewFile *.nw set filetype=noweb
au BufRead,BufNewFile *.tao set filetype=php.html
au BufRead,BufNewFile *.tpl set filetype=smarty.html
+let g:pyflakes_use_quickfix = 0
+
let noweb_backend = "tex"
let noweb_language = "lisp"
let noweb_fold_code = 1
@@ -204,8 +238,6 @@ au BufRead,BufNewFile *.text set filetype=markdown
au BufRead,BufNewFile *.phn set filetype=lisp
autocmd filetype scheme nnoremap <silent> <C-c> :! csc %; BNAME=`basename % .scm`; chmod +x $BNAME; ./$BNAME; echo "\n" <CR>
-autocmd filetype rst nnoremap <silent> <leader>gd :! cd docs/source; make html; cd ../..<CR>
-autocmd filetype rst nnoremap <silent> <leader>gc :! mtxrun --script rst --if=% --of=`dirname %`/`basename % .rst`.tex; context `dirname %`/`basename % .rst`.tex; open `dirname %`/`basename % .rst`.pdf<CR>
-autocmd filetype rst set softtabstop=3
-autocmd filetype rst set tabstop=3
-autocmd filetype rst set shiftwidth=3
+autocmd filetype rst nnoremap <silent> <leader>gd :! cd docs; make html; cd ..<CR>
+autocmd FileType python map <buffer> <d-l> :call Pep8()<CR>
+"autocmd filetype rst nnoremap <silent> <leader>gc :! mtxrun --script rst --if=% --of=`dirname %`/`basename % .rst`.tex; context `dirname %`/`basename % .rst`.tex; open `dirname %`/`basename % .rst`.pdf<CR>
View
44 .zshrc
@@ -0,0 +1,44 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="tim"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git, brew, git-flow, svn, vagrant)
+# vi-mode
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
+export PATH="/Users/twraight/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin:/usr/local/git/bin:/Users/twraight/pear/bin:/Users/twraight/context/tex/texmf-osx-64/bin:$PATH"
+
+# Path ------------------------------------------------------------
+ if [ -d ~/.local/bin ]; then
+ export PATH=~/.local/bin:$PATH exists.
+ fi
+
+# # Python path -----------------------------------------------------
+ if [ -d ~/.local/lib/python2.7/site-packages ]; then
+ export PYTHONPATH=~/.local/lib/python2.7/site-packages:$PYTHONPATH
+ fi
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
+
+export TANGENT_USER=wraightt
View
2  gfm.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+git status | awk "/$1/ { print \$3 }"
View
9 tim.zsh-theme
@@ -6,6 +6,15 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
alias gs='git status'
+alias gl='git log --graph --decorate'
+alias gc='git checkout'
+alias gco='git commit'
+alias gb='git branch'
+alias gm='git merge'
+alias ga='git add'
+alias gd='git diff'
+alias gl1='git log --oneline'
+alias gls='git log --oneline --stat'
# Customize to your needs...
export EDITOR=vim

No commit comments for this range

Something went wrong with that request. Please try again.