Permalink
Browse files

Add inthe updates

  • Loading branch information...
1 parent d90ac61 commit 2f20bb6868fc0f012f6e4e98d13cb27eac96d678 Jeffry Ghazally committed Feb 18, 2013
Showing with 29 additions and 14 deletions.
  1. +0 −9 .gitmodules
  2. +1 −1 oh-my-zsh
  3. +21 −0 vimrc
  4. +7 −4 zshrc
View
@@ -46,21 +46,12 @@
[submodule "vim/bundle/vim-eunuch"]
path = vim/bundle/vim-eunuch
url = git://github.com/tpope/vim-eunuch.git
-[submodule "vim/bundle/nerdtree_plugin"]
- path = vim/bundle/nerdtree_plugin
- url = http://github.com/scrooloose/nerdtree.git
[submodule "vim/bundle/snipmate"]
path = vim/bundle/snipmate
url = http://github.com/jghazally/snipmate.vim.git
-[submodule "vim/bundle/taglist"]
- path = vim/bundle/taglist
- url = http://github.com/vim-scripts/taglist.vim.git
[submodule "vim/bundle/nerdtree_plugin"]
path = vim/bundle/nerdtree_plugin
url = http://github.com/scrooloose/nerdtree.git
-[submodule "vim/bundle/snipmate"]
- path = vim/bundle/snipmate
- url = http://github.com/jghazally/snipmate.vim.git
[submodule "vim/bundle/taglist"]
path = vim/bundle/taglist
url = http://github.com/vim-scripts/taglist.vim.git
View
@@ -140,3 +140,24 @@ nmap <F4> :TlistToggle<cr>
let Tlist_Ctags_Cmd='/usr/local/bin/ctags'
" map F3 key to NERDTreeToggle
nmap <F3> :NERDTreeToggle<cr>
+
+:nmap <c-s> :w<CR>
+:imap <c-s> <ESC>:w<CR>a
+:imap <c-s> <ESC><c-s>
+" A more sensible undofile structure, taken from Tim Pope's
+" sensible.vim
+let s:dir = has('win32') ? '~/Application Data/Vim' : has('mac') ? '~/Library/Vim' : '~/.local/share/vim'
+if isdirectory(expand(s:dir))
+ if &directory =~# '^\.,'
+ let &directory = expand(s:dir) . '/swap//,' . &directory
+ endif
+ if &backupdir =~# '^\.,'
+ let &backupdir = expand(s:dir) . '/backup//,' . &backupdir
+ endif
+ if exists('+undodir') && &undodir =~# '^\.\%(,\|$\)'
+ let &undodir = expand(s:dir) . '/undo//,' . &undodir
+ endif
+endif
+if exists('+undofile')
+ set undofile
+endif
View
@@ -19,12 +19,13 @@ setopt extended_glob
autoload -U zmv
alias lsl="ls -lah"
+alias wps="wp --path=wp/ $1"
function webdev_mysql() {
echo "Killing existing connection (sudo)..."
sudo lsof -Pnl +M -i @127.0.0.1:3306 | awk '/[0-9]/ {print $2}' | xargs sudo kill
echo "Opening new connection (ssh)..."
- ssh -f -L 3306:localhost:3306 webdev.bigfish.co.uk -N
+ ssh -f -L 3306:localhost:3306 jeff@webdev.bigfish.co.uk -N
}
function scratch() {
@@ -51,7 +52,9 @@ function compile_compass() {
ls -d1 **/.sass-cache/../ | xargs -L1 compass compile --force -s compressed
}
-alias lsl="ls -ahl"
+# make sure ctrl-s saves stuff in vim
+alias vim="stty stop '' -ixoff; vim"
+ttyctl -f
fancy-ctrl-z () {
if [[ $#BUFFER -eq 0 ]]; then
@@ -74,7 +77,7 @@ export LESS=' -RFX '
[[ -s "$HOME/.z.sh" ]] && source "$HOME/.z.sh"
-export PATH=/Developer/usr/bin:~/.pythonbrew/bin:/opt/local/bin:/opt/local/sbin:/Users/SCM/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/Developer/usr/bin:/Users/SCM/pear/bin:/usr/local/sbin:$HOME/.rvm.bin
-
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+export PATH=/Developer/usr/bin:~/.pythonbrew/bin:/opt/local/bin:/opt/local/sbin:/Users/SCM/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/Developer/usr/bin:/Users/SCM/pear/bin:/usr/local/sbin:$HOME/.rvm.bin
+PATH="/Applications/MAMP/bin/php/php5.3.6/bin/share/pear:/Applications/MAMP/Library/bin:/Applications/MAMP/bin/php/php5.3.6/bin:/Users/SCM/.rvm/gems/ruby-1.9.3-p194/bin:$PATH"

0 comments on commit 2f20bb6

Please sign in to comment.