MErging

1 files changed, 24 insertions, 0 deletions

diff --git a/.emacs b/.emacs
index ea94b36..731f3e5 100644
--- a/.emacs
+++ b/.emacs
@@ -125,10 +125,14 @@
 (global-set-key (kbd "C-x C-b") 'bs-show)
 
 
+
+
+
 (when (fboundp 'winner-mode)
       (winner-mode 1))
 
 
+
 (global-set-key(kbd "C-M-<next>") 'scroll-other-window-down)
 
 
@@ -137,3 +141,23 @@
 (ac-config-default)
 
 (global-auto-complete-mode t)
+
+
+;; Julians cool keybindings
+(global-unset-key (kbd "C-d"))
+(global-set-key (kbd "C-d u") 'undo-tree-visualize)
+(global-set-key (kbd "C-d r") '(lambda() (interactive) (load-file "~/.emacs")))
+(global-set-key (kbd "C-d i") 'indent-region)
+(global-set-key (kbd "C-d e") 'eshell)
+(global-set-key (kbd "C-d n") 'neotree)
+
+
+(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
+
+
+
+
+
+(display-time-mode 1)
+
+