Permalink
Browse files

Merge in kraken

  • Loading branch information...
1 parent df7a46b commit f2c1793ee672dcb49c6a97259c80a1576f0594be @emiel committed Oct 6, 2012
Showing with 20 additions and 2 deletions.
  1. +4 −0 .tmux.conf
  2. +14 −1 .zshenv
  3. +2 −1 .zshrc
View
@@ -0,0 +1,4 @@
+set -g prefix C-a
+
+bind | split-window -h
+bind - split-window -v
View
15 .zshenv
@@ -1 +1,14 @@
-export EDITOR=vim
+export EDITOR="vim"
+export PAGER="less -R"
+
+# GNUPG
+#eval `gpg-agent --daemon`
+#
+#if [ -f "${HOME}/.gpg-agent-info" ]; then
+# . "${HOME}/.gpg-agent-info"
+# export GPG_AGENT_INFO
+# export SSH_AUTH_SOCK
+# export SSH_AGENT_PID
+#fi
+#
+#export GPG_TTY=`tty`
View
3 .zshrc
@@ -39,8 +39,9 @@ if ls -F --color=auto >&/dev/null; then
else
alias ls='ls -F -G'
fi
-alias ll='ls -l'
alias l.='ls -d .[^.]*'
+alias ll='ls -l'
+alias ll.='ls -l -d .[^.]*'
alias lsd='ls -ld *(-/DN)'
alias md='mkdir -p'

0 comments on commit f2c1793

Please sign in to comment.