1 files changed, 58 insertions, 2 deletions
diff --git a/.config/emacs/modules/mm-editing.el b/.config/emacs/modules/mm-editing.el
index 540bae4..6054f5a 100644
--- a/.config/emacs/modules/mm-editing.el
+++ b/.config/emacs/modules/mm-editing.el
@@ -56,6 +56,7 @@
     (go-ts-mode            . (:extras go-ts-mode-indent-offset))
     (gsp-ts-mode           . (:width 2 :extras gsp-ts-mode-indent-rules))
     (helpful-mode          . (:width 8)) ; GNU code uses 8-column tabs
+    (json-ts-mode          . (:extras json-ts-mode-indent-offset))
     (latex-mode            . (:width 2))
     (lisp-data-mode        . (:spaces t))
     (lisp-interaction-mode . (:spaces t))
@@ -66,6 +67,7 @@
     (python-ts-mode        . (:extras python-indent-offset))
     (sgml-mode             . (:extras sgml-basic-offset))
     (sh-mode               . (:extras sh-basic-offset))
+    (sql-mode              . (:extras sqlind-basic-offset))
     (tex-mode              . (:width 2))
     (typescript-ts-mode    . (:extras typescript-ts-mode-indent-offset))
     (vimscript-ts-mode     . (:extras vimscript-ts-mode-indent-level))
@@ -125,6 +127,11 @@ those should be listed in `mm-editing-indentation-settings'."
                        extras))
         (set (make-local-variable extra) tabsize)))))
 
+(use-package sh-mode
+  :custom
+  (sh-indent-for-case-label 0)
+  (sh-indent-for-case-alt #'+))
+
 
 ;;; Code Commenting
 
@@ -298,6 +305,18 @@ surround with spaces."
               (push '("`" . "'") surround-pairs))))
 
 
+;;; Insert Webpage Contents
+
+(defun mm-insert-from-url (url)
+  "Insert the contents of URL at point."
+  (interactive
+   (let ((url-at-point (thing-at-point 'url)))
+     (list (read-string
+            (format-prompt "URL" url-at-point)
+            nil nil url-at-point))))
+  (call-process "curl" nil '(t nil) nil url))
+
+
 ;;; Emmet Mode
 
 (defun mm-editing-emmet-dwim (arg)
@@ -318,6 +337,36 @@ is as described by `emmet-expand-line'."
   (emmet-self-closing-tag-style ""))
 
 
+;;; JQ Manipulation in JSON Mode
+
+(defun mm-jq-filter (query &optional beg end)
+  "TODO"
+  (interactive
+   (list
+    (read-string (format-prompt "Query" nil))
+    (when (use-region-p) (region-beginning))
+    (when (use-region-p) (region-end))))
+  (let* ((beg (or beg (point-min)))
+         (end (or end (point-max)))
+         (temp-buffer (generate-new-buffer "* jq temp*"))
+         (exit-code (call-process-region beg end "jq" nil temp-buffer nil
+                                         "--tab" query))
+         (output (with-current-buffer temp-buffer (buffer-string))))
+    (if (zerop exit-code)
+        (atomic-change-group
+          (delete-region beg end)
+          (insert output)
+          (indent-region beg (point)))
+      (message "%s" output))
+    (kill-buffer temp-buffer)))
+
+(use-package json-ts-mode
+  :bind ( :map json-ts-mode-map
+          ("C-|" . #'mm-jq-filter))
+  :config
+  (require 'live-jq))
+
+
 ;;; Number Formatting
 
 (use-package number-format-mode
@@ -329,6 +378,7 @@ is as described by `emmet-expand-line'."
 ;;; Additional Major Modes
 
 (use-package awk-ts-mode :ensure t)
+(use-package cmake-mode  :ensure t)
 (use-package git-modes   :ensure t)
 (use-package po-mode     :ensure t)
 (use-package sed-mode    :ensure t)
@@ -362,6 +412,12 @@ is as described by `emmet-expand-line'."
 ;;; Add Missing Extensions
 
 (dolist (pattern '("\\.tmac\\'" "\\.mom\\'"))
-  (add-to-list 'auto-mode-alist (cons pattern 'nroff-mode)))
+  (add-to-list 'auto-mode-alist (cons pattern #'nroff-mode)))
+
+
+;;; Subword Navigation
+
+(use-package subword
+  :hook prog-mode)
 
-(provide 'mm-editing)
-\ No newline at end of file
+(provide 'mm-editing)