Skip to content
Browse files

removed some cruft

  • Loading branch information...
1 parent 9015262 commit 37a235fa931368531a64654e13c0bb46874ad02f @ranman committed Apr 11, 2013
Showing with 6 additions and 98 deletions.
  1. +0 −2 .gitconfig
  2. +0 −3 .gitmessage.txt
  3. +3 −0 .gitmodules
  4. 0 .mongorc.js
  5. +0 −11 .pythontidy.xml
  6. +1 −12 .ssh/config
  7. +1 −3 .vimrc
  8. +0 −45 makefile
  9. +0 −7 post-commit
  10. +1 −0 vim/bundle/ctrlp.vim
  11. +0 −15 xgen.sh
View
2 .gitconfig
@@ -4,8 +4,6 @@
[core]
editor = vim
whitespace = trailing-space,space-before-tab
-[commit]
- template = /Users/ranman/.gitmessage.txt
[color]
ui = true
[push]
View
3 .gitmessage.txt
@@ -1,3 +0,0 @@
-PROJECT-# Summary
-
-DETAIL
View
3 .gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim/bundle/ctrlp.vim"]
+ path = vim/bundle/ctrlp.vim
+ url = git://github.com/kien/ctrlp.vim.git
View
0 .mongorc.js
No changes.
View
11 .pythontidy.xml
@@ -1,11 +0,0 @@
-<config>
- <parm name="COL_LIMIT" value="int(1000)" />
- <parm name="SHEBANG" value="" />
- <parm name="PARENTHESIZE_TUPLE_DISPLAY" value="bool(False)" />
- <parm name="ADD_BLANK_LINES_AROUND_COMMENTS" value="bool(False)" />
- <parm name="ADD_BLANK_LINE_AFTER_DOC_STRING" value="bool(False)" />
- <parm name="MAX_SEPS_FUNC_DEF" value="int(99)" />
- <parm name="MAX_SEPS_FUNC_REF" value="int(99)" />
- <parm name="WRAP_DOC_STRINGS" value="bool(True)" />
- <parm name="NORMALIZE_DOC_STRINGS" value="bool(True)" />
-</config>
View
13 .ssh/config
@@ -1,18 +1,7 @@
Host *
- ControlMaster yes
- ControlPath ~/.ssh/master-%l-%h-%p-%r.sock
Compression yes
- XAuthLocation /usr/X11R6/bin/xauth
-ControlMaster auto
-ControlPath ~/ssh-%r@%h:%p
-ControlPersist 4h
-ServerAliveInterval 300
-Host linode
- Compression yes
- User ranman
- IdentityFile ~/.ssh/id_rsa
- HostName 66.175.213.126
+ServerAliveInterval 300
# 10gen hosts
Host buildbot-special
View
4 .vimrc
@@ -1,17 +1,15 @@
+runtime bundle/vim-pathogen/autoload/pathogen.vim
call pathogen#infect()
set nocompatible
syntax enable
set encoding=utf-8
-filetype plugin indent on
set laststatus=2
set hidden " allow hidden buffers
set nowrap " don't wrap lines
set tabstop=4 shiftwidth=4 " indentation is always 4 spaces
set shiftround
-set autoindent
-set copyindent
set smarttab
set backspace=indent,eol,start " allow backspace over everything in insert mode
set hlsearch incsearch smartcase " highlight matches and search as you type
View
45 makefile
@@ -1,45 +0,0 @@
-all: clean git tmux vim zsh
-clean: git_clean tmux_clean vim_clean zsh_clean
-
-PWD = $(shell pwd)
-
-# GIT
-git: gitconfig gitignore
-GIT = $(PWD)/git/
-
-gitconfig:
- ln -s $GIT/gitconfig ~/.gitconfig
-
-gitignore:
- ln -s $(GIT)/gitignore_global ~/.gitignore_global
-
-git_clean:
- mv ~/.gitconfig ~/.gitconfig.old
- mv ~/.gitignore_global ~/.gitignore_global.old
-
-# TMUX
-
-tmux: tmux.conf
-TMUX = $(PWD)/tmux/
-
-tmux.conf:
- ln -s $(TMUX)/tmux.conf ~/.tmux.conf
-
-tmux_clean:
- mv ~/.tmux.conf.clean ~/.tmux.conf
-
-# VIM
-
-vim: vimdir vimrc
-VIM = $(PWD)/vim/
-
-vimdir:
- ln -s $(VIM) ~/.vim
-
-vimrc: vimdir
- ln -s ~/.vim/vimrc ~/.vimrc
-
-vim_clean:
- mv ~/.vim/ ~/.vim.old
- mv ~/.vimrc ~/.vimrc.old
-
View
7 post-commit
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-file="~/.gitshots/#{Time.now.to_i}.jpg"
-unless File.directory?(File.expand_path("../../rebase-merge", __FILE__))
- puts "Taking capture into #{file}!"
- system "imagesnap -q -w 1 #{file} &"
-end
-exit 0
1 vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit 287b9c12aad2420269576504d1c05d36111a4562
View
15 xgen.sh
@@ -1,15 +0,0 @@
-xgen() {
- # without an argument just goto the directory
- if [ -z "$1" ]; then
- cd $HOME/dev/10gen
- # if the path in the argument exists goto it
- elif [ -d "$HOME/dev/10gen/${1}" ]; then
- cd "$HOME/dev/10gen/${1}"
- else
- # otherwise we move to the directory and attempt to clone
- # the repo from $2 argument
- cd $HOME/dev/10gen
- git clone git@github.com:${2}/${1}.git
- cd $1
- fi
-}

0 comments on commit 37a235f

Please sign in to comment.
Something went wrong with that request. Please try again.