reorgnized

1 files changed, 111 insertions, 120 deletions

diff --git a/init-el.org b/init-el.org
index c40f4da..a1cab95 100644
--- a/init-el.org
+++ b/init-el.org
@@ -21,42 +21,20 @@
 #+name: preamble
 #+begin_src elisp :noweb no-export
 
-
-
-#+end_src
-  
-#+begin_src elisp :tangle ~/.emacs.d/init.el :noweb no-export  :results none
-;;;; init.el 
-
-;;;; DO NOT EDIT: This file has been generated by org-babel-tangle
-;;;; from a source file called init-el.org.
-
-
-
 (setq custom-file (concat user-emacs-directory "custom.el"))
 (load custom-file 'noerror)
 
 (setq warning-minimum-level :emergency)
 
-<<native-comp>>
-
 ;;; utilities
 (defun read-file-into-string (f)
   (with-temp-buffer
     (insert-file-contents f)
     (buffer-string)))
 
-<<packages-setup-config>>
-<<my-leader-keys-config>>
-<<org-mode-config>>
-<<ui-config>>
-<<communications-config>>
-<<time-management-config>>
-<<reading-notes-and-writing-config>>
-<<software-development-config>>
-<<tools-config>>
-
 #+end_src
+  
+
 ** Native Compilation
 
 New in emacs 28, native compilation can be enabled. I have attempted
@@ -72,7 +50,6 @@ to disable it.
   (setq package-native-compile nil
         native-comp-always-compile nil))
 
-
 #+end_src
 
 ** Packages Setup Config 
@@ -108,17 +85,6 @@ I'm using melpa and elpa package archives.
 
 * Leader Keys
 
-#+name: my-leader-keys-config
-#+begin_src elisp :noweb no-export :results none
-<<my-leader-key-system>>
-<<my-leader-key-toplevel-menu>>
-<<my-leader-key-major-mode-menu>>
-<<my-leader-key-applications-menu>>
-<<my-leader-special-edit>>
-<<my-special-inserts>>
-
-#+end_src
-
  I have written a custom leader key system called "my-leader-keys".  A
  leader key system emulates menus.  An initial key (M-m for me) opens
  the top level menu. The menu presents a key to press that either leads
@@ -297,9 +263,6 @@ I'm using melpa and elpa package archives.
 
 #+name: org-mode-config
 #+begin_src elisp :noweb no-export
-<<org-mode-main-config>>
-<<org-mode-leader-key-menu>>
-<<org-protocol-config>> 
 #+end_src
 
 ** Org Mode Main Config
@@ -496,21 +459,6 @@ e.g. here's one for org capture
 
 * UI 
 
-#+name: ui-config 
-#+begin_src elisp :noweb no-export  :results none
-;;; UI
-<<ui-chrome-config>>
-<<ui-tweaks-config>>
-<<ui-fonts-config>>
-<<ui-bells-and-wistles>>
-
-<<ui-completion-engine>>
-<<ui-windows-and-perspectives>>
-<<ui-themes>>
-<<ui-org-mode-tweaks>>
-<<ui-fonts>>
-#+end_src
-
 ** Fonts
 #+name: ui-fonts
 #+begin_src elisp :noweb no-export
@@ -937,20 +885,12 @@ LOAD-THEME"
 
 * Time Managment
 
-#+name: time-management-config
+#+name: time-management-preamble
 #+begin_src elisp :noweb no-export :results none
-;;; TIME MANAGMENT
-
 (setq org-enforce-todo-dependencies t
       org-enforce-todo-checkbox-dependencies t)
 
 (setq org-edit-src-content-indentation 0)
-
-<<pomidor>>
-<<calfw-org-config>>
-<<org-refile-config>>
-<<org-capture-config>>
-<<org-agenda-config>>
 #+end_src
 
 ** Pomidor
@@ -1058,11 +998,6 @@ stand up and move around.
 #+end_src
 
 * Communication
-#+name: communications-config
-#+begin_src elisp :noweb no-export :results none
-<<erc-config>>
-<<crdt-config>>
-#+end_src
 
 ** ERC
 
@@ -1088,25 +1023,6 @@ stand up and move around.
 #+end_src
 * Reading, Notes, and Writing 
 
-#+name: reading-notes-and-writing-config 
-#+begin_src elisp :noweb no-export  :results none
-
-<<general-reading-tools>>
-<<calibre-config>>
-<<pdf-tools>>
-<<pdf-mode-config>>
-<<nov>>
-<<elfeed-config>>
-
-<<ccrypt>>
-<<toggler>>
-<<deft>>
-<<writeroom>>
-<<eww-config>>
-<<markdown-editing>>
-
-
-#+end_src
 ** General Reading Tools
 
 wordnut is a wordnet interface
