only set prompts if default or unset

[etc/zsh.git] / .zsh / zshrc / 30_aliases

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 42c5624dd7907ff69d46acc0048263abfc68e21c..82625ff68b240a27dc1513063c097051d8577356 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,12 +23,12 @@ alias curl='noglob curl'
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 

-_LS_OPTS='-bCF --color=auto'
+_ls_opts=(-bC --color=auto)

 ls --group-directories-first >/dev/null 2>&1 \
 ls --group-directories-first >/dev/null 2>&1 \

-  && _LS_OPTS="$_LS_OPTS --group-directories-first"
+  && _ls_opts+=--group-directories-first

 # I prefer POSIX collation for ls
 # I prefer POSIX collation for ls

-alias ls="LC_COLLATE=POSIX ls $_LS_OPTS"
-unset _LS_OPTS
+alias ls="LC_COLLATE=POSIX ls $_ls_opts"
+unset _ls_opts

 
 alias ll='ls -l'
 alias l=ll
 
 alias ll='ls -l'
 alias l=ll


@@ -93,11 +93,6 @@ alias h2d='baseconv 16 10'
 alias d2o='baseconv 10 8'
 alias o2d='baseconv 8 10'
 
 alias d2o='baseconv 10 8'
 alias o2d='baseconv 8 10'
 

-alias sshnew='ssh -o "StrictHostKeyChecking no"'
-alias scpnew='scp -o "StrictHostKeyChecking no"'
-alias sshtmp='sshnew -o "UserKnownHostsFile /dev/null"'
-alias scptmp='scpnew -o "UserKnownHostsFile /dev/null"'
-

 alias sendmail=/usr/sbin/sendmail
 
 _d() { dict $* }
 alias sendmail=/usr/sbin/sendmail
 
 _d() { dict $* }


@@ -122,4 +117,8 @@ for l in ${(k)_LANGUAGES}; do
 done
 unset _LANGUAGES
 
 done
 unset _LANGUAGES
 

+alias dpkg-buildpackage="dpkg-buildpackage -k$DEBKEYID"
+
+uc() { unicode --max=0 --colour=off "$@" | sensible-pager }
+

 # vim:ft=zsh
 # vim:ft=zsh