 ;(add-to-list 'default-frame-alist '(width . 120))
 
 ;; Make linum-mode a keyboard toggle
-(global-set-key (kbd "C-M-l") 'linum-mode)
+(bind-key "C-M-l" 'linum-mode)
 (column-number-mode t)
-
 
 (require 'evil)
 (evil-mode t)
 
 (require 'evil-surround)
-(evil-surround-mode t)
+(global-evil-surround-mode 1)
 
 ;; Easily resize windows in a frame.
 ;; Acts weirdly in different windows
-(global-set-key (kbd "S-C-<left>") 'shrink-window-horizontally)
+(global-set-key (kbd "S-C-<left>")  'shrink-window-horizontally)
 (global-set-key (kbd "S-C-<right>") 'enlarge-window-horizontally)
-(global-set-key (kbd "S-C-<down>") 'shrink-window)
-(global-set-key (kbd "S-C-<up>") 'enlarge-window)
+(global-set-key (kbd "S-C-<down>")  'shrink-window)
+(global-set-key (kbd "S-C-<up>")    'enlarge-window)
 
 ;; Forcefully remove evil-mode (basically) from term states
 ;; One can use `ctl-z` to toggle evil-mode back on

                          'slime
                          'tuareg
                          'magit
                          )

(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-11"))
(set-face-attribute 'default t :font "DejaVu Sans Mono-11")

;; Cleanup whitespace on every save
(add-hook 'before-save-hook 'whitespace-cleanup)

(require 'multi-term)
(setq multi-term-program "/bin/bash")

(require 'ace-window)
(global-set-key (kbd "M-p") 'ace-window)

(require 'cider)
(setq cider-show-error-buffer nil)

(require 'rainbow-delimiters)
(rainbow-delimiters-mode t)

;; Ido niceties
(setq ido-enable-flex-matching t)
(setq ido-everywhere t)
(ido-mode t)
