Skip to content
Browse files

updateses

  • Loading branch information...
1 parent 901fdd2 commit a69733cfb15813396c49948e7385785a97087f15 pmorgan committed Jul 20, 2014
Showing with 369 additions and 76 deletions.
  1. +26 −14 irb/pryrc
  2. +1 −0 vim/bundle/HTML-AutoCloseTag
  3. +0 −1 vim/bundle/astashov-vim-ruby-debugger
  4. +0 −1 vim/bundle/briandoll-change-inside-surroundings
  5. +0 −1 vim/bundle/chrisbra-color_highlight
  6. +0 −1 vim/bundle/chrisbra-narrowrgn
  7. +0 −1 vim/bundle/chrismetcalf-vim-yankring
  8. +1 −0 vim/bundle/csapprox
  9. +1 −0 vim/bundle/ctrlp.vim
  10. +0 −1 vim/bundle/dimasg-vim-mark
  11. +0 −1 vim/bundle/drewolson-ruby_focused_unit_test_vim
  12. +0 −1 vim/bundle/ecomba-vim-ruby-refactoring
  13. +0 −1 vim/bundle/evervim
  14. +1 −0 vim/bundle/gist-vim
  15. +0 −1 vim/bundle/gregsexton-gitv
  16. +0 −1 vim/bundle/honza-snipmate-snippets
  17. +0 −1 vim/bundle/hsitz-VimOrganizer
  18. +0 −1 vim/bundle/jistr-vim-nerdtree-tabs
  19. +0 −1 vim/bundle/kana-vim-arpeggio
  20. +0 −1 vim/bundle/kien-ctrlp
  21. +0 −1 vim/bundle/kshenoy-vim-signature
  22. +0 −1 vim/bundle/majutsushi-tagbar
  23. +1 −0 vim/bundle/mark-2.8.0
  24. 0 vim/bundle/{vim-scripts-matchit.zip → matchit.zip}
  25. +0 −1 vim/bundle/mattn-gist-vim
  26. +0 −1 vim/bundle/nathanaelkane-vim-indent-guides
  27. +1 −0 vim/bundle/neocomplcache
  28. +1 −0 vim/bundle/neosnippet
  29. +1 −0 vim/bundle/nerdcommenter
  30. +1 −0 vim/bundle/nerdtree
  31. +1 −0 vim/bundle/numbers.vim
  32. +0 −1 vim/bundle/powerline
  33. +1 −0 vim/bundle/python-mode
  34. +1 −0 vim/bundle/python.vim
  35. +1 −0 vim/bundle/python_match.vim
  36. +1 −0 vim/bundle/pythoncomplete
  37. +1 −0 vim/bundle/restore_view.vim
  38. +0 −1 vim/bundle/scrooloose-nerdtree
  39. +0 −1 vim/bundle/scrooloose-syntastic
  40. +1 −0 vim/bundle/sessionman.vim
  41. +0 −1 vim/bundle/sjl-gundo
  42. +0 −1 vim/bundle/skwp-greplace
  43. +0 −1 vim/bundle/skwp-vim-colors-solarized
  44. +0 −1 vim/bundle/skwp-vim-conque
  45. +0 −1 vim/bundle/skwp-vim-html-escape
  46. +0 −1 vim/bundle/skwp-vim-indexed-search
  47. +0 −1 vim/bundle/skwp-vim-powerline
  48. +0 −1 vim/bundle/skwp-vim-ruby-conque
  49. +1 −0 vim/bundle/syntastic
  50. +1 −0 vim/bundle/tabular
  51. +1 −0 vim/bundle/tagbar
  52. +1 −0 vim/bundle/tlib_vim
  53. +0 −1 vim/bundle/tomtom-tcomment_vim
  54. +0 −1 vim/bundle/tomtom-tlib_vim
  55. +0 −1 vim/bundle/tpope-vim-bundler
  56. +0 −1 vim/bundle/tpope-vim-endwise
  57. +0 −1 vim/bundle/tpope-vim-fugitive
  58. +0 −1 vim/bundle/tpope-vim-git
  59. +0 −1 vim/bundle/tpope-vim-pathogen
  60. +0 −1 vim/bundle/tpope-vim-repeat
  61. +0 −1 vim/bundle/tpope-vim-surround
  62. +0 −1 vim/bundle/tpope-vim-unimpaired
  63. +1 −0 vim/bundle/undotree
  64. +1 −0 vim/bundle/vim-abolish
  65. +1 −0 vim/bundle/vim-addon-mw-utils
  66. +1 −0 vim/bundle/vim-airline
  67. +1 −0 vim/bundle/vim-autoclose
  68. +1 −0 vim/bundle/vim-coffee-script
  69. +1 −0 vim/bundle/vim-colors
  70. +1 −0 vim/bundle/vim-colors-solarized
  71. +1 −0 vim/bundle/vim-colorschemes
  72. +1 −0 vim/bundle/vim-cucumber
  73. +1 −0 vim/bundle/vim-cucumber-align-pipes
  74. +1 −0 vim/bundle/vim-easymotion
  75. +1 −0 vim/bundle/vim-fugitive
  76. +1 −0 vim/bundle/vim-gitgutter
  77. +1 −0 vim/bundle/vim-gocode
  78. +1 −0 vim/bundle/vim-golang
  79. +1 −0 vim/bundle/vim-indent-guides
  80. +1 −0 vim/bundle/vim-javascript
  81. +1 −0 vim/bundle/vim-json
  82. +1 −0 vim/bundle/vim-jst
  83. +1 −0 vim/bundle/vim-less
  84. +1 −0 vim/bundle/vim-markdown
  85. +1 −0 vim/bundle/vim-multiple-cursors
  86. +1 −0 vim/bundle/vim-nerdtree-tabs
  87. +1 −0 vim/bundle/vim-preview
  88. +0 −1 vim/bundle/vim-ruby-vim-ruby
  89. +0 −1 vim/bundle/vim-scripts-AnsiEsc
  90. +0 −1 vim/bundle/vim-scripts-AutoTag
  91. +0 −1 vim/bundle/vim-scripts-IndexedSearch
  92. +0 −1 vim/bundle/vim-scripts-Specky
  93. +0 −1 vim/bundle/vim-scripts-Vim-R-plugin
  94. +0 −1 vim/bundle/vim-scripts-ZoomWin
  95. +0 −1 vim/bundle/vim-scripts-argtextobj
  96. +0 −1 vim/bundle/vim-scripts-camelcasemotion
  97. +0 −1 vim/bundle/vim-scripts-lastpos
  98. +0 −1 vim/bundle/vim-scripts-lustyjuggler
  99. +0 −1 vim/bundle/vim-scripts-sudo
  100. +0 −1 vim/bundle/vim-seek
  101. +1 −0 vim/bundle/vim-snippets
  102. +1 −0 vim/bundle/vim-surround
  103. +0 −1 vim/bundle/vimscripts-utl
  104. +1 −0 vim/bundle/vundle
  105. +1 −0 vim/bundle/webapi-vim
  106. 0 vim/{plugin → }/highlight.vim
  107. +1 −0 vim/plugin/settings/abbr.vim
  108. +7 −1 vimrc
  109. +1 −1 zsh/0_path.zsh
  110. +205 −0 zsh/6V
  111. +11 −0 zsh/aliases.zsh
  112. +60 −5 zsh/functions.zsh
  113. +1 −1 zsh/key-bindings.zsh
  114. +3 −0 zsh/prompt
  115. +1 −0 zsh/zsh-aliases.zsh
  116. +4 −0 zsh/zshrc
