summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.keychain3
-rw-r--r--.zlogin3
-rw-r--r--.zshrc13
-rw-r--r--25_Prompts.zsh2
-rw-r--r--70_Aliases.zsh2
-rw-r--r--LICENSE10
-rw-r--r--host:paranoid/Aliases.zsh4
l---------net:hiegel.fr1
-rw-r--r--net:ordener.fr/Hashes.zsh3
9 files changed, 35 insertions, 6 deletions
diff --git a/.keychain b/.keychain
new file mode 100644
index 0000000..21f145f
--- /dev/null
+++ b/.keychain
@@ -0,0 +1,3 @@
+KEYCHAIN=~/.keychain/$(hostname)-sh
+[ -f ${KEYCHAIN} ] && source ${KEYCHAIN}
+[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
diff --git a/.zlogin b/.zlogin
index ef67c4b..fb12fb6 100644
--- a/.zlogin
+++ b/.zlogin
@@ -5,3 +5,6 @@
which keychain >/dev/null 2>&1 && keychain --quiet --stop others --inherit any
#keychain --quiet --quick id_dsa
#keychain --quiet --quick 593F1F92
+
+which remind >/dev/null 2>&1 && remind -n
+
diff --git a/.zshrc b/.zshrc
index 39ad266..3643640 100644
--- a/.zshrc
+++ b/.zshrc
@@ -23,6 +23,12 @@
ZDOTDIR=${ZDOTDIR:-~/.zsh}
mkdir -p $ZDOTDIR
+USER=${USER:-`whoami`}
+HOST=${HOST:-$(hostname -s 2>/dev/null)}
+DOMAIN=${DOMAIN:-${$(hostname -d 2>/dev/null):-$(hostname -y 2>/dev/null)}}
+
+export USER HOST DOMAIN
+
if [ -d $ZDOTDIR ]; then
for script in $ZDOTDIR/??_*.zsh
do
@@ -30,10 +36,13 @@ if [ -d $ZDOTDIR ]; then
[ "$DEBUG" != "" ] && echo "${${script:t:r}/??_/}... ";
source $script
- for i in "host:`hostname -s 2>/dev/null`" "user:`whoami`" "net:`hostname -d 2>/dev/null`"
+ for i in "net:$DOMAIN" "host:$HOST" "user:$USER"
do
specific_script=${script:h}/$i/${${script:t}/??_/}
- [ -f $specific_script ] && source $specific_script
+ if test -f $specific_script
+ then
+ source $specific_script
+ fi
done
done
fi
diff --git a/25_Prompts.zsh b/25_Prompts.zsh
index 90824b1..6c10f8f 100644
--- a/25_Prompts.zsh
+++ b/25_Prompts.zsh
@@ -78,5 +78,5 @@ PS4="+%N:%i> "
RPS1="%(?;;"$C_$COLOR_ERRR$_C"%?"$C_$VOID$_C") "$C_$COLOR_DATE$_C"%D{%H:%M:%S %d/%m/%Y}"$C_$VOID$_C""
# Ultime : prompt de correction :-)
-SPROMPT="zsh: $_C_$BLUE$_C%B'%R'%b%C_$VOID$_C ? Vous ne vouliez pas plutôt $C_$MAGENTA$_C%B'%r'%b$C_$VOID$_C ? [%BN%byae] "
+SPROMPT="zsh: $C_$BLUE$_C%B'%R'%b$C_$VOID$_C ? Vous ne vouliez pas plutôt $C_$MAGENTA$_C%B'%r'%b$C_$VOID$_C ? [%BN%byae] "
diff --git a/70_Aliases.zsh b/70_Aliases.zsh
index 82f2fe9..40460db 100644
--- a/70_Aliases.zsh
+++ b/70_Aliases.zsh
@@ -62,7 +62,7 @@ a gnus='emacs -f gnus'
#a make='make -j'
# Unicode-uncompliant
-a mutt='ASCII mutt'
+#a mutt='ASCII mutt'
## Suffixes Aliases
a -s patch=editdiff
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3148444
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,10 @@
+#!/bin/zsh
+##
+## Part of configuration files for Zsh4
+## AUTHOR: Hugues Hiegel <hugues@hiegel.fr>
+##
+## You are encouraged to use, modify, and redistribute
+## these files with or without this notice.
+##
+## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS
+##
diff --git a/host:paranoid/Aliases.zsh b/host:paranoid/Aliases.zsh
index 986ad6b..330f68d 100644
--- a/host:paranoid/Aliases.zsh
+++ b/host:paranoid/Aliases.zsh
@@ -11,6 +11,6 @@
## Paranoid specifics aliases
-a mailstat='\mailstat -o ~/.procmail/procmail.log | egrep -v "## procmail:"'
-a mails='\mailstat -k ~/.procmail/procmail.log | egrep -v "## procmail:" ; cat ~/.procmail/procmail.log >> ~/.procmail/procmail.log.old ; echo -n > ~/.procmail/procmail.log'
+a mailstats='mailstat -mo ~/.procmail/procmail.log'
+a mails='mailstat -k ~/.procmail/procmail.log | egrep -v "## .*:" ; cat ~/.procmail/procmail.log >> ~/.procmail/procmail.log.old ; echo -n > ~/.procmail/procmail.log'
a junkmail='mutt -f ~/Mail/junk.gz'
diff --git a/net:hiegel.fr b/net:hiegel.fr
new file mode 120000
index 0000000..725ab49
--- /dev/null
+++ b/net:hiegel.fr
@@ -0,0 +1 @@
+net:ordener.fr \ No newline at end of file
diff --git a/net:ordener.fr/Hashes.zsh b/net:ordener.fr/Hashes.zsh
new file mode 100644
index 0000000..b7b0fc8
--- /dev/null
+++ b/net:ordener.fr/Hashes.zsh
@@ -0,0 +1,3 @@
+
+hash -d foutoir=/goinfre/FICHIERS_A_LA_CON
+