Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --git a/X/.Xresources b/X/.Xresources
index 7ebee6a3c8b70b15c10a2e93ced5093834b49a45..69be4b55e9b195e9a4410b92133d725f71873f24 100644 (file)
--- a/X/.Xresources
+++ b/X/.Xresources
@@ -41,3 +41,6 @@
 
 
 XTerm*termName: xterm-256color
+
+XTerm*metaSendsEscape: true
+Xterm*eightBitinput: true

diff --git a/bash/.bash_profile b/bash/.bash_profile
index 106bfe29d732ce376ed82e82591887aafe46becc..8aa3b2f89f68e3ac5ab06cdb64c2b3f313f59053 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,5 +1,5 @@
 export EDITOR="/usr/bin/vim"
-export PAGER="/usr/bin/less"
+export PAGER="/usr/bin/less -R"
 export PATH="/home/max/.local/bin:${PATH}"
 
 if [ -n "$BASH_VERSION" ]; then

diff --git a/emacs/.emacs b/emacs/.emacs
new file mode 100644 (file)
index 0000000..da4d39a
--- /dev/null
+++ b/emacs/.emacs
@@ -0,0 +1,21 @@
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
+(package-initialize)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages (quote (org evil))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+
+(require 'evil)
+(evil-mode 1)
+
+
+(load-theme 'molokai t)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 5d8a0c08aea706c07b41a47f9515e96d2d2ecc1c..df38b8765928f7abfa2ffa6421eeb0e4f6c1f66c 100644 (file)
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -8,3 +8,5 @@ set -g prefix C-a
 bind C-a send-prefix
 
 set -g default-terminal "screen-256color"
+
+set -s escape-time 0
\ No newline at end of file