Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removing vim stuff as I use janus

  • Loading branch information...
commit b665a07d1a1bd41cf0c21ef02b2e676cbb7bee99 1 parent aabcce7
@tclem authored
Showing with 45 additions and 231 deletions.
  1. +4 −0 bin/server-reload
  2. +9 −21 git/aliases.zsh
  3. +12 −19 git/gitconfig.sample
  4. +0 −2  jruby/aliases.zsh
  5. +0 −63 mailplane/stylesheet.css
  6. +0 −12 netnewswire/reclining.nnwstyle/Info.plist
  7. +0 −13 netnewswire/reclining.nnwstyle/Readme.markdown
  8. +0 −69 netnewswire/reclining.nnwstyle/stylesheet.css
  9. +0 −16 netnewswire/reclining.nnwstyle/template.html
  10. +4 −3 ruby/aliases.zsh
  11. 0  {vim → vim.old}/gvimrc.symlink
  12. 0  {vim → vim.old}/vim.symlink/.VimballRecord
  13. 0  {vim → vim.old}/vim.symlink/autoload/rails.vim
  14. 0  {vim → vim.old}/vim.symlink/colors/molokai.vim
  15. 0  {vim → vim.old}/vim.symlink/colors/railscasts.vim
  16. 0  {vim → vim.old}/vim.symlink/doc/command-t.txt
  17. 0  {vim → vim.old}/vim.symlink/doc/rails.txt
  18. 0  {vim → vim.old}/vim.symlink/doc/tags
  19. 0  {vim → vim.old}/vim.symlink/filetype.vim
  20. 0  {vim → vim.old}/vim.symlink/ftdetect/markdown.vim
  21. 0  {vim → vim.old}/vim.symlink/plugin/command-t.vim
  22. 0  {vim → vim.old}/vim.symlink/plugin/gitignore.vim
  23. 0  {vim → vim.old}/vim.symlink/plugin/rails.vim
  24. 0  {vim → vim.old}/vim.symlink/ruby/command-t/Makefile
  25. 0  {vim → vim.old}/vim.symlink/ruby/command-t/controller.rb
  26. 0  {vim → vim.old}/vim.symlink/ruby/command-t/depend
  27. 0  {vim → vim.old}/vim.symlink/ruby/command-t/ext.bundle
  28. 0  {vim → vim.old}/vim.symlink/ruby/command-t/ext.c
  29. 0  {vim → vim.old}/vim.symlink/ruby/command-t/ext.h
  30. 0  {vim → vim.old}/vim.symlink/ruby/command-t/ext.o
  31. 0  {vim → vim.old}/vim.symlink/ruby/command-t/extconf.rb
  32. 0  {vim → vim.old}/vim.symlink/ruby/command-t/finder.rb
  33. 0  {vim → vim.old}/vim.symlink/ruby/command-t/match.c
  34. 0  {vim → vim.old}/vim.symlink/ruby/command-t/match.h
  35. 0  {vim → vim.old}/vim.symlink/ruby/command-t/match.o
  36. 0  {vim → vim.old}/vim.symlink/ruby/command-t/match_window.rb
  37. 0  {vim → vim.old}/vim.symlink/ruby/command-t/matcher.c
  38. 0  {vim → vim.old}/vim.symlink/ruby/command-t/matcher.h
  39. 0  {vim → vim.old}/vim.symlink/ruby/command-t/matcher.o
  40. 0  {vim → vim.old}/vim.symlink/ruby/command-t/mkmf.log
  41. 0  {vim → vim.old}/vim.symlink/ruby/command-t/prompt.rb
  42. 0  {vim → vim.old}/vim.symlink/ruby/command-t/ruby_compat.h
  43. 0  {vim → vim.old}/vim.symlink/ruby/command-t/scanner.rb
  44. 0  {vim → vim.old}/vim.symlink/ruby/command-t/settings.rb
  45. 0  {vim → vim.old}/vim.symlink/ruby/command-t/stub.rb
  46. 0  {vim → vim.old}/vim.symlink/ruby/command-t/vim.rb
  47. 0  {vim → vim.old}/vim.symlink/ruby/command-t/vim/screen.rb
  48. 0  {vim → vim.old}/vim.symlink/ruby/command-t/vim/window.rb
  49. 0  {vim → vim.old}/vim.symlink/snippets/markdown.snippets
  50. 0  {vim → vim.old}/vim.symlink/syntax/markdown.vim
  51. 0  {vim → vim.old}/vim.symlink/syntax/mustache.vim
  52. 0  {vim → vim.old}/vimrc.symlink
  53. +2 −1  zsh/aliases.zsh
  54. +4 −0 zsh/completion.zsh
  55. +10 −12 zsh/prompt.zsh
