     (use-package nlinum-relative
       :ensure t
       :config
-      (add-hook 'prog-mode-hook 'nlinum-relative-mode)
+      (nlinum-relative-setup-evil)
       (setq nlinum-relative-current-symbol "")
-      (setq nlinum-relative-redisplay-delay 0))
-  (add-hook 'prog-mode-hook (lambda ()
-                              (setq-local display-line-numbers 'visual)
-                              (setq-local display-line-number-width 1))))
-
-;; Also show column numbers
-(column-number-mode)
+      (setq nlinum-relative-redisplay-delay 0.2))
+  (defun ach/set-line-numbers ()
+    (setq-default display-line-numbers 'visual))
+  (add-hook 'prog-mode-hook 'ach/set-line-numbers)
+  (add-hook 'prog-mode-hook 'ach/set-line-numbers))
 
 ;; expand region. An *excellent* tool.
 (use-package expand-region

;; remap C-a to `smarter-move-beginning-of-line'
(global-set-key [remap move-beginning-of-line]
                'smarter-move-beginning-of-line)

;; and unbind M-m
(global-unset-key (kbd "M-m"))

  :bind ("C-=" . er/expand-region))

;; Undo-Tree for real undo/redo commands
;; Also required by evil
(use-package undo-tree
  :ensure t
  :diminish ""
  :init
  (global-undo-tree-mode 1)
  :config
  (define-key undo-tree-map (kbd "C-/") nil))

;; Same as in vim: lightweight and great
(use-package evil-commentary
  :ensure t
  :config
  (evil-commentary-mode))

;; diminish visual-line-mode
(diminish 'visual-line-mode)
(add-hook 'Man-mode-hook 'visual-line-mode)

;; Might need to change this
(use-package multiple-cursors
  :ensure t
  :bind
