Merge branch 'master' of ssh://www@nem.cielonegro.org/home/www/git.cielonegro.org...

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index 6f174bb8acde75f69d486f1665d3002ebf153390..e4f77b36239902131b56a313bca0e20bbf673962 100644 (file)
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -25,6 +25,7 @@ append_path PATH /usr/pkg/bin
 append_path PATH /usr/pkg/sbin
 append_path PATH /usr/local/bin
 append_path PATH /usr/local/sbin
+append_path PATH $HOME/bin
 # Hope these could be removed someday!
 append_path PATH /usr/local/ymir/perl/bin
 

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 8b95b52ba3bf87513e9ed35f14a15c5b3937c082..b5a69ac9caed0bd59fdb8b392446eeaaa69f806b 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -78,10 +78,6 @@ alias -g T="| tail"
 
 alias ..='cd ..'
 alias cd..='cd ..'
-alias ls='ls -F'
-alias la='ls -a'
-alias l='ls -l'
-alias lls='ls -la'
 alias p='pushd'
 alias o='popd'
 alias d='dirs'
@@ -93,6 +89,7 @@ alias mwget="wget --user-agent='Mozilla/1.4b'"
 alias pstow="pushd /usr/local/stow"
 alias w3m="w3m -O UTF-8"
 alias w3mb="w3m -O UTF-8 -B"
+alias pkgsrc="pushd /usr/pkgsrc"
 
 if [ $(hostname) = "aria.cielonegro.org" ]; then
     alias safari="open -a Safari"
@@ -104,6 +101,16 @@ fi
 
 if [ $(uname) = "Darwin" ]; then
     alias ldd="otool -L"
+
+    alias ls='ls -Fw'
+    alias la='ls -aw'
+    alias l='ls -lw'
+    alias lls='ls -law'
+else
+    alias ls='ls -F'
+    alias la='ls -a'
+    alias l='ls -l'
+    alias lls='ls -la'
 fi
 
 # The following lines were added by compinstall