1 files changed, 9 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index 1ed95ff..a176df6 100644
--- a/.emacs
+++ b/.emacs
@@ -197,6 +197,7 @@
 
 (show-paren-mode 1)
 
+<<<<<<< HEAD
 (require 'dired-single)
 
 (defun my-dired-init ()
@@ -230,3 +231,11 @@
    (C . t)
    ))
 
+(require 'evil)
+(evil-mode 1)
+
+(require 'evil-surround)
+(global-evil-surround-mode 1)
+
+(display-time-mode 1)
+(display-battery-mode 1)