summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-09-12 15:54:08 (GMT)
committer Jaromil <jaromil@dyne.org>2014-09-12 15:54:08 (GMT)
commitfc133980a06bb694f4c8a3bb39e102b28adca923 (patch)
tree717366ae174496f7f9ae1207ba393d2f4309f62a
parent3a8166c3ef418893cc2b06d50de5af0b32c177cd (diff)
slightly more flexible zsh environment (delete .zshrc to reset it)
-rw-r--r--conf/etc/skel/zshrc3
-rw-r--r--conf/etc/ssh/ssh_config6
-rw-r--r--conf/etc/zenv7
-rwxr-xr-xconf/etc/zlogin3
4 files changed, 14 insertions, 5 deletions
diff --git a/conf/etc/skel/zshrc b/conf/etc/skel/zshrc
index 4d60360..446ff77 100644
--- a/conf/etc/skel/zshrc
+++ b/conf/etc/skel/zshrc
@@ -22,6 +22,9 @@ alias mc='mc -aX' # correct rendering
# Lynx web browser
alias lynx="lynx -cfg ${SYS}/etc/lynx.cfg -lss ${SYS}/etc/lynx.lss"
+# System wide fine tuning
+{ test -f $SYS/etc/zenv } && { source $SYS/etc/zenv }
+
# Custom user configuration
{ test -r ~/.profile } && { source ~/.profile }
diff --git a/conf/etc/ssh/ssh_config b/conf/etc/ssh/ssh_config
index 1893674..5ca5c41 100644
--- a/conf/etc/ssh/ssh_config
+++ b/conf/etc/ssh/ssh_config
@@ -32,12 +32,12 @@
# ConnectTimeout 0
# StrictHostKeyChecking ask
# IdentityFile ~/.ssh/identity
-# IdentityFile ~/.ssh/id_rsa
+IdentityFile ~/.ssh/id_rsa
# IdentityFile ~/.ssh/id_dsa
# Port 22
# Protocol 2,1
# Cipher 3des
-# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
+Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
# EscapeChar ~
# Tunnel no
@@ -45,3 +45,5 @@
# PermitLocalCommand no
# VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com
+SendEnv LANG LC_*
+HashKnownHosts yes
diff --git a/conf/etc/zenv b/conf/etc/zenv
new file mode 100644
index 0000000..9c8e1d3
--- /dev/null
+++ b/conf/etc/zenv
@@ -0,0 +1,7 @@
+# This file defines some aliases and user-friendly tweaks that
+# may change in new releases. It is overwritten by system install.
+# It is processed by the default .zshrc (in etc/skel)
+
+alias vi='vim'
+alias less='most'
+
diff --git a/conf/etc/zlogin b/conf/etc/zlogin
index a027628..9dd68e9 100755
--- a/conf/etc/zlogin
+++ b/conf/etc/zlogin
@@ -30,9 +30,6 @@ function restore_rc() {
if [ "$res" = "1" ]; then echo " . restored: ~/.$rc"; fi
}
-# links vim if present
-{ test -r $SYS/bin/vim } && { alias vi=vim }
-
cd $HOME
echo "Welcome to ZShaolin"
restore_rc zshrc