From 677e5832784aee5860e307a9ad801506ec4b59a9 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely.polonkai@ericsson.com>
Date: Wed, 12 Oct 2016 10:36:56 +0200
Subject: [PATCH] Move org configuration to use-package

---
 init.el | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/init.el b/init.el
index c712c42..bc40439 100644
--- a/init.el
+++ b/init.el
@@ -5,8 +5,6 @@
 (add-to-list 'load-path (concat
                          user-emacs-directory
                          (convert-standard-filename "lisp/")))
-;; Load xdg-paths; it is needed to set `org-directory'
-(require 'xdg-paths)
 
 ;; Custom stuff
 (custom-set-variables
@@ -44,24 +42,6 @@
  '(nxml-attribute-indent 4)
  '(nxml-child-indent 2)
  '(nxml-outline-child-indent 4)
- '(org-crypt-key "B0740C4C")
- '(org-default-notes-file
-   (concat user-documents-directory
-           (convert-standard-filename "/orgmode/notes.org")))
- '(org-directory
-   (concat user-documents-directory
-           (convert-standard-filename "/orgmode/")))
- '(org-agenda-files
-   (concat user-documents-directory
-           (convert-standard-filename "/orgmode/agenda_files")))
- '(org-ellipsis "…#")
- '(org-mobile-directory
-   (concat user-documents-directory
-           (convert-standard-filename "/orgmode/mobile/")))
- '(org-mobile-inbox-for-pull
-   (concat user-documents-directory
-           (convert-standard-filename "/orgmode/from-mobile.org")))
- '(org-startup-folded (quote content))
  '(package-archives
    (quote
     (("gnu" . "http://elpa.gnu.org/packages/")
@@ -357,6 +337,30 @@
   :config
   (global-git-gutter-mode t))
 
+;; Org mode
+(use-package org
+  :ensure t
+  :init
+  (require 'xdg-paths)
+  (setq-default org-crypt-key "B0740C4C"
+                org-default-notes-file (concat user-documents-directory
+                                               (convert-standard-filename
+                                                "/orgmode/notes.org"))
+                org-directory (concat user-documents-directory
+                                      (convert-standard-filename "/orgmode/"))
+                org-agenda-files (concat user-documents-directory
+                                         (convert-standard-filename
+                                          "/orgmode/agenda_files"))
+                org-ellipsis "…#"
+                org-startup-folded 'content
+                org-mobile-directory (concat user-documents-directory
+                                             (convert-standard-filename
+                                              "/orgmode/mobile/"))
+                org-mobile-inbox-for-pull (concat
+                                           user-documents-directory
+                                           (convert-standard-filename
+                                            "/orgmode/from-mobile.org"))))
+
 ;; Load my own functions
 (load "gnu-c-header.el")
 (load "toggle-window-split.el")