From 37303d022e1d8a47dec56fda4c7f946fd9437d87 Mon Sep 17 00:00:00 2001
From: Steve Losh <steve@stevelosh.com>
Date: Fri, 30 Apr 2010 15:26:03 -0400
Subject: [PATCH] Move over a few more aliases from my personal .zshrc.

---
 lib/directories.zsh |  1 +
 lib/django.zsh      |  3 ++-
 lib/misc.zsh        | 11 ++++++++++-
 lib/python.zsh      |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 3fd274fc9..fbd90f888 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -48,4 +48,5 @@ alias d='dirs -v'
 alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -alr'
+alias ls='ls -Goh'
 alias sl=ls
diff --git a/lib/django.zsh b/lib/django.zsh
index 901c2f6ef..b1d2c9974 100644
--- a/lib/django.zsh
+++ b/lib/django.zsh
@@ -1,3 +1,4 @@
+alias pm='python manage.py'
 alias pmr='python manage.py runserver'
 alias pmrp='python manage.py runserver_plus'
 alias pmrpg='pmrp --adminmedia=`pwd`/media/admin'
@@ -7,4 +8,4 @@ alias pmlf='python manage.py loaddata fixtures/*'
 
 alias gs='gunicorn_django'
 alias gk='kill `cat .gunicorn.pid`'
-alias gl='tail -f .gunicorn.log'
\ No newline at end of file
+alias gl='tail -f .gunicorn.log'
diff --git a/lib/misc.zsh b/lib/misc.zsh
index aa033dec3..722412a82 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -24,4 +24,13 @@ function pj() {
 }
 
 ## Open current directory
-alias oo='open .'
\ No newline at end of file
+alias oo='open .'
+
+## Start a local SMTP server and dump emails sent to it to the console
+alias smtpconsole='python -m smtpd -n -c DebuggingServer localhost:1025'
+
+## Serve the current folder on port 80
+alias serve_this='python -m SimpleHTTPServer'
+
+## Highlight-aware less command
+alias hl='less -R'
\ No newline at end of file
diff --git a/lib/python.zsh b/lib/python.zsh
index f1e507c48..7c17a097e 100644
--- a/lib/python.zsh
+++ b/lib/python.zsh
@@ -1,7 +1,7 @@
 function wo() {
     [ -f './.venv' ] && workon `cat ./.venv`
 }
-
+alias deact='deactivate'
 alias cdv='cd $WORKON_HOME'
 
 function cdp () {