summaryrefslogtreecommitdiff
path: root/.config/emacs/modules
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs/modules')
-rw-r--r--.config/emacs/modules/mm-buffer-menu.el15
-rw-r--r--.config/emacs/modules/mm-editing.el57
-rw-r--r--.config/emacs/modules/mm-keybindings.el4
-rw-r--r--.config/emacs/modules/mm-modeline.el7
-rw-r--r--.config/emacs/modules/mm-projects.el61
-rw-r--r--.config/emacs/modules/mm-theme.el25
-rw-r--r--.config/emacs/modules/mm-treesit.el130
7 files changed, 226 insertions, 73 deletions
diff --git a/.config/emacs/modules/mm-buffer-menu.el b/.config/emacs/modules/mm-buffer-menu.el
new file mode 100644
index 0000000..7b725c6
--- /dev/null
+++ b/.config/emacs/modules/mm-buffer-menu.el
@@ -0,0 +1,15 @@
+;;; mm-buffer-menu.el --- Buffer Menu configuration -*- lexical-binding: t; -*-
+
+(defun mm-Buffer-menu-delete-all ()
+ "Mark all buffers for deletion."
+ (interactive nil Buffer-menu-mode)
+ (save-excursion
+ (goto-char (point-min))
+ (while (not (eobp))
+ (Buffer-menu-delete))))
+
+(use-package buff-menu
+ :bind ( :map Buffer-menu-mode-map
+ ("D" . mm-Buffer-menu-delete-all)))
+
+(provide 'mm-buffer-menu) \ No newline at end of file
diff --git a/.config/emacs/modules/mm-editing.el b/.config/emacs/modules/mm-editing.el
index 911a2a0..540bae4 100644
--- a/.config/emacs/modules/mm-editing.el
+++ b/.config/emacs/modules/mm-editing.el
@@ -24,7 +24,8 @@
(dolist (command #'(align-region
c-backslash-region
comment-dwim
- makefile-backslash-region))
+ makefile-backslash-region
+ sh-backslash-region))
(advice-add command :around #'mm-editing-force-space-indentation))
@@ -46,7 +47,8 @@
indent-tabs-mode (not mm-humanwave-p))
(defvar mm-editing-indentation-settings-alist
- '((c-mode . (:extras c-basic-offset))
+ '((awk-ts-mode . (:extras awk-ts-mode-indent-level))
+ (c-mode . (:extras c-basic-offset))
(c-ts-mode . (:extras c-ts-mode-indent-offset))
(css-mode . (:extras css-indent-offset))
(emacs-lisp-mode . (:width 8 :spaces t)) ; GNU code uses 8-column tabs
@@ -65,7 +67,10 @@
(sgml-mode . (:extras sgml-basic-offset))
(sh-mode . (:extras sh-basic-offset))
(tex-mode . (:width 2))
- (vimscript-ts-mode . (:extras vimscript-ts-mode-indent-level)))
+ (typescript-ts-mode . (:extras typescript-ts-mode-indent-offset))
+ (vimscript-ts-mode . (:extras vimscript-ts-mode-indent-level))
+ (vue-ts-mode . (:extras (typescript-ts-mode-indent-offset
+ vue-ts-mode-indent-offset))))
"Alist of indentation settings.
Each pair in this alist is of the form (MODE . SETTINGS) where MODE
specifies the mode for which the given SETTINGS should apply.
@@ -123,18 +128,22 @@ those should be listed in `mm-editing-indentation-settings'."
;;; Code Commenting
-(defun mm-c-comment-no-leading-stars ()
+(defun mm-c-comment-no-continue ()
(setq-local comment-continue " "))
+(defun mm-mhtml-comment-no-continue ()
+ (setq-local comment-continue " "))
+
(use-package newcomment
:custom
(comment-style 'multi-line)
:config
(dolist (mode '(c-mode c++-mode))
- (add-hook (mm-mode-to-hook mode) #'mm-c-comment-no-leading-stars)
+ (add-hook (mm-mode-to-hook mode) #'mm-c-comment-no-continue)
(when-let ((ts-mode (mm-mode-to-ts-mode mode))
((fboundp ts-mode)))
- (add-hook (mm-mode-to-hook ts-mode) #'mm-c-comment-no-leading-stars))))
+ (add-hook (mm-mode-to-hook ts-mode) #'mm-c-comment-no-continue)))
+ (add-hook 'mhtml-mode #'mm-mhtml-comment-no-continue))
;;; Multiple Cursors
@@ -195,6 +204,7 @@ and *Messages* buffer. This forces that to not happen."
(use-package multiple-cursors
:ensure t
+ :demand t
:bind (("C->" . #'mc/mark-next-like-this)
("C-<" . #'mc/mark-previous-like-this)
("C-M-<" . #'mc/mark-all-like-this-dwim)
@@ -220,8 +230,8 @@ and *Messages* buffer. This forces that to not happen."
helpful-symbol
helpful-variable))
(add-to-list 'mc/cmds-to-run-once command))))
- :config
- (keymap-unset mc/keymap "<return>" :remove))
+ (with-eval-after-load 'multiple-cursors-core
+ (keymap-unset mc/keymap "<return>" :remove)))
;;; Increment Numbers
@@ -308,11 +318,33 @@ is as described by `emmet-expand-line'."
(emmet-self-closing-tag-style ""))
+;;; Number Formatting
+
+(use-package number-format-mode
+ :commands ( number-format-buffer number-format-region
+ number-unformat-buffer number-unformat-region
+ number-format-mode))
+
+
;;; Additional Major Modes
-(use-package csv-mode :ensure t)
-(use-package git-modes :ensure t)
-(use-package sed-mode :ensure t)
+(use-package awk-ts-mode :ensure t)
+(use-package git-modes :ensure t)
+(use-package po-mode :ensure t)
+(use-package sed-mode :ensure t)
+
+(use-package csv-mode
+ :ensure t
+ :custom
+ (csv-align-style 'auto)
+ (csv-align-padding 2))
+
+(use-package xcompose-mode
+ :vc ( :url "https://git.thomasvoss.com/xcompose-mode"
+ :branch "master"
+ :rev :newest
+ :vc-backend Git)
+ :ensure t)
;;; Mode-Specific Configurations
@@ -329,6 +361,7 @@ is as described by `emmet-expand-line'."
;;; Add Missing Extensions
-(add-to-list 'auto-mode-alist '("\\.tmac\\'" . nroff-mode))
+(dolist (pattern '("\\.tmac\\'" "\\.mom\\'"))
+ (add-to-list 'auto-mode-alist (cons pattern 'nroff-mode)))
(provide 'mm-editing) \ No newline at end of file
diff --git a/.config/emacs/modules/mm-keybindings.el b/.config/emacs/modules/mm-keybindings.el
index 9917ab8..a5919de 100644
--- a/.config/emacs/modules/mm-keybindings.el
+++ b/.config/emacs/modules/mm-keybindings.el
@@ -100,6 +100,10 @@ the first command is remapped to the second command."
(keymap-global-unset "C-x C-l" :remove) ; ‘downcase-region’
(keymap-global-unset "C-x C-u" :remove) ; ‘upcase-region’
+;; The following conflict with ‘ace-window’
+(with-eval-after-load 'mhtml-mode
+ (keymap-unset html-mode-map "M-o" :remove))
+
;;; Bind Commands Globally
diff --git a/.config/emacs/modules/mm-modeline.el b/.config/emacs/modules/mm-modeline.el
index eaa852c..d1ec6f0 100644
--- a/.config/emacs/modules/mm-modeline.el
+++ b/.config/emacs/modules/mm-modeline.el
@@ -38,7 +38,8 @@
(propertize " (modified)" 'face 'mm-modeline-buffer-modified-face)))
(defconst mm-modeline-mode-acronyms
- '("css" "csv" "gsp" "html" "json" "mhtml" "rfc" "scss" "toml" "tsv")
+ '("css" "csv" "gsp" "html" "json" "mhtml" "rfc" "scss" "sql" "toml" "tsv"
+ "url")
"List of acronyms in major mode names that should be capitalized.")
(defconst mm-modeline-remap-alist
@@ -50,7 +51,9 @@
("Gmake" . "GMake")
("Imake" . "IMake")
("Js" . "JavaScript")
- ("Ts Mode" . "Tree-Sitter Mode"))
+ ("Ts Mode" . "Tree-Sitter Mode")
+ ("Wdired" . "WDired")
+ ("Xcompose" . "XCompose"))
"Alist of substrings in major mode names that should be remapped.
Some major modes have substrings that would be better displayed in
another manner. For example expanding an abbreviation such as ‘Js’ to
diff --git a/.config/emacs/modules/mm-projects.el b/.config/emacs/modules/mm-projects.el
index f3a8710..71006d5 100644
--- a/.config/emacs/modules/mm-projects.el
+++ b/.config/emacs/modules/mm-projects.el
@@ -20,14 +20,14 @@ This is intended to be called interactively via
(mm-projects-project-magit-status "Git Status" ?s)))
:config
(unless mm-darwin-p
- (if-let ((repo-directory (getenv "REPODIR"))
- (directories
- (cl-loop
- for author in (directory-files repo-directory :full "\\`[^.]")
- append (cl-loop
- for path in (directory-files author :full "\\`[^.]")
- collect (list (concat path "/"))))))
- (progn
+ (if-let ((repo-directory (getenv "REPODIR")))
+ (let* ((list-dir
+ (lambda (path)
+ (directory-files path :full "\\`[^.]")))
+ (directories
+ (cl-loop for author in (funcall list-dir (getenv "REPODIR"))
+ append (cl-loop for path in (funcall list-dir author)
+ collect (list (concat path "/"))))))
(with-temp-buffer
(prin1 directories (current-buffer))
(write-file project-list-file))
@@ -96,4 +96,49 @@ This is intended to be called interactively via
(require 'ansi-color)
(add-hook 'compilation-filter-hook #'ansi-color-compilation-filter))
+
+;;; GitHub Pull Requests
+
+(require 'gh)
+(keymap-global-set "C-c p" #'gh-create-pr)
+
+;; (defun mm-gh--get-labels ()
+;; (with-temp-buffer
+;; (call-process "gh" nil t nil "label" "list" "--json" "name")
+;; (goto-char (point-min))
+;; (let* ((data (json-parse-buffer))
+;; (labels (seq-map (lambda (x) (gethash "name" x)) data)))
+;; (sort labels
+;; :in-place t
+;; :lessp (lambda (x y)
+;; (let ((prefix-x-p (string-prefix-p "Sprint " x))
+;; (prefix-y-p (string-prefix-p "Sprint " y)))
+;; (cond
+;; ((and prefix-x-p prefix-y-p) (string> x y))
+;; (prefix-x-p t)
+;; (prefix-y-p nil)
+;; (:else (string< x y)))))))))
+
+;; (defun mm-gh-create-pr (title draftp labels)
+;; "Create a GitHub pull request using the gh CLI.
+;; If DRAFT is non-nil, the PR will be created as a draft.
+;; LABELS should be a comma-separated string of GitHub labels."
+;; (interactive
+;; (list
+;; (read-string (format-prompt "PR Title" nil))
+;; (y-or-n-p "Create as draft PR? ")
+;; (completing-read-multiple (format-prompt "PR Labels" nil)
+;; (mm-gh--get-labels))))
+;; (let* ((branch (car (vc-git-branches)))
+;; (title (format "%s %s" branch title))
+;; (flags `("--fill-verbose" "--title" ,title "--assignee" "@me"))
+;; (label-string (mapconcat #'identity labels ",")))
+;; (when draftp
+;; (setq flags (append flags '("--draft"))))
+;; (when labels
+;; (setq flags (append flags `("--label" ,label-string))))
+;; (with-temp-buffer
+;; (apply #'call-process "gh" nil t nil "pr" "create" flags)
+;; (message (buffer-string)))))
+
(provide 'mm-projects) \ No newline at end of file
diff --git a/.config/emacs/modules/mm-theme.el b/.config/emacs/modules/mm-theme.el
index 90d4992..90b89ba 100644
--- a/.config/emacs/modules/mm-theme.el
+++ b/.config/emacs/modules/mm-theme.el
@@ -16,7 +16,9 @@
"The default monospace font.
This is a plist containing a font name, -weight, and -height.")
-(defvar mm-theme-proportional-font '("SF Pro" :weight regular :height 162)
+(defvar mm-theme-proportional-font
+ `(,(if mm-darwin-p "Microsoft Sans Serif" "OpenSans")
+ :weight regular :height 162)
"The default proportional font.
This is a plist containing a font name, -weight, and -height.")
@@ -74,7 +76,7 @@ _FRAME is ignored."
((mhtml-mode html-mode html-ts-mode vue-ts-mode)
. ("<!--" "-->" "/>"))
(prog-mode
- . ("<=" ">=" "==" "!=" "*=" "__")))
+ . ("<<=" "<=" ">=" "==" "!=" "*=" "__")))
"Ligatures to enable in specific modes.
Elements of this alist are of the form:
@@ -203,9 +205,14 @@ See also the `mm-theme-background-opacity' variable."
;;; More Intuiative UI for Certain Modes
+(defun mm-disable-line-selection-mode ()
+ (line-selection-mode -1))
+
(use-package line-selection-mode
:hook ((bookmark-bmenu-mode dired-mode ibuffer-mode magit-repolist-mode)
- . line-selection-mode))
+ . line-selection-mode)
+ :config
+ (add-hook 'wdired-mode-hook #'mm-disable-line-selection-mode))
;;; Line Highlighting
@@ -214,4 +221,16 @@ See also the `mm-theme-background-opacity' variable."
:custom
(hl-line-sticky-flag nil))
+
+;;; Indent Guides
+
+(when mm-darwin-p
+ (use-package highlight-indent-guides
+ :ensure t
+ :hook ((jinja2-mode vue-ts-mode mhtml-mode) . highlight-indent-guides-mode)
+ :custom
+ (highlight-indent-guides-method 'fill)
+ (highlight-indent-guides-auto-even-face-perc 30)
+ (highlight-indent-guides-auto-odd-face-perc 0)))
+
(provide 'mm-theme) \ No newline at end of file
diff --git a/.config/emacs/modules/mm-treesit.el b/.config/emacs/modules/mm-treesit.el
index df3d85a..1d4defa 100644
--- a/.config/emacs/modules/mm-treesit.el
+++ b/.config/emacs/modules/mm-treesit.el
@@ -15,49 +15,65 @@
(setopt treesit-font-lock-level 4)
(setopt treesit-language-source-alist
- '((c "https://github.com/tree-sitter/tree-sitter-c")
- (cpp "https://github.com/tree-sitter/tree-sitter-cpp")
- (css "https://github.com/tree-sitter/tree-sitter-css")
- (go "https://github.com/tree-sitter/tree-sitter-go")
- (gomod "https://github.com/camdencheek/tree-sitter-go-mod")
- (gsp "git://git.thomasvoss.com/tree-sitter-gsp.git")
- (html "https://github.com/tree-sitter/tree-sitter-html")
- (javascript "https://github.com/tree-sitter/tree-sitter-javascript")
- (python "https://github.com/tree-sitter/tree-sitter-python")
- (typescript "https://github.com/tree-sitter/tree-sitter-typescript"
- "master" "typescript/src")
- (vim "https://github.com/tree-sitter-grammars/tree-sitter-vim")
- (vue "https://github.com/ikatyang/tree-sitter-vue")))
+ '((awk
+ "https://github.com/Beaglefoot/tree-sitter-awk")
+ (c
+ "https://github.com/tree-sitter/tree-sitter-c")
+ (cpp
+ "https://github.com/tree-sitter/tree-sitter-cpp")
+ (css
+ "https://github.com/tree-sitter/tree-sitter-css")
+ (go
+ "https://github.com/tree-sitter/tree-sitter-go")
+ (gomod
+ "https://github.com/camdencheek/tree-sitter-go-mod")
+ (gsp
+ "git://git.thomasvoss.com/tree-sitter-gsp.git")
+ (html
+ "https://github.com/tree-sitter/tree-sitter-html")
+ (java
+ "https://github.com/tree-sitter/tree-sitter-java")
+ (javascript
+ "https://github.com/tree-sitter/tree-sitter-javascript")
+ (markdown
+ "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
+ "split_parser" "tree-sitter-markdown/src")
+ (markdown-inline
+ "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
+ "split_parser" "tree-sitter-markdown-inline/src")
+ (python
+ "https://github.com/tree-sitter/tree-sitter-python")
+ (tsx
+ "https://github.com/tree-sitter/tree-sitter-typescript"
+ "master" "tsx/src")
+ (typescript
+ "https://github.com/tree-sitter/tree-sitter-typescript"
+ "master" "typescript/src")
+ (vim
+ "https://github.com/tree-sitter-grammars/tree-sitter-vim")
+ (vue
+ "https://github.com/ikatyang/tree-sitter-vue")))
;;; Install Missing Parsers
-(defun mm-treesit-sync-sources ()
- "Sync Tree-Sitter parsers.
-Reinstall the Tree-Sitter parsers specified by
- `treesit-language-source-alist'."
+(defun mm-treesit-install-all ()
+ "Install all Tree-Sitter parsers.
+This is like `mm-treesit-install-missing' but also reinstalls parsers
+that are already installed."
(interactive)
- (let ((total (length treesit-language-source-alist))
- (count 0)
- (work treesit-language-source-alist)
- (processors-to-use (max 1 (1- (num-processors)))))
- (while work
- (let ((specs (seq-take work processors-to-use)))
- (dolist (spec specs)
- (async-start
- `(lambda ()
- ,(async-inject-variables "\\`treesit-language-source-alist\\'")
- (treesit-install-language-grammar ',(car spec)))
- (lambda (_)
- (setq count (1+ count))
- (message "Done syncing Tree-Sitter grammar for `%s' [%d/%d]"
- (car spec) count total))))
- (setq work (seq-drop work processors-to-use))))))
-
-(thread-last
- (mapcar #'car treesit-language-source-alist)
- (seq-remove #'treesit-language-available-p)
- (mapc #'treesit-install-language-grammar))
+ (cl-loop for (lang) in treesit-language-source-alist
+ do (treesit-install-language-grammar lang)))
+
+(defun mm-treesit-install-missing ()
+ "Install missing Tree-Sitter parsers.
+The parsers are taken from `treesit-language-source-alist'."
+ (interactive)
+ (cl-loop for (lang) in treesit-language-source-alist
+ unless (treesit-language-available-p lang)
+ do (treesit-install-language-grammar lang)))
+
+(mm-treesit-install-missing)
;;; Install Additional TS Modes
@@ -79,13 +95,18 @@ Reinstall the Tree-Sitter parsers specified by
;; NOTE: This package doesn’t autoload its ‘auto-mode-alist’ entries
(use-package vue-ts-mode
- :vc (:url "https://github.com/8uff3r/vue-ts-mode.git"
- :branch "main"
- :rev :newest
- :vc-backend Git)
+ :vc ( :url "https://github.com/8uff3r/vue-ts-mode.git"
+ :branch "main"
+ :rev :newest
+ :vc-backend Git)
:ensure t
:mode "\\.vue\\'")
+;; NOTE: This package doesn’t autoload its ‘auto-mode-alist’ entries
+(use-package markdown-ts-mode
+ :ensure t
+ :mode "\\.md\\'")
+
;;; Prefer Tree-Sitter Modes
@@ -94,28 +115,38 @@ Reinstall the Tree-Sitter parsers specified by
;; anyway. Same goes for ‘typescript-ts-mode’.
(defvar mm-treesit-language-file-name-alist
'((go . "\\.go\\'")
- (go-mod . "/go\\.mod\\'")
+ (gomod . "/go\\.mod\\'")
+ (tsx . "\\.tsx\\'")
(typescript . "\\.ts\\'"))
"Alist mapping languages to their associated file-names.
This alist is a set of pairs of the form (LANG . REGEXP) where LANG is
-the symbol corresponding to a major mode with the ‘-ts-mode’ suffix
+the symbol corresponding to a major mode with the `-ts-mode' suffix
removed. REGEXP is a regular expression matching filenames for which
the associated language’s major-mode should be enabled.
This alist is used to configure `auto-mode-alist'.")
+(defvar mm-treesit-dont-have-modes
+ '(markdown-inline)
+ "List of languages that don't have modes.
+Some languages may come with multiple parsers, (e.g. `markdown' and
+`markdown-inline') and as a result one-or-more of the parsers won't be
+associated with a mode. To avoid breaking the configuration, these
+languages should be listed here.")
+
(dolist (spec treesit-language-source-alist)
(let* ((lang (car spec))
- (lang (alist-get lang mm-treesit-language-remap-alist lang))
- (symbol-name (symbol-name lang))
- (name-mode (intern (concat symbol-name "-mode")))
- (name-ts-mode (intern (concat symbol-name "-ts-mode"))))
+ (lang-remap (alist-get lang mm-treesit-language-remap-alist lang))
+ (name-mode (intern (format "%s-mode" lang-remap)))
+ (name-ts-mode (intern (format "%s-ts-mode" lang-remap))))
;; If ‘name-ts-mode’ is already in ‘auto-mode-alist’ then we don’t
;; need to do anything, however if that’s not the case then if
;; ‘name-ts-mode’ and ‘name-mode’ are both bound we do a simple
;; remap. If the above is not true then we lookup the extensions in
;; ‘mm-treesit-language-file-name-alist’.
(cond
+ ((memq lang mm-treesit-dont-have-modes)
+ nil)
((not (fboundp name-ts-mode))
(warn "`%s' is missing." name-ts-mode))
((rassq name-ts-mode auto-mode-alist)
@@ -128,6 +159,9 @@ This alist is used to configure `auto-mode-alist'.")
(add-to-list 'auto-mode-alist (cons file-regexp name-ts-mode))
(warn "Unable to determine the extension for `%s'." name-ts-mode))))))
+;; JavaScript being difficult as usual
+(add-to-list 'major-mode-remap-alist '(javascript-mode . js-ts-mode))
+
;;; Hack For C23