View
4 bin/server-reload
@@ -0,0 +1,4 @@
+#!/bin/sh
+ps aux | grep nginx | awk '{print }' | xargs sudo kill -9
+sudo nginx
+script/unicorn_dev
View
30 git/aliases.zsh
@@ -1,33 +1,21 @@
# Use `hub` as our git wrapper:
# http://defunkt.github.com/hub/
-#
-# I use JRuby substantially, and we want to make sure hub is run using MRI
-# regardless of which Ruby you're using or else the `git status` in your prompt
-# will take seven thousand seconds to run `ls`.
-#
-# I'm hardcoding it to an installed rvm (using rvm's `rvm 1.8.7,ruby /hub/path`
-# syntax is way too slow). It should work fine for those without rvm, though.
-if [[ -s $HOME/.rvm/scripts/rvm ]]
-then
- # alias git='$HOME/.rvm/rubies/ruby-1.8.7-p302/bin/ruby `which hub`'
- alias git='$HOME/.rvm/rubies/ruby-1.8.7-p330/bin/ruby `which hub`'
-fi
-
-# The rest of my fun git aliases
-# alias ga='git add .'
+git(){hub "$@"}
ga() {
git add .
git add -u
}
-alias gl='git pull --rebase --prune'
-alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
-alias gp='git push origin HEAD'
+alias g='git'
+alias gp='git pull --rebase --prune'
+alias gpush='git push origin HEAD'
+# alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+# alias gp='git push origin HEAD'
alias gd='git diff'
alias gc='git commit'
alias gitc='git commit -m'
-alias gca='git commit -a'
+# alias gca='git commit -a'
alias gco='git checkout'
alias gb='git branch'
alias gss='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
-alias gs='git status' # upgrade your git if -sb breaks for you. it's fun.
-alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
+alias gs='git status'
+# alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
View
31 git/gitconfig.sample
@@ -7,24 +7,17 @@
# can symlink ~/.gitconfig to this file and go rock out with your git out!
[user]
- name = Zach Holman
- email = your@example.com
-[alias]
- co = checkout
- promote = !$ZSH/bin/git-promote
- wtf = !$ZSH/bin/git-wtf
- rank-contributers = !$ZSH/bin/git-rank-contributers
- count = !git shortlog -sn
+ name = Tim Clem
+ email = timothy.clem@gmail.com
+[github]
+ user = tclem
+ token = 30105e012899452fc53ec28c637d988f
[color]
- diff = auto
- status = auto
- branch = auto
+ ui = true
+[rerere]
+ enabled = true
+[alias]
+ lol = log --oneline --graph --decorate
[core]
- excludesfile = ~/.gitignore
- editor = mate -w
-[apply]
- whitespace = nowarn
-[github]
- user = holman
-[mergetool]
- keepBackup = false
+ autocrlf = input
+
View
2  jruby/aliases.zsh
@@ -1,2 +0,0 @@
-# Quick switch to 1.5.2
-alias j='rvm jruby-1.5.2'
View
63 mailplane/stylesheet.css
@@ -1,63 +0,0 @@
-/*
-Minimal Gmail/Mailplane User Stylesheet
-Copyright (C) 2009 Ryan Tomayko <tomayko.com/about>
-Copyright (C) BEFORE THAT, some other scros on the internet
-*/
-
-* {outline: none !important;}
-* {font-family: 'Lucida Grande', Tahoma, Verdana, Arial, Helvetica, sans-serif !important;}
-.l73JSe { color:#D19800 !important;text-decoration:none !important; }
-.oM { display:none; }
-
-
-/* Hide the links to other apps */
-#gbar { display:none }
-
-/* Put the settings links on the same level as the search box */
-div.nH + div.nH div.nH.qp {
- border: none;
- line-height: 22px;
- height: auto;
- padding-top: 12px;
- position: absolute;
- right: 4px;
- z-index: 100000000 !important;
-}
-
-/* Hide the "Manage this Domain Link" */
-span[id=':qf'] { display:none }
-
-/* Hide the G-mail Logo */
-div.nH + div.nH div.nH div.no div.nH.nn {
- display: none;
-}
-div.nH + div.nH div.nH div.no div.nH.nn + div.nH.nn {
- display: block;
-}
-
-/* Hide the "Search the Web" button */
-div[id=':r8'], div[id=':r9'] {
- display: none !important;
-}
-
-/* Hide the footer */
-div.nH.l2.ov {
- display: none;
-}
-
-/* Hide new window / print box */
-div.hj {
- display: none;
-}
-table.iY > tr > td {
- display: none;
-}
-table.iY > tr > td:first-child {
- display: table-cell;
-}
-
-/* Fixed width font */
-.ii, .ii a {
- font-family: Consolas, 'Dejavu Sans', monospace !important;
- font-size:15px !important;
-}
View
12 netnewswire/reclining.nnwstyle/Info.plist
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CreatorHomePage</key>
- <string>http://github.com/holman/dotfiles</string>
- <key>CreatorName</key>
- <string>Zach Holman</string>
- <key>Version</key>
- <integer>1</integer>
-</dict>
-</plist>
View
13 netnewswire/reclining.nnwstyle/Readme.markdown
@@ -1,13 +0,0 @@
-# RECLINING: I'm getting used to it
-
-### A tidy little theme for NetNewsWire
-
-<a href="http://cl.ly/24QJ"><img src="http://cl.ly/24QJ/content" width="500" /></a>
-
-### Installation
-
-With you double-clicking on `reclining.nnwstyle`, there will be advantages to each.
-
-### Pow Pow
-
-Love, [@holman](http://twitter.com/holman).
View
69 netnewswire/reclining.nnwstyle/stylesheet.css
@@ -1,69 +0,0 @@
-body{
- margin: 0;
- padding: 0;
- -webkit-font-smoothing: antialiased;
-}
-#header{
- background:
- -webkit-gradient(linear, left top, left bottom, from(#F2F5FF), to(#C5E0E3));
-}
-#header{
- color: #335054;
- text-shadow: 1px 1px 0 #fff;
- font-family: Helvetica, sans-serif;
- padding: 10px 0 10px 30px;
-}
-#header #favicon{
- float: right;
-}
-#header #favicon span{
- visibility: hidden;
-}
-#header #favicon img{
- margin-right: 10px;
- visibility: visible;
- float: right;
- display: block;
- border: 1px solid #fff;
-}
-#header .newsItemSource a{
- font-size: 1.25em;
- color: #335054;
- text-decoration: none;
- padding: 5px 10px 5px 0;
-}
-#header .newsItemSource img{
- display: none;
-}
-#header .newsItemDate{
- display: none;
-}
-#header .newsItemCreator{
- color: #999;
- padding-left: 3px;
- font-size: .9em;
-}
-#blendsplit{
- height: 7px;
- background:
- -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#fff));
- border-top: 1px solid #95A8AB;
- margin-bottom: 15px;
-}
-#content #title{
- padding-bottom: 10px;
-}
-#content #title a{
- color: #333;
- font-size: 2.25em;
- text-decoration: none;
-}
-#content #title .newsItemDate{
- display: none;
-}
-#content #title .newsItemCreator{
- display: none;
-}
-#content{
- padding: .5em 30px;
-}
View
16 netnewswire/reclining.nnwstyle/template.html
@@ -1,16 +0,0 @@
-<div id="main">
- <div id="header">
- [[newsitem_dateline]]
- <div id="favicon">[[newsitem_dateline]]</div>
- </div>
-
- <div id="blendsplit"></div>
-
- <div id="content">
- <div id="title">
- [[newsitem_title]]
- </div>
-
- [[newsitem_description]]
- </div>
-</div>
View
7 ruby/aliases.zsh
@@ -1,7 +1,5 @@
alias r='rvm use 1.8.7'
-alias f='RAILS_ENV=fi'
-
alias sc='script/console'
alias ss='script/server -p `available_rails_port`'
alias sg='script/generate'
@@ -9,4 +7,7 @@ alias sd='script/destroy'
alias migrate='rake db:migrate db:test:clone'
-alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
+alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
+
+alias killnginx="ps aux | grep nginx | awk '{print $2}' | xargs sudo kill -9"
+
View
0  vim/gvimrc.symlink → vim.old/gvimrc.symlink
File renamed without changes
View
0  vim/vim.symlink/.VimballRecord → vim.old/vim.symlink/.VimballRecord
File renamed without changes
View
0  vim/vim.symlink/autoload/rails.vim → vim.old/vim.symlink/autoload/rails.vim
File renamed without changes
View
0  vim/vim.symlink/colors/molokai.vim → vim.old/vim.symlink/colors/molokai.vim
File renamed without changes
View
0  vim/vim.symlink/colors/railscasts.vim → vim.old/vim.symlink/colors/railscasts.vim
File renamed without changes
View
0  vim/vim.symlink/doc/command-t.txt → vim.old/vim.symlink/doc/command-t.txt
File renamed without changes
View
0  vim/vim.symlink/doc/rails.txt → vim.old/vim.symlink/doc/rails.txt
File renamed without changes
View
0  vim/vim.symlink/doc/tags → vim.old/vim.symlink/doc/tags
File renamed without changes
View
0  vim/vim.symlink/filetype.vim → vim.old/vim.symlink/filetype.vim
File renamed without changes
View
0  vim/vim.symlink/ftdetect/markdown.vim → vim.old/vim.symlink/ftdetect/markdown.vim
File renamed without changes
View
0  vim/vim.symlink/plugin/command-t.vim → vim.old/vim.symlink/plugin/command-t.vim
File renamed without changes
View
0  vim/vim.symlink/plugin/gitignore.vim → vim.old/vim.symlink/plugin/gitignore.vim
File renamed without changes
View
0  vim/vim.symlink/plugin/rails.vim → vim.old/vim.symlink/plugin/rails.vim
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/Makefile → vim.old/vim.symlink/ruby/command-t/Makefile
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/controller.rb → .../vim.symlink/ruby/command-t/controller.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/depend → vim.old/vim.symlink/ruby/command-t/depend
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/ext.bundle → ...old/vim.symlink/ruby/command-t/ext.bundle
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/ext.c → vim.old/vim.symlink/ruby/command-t/ext.c
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/ext.h → vim.old/vim.symlink/ruby/command-t/ext.h
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/ext.o → vim.old/vim.symlink/ruby/command-t/ext.o
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/extconf.rb → ...old/vim.symlink/ruby/command-t/extconf.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/finder.rb → vim.old/vim.symlink/ruby/command-t/finder.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/match.c → vim.old/vim.symlink/ruby/command-t/match.c
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/match.h → vim.old/vim.symlink/ruby/command-t/match.h
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/match.o → vim.old/vim.symlink/ruby/command-t/match.o
File renamed without changes
View
0  ...im.symlink/ruby/command-t/match_window.rb → ...im.symlink/ruby/command-t/match_window.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/matcher.c → vim.old/vim.symlink/ruby/command-t/matcher.c
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/matcher.h → vim.old/vim.symlink/ruby/command-t/matcher.h
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/matcher.o → vim.old/vim.symlink/ruby/command-t/matcher.o
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/mkmf.log → vim.old/vim.symlink/ruby/command-t/mkmf.log
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/prompt.rb → vim.old/vim.symlink/ruby/command-t/prompt.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/ruby_compat.h → .../vim.symlink/ruby/command-t/ruby_compat.h
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/scanner.rb → ...old/vim.symlink/ruby/command-t/scanner.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/settings.rb → ...ld/vim.symlink/ruby/command-t/settings.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/stub.rb → vim.old/vim.symlink/ruby/command-t/stub.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/vim.rb → vim.old/vim.symlink/ruby/command-t/vim.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/vim/screen.rb → .../vim.symlink/ruby/command-t/vim/screen.rb
File renamed without changes
View
0  vim/vim.symlink/ruby/command-t/vim/window.rb → .../vim.symlink/ruby/command-t/vim/window.rb
File renamed without changes
View
0  vim/vim.symlink/snippets/markdown.snippets → ...ld/vim.symlink/snippets/markdown.snippets
File renamed without changes
View
0  vim/vim.symlink/syntax/markdown.vim → vim.old/vim.symlink/syntax/markdown.vim
File renamed without changes
View
0  vim/vim.symlink/syntax/mustache.vim → vim.old/vim.symlink/syntax/mustache.vim
File renamed without changes
View
0  vim/vimrc.symlink → vim.old/vimrc.symlink
File renamed without changes
View
3  zsh/aliases.zsh
@@ -1,4 +1,5 @@
alias dotmate='mate $ZSH'
alias dotcd='cd $ZSH'
-alias reload!='. ~/.zshrc'
+alias reload!='. ~/.zshrc'
+alias v=mvim
View
4 zsh/completion.zsh
@@ -3,3 +3,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
# pasting with tabs doesn't perform completion
zstyle ':completion:*' insert-tab pending
+
+# tab completion colors
+zstyle ':completion:*' list-colors ''
+#zstyle ':completion:*' list-colors ${(s.:.)LSCOLORS}
View
22 zsh/prompt.zsh
@@ -22,13 +22,13 @@ git_dirty() {
}
git_prompt_info () {
- ref=$(git symbolic-ref HEAD 2>/dev/null) || return
+ ref=$(git symbolic-ref HEAD 2>/dev/null) || return
# echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
- echo "${ref#refs/heads/}"
+ echo "${ref#refs/heads/}"
}
project_name () {
- name=$(pwd | awk -F'Development/' '{print $2}' | awk -F/ '{print $1}')
+ name=$(pwd | awk -F'GitHub/' '{print $2}' | awk -F/ '{print $1}')
echo $name
}
@@ -44,9 +44,9 @@ unpushed () {
need_push () {
if [[ $(unpushed) == "" ]]
then
- echo " "
+ echo ""
else
- echo "with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
+ echo " with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
fi
}
@@ -63,11 +63,9 @@ directory_name(){
echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
}
-export PROMPT=$'\n$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty) $(need_push)\n'
-set_prompt () {
- export RPROMPT=""
-}
+date_time='%D{%m.%d.%Y} %@'
+
+export PROMPT=$'$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty)$(need_push)\n%% '
+#export RPROMPT=$'$date_time'
+export RPROMPT=""
-precmd() {
- set_prompt
-}
Please sign in to comment.
Something went wrong with that request. Please try again.