summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--bashrc4
-rw-r--r--tmux.conf2
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8b5bf65..659e1d6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ INSTALL = \
 	  bash_logout \
 	  bashrc \
 	  bin \
+	  emacs.d \
 	  gitconfig \
 	  gitignore \
 	  tmux.conf \
diff --git a/bashrc b/bashrc
index 751f5e1..a176073 100644
--- a/bashrc
+++ b/bashrc
@@ -1,4 +1,5 @@
-export EDITOR="vim"
+export TERM=xterm-256color
+export EDITOR="emacsclient -a enacs -n"
 export HISTFILE=
 export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
@@ -57,6 +58,7 @@ alias mv="mv -i"
 alias rm="rm -i"
 
 alias e="$EDITOR"
+alias em="emacsclient -a emacs -nw"
 alias g="git"
 alias gclean="git clean -dfx"
 
diff --git a/tmux.conf b/tmux.conf
index 0194bde..83f6bc4 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -23,6 +23,8 @@ new-session -s work
 new-session -s main
 new-session -s misc
 
+set -gw mode-keys emacs
+
 set -g status-right '#h'
 
 set -g status-bg white