Permalink
Browse files

Merge branch 'master' of github.com:derekwyatt/dotfiles

  • Loading branch information...
derekwyatt committed Dec 4, 2012
2 parents 441ab11 + c50a8d0 commit 5ce22326caf1024b54d4dac556d27e8b3e4c93c5
Showing with 30 additions and 7 deletions.
  1. +2 −2 dircolors
  2. +1 −0 inputrc
  3. +4 −3 zsh_custom/plugins/vim-interaction/vim-interaction.plugin.zsh
  4. +23 −2 zshrc
View
@@ -202,8 +202,8 @@ EXEC 00;32
.C 00;37;44
.cc 00;37;44
.cpp 00;37;44
-.scala 00;37;44
-.java 00;33;41
+.scala 00;33;44
+.java 00;37;44
.h 00;33;41
.H 00;33;41
.hh 00;33;41
View
@@ -1,3 +1,4 @@
+set editing-mode vi
set bell-style none
$if mode=vi
set keymap vi-command
@@ -30,14 +30,15 @@ EOH
fi
local cmd=""
- local before="<esc>"
+ local toNormal="<c-\\><c-n>"
+ local before=""
local after=""
while getopts ":b:a:" option
do
case $option in
a) after="$OPTARG"
;;
- b) before="$OPTARG"
+ b) before="$before$OPTARG"
;;
esac
done
@@ -56,7 +57,7 @@ EOH
if [[ -n $files ]]; then
files=':args! '"$files<cr>"
fi
- cmd="$before$files$after"
+ cmd="$toNormal$before$files$after"
gvim --remote-send "$cmd"
if typeset -f postCallVim > /dev/null; then
postCallVim
View
25 zshrc
@@ -42,7 +42,7 @@ if [ $(uname) = Darwin ]; then
export PATH=.:~/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
else
alias open=gnome-open
- export PATH=.:buildutil:/home/dwyatt/local/bin:/home/dwyatt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/opt/qnx650/host/linux/x86/usr/bin:/etc/qnx/bin
+ export PATH=.:buildutil:~/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
fi
export GPGKEY=B2F6D883
@@ -66,7 +66,7 @@ function eecho
function findWithSpec
{
local dirs=
- local egrepopts="-v '\\.sw[po]\\$|/\\.git/|^\\.git/'"
+ local egrepopts="-v '\\.sw[po]\\$|/\\.git/|^\\.git/|/\\.svn/|^\\.svn/'"
local nullprint=
while [[ $# != 0 ]];
do
@@ -141,6 +141,24 @@ function findm
}
alias findmz="findm -Z"
+function findpom
+{
+ findWithSpec "$@" "-name pom.xml"
+}
+alias findpomz="findpom -Z"
+
+function findx
+{
+ findWithSpec "$@" "-name \*.xml"
+}
+alias findxz="findx -Z"
+
+function findd
+{
+ findWithSpec "$@" "-type d"
+}
+alias finddz="findd -Z"
+
alias f=findWithSpec
function findClass
@@ -198,11 +216,14 @@ function gitall
alias swps='find . -name .\*.sw[op]'
alias rmstd='xargs rm -vf'
alias xag='xargs -0 egrep'
+alias xg='xargs egrep'
+alias xgi='xargs egrep -i'
alias pd="cd -"
alias grss='for f in $(find . -type d -a -name .git); do x=${f%/.git}; echo ==== $x; (cd $x; gss); done'
alias gd='git diff'
alias gdc='git diff --cached'
alias o=octave
+alias mvn=~/bin/mvn-colour
alias sc=screen
alias scl="screen -list"

0 comments on commit 5ce2232

Please sign in to comment.