 
 ;; Make mousewheel scrolling less jumpy
 (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control))))
+
+;; Highlight tabs, trailing spaces, and long lines
+(setq whitespace-style '(face tabs trailing lines-tail tab-mark))
+(global-whitespace-mode 1)
 
 ;; Replace yes/no prompts with simpler y/n ones
 (defalias 'yes-or-no-p 'y-or-n-p)

(global-set-key (kbd "<f12>") 'toggle-max-nyan)

(require 'undo-tree)
(global-undo-tree-mode)

(require 'vimrc-mode)

(require 'xkcd)
(evil-set-initial-state 'xkcd 'emacs)

;; Add some xkcd keybindings
(add-hook 'xkcd-mode-hook
	  (lambda ()
	    (linum-mode -1)
	    (setq cursor-type nil)))

(define-key xkcd-mode-map (kbd "h") 'xkcd-prev)
(define-key xkcd-mode-map (kbd "j") 'xkcd-next)
(define-key xkcd-mode-map (kbd "k") 'xkcd-prev)

(load-theme 'solarized-dark t)

(require 'editorconfig)
(editorconfig-mode)

;; Allow evil to override more Emacs keybindings
(setq evil-search-module 'evil-search
