Remove old Borg-specific Makefile
[~bandali/configs] / lisp / bandali-org.el
index 9e45fa4..38a4a5a 100644 (file)
@@ -1,62 +1,66 @@
-(use-package org
-  :config
-  (setq org-src-tab-acts-natively t
-        org-src-preserve-indentation nil
-        org-edit-src-content-indentation 0
-        org-link-email-description-format "Email %c: %s" ; %.30s
-        org-highlight-latex-and-related '(entities)
-        org-use-speed-commands t
-        org-startup-folded 'content
-        org-catch-invisible-edits 'show-and-error
-        org-log-done 'time)
-  (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
-  (add-to-list 'org-modules 'org-habit)
-  :bind
-  (("C-c a o a" . org-agenda)
-   :map org-mode-map
-   ("M-L" . org-insert-last-stored-link)
-   ("M-O" . org-toggle-link-display))
-  :hook ((org-mode . org-indent-mode)
-         (org-mode . auto-fill-mode)
-         (org-mode . flyspell-mode))
-  :custom
-  (org-pretty-entities t)
-  (org-agenda-files '("~/usr/org/todos/personal.org"
-                      "~/usr/org/todos/habits.org"
-                      "~/src/git/masters-thesis/todo.org"))
-  (org-agenda-start-on-weekday 0)
-  (org-agenda-time-leading-zero t)
-  (org-habit-graph-column 44)
-  (org-latex-packages-alist '(("" "listings") ("" "color")))
-  :custom-face
-  '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
-  '(org-block ((t (:background "#1d1f21"))))
-  '(org-latex-and-related ((t (:foreground "#b294bb")))))
+;;; bandali-org.el --- bandali's Org setup           -*- lexical-binding: t; -*-
 
 
-(use-package ox-latex
-  :after ox
-  :config
-  (setq org-latex-listings 'listings
-        ;; org-latex-prefer-user-labels t
-        )
-  (add-to-list 'org-latex-classes
-               '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
-                 ("\\section{%s}"       . "\\section*{%s}")
-                 ("\\subsection{%s}"    . "\\subsection*{%s}")
-                 ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
-                 ("\\paragraph{%s}"     . "\\paragraph*{%s}")
-                 ("\\subparagraph{%s}"  . "\\subparagraph*{%s}"))
-               t)
-  (require 'ox-beamer))
+;; Copyright (C) 2018-2020  Amin Bandali
 
 
-(use-package ox-extra
-  :config
-  (ox-extras-activate '(latex-header-blocks ignore-headlines)))
+;; Author: Amin Bandali <bandali@gnu.org>
+;; Keywords: calendar, data, docs, hypermedia, outlines
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; My set up for Org (org-mode) and all things Org.
+
+;;; Code:
 
 
-;; asynchronous tangle, using emacs-async to asynchronously tangle an
-;; org file.  closely inspired by
-;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles
 (with-eval-after-load 'org
 (with-eval-after-load 'org
+  (csetq org-src-tab-acts-natively t
+         org-src-preserve-indentation nil
+         org-edit-src-content-indentation 0
+         org-id-locations-file (b/var "org/id-locations.el")
+         org-link-email-description-format "Email %c: %s" ; %.30s
+         org-highlight-latex-and-related '(entities)
+         org-use-speed-commands t
+         org-startup-folded 'content
+         org-catch-invisible-edits 'show-and-error
+         org-log-done 'time
+         org-pretty-entities t
+         org-agenda-files '("~/usr/org/todos/personal.org"
+                            "~/usr/org/todos/habits.org"
+                            "~/src/git/masters-thesis/todo.org")
+         org-agenda-start-on-weekday 0
+         org-agenda-time-leading-zero t
+         org-habit-graph-column 44
+         org-latex-packages-alist '(("" "listings") ("" "color")))
+  (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
+  (add-to-list 'org-modules 'org-habit)
+  (custom-set-faces
+   '(org-block-begin-line
+     ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
+   '(org-block ((t (:background "#1d1f21"))))
+   '(org-latex-and-related ((t (:foreground "#b294bb")))))
+  ;; local key bindings
+  (define-key org-mode-map (kbd "M-L") #'org-insert-last-stored-link)
+  (define-key org-mode-map (kbd "M-O") #'org-toggle-link-display)
+  ;; hooks
+  (add-hook 'org-mode-hook #'org-indent-mode)
+  (add-hook 'org-mode-hook #'auto-fill-mode)
+  (add-hook 'org-mode-hook #'flyspell-mode)
+
+  ;; asynchronous tangle, using emacs-async to asynchronously tangle an
+  ;; org file.  closely inspired by
+  ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles
   (defvar b/show-async-tangle-results nil
     "Keep *emacs* async buffers around for later inspection.")
 
   (defvar b/show-async-tangle-results nil
     "Keep *emacs* async buffers around for later inspection.")
 
@@ -70,7 +74,8 @@
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
            ;; (async-quiet-switch "-q")
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
            ;; (async-quiet-switch "-q")
-           (file-noext (file-name-sans-extension file)))
+           ;; (file-noext (file-name-sans-extension file))
+           )
       (async-start
        `(lambda ()
           (require 'org)
       (async-start
        `(lambda ()
           (require 'org)
                                      (float-time (time-subtract (current-time)
                                                                 ',file-tangle-start-time)))
                            ""))
                                      (float-time (time-subtract (current-time)
                                                                 ',file-tangle-start-time)))
                            ""))
-              (message "Tangling %s failed" ,file-nodir))))))))
+              (message "Tangling %s failed" ,file-nodir)))))))
+  (add-to-list
+   'safe-local-variable-values
+   '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local)))
+;; global key bindings
+(global-set-key (kbd "C-c a o a") #'org-agenda)
+
+(with-eval-after-load 'ox-latex
+  (csetq org-latex-listings 'listings
+         ;; org-latex-prefer-user-labels t
+         )
+  (add-to-list 'org-latex-classes
+               '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
+                 ("\\section{%s}"       . "\\section*{%s}")
+                 ("\\subsection{%s}"    . "\\subsection*{%s}")
+                 ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+                 ("\\paragraph{%s}"     . "\\paragraph*{%s}")
+                 ("\\subparagraph{%s}"  . "\\subparagraph*{%s}"))
+               t)
+  (require 'ox-beamer))
 
 
-(add-to-list
- 'safe-local-variable-values
'(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local))
+(with-eval-after-load 'ox-extra  
+  (declare-function ox-extras-activate "ox-extra" (extras))
 (ox-extras-activate '(latex-header-blocks ignore-headlines)))
 
 (provide 'bandali-org)
 
 (provide 'bandali-org)
+;;; bandali-org.el ends here