2 files changed, 9 insertions, 1 deletions
diff --git a/.aliases b/.aliases
index 336bc0b..2539d30 100644
--- a/.aliases
+++ b/.aliases
@@ -15,7 +15,6 @@ alias g="git"
 alias h="history"
 alias j="jobs"
 alias v="vim"
-alias s="subl ."
 alias o="open"
 alias oo="open ."
 
diff --git a/.functions b/.functions
index cf64dc6..40ef656 100644
--- a/.functions
+++ b/.functions
@@ -261,3 +261,12 @@ function m() {
 		mate "$@"
 	fi
 }
+# `s` with no arguments opens the current directory in Sublime, otherwise opens
+# the given location
+function s() {
+	if [ $# -eq 0 ]; then
+		subl .
+	else
+		subl "$@"
+	fi
+}