Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

This commit is contained in:
Chris Cochrun 2021-04-13 06:04:05 -05:00
commit 0398122164
2 changed files with 11 additions and 8 deletions

View file

@ -814,7 +814,7 @@ Part of this config includes some special capture templates for my work as a you
"/home/chris/org/ministry_team.org" "/home/chris/org/ministry_team.org"
"/home/chris/org/todo.org" "/home/chris/org/todo.org"
"/home/chris/org/newsletter.org" "/home/chris/org/newsletter.org"
)) "/home/chris/org/nvtfc_social_media.org"))
;; (add-to-list '("/home/chris/org/inbox.org" ;; (add-to-list '("/home/chris/org/inbox.org"
;; "/home/chris/org/notes.org" ;; "/home/chris/org/notes.org"
;; "/home/chris/org/repetition.org" ;; "/home/chris/org/repetition.org"
@ -864,9 +864,10 @@ Part of this config includes some special capture templates for my work as a you
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'override :keymaps 'override
"o a" 'org-agenda "oa" 'org-agenda
"c" 'org-capture "c" 'org-capture
"rr" 'org-refile) "rr" 'org-refile
"e" 'org-export-dispatch)
('normal org-agenda-mode-map ('normal org-agenda-mode-map
"q" 'org-agenda-quit "q" 'org-agenda-quit
"r" 'org-agenda-redo "r" 'org-agenda-redo
@ -901,7 +902,7 @@ We are also going to make our config auto-tangle. This is so helpful on saving t
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun chris/org-babel-tangle-config () (defun chris/org-babel-tangle-config ()
(when (string-equal (buffer-file-name) (when (string-equal (buffer-file-name)
(expand-file-name "~/.emacs.d/README.org")) (expand-file-name "README.org" user-emacs-directory))
(let ((org-confirm-babel-evaluate nil)) (let ((org-confirm-babel-evaluate nil))
(org-babel-tangle)))) (org-babel-tangle))))
@ -909,6 +910,7 @@ We are also going to make our config auto-tangle. This is so helpful on saving t
:append :local))) :append :local)))
#+end_src #+end_src
We also need to add =evil-org= to make better keybindings. We also need to add =evil-org= to make better keybindings.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package evil-org (use-package evil-org

View file

@ -520,7 +520,7 @@ vertically."
"/home/chris/org/ministry_team.org" "/home/chris/org/ministry_team.org"
"/home/chris/org/todo.org" "/home/chris/org/todo.org"
"/home/chris/org/newsletter.org" "/home/chris/org/newsletter.org"
)) "/home/chris/org/nvtfc_social_media.org"))
;; (add-to-list '("/home/chris/org/inbox.org" ;; (add-to-list '("/home/chris/org/inbox.org"
;; "/home/chris/org/notes.org" ;; "/home/chris/org/notes.org"
;; "/home/chris/org/repetition.org" ;; "/home/chris/org/repetition.org"
@ -570,9 +570,10 @@ vertically."
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'override :keymaps 'override
"o a" 'org-agenda "oa" 'org-agenda
"c" 'org-capture "c" 'org-capture
"rr" 'org-refile) "rr" 'org-refile
"e" 'org-export-dispatch)
('normal org-agenda-mode-map ('normal org-agenda-mode-map
"q" 'org-agenda-quit "q" 'org-agenda-quit
"r" 'org-agenda-redo "r" 'org-agenda-redo
@ -601,7 +602,7 @@ vertically."
(defun chris/org-babel-tangle-config () (defun chris/org-babel-tangle-config ()
(when (string-equal (buffer-file-name) (when (string-equal (buffer-file-name)
(expand-file-name "~/.emacs.d/README.org")) (expand-file-name "README.org" user-emacs-directory))
(let ((org-confirm-babel-evaluate nil)) (let ((org-confirm-babel-evaluate nil))
(org-babel-tangle)))) (org-babel-tangle))))