 ;;   (setq-local company-backends '(company-anaconda))
 ;;   (py-yapf-enable-on-save))
 
-(defun ar/python-mode-hook-function ()
-  "Called when entering `python-mode'."
-  (validate-setq python-indent-offset 2)
-  (validate-setq python-indent-guess-indent-offset nil)
-  (python-docstring-mode +1)
-  (py-yapf-enable-on-save))
-(add-hook 'python-mode-hook #'ar/python-mode-hook-function)
+(use-package python-docstring :ensure t
+  :hook (python-mode . python-docstring-mode))
+
+(use-package python
+  :init
+  (defun ar/python-mode-hook-function ()
+    "Called when entering `python-mode'."
+    (validate-setq python-indent-offset 2)
+    (validate-setq python-indent-guess-indent-offset nil))
+  :hook (python-mode . ar/python-mode-hook-function))
 
 (use-package objc-font-lock
   :ensure t


;; Best way (so far) to search for files in repo.
(use-package helm-projectile :ensure t
  :demand
  :bind ("C-x f" . helm-projectile))

(use-package ediff
  :config
  (csetq ediff-window-setup-function #'ediff-setup-windows-plain)
  (csetq ediff-split-window-function #'split-window-horizontally)

  ;; Automatically highlight first change.
  (add-hook 'ediff-startup-hook 'ediff-next-difference)

  (use-package outline
    :config
    ;; Ensure ediff expands org files.
    (add-hook 'ediff-prepare-buffer-hook #'outline-show-all))

  ;; Expand org files when ediffing.
  (add-hook 'ediff-prepare-buffer-hook


(use-package company-anaconda :ensure t)

;; View, browse, rotate, manipulate images with picpocket.
(use-package picpocket :ensure t)