View
40 irb/pryrc
@@ -34,13 +34,22 @@ def reqs
require 'mechanize'
end
+def temprbkb
+ $: << "~/git/rbkb/lib"
+ load "rbkb.rb"
+end
+
+def pl(blah = _)
+ puts blah
+end
+
# === EDITOR ===
Pry.editor = 'vi'
# == Pry-Nav - Using pry as a debugger ==
-Pry.commands.alias_command 'c', 'continue' rescue nil
-Pry.commands.alias_command 's', 'step' rescue nil
-Pry.commands.alias_command 'n', 'next' rescue nil
+#Pry.commands.alias_command 'c', 'continue' rescue nil
+#Pry.commands.alias_command 's', 'step' rescue nil
+#Pry.commands.alias_command 'n', 'next' rescue nil
# === CUSTOM PROMPT ===
# This prompt shows the ruby version (useful for RVM)
@@ -305,16 +314,16 @@ TERM_TOKEN_COLORS = {
:head => '45'
}
-module CodeRay
- module Encoders
- class Terminal < Encoder
- # override old colors
- TERM_TOKEN_COLORS.each_pair do |key, value|
- TOKEN_COLORS[key] = value
- end
- end
- end
-end
+#module CodeRay
+# module Encoders
+# class Terminal < Encoder
+# # override old colors
+# TERM_TOKEN_COLORS.each_pair do |key, value|
+# TOKEN_COLORS[key] = value
+# end
+# end
+# end
+#end
def pattern
blah = %x[/usr/local/newmsf/trunk/tools/pattern_create.rb 8096]
@@ -350,7 +359,6 @@ def newweb(str = nil, enable_proxy = nil)
end
$W = Mechanize.new
- $W.user
if enable_proxy
$W.set_proxy("localhost",8080)
end
@@ -379,6 +387,10 @@ def dif_buf(a,b)
end
+def quickepoch
+ Time.now.to_f.to_s.gsub(/\./,"")[(0..13)]
+end
+
def pry_reload
load "~/.pryrc"
end
1 vim/bundle/HTML-AutoCloseTag
@@ -0,0 +1 @@
+Subproject commit c2f6f59cf5c08dd487ef361f93ba09317a840e25
1 vim/bundle/astashov-vim-ruby-debugger
@@ -1 +0,0 @@
-Subproject commit 631a9ebbb13a75ed6e8e72b52d197301452777d8
1 vim/bundle/briandoll-change-inside-surroundings
@@ -1 +0,0 @@
-Subproject commit 6769ec701f03e8404f8aad9f56430e9976a3f995
1 vim/bundle/chrisbra-color_highlight
@@ -1 +0,0 @@
-Subproject commit 9f962d0e02ee38bccae17e8fa7ccbf2d4aeab30f
1 vim/bundle/chrisbra-narrowrgn
@@ -1 +0,0 @@
-Subproject commit 698e0c333c1edae8a1d83b04e5674efa7cac3137
1 vim/bundle/chrismetcalf-vim-yankring
@@ -1 +0,0 @@
-Subproject commit 41d996ceed5b907f07b512f03ed835489635140e
1 vim/bundle/csapprox
@@ -0,0 +1 @@
+Subproject commit 7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd
1 vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
1 vim/bundle/dimasg-vim-mark
@@ -1 +0,0 @@
-Subproject commit d430c3cdedeaf84ebe63b1cd96af4eccea849e9d
1 vim/bundle/drewolson-ruby_focused_unit_test_vim
@@ -1 +0,0 @@
-Subproject commit 980b2ebad5d994ce44a7a765e734e1a3ffde3004
1 vim/bundle/ecomba-vim-ruby-refactoring
@@ -1 +0,0 @@
-Subproject commit 6447a4debc3263a0fa99feeab5548edf27ecf045
1 vim/bundle/evervim
@@ -1 +0,0 @@
-Subproject commit 0d95ecc5f9cb83c9d11375ba89acaafdcb5cda64
1 vim/bundle/gist-vim
@@ -0,0 +1 @@
+Subproject commit 1aed2e01b0e124295b705ae5b6de8ea3c82a2a2b
1 vim/bundle/gregsexton-gitv
@@ -1 +0,0 @@
-Subproject commit a50dc10b6dc6b8bae43095fddc4826866585d7ea
1 vim/bundle/honza-snipmate-snippets
@@ -1 +0,0 @@
-Subproject commit ce0037f583b10e898a983dcbe4642acbbef24963
1 vim/bundle/hsitz-VimOrganizer
@@ -1 +0,0 @@
-Subproject commit 0a1e0ee600927d0cb9bbde3a27c6bdb8aad81d05
1 vim/bundle/jistr-vim-nerdtree-tabs
@@ -1 +0,0 @@
-Subproject commit 1b2871987bdf97e066554794c45639d5df2a3d93
1 vim/bundle/kana-vim-arpeggio
@@ -1 +0,0 @@
-Subproject commit c0a4929c940e4fb32f8aaa70440da113c7064467
1 vim/bundle/kien-ctrlp
@@ -1 +0,0 @@
-Subproject commit 96bd4b37f4459f30cc6963142aff6697e42bf69e
1 vim/bundle/kshenoy-vim-signature
@@ -1 +0,0 @@
-Subproject commit 16436bdd80845b22b8cd67e235c18cee7993bdeb
1 vim/bundle/majutsushi-tagbar
@@ -1 +0,0 @@
-Subproject commit ee1c4e137e33c64c787df68efcca7e9af4c5f790
1 vim/bundle/mark-2.8.0
@@ -0,0 +1 @@
+Subproject commit cfd5f72ceb2fe34f4cb8952abe1027897e1e9540
View
0 vim/bundle/vim-scripts-matchit.zip → vim/bundle/matchit.zip
File renamed without changes.
1 vim/bundle/mattn-gist-vim
@@ -1 +0,0 @@
-Subproject commit 5954a994fba2ce75c92d9d211487534c2a525824
1 vim/bundle/nathanaelkane-vim-indent-guides
@@ -1 +0,0 @@
-Subproject commit 66306748d8960945342d04d41fe6131a00bbf7cb
1 vim/bundle/neocomplcache
@@ -0,0 +1 @@
+Subproject commit a54079968b268e4fe8843290b23c410c1af619c5
1 vim/bundle/neosnippet
@@ -0,0 +1 @@
+Subproject commit b7ec09cf4dbf8aed67fbb111a2e60a9dc433d48e
1 vim/bundle/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4
1 vim/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d
1 vim/bundle/numbers.vim
@@ -0,0 +1 @@
+Subproject commit d46a31996482d41b754fc5010f545ef0c3d4c3d6
1 vim/bundle/powerline
@@ -1 +0,0 @@
-Subproject commit 52a52c8eb6a88dff0c845a3cd45880112455c444
1 vim/bundle/python-mode
@@ -0,0 +1 @@
+Subproject commit a9afe07f2ad1be958a302d6ca764e8ff00d0954f
1 vim/bundle/python.vim
@@ -0,0 +1 @@
+Subproject commit 0877af4dffe6d86439f8069b510129527ce38b27
1 vim/bundle/python_match.vim
@@ -0,0 +1 @@
+Subproject commit 20bb437d265544e7b8022b04cf2d6553d5f233ed
1 vim/bundle/pythoncomplete
@@ -0,0 +1 @@
+Subproject commit cf74ca3f94258eb9ebe1bc8345532c3eb443923d
1 vim/bundle/restore_view.vim
@@ -0,0 +1 @@
+Subproject commit 82927448641c9dec2044666b475b2074dbc1e94b
1 vim/bundle/scrooloose-nerdtree
@@ -1 +0,0 @@
-Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d
1 vim/bundle/scrooloose-syntastic
@@ -1 +0,0 @@
-Subproject commit ec9bf2e983463445b15e1df20c2d774e9bf7361b
1 vim/bundle/sessionman.vim
@@ -0,0 +1 @@
+Subproject commit 8e9fcc41152e8456048bad1a44918eb84821db45
1 vim/bundle/sjl-gundo
@@ -1 +0,0 @@
-Subproject commit 4c376a8061fa335228da420937ce385b847dd56a
1 vim/bundle/skwp-greplace
@@ -1 +0,0 @@
-Subproject commit e7fb26ec95ecf97bfe4b99683b95cb37c654460a
1 vim/bundle/skwp-vim-colors-solarized
@@ -1 +0,0 @@
-Subproject commit dda70ab66551c7d454b7b6831cde68ba1a383069
1 vim/bundle/skwp-vim-conque
@@ -1 +0,0 @@
-Subproject commit 00890b58ca8821c9eda2f25a993a8f09a1ae0465
1 vim/bundle/skwp-vim-html-escape
@@ -1 +0,0 @@
-Subproject commit 0d673be2b8420f2e700022df002fb851e7a55699
1 vim/bundle/skwp-vim-indexed-search
@@ -1 +0,0 @@
-Subproject commit 3c2fe16dd2ed0cdc5a9d58e75879e4c2566c41ab
1 vim/bundle/skwp-vim-powerline
@@ -1 +0,0 @@
-Subproject commit fa8770161f9dafe40ae08d4a8485f2a2452ff200
1 vim/bundle/skwp-vim-ruby-conque
@@ -1 +0,0 @@
-Subproject commit 36574785ccad4cd887c4e20b187bd23de966995c
1 vim/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit 3eb51f1e26bbc7e1682a68516ebc8acb74011717
1 vim/bundle/tabular
@@ -0,0 +1 @@
+Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb
1 vim/bundle/tagbar
@@ -0,0 +1 @@
+Subproject commit 3c37ddcc140ed4f5aa1b85f0dc476b410d1bacb3
1 vim/bundle/tlib_vim
@@ -0,0 +1 @@
+Subproject commit e585a338fd755d44f377224e5982db158c836934
1 vim/bundle/tomtom-tcomment_vim
@@ -1 +0,0 @@
-Subproject commit ec0ae34e981627e05f6441c77b4e0aa3e8cc99ff
1 vim/bundle/tomtom-tlib_vim
@@ -1 +0,0 @@
-Subproject commit 4d2b437055c56cabc65a19044659bc01ff86870b
1 vim/bundle/tpope-vim-bundler
@@ -1 +0,0 @@
-Subproject commit f2abc73969de37ef68e1cd47a4e3b2507c79495a
1 vim/bundle/tpope-vim-endwise
@@ -1 +0,0 @@
-Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
1 vim/bundle/tpope-vim-fugitive
@@ -1 +0,0 @@
-Subproject commit 1eb4a9f7e32d0da674fbd58c6993f2d27bcecee3
1 vim/bundle/tpope-vim-git
@@ -1 +0,0 @@
-Subproject commit 3d31cb0cc9470d57adf36cc3224814ccb0293cc9
1 vim/bundle/tpope-vim-pathogen
@@ -1 +0,0 @@
-Subproject commit 09f2c3b7d3666124157de759a68afe47d0bb8d25
1 vim/bundle/tpope-vim-repeat
@@ -1 +0,0 @@
-Subproject commit d75a544b786710705f0db0d8d8fd66ca4a5a7239
1 vim/bundle/tpope-vim-surround
@@ -1 +0,0 @@
-Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
1 vim/bundle/tpope-vim-unimpaired
@@ -1 +0,0 @@
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
1 vim/bundle/undotree
@@ -0,0 +1 @@
+Subproject commit f99c22e08e7f4787bf4ba6937f5df942a285efec
1 vim/bundle/vim-abolish
@@ -0,0 +1 @@
+Subproject commit d64ce06650cf9b098b5a01c0db53864965d9310b
1 vim/bundle/vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
1 vim/bundle/vim-airline
@@ -0,0 +1 @@
+Subproject commit 0860d2f525f488c999d4f0718827e87c705c835a
1 vim/bundle/vim-autoclose
@@ -0,0 +1 @@
+Subproject commit c098b4f45da6232e66c14898ff6b197f360a29cc
1 vim/bundle/vim-coffee-script
@@ -0,0 +1 @@
+Subproject commit 7130a14289eb338ba2a670cbe3e0898928ea574f
1 vim/bundle/vim-colors
@@ -0,0 +1 @@
+Subproject commit 9522f2f17cfdf249eac0a0c5b25d65040d0909ce
1 vim/bundle/vim-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
1 vim/bundle/vim-colorschemes
@@ -0,0 +1 @@
+Subproject commit f134dd5726732a74e05edacc9a795006b984b82f
1 vim/bundle/vim-cucumber
@@ -0,0 +1 @@
+Subproject commit 9e686ad36da43eae7462612fb8123bd47ea16171
1 vim/bundle/vim-cucumber-align-pipes
@@ -0,0 +1 @@
+Subproject commit 49c59fe88302b95dc96637e38f964cae5d7c89bb
1 vim/bundle/vim-easymotion
@@ -0,0 +1 @@
+Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
1 vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9
1 vim/bundle/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit 878c3422c9ad9edc7b907948515b3118d91a67d1
1 vim/bundle/vim-gocode
@@ -0,0 +1 @@
+Subproject commit f9d0de3f90970711b5fe76e736de90a866123fcb
1 vim/bundle/vim-golang
@@ -0,0 +1 @@
+Subproject commit e4f4d6ded00b498e517939f9b01c828ec44de110
1 vim/bundle/vim-indent-guides
@@ -0,0 +1 @@
+Subproject commit eec1b629dc4cfa3986d20f21d4b4489732cd3f5a
1 vim/bundle/vim-javascript
@@ -0,0 +1 @@
+Subproject commit 932b675412e28149d00ba3e0f0669c5a73d181b3
1 vim/bundle/vim-json
@@ -0,0 +1 @@
+Subproject commit 752e607ba78550de6ddace4f009ced4c5f7ae395
1 vim/bundle/vim-jst
@@ -0,0 +1 @@
+Subproject commit a0c3283be10c2bb6ac2247f09f16e7b7b034d902
1 vim/bundle/vim-less
@@ -0,0 +1 @@
+Subproject commit 020f0747eaa3a8220b7dbbc529e7f35523f364a0
1 vim/bundle/vim-markdown
@@ -0,0 +1 @@
+Subproject commit fccf76f68fa819629e9dac50a20f3369983e2a38
1 vim/bundle/vim-multiple-cursors
@@ -0,0 +1 @@
+Subproject commit 35028be1f71953da9f2c28509bf6c5ebd1d31c28
1 vim/bundle/vim-nerdtree-tabs
@@ -0,0 +1 @@
+Subproject commit e222113e6eeaba1c13d0201b349468bdfe5398f1
1 vim/bundle/vim-preview
@@ -0,0 +1 @@
+Subproject commit ac138697f3e1bf8747397270c1940d9103d53302
1 vim/bundle/vim-ruby-vim-ruby
@@ -1 +0,0 @@
-Subproject commit e7e6b4e8d92938b461f20cb94bdca7f79aed2447
1 vim/bundle/vim-scripts-AnsiEsc
@@ -1 +0,0 @@
-Subproject commit d2bb7878622e4c16203acf1c92a0f4bc7ac58003
1 vim/bundle/vim-scripts-AutoTag
@@ -1 +0,0 @@
-Subproject commit ef0a37e8da77cd6c40d97a8e7a60c33ddc39d6ba
1 vim/bundle/vim-scripts-IndexedSearch
@@ -1 +0,0 @@
-Subproject commit 500a64a50dda26a4553b296c52eb6610bef55ae6
1 vim/bundle/vim-scripts-Specky
@@ -1 +0,0 @@
-Subproject commit b6415ac2ca85238c224e8bb831bd88b4bfeacf91
1 vim/bundle/vim-scripts-Vim-R-plugin
@@ -1 +0,0 @@
-Subproject commit 7b5e259b1d3c54ee33b94f04d7881616857cc593
1 vim/bundle/vim-scripts-ZoomWin
@@ -1 +0,0 @@
-Subproject commit e7ee18e2e7ed60509aa951cd34b57193fa14e5ab
1 vim/bundle/vim-scripts-argtextobj
@@ -1 +0,0 @@
-Subproject commit f3fbe427f7b4ec436416a5816d714dc917dc530b
1 vim/bundle/vim-scripts-camelcasemotion
@@ -1 +0,0 @@
-Subproject commit 8db17bdee3f42bd71839ead2a84b2ee1916e45c2
1 vim/bundle/vim-scripts-lastpos
@@ -1 +0,0 @@
-Subproject commit 21a22ce4a11117cae8a0017c1cd9a9094fe5adf2
1 vim/bundle/vim-scripts-lustyjuggler
@@ -1 +0,0 @@
-Subproject commit 8aea87dab15bb13b418ac89fe8fdfbc768d727fb
1 vim/bundle/vim-scripts-sudo
@@ -1 +0,0 @@
-Subproject commit 060f0250d6f399d1cf9b15eaad3d55b3fbad4b0d
1 vim/bundle/vim-seek
@@ -1 +0,0 @@
-Subproject commit 9b0c523cd4f70624af2cf959a8388fbedc0d31b1
1 vim/bundle/vim-snippets
@@ -0,0 +1 @@
+Subproject commit dec4556898a3287a2e9244835e765b5198121355
1 vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit 9bf527af3ae7338346ca9f0657dc077722d517f7
1 vim/bundle/vimscripts-utl
@@ -1 +0,0 @@
-Subproject commit 67a6506a7a8a3847d00d3af3e2ed9707460d5ce5
1 vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit c3ec8796944a372c6d44496ad6113e7d2e74331e
1 vim/bundle/webapi-vim
@@ -0,0 +1 @@
+Subproject commit 1ebf9b3af362663e4f87b6f9c1648742df2689d2
View
0 vim/plugin/highlight.vim → vim/highlight.vim
File renamed without changes.
View
1 vim/plugin/settings/abbr.vim
@@ -4,3 +4,4 @@ abbr rlb Rails.logger.banner
abbr rld Rails.logger.debug
abbr pry! require 'pry'; binding.pry
+abbr putsd puts "[DEBUG] - " if debug
View
8 vimrc
@@ -39,7 +39,7 @@ syntax on
set incsearch "Find the next match as we type the search
set hlsearch "Hilight searches by default
-set viminfo='100,f1 "Save up to 100 marks, enable capital marks
+set viminfo='100,f1! "Save up to 100 marks, enable capital marks
" ================ Turn Off Swap Files ==============
@@ -107,3 +107,9 @@ set sidescroll=1
for f in split(glob('~/.vim/plugin/settings/*.vim'), '\n')
exe 'source' f
endfor
+
+" Marks
+
+let g:mwAutoLoadMarks = 1
+let g:mwAutoSaveMarks = 1
+
View
2 zsh/0_path.zsh
@@ -1,3 +1,3 @@
# path, the 0 in the filename causes this to load first
-export PATH=/usr/local/bin:/usr/local/sbin:$HOME/bin/rbin:$PATH:$yadr/bin:$yadr/bin/yadr
+export PATH=/usr/local/bin:/usr/local/sbin:$HOME/bin:$HOME/bin/pybin:$HOME/bin/rbin:$PATH:$yadr/bin:$yadr/bin/yadr
View
205 zsh/6V
@@ -0,0 +1,205 @@
+# ruby grep
+function rgrep() {
+ find -L . -type f -name \*.rb -exec grep -n -i -H --color "$1" {} \;
+}
+
+# quick grep
+function qgrep() {
+ find -L . -type f -exec grep -n -i -H --color "$1" {} \;
+}
+
+function efind() {
+ find -L . -type f -iname "*.$1"
+}
+
+function efind0() {
+ find -L . -type f -iname "*.$1" -print0
+}
+
+function efind1() {
+ find -L . -type f -iname "*.$1" -maxdepth 1
+}
+
+function efind10() {
+ find -L . -type f -iname "*.$1" -maxdepth 1 -print0
+}
+
+function qfind() {
+ find -L . -type f -iname "*$1*"
+}
+
+function dfind() {
+ find -L . -type d -iname "*$1*"
+}
+
+function qgfind() {
+ find -L . -type f -iname "*$1*" -exec grep -n -i -H --color "$2" {} \;
+}
+
+function qfind0() {
+ find -L . -type f -iname "*$1*" -print0
+}
+
+function qfind1() {
+ find -L . -type f -iname "*$1*" -maxdepth 1
+}
+
+function qfind10() {
+ find -L . -type f -iname "*$1*" -maxdepth 1 -print0
+}
+
+function mfind() {
+ mdfind -name "$1"
+}
+
+function mgrep() {
+ mdfind "$1"
+}
+
+function mfind1() {
+ mdfind -onlyin . -name "$1"
+}
+
+function mgrep1() {
+ mdfind -onlyin . "$1"
+}
+
+function emfind() {
+ mdfind -name "\.$1"
+}
+
+function gs() {
+ screencapture -i "$1.png"
+}
+
+function gsc() {
+ if [ ! -d "$CUR/screenshots" ]; then
+ mkdir -p "$CUR/screenshots"
+ fi
+ print $CUR/screenshots/$I.png
+ screencapture -i "$CUR/screenshots/$1.png"
+}
+
+function routeadd() {
+ route add -host 209.160.65.6 $1
+ route add -host imap.gmail.com $1
+ route add -host talk.google.com $1
+ route add -host chat.facebook.com $1
+ route add -host twitter.com $1
+ route add -host 66.146.193.138 $1
+}
+
+#function routeclean() {
+# route delete 209.160.65.6
+# route delete imap.gmail.com
+# route delete talk.google.com
+# route delete chat.facebook.com
+# route delete twitter.com
+#}
+
+function routeclean() {
+ netstat -rn -f inet | grep -i $1 | cut -d' ' -f 1 | while read foo; do route delete $foo; done;
+}
+
+function routetest() {
+ echo "==daedalus=="
+ route get 209.160.65.6 | grep -i gateway
+ echo "==imap.gmail.com=="
+ route get imap.gmail.com | grep -i gateway
+ echo "==talk.google.com=="
+ route get talk.google.com | grep -i gateway
+ echo "==chat.facebook.com=="
+ route get chat.facebook.com | grep -i gateway
+ echo "==itunes.apple.com=="
+ route get itunes.apple.com | grep -i gateway
+ echo "==ax.itunes.apple.com=="
+ route get ax.itunes.apple.com | grep -i gateway
+ echo "==albert.apple.com=="
+ route get albert.apple.com | grep -i gateway
+ echo "==twitter.com=="
+ route get twitter.com | grep -i gateway
+}
+
+function rgem() {
+ rvm jruby-1.5.2,1.8.7,1.9.2 gem install $1
+}
+
+#function rgem-shire() {
+# rvm jruby-1.5.2,1.8.7,1.9.2 gem install -p http://proxycacheF.hewitt.com:3128 $1
+#}
+
+function whog() {
+ whois -h whois.geektools.com "$1"
+}
+
+function whoa() {
+ whois -h whois.arin.net "$1"
+}
+
+function stelnet() {
+ openssl s_client -connect $1:$2
+}
+
+function numbers() {
+ open -a "Numbers" $1
+}
+
+# quick port scan - ip port
+function qp() {
+ nmap --min-rate=2000 -p$2 $1 -oG temp && cat temp | ruby ~/bin/gnmap-ng.rb
+}
+
+function rbjsonpp() {
+ pbpaste | ruby -e "require 'rubygems';require 'JSON'; jj JSON.parse(STDIN.gets)"
+}
+
+function rbxmlpp() {
+ pbpaste | ruby -e "require 'rubygems'; require 'rexml/document'; doc = REXML::Document.new(STDIN.gets); doc.write(STDOUT,1)"
+}
+
+function jsb() {
+ pbpaste | js-beautify -i
+}
+
+function addpaths {
+ for i in $*; do
+ i=${~i}
+ if [ -d "$i" ]; then
+ notinpath $i && path+=$i
+ fi
+ done
+}
+
+function delpaths {
+ for i in $*; do
+ i=${~i}
+ PATH="$(echo "$PATH" | tr ':' '\n' | grep -v "$i" | tr '\n' ':')"
+ done
+}
+
+function openff {
+ open -a "Firefox" $*
+}
+
+function mdir {
+ mkdir -p $1
+ cd $1
+}
+
+function ccal {
+ cal=`cal`; today=`date "+%e"`; echo -en "${cal/${today}/\033[1;32m${today}\033[0m}"
+}
+
+function test_web {
+ for i in $*; do
+ curl -sL -w "%{http_code} %{url_effective}\\n" "$i" -o /dev/null
+ done
+}
+
+function qssh {
+ sshpass -p '( sh Administrator@$1
+}
+
+function q4ssh {
+ sshpass -p '' ssh Administrator@$1
+}
View
11 zsh/aliases.zsh
@@ -50,6 +50,9 @@ alias sr='source $yadr/zsh/shellvars.zsh'
alias fe='vi $yadr/zsh/functions.zsh'
alias fr='source $yadr/zsh/functions.zsh'
+# ssh config edit
+alias sshe='vi ~/.ssh/config'
+
# Git Aliases
alias gs='git status'
alias gstsh='git stash'
@@ -182,3 +185,11 @@ alias gsd='/usr/local/git/get-shit-done/get-shit-done'
alias work='sudo /usr/local/git/get-shit-done/get-shit-done.py work'
alias play='sudo /usr/local/git/get-shit-done/get-shit-done.py play'
+alias rbjspp='pbpaste | js-beautify -i | pbcopy'
+
+
+alias vinew='vi *(.om[1])'
+alias vissh='vi ~/.ssh/config'
+
+alias pz='prompt zefram'
+alias gn='python ~/git/geeknote/geeknote/geeknote.py'
View
65 zsh/functions.zsh
@@ -28,12 +28,12 @@ function qfind() {
find -L . -type f -iname "*$1*"
}
-function qgfind() {
- find -L . -type f -iname "*$1*" -exec grep -n -i -H --color "$2" {} \;
+function dfind() {
+ find -L . -type d -iname "*$1*"
}
-function qpdffail() {
-find -L . -type f -iname "*.pdf" | grep -i $1 | xargs -I {} pdfgrep -C line -H "\ FAILED(:|\ )" {}
+function qgfind() {
+ find -L . -type f -iname "*$1*" -exec grep -n -i -H --color "$2" {} \;
}
function qfind0() {
@@ -52,10 +52,22 @@ function mfind() {
mdfind -name "$1"
}
+function mgrep() {
+ mdfind "$1"
+}
+
function mfind1() {
mdfind -onlyin . -name "$1"
}
+function mgrep1() {
+ mdfind -onlyin . "$1"
+}
+
+function emfind() {
+ mdfind -name "\.$1"
+}
+
function gs() {
screencapture -i "$1.png"
}
@@ -134,7 +146,7 @@ function numbers() {
# quick port scan - ip port
function qp() {
- sudo nmap -sS -T5 -p$2 $1
+ nmap --min-rate=2000 -p$2 $1 -oG temp && cat temp | ruby ~/bin/gnmap-ng.rb
}
function rbjsonpp() {
@@ -178,3 +190,46 @@ function ccal {
cal=`cal`; today=`date "+%e"`; echo -en "${cal/${today}/\033[1;32m${today}\033[0m}"
}
+function test_web {
+ for i in $*; do
+ curl -sL -w "%{http_code} %{url_effective}\\n" "$i" -o /dev/null
+ done
+}
+
+function qssh {
+ echo $1
+ sshpass -p "r(EX!cQW6V" ssh -oStrictHostKeyChecking=no Administrator@$1
+}
+
+function qscp {
+ sshpass -p "r(EX!cQW6V" scp -oStrictHostKeyChecking=no $2 Administrator@$1:
+}
+
+function qwssh {
+ echo $1
+ sshpass -p "vH5zse9oE=" ssh -oStrictHostKeyChecking=no Administrator@$1
+}
+
+function autoicarus {
+ autossh -M 20000 icarus
+}
+
+function rdp {
+ open rdp://Administrator:"r(EX!cQW6V"@$1
+}
+
+function daverdp {
+ open rdp://Administrator:"BeautyEssex7680"@$1
+}
+
+function zoom {
+ open "/Users/pmorgan/Library/Application Support/zoom.us/zoom.us.app"
+}
+
+function tmuxV {
+ tmux -L vimpry new-session -s vimpry
+}
+
+function tmuxN {
+ tmux new-session -s $1
+}
View
2 zsh/key-bindings.zsh
@@ -5,7 +5,7 @@
bindkey -v # Use vi key bindings
bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls
+bindkey -s '\el' 'ls -lhtr\n' # [Esc-l] - run command: ls
bindkey -s '\e.' '..\n' # [Esc-.] - run command: .. (up directory)
bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
bindkey '^[[5~' up-line-or-history # [PageUp] - Up a line of history
View
3 zsh/prompt
@@ -0,0 +1,3 @@
+autoload -U promptinit
+promptinit
+prompt adam1
View
1 zsh/zsh-aliases.zsh
@@ -13,6 +13,7 @@ alias -g PG='|pcregrep -i'
alias -g PGV='|pcregrep -i -v'
alias -g V='|grep -vi'
alias -g T='|tail'
+alias -g M='|mvim -'
alias -g 'TL'='|tr ''A-Z'' ''a-z'''
alias -g 'TU'='|tr ''a-z'' ''A-Z'''
alias -g 'PGIP'='| pcregrep -o "\d+\.\d+\.\d+\.\d+"'
View
4 zsh/zshrc
@@ -8,6 +8,9 @@
# Don't change. The following determines where YADR is installed.
+autoload -U promptinit
+promptinit
+prompt adam1
yadr=`find -L ~ -type file -maxdepth 2 -name .yadr | head | sed 's:\.yadr\/::'`
#yadr="/Users/pmorgan/.dotfiles"
@@ -54,3 +57,4 @@ if [[ -a ~/.secrets ]] then
fi
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+source /Users/pmorgan/.iterm2_shell_integration.zsh

0 comments on commit a69733c

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