From be61aa14fbfcaf44ea20983fed05c8465b482e10 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 30 Oct 2024 10:34:30 -0500 Subject: [PATCH] adding a lot of changes --- README.org | 40 +++++++++++++++++++++++++++++----------- init.el | 35 ++++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 22 deletions(-) diff --git a/README.org b/README.org index e11cac22..fc3982c5 100644 --- a/README.org +++ b/README.org @@ -387,6 +387,13 @@ Let's make parens and other delimiters easier to tell apart by making nested one mini-echo-buffer-status-style 'both mini-echo-update-interval 0.2) + (set-face-foreground 'mini-echo-blue "#57c7ff") + (set-face-foreground 'mini-echo-red "#ff5c57") + (set-face-foreground 'mini-echo-magenta "#ff6ac1") + (set-face-foreground 'mini-echo-green "#5af78e") + (set-face-foreground 'mini-echo-gray "#848688") + (set-face-foreground 'mini-echo-yellow "#f3f99d") + (set-face-foreground 'mini-echo-cyan "#9aedfe") (defun chris/mini-echo-minibuffer-width-lessp () "Return non-nil if current minibuffer window width less than 120." @@ -827,6 +834,7 @@ Let's start by creating a self contained function of what I'd like started on ev (visual-fill-column-mode +1) (display-line-numbers-mode -1) (variable-pitch-mode +1) + (jinx-mode +1) (setq visual-fill-column-width 100 visual-fill-column-center-text t) @@ -2155,7 +2163,7 @@ GPTEL is a package that uses chatGPT to get some text generation in org-mode (setq gptel-directives '((default . "You are a large language model living in Emacs and a helpful assistant. Respond concisely.") (programming - . "You are a large language model and a careful programmer. Provide code and only code as output without any additional text, prompt or note.") + . "You are a large language model and a careful programmer. Provide code and thorough explanation to what you are doing. Please be thorough and teach me what you are trying to get across.") (writing . "You are a large language model and a writing assistant. Respond concisely.") (chat @@ -2687,21 +2695,35 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc (setq xref-show-xrefs-function 'consult-xref) - :general (chris/leader-keys :states 'normal :keymaps 'override "si" 'consult-imenu "so" 'consult-org-heading - "sf" 'consult-find + "sf" 'consult-fd "sm" 'bookmark-jump - "sf" 'consult-flymake + "sF" 'consult-flymake "sx" 'xref-show-xrefs "sy" 'consult-yank-from-kill-ring "sb" 'consult-eglot-symbols)) #+end_src +**** Consult Omni +This a omni search for finding well, everything... +#+begin_src emacs-lisp +(use-package consult-omni + :load-path "/home/chris/.emacs.d/consult-omni/" + :load-path "/home/chris/.emacs.d/consult-omni/sources/" + :after consult + :config + (require 'consult-omni-sources) + (require 'consult-omni-embark) + (setq consult-omni-sources-modules-to-load '(consult-omni-brave-autosuggest consult-omni-wikipedia consult-omni-apps)) + (consult-omni-sources-load-modules)) +#+end_src + + *** MARGINALIA Marginalia makes for some great decoration to our minibuffer completion items. Works great with Selectrum which does not have this out of the box. @@ -3558,7 +3580,7 @@ I'd like to start learning and using rust if I can. (setq rustic-format-on-save t rustic-lsp-client 'eglot rustic-clippy-arguments "-- -W clippy::pedantic -W clippy::perf -W clippy::nursery -W clippy::unwrap_used" - rustic-rustfmt-args '("--edition" "2021") + rustic-rustfmt-args "" rustic-test-arguments "-- --nocapture") (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster) (add-to-list 'compilation-error-regexp-alist rustic-compilation-error) @@ -3705,7 +3727,6 @@ Let's give eglot a try. (rust-mode . eglot-ensure) (rustic-mode . eglot-ensure) (rust-ts-mode . eglot-ensure) - (text-mode . eglot-ensure) :config (defun chris/eglot-capf () @@ -3716,15 +3737,13 @@ Let's give eglot a try. #'cape-file)))) (add-hook 'eglot-managed-mode-hook #'chris/eglot-capf) - (add-to-list 'eglot-server-programs '(org-mode . ("harper-ls" "--stdio"))) :general (general-def 'normal eglot-mode-map "ga" 'eglot-code-actions "gi" 'eglot-find-implementation "gr" 'eglot-rename - "gR" 'xref-find-references - "ge" 'eglot)) + "gR" 'xref-find-references)) #+end_src #+begin_src emacs-lisp @@ -4280,7 +4299,7 @@ Ledger mode (setq mu4e-bookmarks '((:name "Unread messages" - :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\"0 AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/office/INBOX/Website Forms\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" AND NOT maildir:\"/cochrun/Junk\" AND NOT flag:list" + :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\"0 AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/office/INBOX/Website Forms\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" AND NOT maildir:\"/cochrun/Junk\"" :key 117) (:name "Today's messages" :query "date:today..now" @@ -4526,7 +4545,6 @@ Let's add our own eshell prompt. and set the password cache to a significantly h (setq eshell-history-size 1024) - ;;; Extra execution information (defvar chris/eshell-status-p t "If non-nil, display status before prompt.") diff --git a/init.el b/init.el index 2f71ba7e..fcae7feb 100644 --- a/init.el +++ b/init.el @@ -181,6 +181,13 @@ mini-echo-buffer-status-style 'both mini-echo-update-interval 0.2) + (set-face-foreground 'mini-echo-blue "#57c7ff") + (set-face-foreground 'mini-echo-red "#ff5c57") + (set-face-foreground 'mini-echo-magenta "#ff6ac1") + (set-face-foreground 'mini-echo-green "#5af78e") + (set-face-foreground 'mini-echo-gray "#848688") + (set-face-foreground 'mini-echo-yellow "#f3f99d") + (set-face-foreground 'mini-echo-cyan "#9aedfe") (defun chris/mini-echo-minibuffer-width-lessp () "Return non-nil if current minibuffer window width less than 120." @@ -541,6 +548,7 @@ (visual-fill-column-mode +1) (display-line-numbers-mode -1) (variable-pitch-mode +1) + (jinx-mode +1) (setq visual-fill-column-width 100 visual-fill-column-center-text t) @@ -1645,7 +1653,7 @@ Optional BACKEND must be `re-reveal' or a backend derived from it." (setq gptel-directives '((default . "You are a large language model living in Emacs and a helpful assistant. Respond concisely.") (programming - . "You are a large language model and a careful programmer. Provide code and only code as output without any additional text, prompt or note.") + . "You are a large language model and a careful programmer. Provide code and thorough explanation to what you are doing. Please be thorough and teach me what you are trying to get across.") (writing . "You are a large language model and a writing assistant. Respond concisely.") (chat @@ -1897,20 +1905,29 @@ Describe everything that follows in the present tense, in response to what I typ (setq xref-show-xrefs-function 'consult-xref) - :general (chris/leader-keys :states 'normal :keymaps 'override "si" 'consult-imenu "so" 'consult-org-heading - "sf" 'consult-find + "sf" 'consult-fd "sm" 'bookmark-jump - "sf" 'consult-flymake + "sF" 'consult-flymake "sx" 'xref-show-xrefs "sy" 'consult-yank-from-kill-ring "sb" 'consult-eglot-symbols)) +(use-package consult-omni + :load-path "/home/chris/.emacs.d/consult-omni/" + :load-path "/home/chris/.emacs.d/consult-omni/sources/" + :after consult + :config + (require 'consult-omni-sources) + (require 'consult-omni-embark) + (setq consult-omni-sources-modules-to-load '(consult-omni-brave-autosuggest consult-omni-wikipedia consult-omni-apps)) + (consult-omni-sources-load-modules)) + (use-package marginalia :bind (:map minibuffer-local-map ("C-M-a" . marginalia-cycle) @@ -2600,7 +2617,7 @@ targets." (setq rustic-format-on-save t rustic-lsp-client 'eglot rustic-clippy-arguments "-- -W clippy::pedantic -W clippy::perf -W clippy::nursery -W clippy::unwrap_used" - rustic-rustfmt-args '("--edition" "2021") + rustic-rustfmt-args "" rustic-test-arguments "-- --nocapture") (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster) (add-to-list 'compilation-error-regexp-alist rustic-compilation-error) @@ -2682,7 +2699,6 @@ targets." (rust-mode . eglot-ensure) (rustic-mode . eglot-ensure) (rust-ts-mode . eglot-ensure) - (text-mode . eglot-ensure) :config (defun chris/eglot-capf () @@ -2693,15 +2709,13 @@ targets." #'cape-file)))) (add-hook 'eglot-managed-mode-hook #'chris/eglot-capf) - (add-to-list 'eglot-server-programs '(org-mode . ("harper-ls" "--stdio"))) :general (general-def 'normal eglot-mode-map "ga" 'eglot-code-actions "gi" 'eglot-find-implementation "gr" 'eglot-rename - "gR" 'xref-find-references - "ge" 'eglot)) + "gR" 'xref-find-references)) (use-package consult-eglot :general @@ -3065,7 +3079,7 @@ targets." (setq mu4e-bookmarks '((:name "Unread messages" - :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\"0 AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/office/INBOX/Website Forms\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" AND NOT maildir:\"/cochrun/Junk\" AND NOT flag:list" + :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\"0 AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/office/INBOX/Website Forms\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" AND NOT maildir:\"/cochrun/Junk\"" :key 117) (:name "Today's messages" :query "date:today..now" @@ -3253,7 +3267,6 @@ targets." (setq eshell-history-size 1024) - ;;; Extra execution information (defvar chris/eshell-status-p t "If non-nil, display status before prompt.")