diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el index 16027d5..62ea3ee 100644 --- a/core/siren-core-modules.el +++ b/core/siren-core-modules.el @@ -26,16 +26,16 @@ (require 'siren-helpful) ;; Editor -(require 'siren-amx) -(require 'siren-highlight-symbol) (require 'siren-display-fill-column) (require 'siren-display-indentation) (require 'siren-display-line-numbers) (require 'siren-folding) -(require 'siren-ido) +(require 'siren-highlight-symbol) +(require 'siren-marginalia) (require 'siren-minions) (require 'siren-mwim) (require 'siren-rainbow) +(require 'siren-selectrum) (require 'siren-undo-tree) (require 'siren-undohist) (require 'siren-which-key) diff --git a/modules/completion/siren-prescient.el b/modules/completion/siren-prescient.el deleted file mode 100644 index 0b874f3..0000000 --- a/modules/completion/siren-prescient.el +++ /dev/null @@ -1,17 +0,0 @@ -;;; siren-prescient.el --- jimeh's Emacs Siren: prescient configuration. - -;;; Commentary: - -;; Basic configuration for prescient. - -;;; Code: - -(use-package prescient - :defer t - - :custom - (prescient-filter-method '(literal regexp initialism fuzzy)) - (prescient-save-file (expand-file-name "prescient-save.el" siren-cache-dir))) - -(provide 'siren-prescient) -;;; siren-prescient.el ends here diff --git a/modules/core/siren-global-keybindings.el b/modules/core/siren-global-keybindings.el index 6805639..5fdf4ab 100644 --- a/modules/core/siren-global-keybindings.el +++ b/modules/core/siren-global-keybindings.el @@ -6,6 +6,9 @@ ;;; Code: +;; Enable alternative to M-x. +(global-set-key (kbd "C-x C-m") 'execute-extended-command) + ;; Enable dabbrev-expand via custom keybinding. (global-set-key (kbd "C-x M-/") 'dabbrev-expand) diff --git a/modules/editor/siren-ido.el b/modules/editor/siren-ido.el index 1f921a8..5a8e38d 100644 --- a/modules/editor/siren-ido.el +++ b/modules/editor/siren-ido.el @@ -16,7 +16,7 @@ (ido-default-file-method 'selected-window) (ido-enable-flex-matching t) (ido-enable-prefix nil) - (ido-max-prospects 10) + (ido-max-prospects 12) (ido-save-directory-list-file (expand-file-name "ido.hist" siren-cache-dir)) (ido-use-faces t) (ido-use-filename-at-point nil) diff --git a/modules/editor/siren-marginalia.el b/modules/editor/siren-marginalia.el new file mode 100644 index 0000000..11894fb --- /dev/null +++ b/modules/editor/siren-marginalia.el @@ -0,0 +1,16 @@ +;;; siren-marginalia.el --- jimeh's Emacs Siren: marginalia configuration. + +;;; Commentary: + +;; Basic configuration for marginalia. + +;;; Code: + +(use-package marginalia + :bind (:map minibuffer-local-map + ("M-A" . marginalia-cycle)) + :init + (marginalia-mode +1)) + +(provide 'siren-marginalia) +;;; siren-marginalia.el ends here diff --git a/modules/editor/siren-prescient.el b/modules/editor/siren-prescient.el new file mode 100644 index 0000000..4f0747e --- /dev/null +++ b/modules/editor/siren-prescient.el @@ -0,0 +1,31 @@ +;;; siren-prescient.el --- jimeh's Emacs Siren: prescient configuration. + +;;; Commentary: + +;; Basic configuration for prescient. + +;;; Code: + +(use-package prescient + :defer t + + :custom + (prescient-filter-method '(literal-prefix literal regexp initialism fuzzy)) + (prescient-history-length 100) + (prescient-save-file (expand-file-name "prescient-save.el" siren-cache-dir)) + (prescient-sort-full-matches-first t) + (prescient-sort-length-enable nil) + + :config + (prescient-persist-mode +1)) + +(use-package company-prescient + :defer t + :after (prescient company) + + :config + (company-prescient-mode +1)) + + +(provide 'siren-prescient) +;;; siren-prescient.el ends here diff --git a/modules/editor/siren-selectrum.el b/modules/editor/siren-selectrum.el index cbb2714..ce8e69e 100644 --- a/modules/editor/siren-selectrum.el +++ b/modules/editor/siren-selectrum.el @@ -9,14 +9,15 @@ (require 'siren-prescient) (use-package selectrum - :straight (:host github :repo "raxod502/selectrum") + :custom + (selectrum-display-action nil) + (selectrum-fix-vertical-window-height t) + (selectrum-max-window-height 12) :config (selectrum-mode +1)) (use-package selectrum-prescient - :straight (:host github :repo "raxod502/prescient.el" - :files ("selectrum-prescient.el")) :after (selectrum) :config diff --git a/modules/linting/siren-flycheck.el b/modules/linting/siren-flycheck.el index 3b01d8d..f399950 100644 --- a/modules/linting/siren-flycheck.el +++ b/modules/linting/siren-flycheck.el @@ -11,7 +11,6 @@ (prog-mode . flycheck-mode) :custom - (flycheck-completion-system 'ido) (flycheck-idle-change-delay 1.0) (flycheck-indication-mode 'right-fringe) (flycheck-ruby-rubocop-executable "rubocop-bundle-safe") diff --git a/modules/navigation/siren-dumb-jump.el b/modules/navigation/siren-dumb-jump.el index 04465b9..9325bfb 100644 --- a/modules/navigation/siren-dumb-jump.el +++ b/modules/navigation/siren-dumb-jump.el @@ -6,8 +6,6 @@ ;;; Code: -(require 'siren-ido) - (use-package dumb-jump :bind ("C-c C-j" . dumb-jump-go) @@ -16,10 +14,7 @@ ("M-g b" . dumb-jump-back) ("M-g i" . dumb-jump-go-prompt) ("M-g x" . dumb-jump-go-prefer-external) - ("M-g z" . dumb-jump-go-prefer-external-other-window) - - :custom - (dumb-jump-selector 'ido)) + ("M-g z" . dumb-jump-go-prefer-external-other-window)) (provide 'siren-dumb-jump) ;;; siren-dumb-jump.el ends here diff --git a/modules/projects/siren-projectile.el b/modules/projects/siren-projectile.el index 52c5572..d824b89 100644 --- a/modules/projects/siren-projectile.el +++ b/modules/projects/siren-projectile.el @@ -21,7 +21,7 @@ :custom (projectile-cache-file (expand-file-name "projectile" siren-cache-dir)) - (projectile-completion-system 'ido) + (projectile-completion-system 'default) (projectile-enable-caching nil) (projectile-globally-ignored-directories '(".bzr" ".eunit" diff --git a/modules/spelling/siren-flyspell.el b/modules/spelling/siren-flyspell.el index d7487bf..411a279 100644 --- a/modules/spelling/siren-flyspell.el +++ b/modules/spelling/siren-flyspell.el @@ -6,8 +6,6 @@ ;;; Code: -(require 'siren-ido) - (use-package flyspell :straight (:type built-in) :defer t @@ -28,9 +26,7 @@ (unbind-key "C-;" flyspell-mode-map)) (use-package flyspell-correct - :bind ("C-/" . flyspell-correct-wrapper) - :custom - (flyspell-correct-interface #'flyspell-correct-ido)) + :bind ("C-/" . flyspell-correct-wrapper)) (provide 'siren-flyspell) ;;; siren-flyspell.el ends here diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el index 6793b95..adc457f 100644 --- a/modules/version-control/siren-magit.el +++ b/modules/version-control/siren-magit.el @@ -21,7 +21,7 @@ :custom (magit-bury-buffer-function 'magit-mode-quit-window) (magit-commit-arguments '("-S")) - (magit-completing-read-function 'magit-ido-completing-read) + (magit-completing-read-function 'magit-builtin-completing-read) (magit-default-tracking-name-function 'magit-default-tracking-name-branch-only) (magit-diff-adjust-tab-width t) diff --git a/straight/versions/default.el b/straight/versions/default.el index bafdd88..10b23fd 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,7 +1,6 @@ (("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9") ("all-the-icons-ibuffer" . "5a984b4d7f811e2ad08fdc461a1e89205804b7bd") ("all-the-icons.el" . "facbde4a7be292bf9490932cbe403b443273f45d") - ("amx" . "37f9c7ae55eb0331b27200fb745206fc58ceffc0") ("anzu" . "bdb3da5028935a4aea55c40769bc191a81afb54e") ("applescript-mode" . "a45c426b7e4a450faea004ef5b842fd37e17a7c6") ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa") @@ -94,8 +93,6 @@ ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87") ("httprepl.el" . "cfa3693267a8ed1c96a86a126823f37dbfe077d8") ("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1") - ("ido-completing-read-plus" . "36a8bb93a59a16c8d5a5163c8cfde3770a1052df") - ("ido-vertical-mode.el" . "b1659e967da0687abceca733b389ace24004fa66") ("imenu-anywhere" . "06ec33d79e33edf01b9118aead1eabeae8ee08b1") ("inf-ruby" . "92d5d122fa172bc49b5ec9ee1891aa9c84805c92") ("jinja2-mode" . "ecd19a40b7832bb00f0a2244e3b0713d0bf3850d") @@ -113,6 +110,7 @@ ("lua-mode" . "2d9a468b94acd8480299d47449b53136060b7b23") ("magit" . "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f") ("magit-popup" . "d8585fa39f88956963d877b921322530257ba9f5") + ("marginalia" . "e31e03c5857bf7aada333f693caedfc3087d6297") ("markdown-mode" . "58f2d22526ac1e4abd4ee1afff8624d2dd3123d3") ("melpa" . "1bebe80350df731711bc526ca9fe942410211220") ("mermaid-mode" . "562ffe86cad91627e2b94b8684818562c3ad2b5d") @@ -139,6 +137,7 @@ ("popup-el" . "866a091b83369873b4d1c5d62a590fbb0a150bd0") ("posframe" . "3257a52e3599bc1d5c9a4b646d36d7a49b0dd025") ("powerline" . "cfba2aa9cfa190e7720900f01a946e1e78aac7e2") + ("prescient.el" . "4a0f5405798cfcb98ea005078ef2e2d490e922c4") ("prettier-emacs" . "e9b73e81d3e1642aec682195f127a42dfb0b5774") ("projectile" . "155fdb44176347c9599357c7935993033260a930") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") @@ -161,6 +160,7 @@ ("sass-mode" . "247a0d4b509f10b28e4687cd8763492bca03599b") ("scss-mode" . "cf58dbec5394280503eb5502938f3b5445d1b53d") ("seeing-is-believing" . "fbbe246c0fda87bb26227bb826eebadb418a220f") + ("selectrum" . "a19bbe94de492bf504399c093cfc5695eb630fa8") ("shell-pop-el" . "4b4394037940a890a313d715d203d9ead2d156a6") ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41") ("smart-shift" . "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae") diff --git a/themes/siren-doom-themes-overrides-theme.el b/themes/siren-doom-themes-overrides-theme.el index 45e7c75..07170be 100644 --- a/themes/siren-doom-themes-overrides-theme.el +++ b/themes/siren-doom-themes-overrides-theme.el @@ -99,7 +99,20 @@ `(diredp-deletion ((t ( :foreground ,(doom-color 'yellow) :background ,(doom-darken 'red 0.25) )))) `(diredp-deletion-file-name ((t ( :foreground ,(doom-color 'red) )))) - `(diredp-compressed-file-name ((t ( :foreground ,(doom-color 'blue) ))))) + `(diredp-compressed-file-name ((t ( :foreground ,(doom-color 'blue) )))) + + ;; selectrum + `(selectrum-current-candidate ((t ( :background ,(doom-blend 'violet 'bg 0.2) + :foreground ,(doom-blend 'violet 'fg 0.3) + ;; :background ,(doom-color 'region) + :distant-foreground nil :extend t )))) + `(selectrum-prescient-primary-highlight ((t ( :background nil + :foreground ,(doom-lighten 'magenta 0.15) + :weight 'light )))) + `(selectrum-prescient-secondary-highlight ((t ( :inherit 'selectrum-prescient-primary-highlight + :background nil + :foreground ,(doom-blend 'magenta 'red 0.6) + :weight 'bold))))) (custom-theme-set-variables 'siren-doom-themes-overrides