       recentf-max-menu-items 15)
 (recentf-mode)
 
-(use-package yasnippet
-  :ensure t)
+(use-package yasnippet :ensure t)
 (setq yas-snippet-dirs
       '("~/.emacs.d/yasnippets/personal"))
 (yas-reload-all)

(setq create-lockfiles nil)

;; displays hex strings representing colors
(use-package rainbow-mode
  :ensure t)
(rainbow-mode 1)

;; Activate smerge on conflicts.

;; (add-to-list 'company-backends 'company-rtags)
;; (rtags-diagnostics)

(use-package helm-c-yasnippet :ensure t)

(use-package helm-make :ensure t)

(use-package discover :ensure t)

(use-package drag-stuff :ensure t)
(global-set-key (kbd "M-<up>") 'drag-stuff-up)
(global-set-key (kbd "M-<down>") 'drag-stuff-down)

