From 3bd155cb799e8ca4af8c0873aa767f61dee9f5bf Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 1 May 2023 00:01:45 +0100 Subject: [PATCH] feat(editor): try snap-indent as a replacement for yank-indent Currently trying via my own fork of snap-indent, which has a PR pending. --- core/siren-core-modules.el | 2 +- core/siren-core-package-overrides.el | 3 +++ modules/editor/siren-snap-indent.el | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 modules/editor/siren-snap-indent.el diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el index 857f637..537460f 100644 --- a/core/siren-core-modules.el +++ b/core/siren-core-modules.el @@ -45,6 +45,7 @@ (require 'siren-rainbow) (require 'siren-recentf) (require 'siren-savehist) +(require 'siren-snap-indent) (require 'siren-subword) (require 'siren-symbol-overlay) (require 'siren-undo-fu) @@ -53,7 +54,6 @@ (require 'siren-vundo) (require 'siren-which-key) (require 'siren-whitespace) -(require 'siren-yank-indent) ;; Completion Systems and Interfaces (require 'siren-vertico) diff --git a/core/siren-core-package-overrides.el b/core/siren-core-package-overrides.el index f874ec5..01d7b3b 100644 --- a/core/siren-core-package-overrides.el +++ b/core/siren-core-package-overrides.el @@ -12,6 +12,9 @@ ;; features. (all-the-icons-completion :type git :flavor melpa :host github :repo "iyefrat/all-the-icons-completion" :fork (:host github :repo "MintSoup/all-the-icons-completion")) + ;; Override snap-indent to use fork with more features. + (snap-indent :type git :flavor melpa :host github :repo "jeffvalk/snap-indent" + :fork (:host github :repo "jimeh/snap-indent" :branch "various-features")) ;; Override vertico recipe to fix issues with extensions. (vertico :type git :host github :repo "minad/vertico" :files (:defaults "extensions/*" (:exclude ".git"))))))) diff --git a/modules/editor/siren-snap-indent.el b/modules/editor/siren-snap-indent.el new file mode 100644 index 0000000..eb6eea1 --- /dev/null +++ b/modules/editor/siren-snap-indent.el @@ -0,0 +1,19 @@ +;;; siren-snap-indent.el --- jimeh's Emacs Siren: snap-indent configuration. + +;;; Commentary: + +;; Basic configuration for snap-indent. + +;;; Code: + +(use-package snap-indent + :hook + (prog-mode . snap-indent-mode) + (tex-mode . snap-indent-mode) + + :custom + (snap-indent-yank-threshold 10000) + (snap-indent-yank-skip-indent-with-prefix-arg t)) + +(provide 'siren-snap-indent) +;;; siren-snap-indent.el ends here