Move org configuration to use-package

This commit is contained in:
Gergely Polonkai 2016-10-12 10:36:56 +02:00
parent 23962832ec
commit 677e583278

44
init.el
View File

@ -5,8 +5,6 @@
(add-to-list 'load-path (concat (add-to-list 'load-path (concat
user-emacs-directory user-emacs-directory
(convert-standard-filename "lisp/"))) (convert-standard-filename "lisp/")))
;; Load xdg-paths; it is needed to set `org-directory'
(require 'xdg-paths)
;; Custom stuff ;; Custom stuff
(custom-set-variables (custom-set-variables
@ -44,24 +42,6 @@
'(nxml-attribute-indent 4) '(nxml-attribute-indent 4)
'(nxml-child-indent 2) '(nxml-child-indent 2)
'(nxml-outline-child-indent 4) '(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 '(package-archives
(quote (quote
(("gnu" . "http://elpa.gnu.org/packages/") (("gnu" . "http://elpa.gnu.org/packages/")
@ -357,6 +337,30 @@
:config :config
(global-git-gutter-mode t)) (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 my own functions
(load "gnu-c-header.el") (load "gnu-c-header.el")
(load "toggle-window-split.el") (load "toggle-window-split.el")