reorganization and tidying. Now with org-mode!

dysmento · dysmento · commit 82d8977e9a9c · 2022-09-11T19:36:33.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ custom.el
 archive-contents
 *.elc
 .cache
+recentf
+transient
diff --git a/customizations/editing.el b/customizations/editing.el
@@ -18,16 +18,13 @@
 ;; Highlight current line
 (global-hl-line-mode 1)
 
-;; Interactive search key bindings. By default, C-s runs
-;; isearch-forward, so this swaps the bindings.
-(global-set-key (kbd "C-s") 'isearch-forward-regexp)
-(global-set-key (kbd "C-r") 'isearch-backward-regexp)
-(global-set-key (kbd "C-M-s") 'isearch-forward)
-(global-set-key (kbd "C-M-r") 'isearch-backward)
-
 ;; Don't use hard tabs
 (setq-default indent-tabs-mode nil)
 
+;; shell scripts
+(setq-default sh-basic-offset 2
+              sh-indentation 2)
+
 ;; When you visit a file, point goes to the last place where it
 ;; was when you previously visited the same file.
 ;; http://www.emacswiki.org/emacs/SavePlace
@@ -43,7 +40,6 @@
                                                "backups"))))
 (setq auto-save-default nil)
 
-
 ;; comments
 (defun toggle-comment-on-line ()
   "comment or uncomment current line"
diff --git a/customizations/elisp-editing.el b/customizations/elisp-editing.el
@@ -1,15 +1,12 @@
-;; Automatically load paredit when editing a lisp file
-;; More at http://www.emacswiki.org/emacs/ParEdit
 (setup (:package paredit)
   (:hook-into emacs-lisp-mode
-              eval-expression-minibuffer-setup
-              ielm-mode
-              lisp-mode
-              lisp-interaction-mode
-              scheme-mode))
+	      eval-expression-minibuffer-setup
+	      ielm-mode
+	      lisp-mode
+	      lisp-interaction-mode
+	      scheme-mode))
 
-;; eldoc-mode shows documentation in the minibuffer when writing code
-;; http://www.emacswiki.org/emacs/ElDoc
-(add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
-(add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode)
-(add-hook 'ielm-mode-hook 'turn-on-eldoc-mode)
+(setup turn-on-eldoc-mode
+  (:hook-into emacs-lisp-mode
+	 lisp-interaction-mode
+	 iel-mode))
diff --git a/customizations/markdown.el b/customizations/markdown.el
diff --git a/customizations/misc.el b/customizations/misc.el
diff --git a/customizations/navigation.el b/customizations/navigation.el
@@ -27,4 +27,8 @@
            "C-x C-b" counsel-switch-buffer
            "M-x" counsel-M-x))
 
-(setup (:package ivy-rich))
+;; ivy-rich-mode adds docstrings and additional metadata
+;; in the ivy picker minibuffer
+;; see screenshots: https://github.com/Yevgnen/ivy-rich/blob/master/screenshots.org
+(setup (:package ivy-rich)
+  (ivy-rich-mode))
diff --git a/customizations/setup-clojure.el b/customizations/setup-clojure.el
@@ -1,6 +1,7 @@
 ;; See https://clojure-lsp.io/