@@ -1349,24 +1265,11 @@ wordnut is a wordnet interface
 
 * Software Development 
 
-#+name: software-development-config
+#+name: software-development-preamble
 #+begin_src elisp :noweb no-export :results none
-
 (show-paren-mode 1)
-
-<<literate-programming>>
-
-<<pair-programming>>
-
-<<software-dev-essentials>>
-
-<<shell-config>>
-
-<<common-lisp-config>>
-
-<<haxe-config>>
-
 #+end_src
+
 ** Literate Programming
 
 Hacks and tweaks for literate programming. Org auto tangle will tangle
@@ -1786,24 +1689,6 @@ from debian contrib
 #+RESULTS: python-config
 
 * Tools
-#+name: tools-config
-#+begin_src elis :noweb no-export
-<<dirvish-config>>xs
-<<buffer-export-config>>
-<<helpful>>
-#+end_src
-** Dirvish
-
-Dirvish is a slicker dired - i.e it's a file manager.
-
-#+name: dirvish-config
-#+begin_src elisp :noweb no-export
-(package-install 'dirvish)
-(dirvish-override-dired-mode)
-#+end_src
-
-#+RESULTS: dirvish-config
-: t
 
 ** Export Emacs Buffer
 
@@ -1833,3 +1718,109 @@ Saves to a temp file and puts the filename in the kill ring."
 
 #+RESULTS: helpful
 : Package ‘helpful’ installed.
+
+* Tangle
+
+This block of code tangles the above into =~/.emacs.d/init.el= which
+emacs loads at startup.
+
+#+begin_src elisp :tangle ~/.emacs.d/init.el :noweb no-export  :results none
+;;;; init.el 
+
+;;;; DO NOT EDIT: This file has been generated by org-babel-tangle
+;;;; from a source file called init-el.org.
+
+<<preamble>>
+<<native-comp>>
+<<packages-setup-config>>
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; LEADER KEY DEFINITION AND TOPLEVEL MENUS ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+<<my-leader-key-system>>
+<<my-leader-key-toplevel-menu>>
+<<my-leader-key-major-mode-menu>>
+<<my-leader-key-applications-menu>>
+<<my-leader-special-edit>>
+<<my-special-inserts>>
+
+;;;;;;;;;;;;;;;;;;;;;;
+;; ORG-MODE CONFIGS ;;
+;;;;;;;;;;;;;;;;;;;;;;
+
+<<org-mode-main-config>>
+<<org-mode-leader-key-menu>>
+<<org-protocol-config>> 
+
+;;;;;;;;
+;; UI ;;
+;;;;;;;;
+
+<<ui-chrome-config>>
+<<ui-tweaks-config>>
+<<ui-fonts-config>>
+<<ui-bells-and-wistles>>
+<<ui-completion-engine>>
+<<ui-windows-and-perspectives>>
+<<ui-themes>>
+<<ui-org-mode-tweaks>>
+<<ui-fonts>>
+
+;;;;;;;;;;;;;;;;;;;;;
+;; TIME MANAGEMENT ;;
+;;;;;;;;;;;;;;;;;;;;;
+
+<<time-management-preamble>>
+<<pomidor>>
+<<calfw-org-config>>
+<<org-refile-config>>
+<<org-capture-config>>
+<<org-agenda-config>>
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;; COMMUNICATION TOOLS ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+<<erc-config>>
+<<crdt-config>>
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; READING, WRITING, AND NOTETAKING ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+<<general-reading-tools>>
+<<calibre-config>>
+<<pdf-tools>>
+<<pdf-mode-config>>
+<<nov>>
+<<elfeed-config>>
+<<ccrypt>>
+<<toggler>>
+<<deft>>
+<<writeroom>>
+<<eww-config>>
+<<markdown-editing>>
+
+;;;;;;;;;;;;;;;;;;
+;; SOFTWARE DEV ;;
+;;;;;;;;;;;;;;;;;;
+
+<<software-development-preamble>>
+<<literate-programming>>
+<<pair-programming>>
+<<software-dev-essentials>>
+<<shell-config>>
+<<common-lisp-config>>
+<<haxe-config>>
+
+;;;;;;;;;;;;;;;;;;;;;;
+;; TOOLS AND UTILS  ;;
+;;;;;;;;;;;;;;;;;;;;;;
+
+<<buffer-export-config>>
+<<helpful>>
+
+#+end_src