markdown includes html now. cleaned up rails.vim shortcuts so command…

…-t is faster
ryanjm · Nov 20, 2012 · 4fae5f6 · 4fae5f6
1 parent 4b7a455
commit 4fae5f6
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 76 deletions.
diff --git a/oh-my-zsh/custom/plugins/rbates/rbates.plugin.zsh b/oh-my-zsh/custom/plugins/rbates/rbates.plugin.zsh
@@ -12,9 +12,12 @@ export EDITOR='mate -w'
 unsetopt correct_all
 
 # a few aliases I like
-alias gs='git status'
+alias gs='git status -sb'
 alias gd='git diff'
 alias tlog='tail -f log/development.log'
+alias git-amend='git commit --amend -C HEAD'
+alias git-undo='git reset --soft HEAD^'
+alias git-count='git shortlog -sn'
 
 # add plugin's bin directory to path
 export PATH="$(dirname $0)/bin:$PATH"
diff --git a/oh-my-zsh/custom/plugins/ryanjm/ryanjm.plugin.zsh b/oh-my-zsh/custom/plugins/ryanjm/ryanjm.plugin.zsh
diff --git a/vim/after/plugin/snipMate.vim b/vim/after/plugin/snipMate.vim
@@ -33,6 +33,8 @@ call GetSnippets(snippets_dir, '_') " Get global snippets
 
 " Add html to erb
 call ExtractSnipsFile(g:snippets_dir.'html.snippets','eruby')
+" Add html to markdown
+call ExtractSnipsFile(g:snippets_dir.'html.snippets','markdown')
 
 au FileType * if &ft != 'help' | call GetSnippets(snippets_dir, &ft) | endif
 " vim:noet:sw=4:ts=4:ft=vim
diff --git a/vim/snippets/html.snippets b/vim/snippets/html.snippets
@@ -440,6 +440,8 @@ snippet hgroup.
 	</hgroup>
 snippet hr
 	<hr />${1}
+snippet hr.
+	<hr class="${1}" />${2}
 snippet html
 	<html>
 	${1}
@@ -721,6 +723,8 @@ snippet source
 	<source src="${1}" type="${2}" media="${3}" />
 snippet span
 	<span>${1}</span>
+snippet span.
+	<span class="${1}">${2}</span>${3}
 snippet strong
 	<strong>${1}</strong>
 snippet style
@@ -817,3 +821,6 @@ snippet video
 	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>${8}
 snippet wbr
 	<wbr />${1}
+snippet jquery
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+
diff --git a/vim/snippets/markdown.snippets b/vim/snippets/markdown.snippets
@@ -1,9 +1,10 @@
 # Markdown
 
 # Includes octopress (http://octopress.org/) snippets
+# Includes html.snippets
 
 snippet [
-	[${1:text}](http://${2:address} "${3:title}")
+	[${1:text}](${2:address} "${3:title}")
 snippet [*
 	[${1:link}](${2:`@*`} "${3:title}")${4}
 
@@ -22,66 +23,3 @@ snippet ![:
 snippet ![:*
 	![${1:id}]: ${2:`@*`} "${3:title}"
 
-snippet ===
-	`repeat('=', strlen(getline(line(".") - 1)))`
-
-	${1}
-snippet ---
-	`repeat('-', strlen(getline(line(".") - 1)))`
-
-	${1}
-
-snippet blockquote
-	{% blockquote %}
-	${1:quote}
-	{% endblockquote %}
-
-snippet blockquote-author
-	{% blockquote ${1:author}, ${2:title} %}
-	${3:quote}
-	{% endblockquote %}
-
-snippet blockquote-link
-	{% blockquote ${1:author} ${2:URL} ${3:link_text} %}
-	${4:quote}
-	{% endblockquote %}
-
-snippet bt-codeblock-short
-	```
-	${1:code_snippet}
-	```
-
-snippet bt-codeblock-full
-	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${5:code_snippet}
-	```
-
-snippet codeblock-short
-	{% codeblock %}
-	${1:code_snippet}
-	{% endcodeblock %}
-
-snippet codeblock-full
-	{% codeblock ${1:title} lang:${2:language} ${3:URL} ${4:link_text} %}
-	${5:code_snippet}
-	{% endcodeblock %}
-
-snippet gist-full
-	{% gist ${1:gist_id} ${2:filename} %}
-
-snippet gist-short
-	{% gist ${1:gist_id} %}
-
-snippet img
-	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${6:alt_text} %}
-
-snippet youtube
-	{% youtube ${1:video_id} %}
-
-# The quote should appear only once in the text. It is inherently part of it.
-# See http://octopress.org/docs/plugins/pullquote/ for more info.
-
-snippet pullquote
-	{% pullquote %}
-	${1:text} {" ${2:quote} "} ${3:text}
-	{% endpullquote %}
diff --git a/vim/snippets/ruby.snippets b/vim/snippets/ruby.snippets
@@ -41,7 +41,7 @@ snippet when
 	when ${1:condition}
 		${2}
 snippet def
-	def ${1:method_name}
+	def ${1:initialize}
 		${2}
 	end
 snippet deft

diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
@@ -0,0 +1,4 @@
+OrangeQC
+Instapaper
+jQuery
+javascript
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
diff --git a/vimrc b/vimrc
@@ -105,13 +105,13 @@ map <Leader>R :e doc/README_FOR_APP<CR>
 map <Leader>m :Rmodel 
 map <Leader>c :Rcontroller 
 map <Leader>v :Rview 
-map <Leader>u :Runittest 
-map <Leader>f :Rfunctionaltest 
-map <Leader>tm :RTmodel 
-map <Leader>tc :RTcontroller 
-map <Leader>tv :RTview 
-map <Leader>tu :RTunittest 
-map <Leader>tf :RTfunctionaltest 
+" map <Leader>u :Runittest 
+" map <Leader>f :Rfunctionaltest 
+" map <Leader>tm :RTmodel 
+" map <Leader>tc :RTcontroller 
+" map <Leader>tv :RTview 
+" map <Leader>tu :RTunittest 
+" map <Leader>tf :RTfunctionaltest 
 map <Leader>sm :RSmodel 
 map <Leader>sc :RScontroller 
 map <Leader>sv :RSview 
@@ -151,9 +151,10 @@ nmap <F1> <Esc>
 imap <C-F> <C-R>=expand("%")<CR>
 
 " Maps autocomplete to tab
-imap <Tab> <C-N>
+" imap <Tab> <C-N>
 
 imap <C-L> <Space>=><Space>
+imap <D-CR> <C-O>o
 
 " Display extra whitespace
 " set list listchars=tab:»·,trail:·

diff --git a/zshrc b/zshrc
@@ -3,11 +3,12 @@ ZSH_THEME="rbates"
 DISABLE_AUTO_UPDATE="true"
 DISABLE_LS_COLORS="true"
 
-plugins=(git bundler brew gem rbates)
+plugins=(git bundler brew gem rbates ryanjm)
 
 export PATH="/usr/local/bin:/Users/ryanjm/code/scripts:$PATH"
 
 source $ZSH/oh-my-zsh.sh
 
 # for Homebrew installed rbenv
-if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+