Skip to content

Commit

Permalink
Merge in kraken
Browse files Browse the repository at this point in the history
  • Loading branch information
emiel committed Oct 6, 2012
1 parent df7a46b commit f2c1793
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .tmux.conf
@@ -0,0 +1,4 @@
set -g prefix C-a

bind | split-window -h
bind - split-window -v
15 changes: 14 additions & 1 deletion .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`
3 changes: 2 additions & 1 deletion .zshrc
Expand Up @@ -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'
Expand Down

0 comments on commit f2c1793

Please sign in to comment.