-(setup (:package lsp-mode)
-  (:bind "M-<f7>" #'lsp-find-references))
+(when (executable-find "clojure-lsp")
+  (setup (:package lsp-mode)
+    (:bind "M-<f7>" lsp-find-references)))
 
 ;; clojure-mode is (naturally) the major mode for editing
 ;; Clojure and ClojureScript. subword-mode allows words
@@ -12,17 +13,16 @@
 (setup (:package clojure-mode)
   (:hook subword-mode
          paredit-mode
-         lsp-mode)
-  (:bind "C-c C-v" #'cider-start-http-server
-         "C-M-r" #'cider-refresh
-         "C-c u" #'cider-user-ns))
+         lsp)
+  (:bind "C-M-r" cider-refresh
+         "C-c u" cider-user-ns))
 
 ;; CIDER is a whole interactive development environment for
 ;; Clojure. There is a ton of functionality here, so be sure
 ;; to check out the excellent documentation at
 ;; https://docs.cider.mx/cider/index.html
 (setup (:package cider)
-  (:bind "C-c u" #'cider-user-ns)
+  (:bind "C-c u" cider-user-ns)
   (:option cider-show-error-buffer t
            cider-auto-select-error-buffer t
            cider-repl-history-file "~/.emacs.d/cider-history"
@@ -52,17 +52,14 @@
 (add-hook 'cider-repl-mode-hook 'paredit-mode)
 
 ;; Use clojure mode for other extensions
-(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
 (add-to-list 'auto-mode-alist '("\\.boot$" . clojure-mode))
 (add-to-list 'auto-mode-alist '("\\.cljs.*$" . clojure-mode))
 (add-to-list 'auto-mode-alist '("lein-env" . enh-ruby-mode))
 
-
-;; key bindings
 ;; these help me out with the way I usually develop web apps
 (defun cider-start-http-server ()
   (interactive)
-  (cider-load-current-buffer)
+  (cider-load-buffer)
   (let ((ns (cider-current-ns)))
     (cider-repl-set-ns ns)
     (cider-interactive-eval (format "(println '(def server (%s/start))) (println 'server)" ns))
@@ -75,3 +72,4 @@
 (defun cider-user-ns ()
   (interactive)
   (cider-repl-set-ns "user"))
+
diff --git a/customizations/setup-js.el b/customizations/setup-js.el
@@ -2,18 +2,19 @@
 (setup (:package tagedit)
   (:hook-into html-mode))
 
-(add-to-list 'auto-mode-alist '("\\.js$" . js-mode))
-(add-hook 'js-mode-hook 'subword-mode)
-(add-hook 'html-mode-hook 'subword-mode)
+(setup subword-mode
+  (:hook-into js-mode
+	      html-mode
+	      coffee-mode))
+
 (setq js-indent-level 2)
 
 ;; coffeescript
-(add-to-list 'auto-mode-alist '("\\.coffee.erb$" . coffee-mode))
-(add-hook 'coffee-mode-hook 'subword-mode)
-(add-hook 'coffee-mode-hook 'highlight-indentation-current-column-mode)
-(add-hook 'coffee-mode-hook
-          (defun coffee-mode-newline-and-indent ()
-            (define-key coffee-mode-map "\C-j" 'coffee-newline-and-indent)
-            (setq coffee-cleanup-whitespace nil)))
+(setup coffee-mode
+  (:hook highlight-indentation-current-column-mode
+	 (defun coffee-mode-newline-and-indent ()
+	   (define-key coffee-mode-map "\C-j" 'coffee-newline-and-indent)
+	   (setq coffee-cleanup-whitespace nil))))
+
 (custom-set-variables
  '(coffee-tab-width 2))
diff --git a/customizations/setup-org.el b/customizations/setup-org.el
@@ -0,0 +1,59 @@
+;; some people consider org-mode to be emacs's killer app
+;; on the face of it, it's a plaintext outliner for organizing
+;; notes, plans, ideas, articles, etc. But it goes way beyond that,
+;; including calendar features, executable code blocks, task statuses,
+;; and even a pomodoro timer!
+;; See https://orgmode.org/ for _tons_ of information
+;; All of the beautifying configuration comes from https://zzamboni.org/post/beautifying-org-mode-in-emacs/
+;; Tip of the had to Diego Zamboni for that.
+(defun efc/org-font-setup ()
+  ;; Replace list hyphen with dot
+  (font-lock-add-keywords 'org-mode
+                          '(("^ *\\([-]\\) "
+                             (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
+
+    (let* ((variable-tuple
+          (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
+                ((x-list-fonts "Lucida Grande")   '(:font "Lucida Grande"))
+                ((x-list-fonts "Verdana")         '(:font "Verdana"))
+                ((x-family-fonts "Sans Serif")    '(:family "Sans Serif"))
+                (nil (warn "Cannot find a Sans Serif Font.  Install Source Sans Pro."))))
+         (base-font-color     (face-foreground 'default nil 'default))
+         (headline           `(:inherit default :weight bold :foreground ,base-font-color)))
+
+    (custom-theme-set-faces
+     'user
+     `(org-level-8 ((t (,@headline ,@variable-tuple))))
+     `(org-level-7 ((t (,@headline ,@variable-tuple))))
+     `(org-level-6 ((t (,@headline ,@variable-tuple))))
+     `(org-level-5 ((t (,@headline ,@variable-tuple))))
+     `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
+     `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
+     `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.33))))
+     `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.5))))
+     `(org-document-title ((t (,@headline ,@variable-tuple :height 1.75 :underline nil))))))
+
+  (custom-theme-set-faces
+   'user
+   '(org-block ((t (:inherit fixed-pitch))))
+   '(org-code ((t (:inherit (shadow fixed-pitch)))))
+   '(org-document-info ((t (:foreground "dark orange"))))
+   '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
+   '(org-indent ((t (:inherit (org-hide fixed-pitch)))))
+   '(org-link ((t (:foreground "royal blue" :underline t))))
+   '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch)))))
+   '(org-property-value ((t (:inherit fixed-pitch))) t)
+   '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch)))))
+   '(org-table ((t (:inherit fixed-pitch :foreground "#83a598"))))
+   '(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold :height 0.8))))
+   '(org-verbatim ((t (:inherit (shadow fixed-pitch)))))))
+
+(setup (:package org-bullets))
+
+(setup org-mode
+  (:global "<f12>" org-agenda)
+  (:option org-hide-emphasis-markers t)
+  (:hook org-bullets-mode
+         visual-line-mode
+         (lambda () (variable-pitch-mode 1)))
+  (efc/org-font-setup))
diff --git a/customizations/ui.el b/customizations/ui.el
@@ -4,26 +4,34 @@
 ;; a matter of preference and may require some fiddling to match your
 ;; preferences
 
-;; Turn off the menu bar at the top of each frame because it's distracting
-(menu-bar-mode -1)
+(tooltip-mode -1)                 ;; disable tooltips
+(tool-bar-mode -1)                ;; the toolbar is pretty ugly
+(scroll-bar-mode -1)              ;; disable visible scrollbar
+(blink-cursor-mode 0)             ;; turn off blinking cursor. distracting!
+(setq create-lockfiles nil)       ;; no need for ~ files when editing
+(fset 'yes-or-no-p 'y-or-n-p)     ;; changes all yes/no questions to y/n type
+(setq inhibit-startup-message t)  ;; go straight to scratch buffer on startup
+(setq ring-bell-function 'ignore) ;; turn off audible bell
+
+;; show full path in title bar
+(setq-default frame-title-format "%b (%f)")
 
-;; Show line numbers
-(global-linum-mode)
+;; initial frame height and width
+(add-to-list 'default-frame-alist '(height . 95))
+(add-to-list 'default-frame-alist '(width . 154))
 
-;; You can uncomment this to remove the graphical toolbar at the top. After
-;; awhile, you won't need the toolbar.
-;; (when (fboundp 'tool-bar-mode)
-;;   (tool-bar-mode -1))
+;; increase font size for better readability
+(set-face-attribute 'default nil :height 140)
 
-;; Don't show native OS scroll bars for buffers because they're redundant
-(when (fboundp 'scroll-bar-mode)
-  (scroll-bar-mode -1))
+;; on a Mac, don't pop up font menu
+(when (string-equal system-type "darwin")
+  (global-set-key (kbd "s-t") '(lambda () (interactive))))
 
 ;; doom is a whole Emacs distribution unto itself,
 ;; but it's got some really nice packages that you
 ;; can use a-la-carte. doom-modeline is simply a more
 ;; modern and more beautiful modeline.
-
+;; doom-modeline uses nice icons from all-the-icons
 (setup (:package all-the-icons))
 
 (setup (:package doom-modeline)
@@ -36,15 +44,7 @@
 ;; look like here:
 ;; https://github.com/doomemacs/themes/tree/screenshots
 (setup (:package doom-themes)
-  (load-theme 'doom-laserwave t))
-
-;; increase font size for better readability
-(set-face-attribute 'default nil :height 140)
-
-;; Uncomment the lines below by removing semicolons and play with the
-;; values in order to set the width (in characters wide) and height
-;; (in lines high) Emacs will have whenever you start it
-;; (setq initial-frame-alist '((top . 0) (left . 0) (width . 177) (height . 53)))
+  (load-theme 'doom-dracula t))
 
 ;; These settings relate to how emacs interacts with your operating system
 (setq ;; makes killing/yanking interact with the clipboard
@@ -66,22 +66,14 @@
       ;; Mouse yank commands yank at point instead of at click.
       mouse-yank-at-point t)
 
-(tool-bar-mode -1)
-
-(tooltip-mode -1)
-
-;; No cursor blinking, it's distracting
-(blink-cursor-mode 0)
-
-;; full path in title bar
-(setq-default frame-title-format "%b (%f)")
+;; CUSTOMIZE
 
-;; don't pop up font menu
-(global-set-key (kbd "s-t") '(lambda () (interactive)))
+;; You can uncomment this to remove the graphical toolbar at the top. After
+;; awhile, you won't need the toolbar.
+;; (tool-bar-mode -1)
 
-;; no bell
-(setq ring-bell-function 'ignore)
+;; Your choice of font is very personal, and you must have installed it
+;; on your system before you specify it here,
+;; Some font suggestions:  https://www.creativebloq.com/features/the-best-monospace-fonts-for-coding
+;; (set-face-attribute 'default nil :font "Fira Code")
 
-;; initial frame height and width
-(add-to-list 'default-frame-alist '(height . 95))
-(add-to-list 'default-frame-alist '(width . 154))
diff --git a/init.el b/init.el
@@ -32,10 +32,9 @@
     "elisp-editing.el"
     "setup-clojure.el"
     "setup-js.el"
+    "setup-org.el"
     "shell-integration.el"
-    "git.el"
-    "markdown.el"
-    "misc.el"))
+    "git.el"))
 
 (dolist (x addons)
   (load x))
