diff --git a/.config/emacs/config.el b/.config/emacs/config.el index 11de981..e3113ea 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -75,8 +75,8 @@ (drag-stuff-global-mode 1) (drag-stuff-define-keys)) -(setq ediff-split-window-function 'split-window-horizontally - ediff-window-setup-function 'ediff-setup-windows-plain) +;;(setq ediff-split-window-function 'split-window-horizontally +;; ediff-window-setup-function 'ediff-setup-windows-plain) (defun dt-ediff-hook () (ediff-setup-keymap) @@ -516,16 +516,12 @@ (make-local-variable 'auto-hscroll-mode) (setq auto-hscroll-mode nil))))) -(use-package toc-org - :commands toc-org-enable - :init (add-hook 'org-mode-hook 'toc-org-enable)) +(eval-after-load 'org-indent '(diminish 'org-indent-mode)) (add-hook 'org-mode-hook 'org-indent-mode) (use-package org-bullets) (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) -(eval-after-load 'org-indent '(diminish 'org-indent-mode)) - (custom-set-faces '(org-level-1 ((t (:inherit outline-1 :height 1.7)))) '(org-level-2 ((t (:inherit outline-2 :height 1.6)))) @@ -537,6 +533,10 @@ (require 'org-tempo) +(use-package toc-org + :commands toc-org-enable + :init (add-hook 'org-mode-hook 'toc-org-enable)) + (use-package pdf-tools :defer t :commands (pdf-loader-install) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index d03f95e..295ecc5 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -34,11 +34,11 @@ - [[#modeline][MODELINE]] - [[#neotree][NEOTREE]] - [[#org-mode][ORG MODE]] - - [[#enabling-table-of-contents][Enabling Table of Contents]] - - [[#enabling-org-bullets][Enabling Org Bullets]] - [[#diminish-org-indent-mode][Diminish Org Indent Mode]] + - [[#org-bullets][Org-Bullets]] - [[#org-level-headers][Org Level Headers]] - - [[#source-code-block-tag-expansion][Source Code Block Tag Expansion]] + - [[#org-tempo][Org-Tempo]] + - [[#toc-org][Toc-Org]] - [[#pdfs][PDFs]] - [[#perspective][PERSPECTIVE]] - [[#projectile][PROJECTILE]] @@ -183,8 +183,8 @@ This package implements hiding or abbreviation of the modeline displays (lighter 'ediff' is a diff program that is built into Emacs. By default, 'ediff' splits files vertically and places the 'help' frame in its own window. I have changed this so the two files are split horizontally and the 'help' frame appears as a lower split within the existing window. Also, I create my own 'dt-ediff-hook' where I add 'j/k' for moving to next/prev diffs. By default, this is set to 'n/p'. #+begin_src emacs-lisp -(setq ediff-split-window-function 'split-window-horizontally - ediff-window-setup-function 'ediff-setup-windows-plain) +;;(setq ediff-split-window-function 'split-window-horizontally +;; ediff-window-setup-function 'ediff-setup-windows-plain) (defun dt-ediff-hook () (ediff-setup-keymap) @@ -720,22 +720,6 @@ Neotree is a file tree viewer. When you open neotree, it jumps to the current f #+end_src * ORG MODE -** Enabling Table of Contents -#+begin_src emacs-lisp -(use-package toc-org - :commands toc-org-enable - :init (add-hook 'org-mode-hook 'toc-org-enable)) -#+end_src - -** Enabling Org Bullets -Org-bullets gives us attractive bullets rather than asterisks. - -#+begin_src emacs-lisp -(add-hook 'org-mode-hook 'org-indent-mode) -(use-package org-bullets) -(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) -#+end_src - ** Diminish Org Indent Mode Removes "Ind" from showing in the modeline. @@ -744,6 +728,15 @@ Removes "Ind" from showing in the modeline. #+end_src +** Org-Bullets +Org-bullets gives us attractive bullets rather than asterisks. + +#+begin_src emacs-lisp +(add-hook 'org-mode-hook 'org-indent-mode) +(use-package org-bullets) +(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) +#+end_src + ** Org Level Headers #+begin_src emacs-lisp (custom-set-faces @@ -756,7 +749,7 @@ Removes "Ind" from showing in the modeline. '(org-level-7 ((t (:inherit outline-5 :height 1.1))))) #+end_src -** Source Code Block Tag Expansion +** Org-Tempo Org-tempo is not a separate package but a module within org that can be enabled. Org-tempo allows for '