X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/d39cbbe3c2fb681e78d51375e0d1a66d66307886..9678e6da76fac31f79a639b987be22322474c416:/init.org diff --git a/init.org b/init.org index cd210db..91d70f0 100644 --- a/init.org +++ b/init.org @@ -54,6 +54,13 @@ make build - [[#header][Header]] - [[#initial-setup][Initial setup]] - [[#core][Core]] +- [[#borg-essentials][Borg's =layer/essentials=]] +- [[#editing][Editing]] +- [[#syntax-spell-checking][Syntax and spell checking]] +- [[#programming-modes][Programming modes]] +- [[#emacs-enhancements][Emacs enhancements]] +- [[#email][Email]] +- [[#blogging][Blogging]] - [[#post-initialization][Post initialization]] - [[#footer][Footer]] @@ -646,18 +653,31 @@ Enable =winner-mode=. (winner-mode 1) #+end_src -*** COMMENT Close =*compilation*= on success +*** Don’t display =*compilation*= on success + +Based on https://stackoverflow.com/a/17788551, with changes to use +=cl-letf= instead of the now obsolete =flet=. #+begin_src emacs-lisp -(setq compilation-exit-message-function - (lambda (status code msg) - "Close the compilation window if successful." - ;; if M-x compile exits with 0 - (when (and (eq status 'exit) (zerop code)) - (bury-buffer) - (delete-window (get-buffer-window (get-buffer "*compilation*")))) - ;; return the result of compilation-exit-message-function - (cons msg code))) +(use-package compile + :config + (defun amin--compilation-finish-function (buffer outstr) + (unless (string-match "finished" outstr) + (switch-to-buffer-other-window buffer)) + t) + + (setq compilation-finish-functions #'amin--compilation-finish-function) + + (require 'cl-macs) + + (defadvice compilation-start + (around inhibit-display + (command &optional mode name-function highlight-regexp)) + (if (not (string-match "^\\(find\\|grep\\)" command)) + (cl-letf (((symbol-function 'display-buffer) #'ignore)) + (save-window-excursion ad-do-it)) + ad-do-it)) + (ad-activate 'compilation-start)) #+end_src *** Search for non-ASCII characters @@ -810,7 +830,8 @@ file. (let* ((file-tangle-start-time (current-time)) (file (buffer-file-name)) (file-nodir (file-name-nondirectory file)) - (async-quiet-switch "-q")) + ;; (async-quiet-switch "-q") + ) (async-start `(lambda () (require 'org) @@ -827,8 +848,7 @@ file. ',file-tangle-start-time))) "")) (when amin-async-tangle-post-compile - (save-window-excursion - (compile amin-async-tangle-post-compile)))) + (compile amin-async-tangle-post-compile))) (message "Tangling %s failed" ,file-nodir)))))))) (add-to-list @@ -898,8 +918,9 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package swiper - :bind (("C-s" . swiper) - ("C-r" . swiper))) + :bind (("C-s" . swiper) + ("C-r" . swiper) + ("C-S-s" . isearch-forward))) #+end_src **** Counsel @@ -925,6 +946,7 @@ There's no way I could top that, so I won't attempt to. (use-package eshell :defer 1 :commands eshell + :bind ("C-c a s e" . eshell) :config (eval-when-compile (defvar eshell-prompt-regexp)) (defun amin/eshell-quit-or-delete-char (arg) @@ -941,7 +963,7 @@ There's no way I could top that, so I won't attempt to. (defun amin|eshell-setup () (make-local-variable 'company-idle-delay) - (setq company-idle-delay nil) + (defvar company-idle-delay nil) (bind-keys :map eshell-mode-map ("C-d" . amin/eshell-quit-or-delete-char) ("C-S-l" . amin/eshell-clear) @@ -980,6 +1002,13 @@ There's no way I could top that, so I won't attempt to. '(("default" ("dired" (mode . dired-mode)) ("org" (mode . org-mode)) + ("gnus" + (or + (mode . gnus-group-mode) + (mode . gnus-summary-mode) + (mode . gnus-article-mode) + ;; not really, but... + (mode . message-mode))) ("web" (or (mode . web-mode) @@ -989,20 +1018,21 @@ There's no way I could top that, so I won't attempt to. ("shell" (or (mode . eshell-mode) - (mode . shell-mode))) - ("notmuch" (name . "\*notmuch\*")) + (mode . shell-mode) + (mode . term-mode))) ("programming" (or (mode . python-mode) + (mode . c-mode) (mode . c++-mode) - (mode . emacs-lisp-mode))) + (mode . emacs-lisp-mode) + (mode . scheme-mode) + (mode . haskell-mode) + (mode . lean-mode))) ("emacs" (or (name . "^\\*scratch\\*$") - (name . "^\\*Messages\\*$"))) - ("slack" - (or - (name . "^\\*Slack*")))))) + (name . "^\\*Messages\\*$")))))) (ibuffer-formats '((mark modified read-only locked " " (name 18 18 :left :elide) @@ -1040,6 +1070,9 @@ There's no way I could top that, so I won't attempt to. #+end_src * Borg's =layer/essentials= +:PROPERTIES: +:CUSTOM_ID: borg-essentials +:END: TODO: break this giant source block down into individual org sections. @@ -1122,6 +1155,9 @@ TODO: break this giant source block down into individual org sections. #+end_src * Editing +:PROPERTIES: +:CUSTOM_ID: editing +:END: ** Company @@ -1143,6 +1179,9 @@ TODO: break this giant source block down into individual org sections. #+end_src * Syntax and spell checking +:PROPERTIES: +:CUSTOM_ID: syntax-spell-checking +:END: #+begin_src emacs-lisp (use-package flycheck @@ -1185,7 +1224,11 @@ TODO: break this giant source block down into individual org sections. (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) #+end_src + * Programming modes +:PROPERTIES: +:CUSTOM_ID: programming-modes +:END: ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]]) @@ -1554,7 +1597,10 @@ treemacs :load-path "lib/guix/elisp") #+end_src -* Emacs Enhancements +* Emacs enhancements +:PROPERTIES: +:CUSTOM_ID: emacs-enhancements +:END: ** [[https://github.com/justbur/emacs-which-key][which-key]] @@ -1670,53 +1716,6 @@ Emacs package that displays available keybindings in popup ("C-S-h p" . helpful-at-point))) #+end_src -** [[https://github.com/knu/shell-toggle.el][shell-toggle]] - -#+begin_src emacs-lisp -(use-package shell-toggle - :after eshell - :bind ("C-c a s e" . amin/shell-toggle) - :config - (defun amin/shell-toggle (make-cd) - "Toggle between the shell buffer and whatever buffer you are editing. -With a prefix argument MAKE-CD also insert a \"cd DIR\" command -into the shell, where DIR is the directory of the current buffer. - -When called in the shell buffer returns you to the buffer you were editing -before calling this the first time. - -Options: `shell-toggle-goto-eob'" - (interactive "P") - ;; Try to decide on one of three possibilities: - ;; If not in shell-buffer, switch to it. - ;; If in shell-buffer, return to state before going to the shell-buffer - (if (eq (current-buffer) shell-toggle-shell-buffer) - (shell-toggle-buffer-return-from-shell) - (progn - (shell-toggle-buffer-goto-shell make-cd) - (if shell-toggle-full-screen-window-only (delete-other-windows))))) - - ;; override to split horizontally instead - (defun shell-toggle-buffer-switch-to-other-window () - "Switch to other window. -If the current window is the only window in the current frame, -create a new window and switch to it. - -\(This is less intrusive to the current window configuration than -`switch-buffer-other-window')" - (let ((this-window (selected-window))) - (other-window 1) - ;; If we did not switch window then we only have one window and need to - ;; create a new one. - (if (eq this-window (selected-window)) - (progn - (split-window-horizontally) - (other-window 1))))) - - :custom - (shell-toggle-launch-shell 'shell-toggle-eshell)) -#+end_src - ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]] Make =*scratch*= and =*Messages*= unkillable. @@ -1786,25 +1785,6 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too #+end_src -** pdf-tools - -#+begin_src emacs-lisp -(use-package pdf-tools - :defer t - :magic ("%PDF" . pdf-view-mode) - :config - (setq pdf-view-resize-factor 1.05) - (pdf-tools-install) - :bind - (:map pdf-view-mode-map - ("C-s" . isearch-forward) - ("C-r" . isearch-backward) - ("j" . pdf-view-next-line-or-next-page) - ("k" . pdf-view-previous-line-or-previous-page) - ("h" . image-backward-hscroll) - ("l" . image-forward-hscroll))) -#+end_src - ** typo.el #+begin_src emacs-lisp @@ -1932,9 +1912,12 @@ Hopefully temporary. #+begin_src emacs-lisp (use-package multi-term :defer 1 - :bind (("C-c C-j" . term-line-mode) - ("C-c a s m m" . multi-term) - ("C-c a s m p" . multi-term-dedicated-toggle)) + :bind (("C-c a s m m" . multi-term) + ("C-c a s m p" . multi-term-dedicated-toggle) + :map term-mode-map + ("C-c C-j" . term-char-mode) + :map term-raw-map + ("C-c C-j" . term-line-mode)) :config (setq multi-term-program "/bin/screen" ;; TODO: add separate bindings for connecting to existing @@ -1968,7 +1951,17 @@ Hopefully temporary. (global-page-break-lines-mode)) #+end_src +** expand-region + +#+begin_src emacs-lisp +(use-package expand-region + :bind ("C-=" . er/expand-region)) +#+end_src + * Email +:PROPERTIES: +:CUSTOM_ID: email +:END: #+begin_src emacs-lisp (defvar amin-maildir (expand-file-name "~/mail/")) @@ -2175,7 +2168,59 @@ Convenient footnotes in =message-mode=. footnote-style 'unicode)) #+end_src -** bbdb +** ebdb + +#+begin_src emacs-lisp +(use-package ebdb + :defer 1 + :bind (:map gnus-group-mode-map ("e" . ebdb)) + :config + (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")) + (after! swiper + (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) + +(use-package ebdb-com + :after ebdb) + +;; (use-package ebdb-complete +;; :after ebdb +;; :config +;; (ebdb-complete-enable)) + +(use-package company-ebdb + :after (:all company message) + :config + (defun company-ebdb--post-complete (_) nil) + :hook + (message-mode . (lambda () + (add-to-list (make-local-variable 'company-backends) + 'company-ebdb)))) + +(use-package ebdb-gnus + :after ebdb + :custom + (ebdb-gnus-window-configuration + '(article + (vertical 1.0 + (summary 0.25 point) + (horizontal 1.0 + (article 1.0) + (ebdb-gnus 0.3)))))) + +(use-package ebdb-mua + :after ebdb + ;; :custom (ebdb-mua-pop-up nil) + ) + +;; (use-package ebdb-message +;; :after ebdb) + + +;; (use-package ebdb-vcard +;; :after ebdb) +#+end_src + +** COMMENT bbdb Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup), because installing it from source on Emacs 27 using the following @@ -2236,6 +2281,9 @@ I tried using =borg-elpa= instead of doing it like this, but it added #+end_src * Blogging +:PROPERTIES: +:CUSTOM_ID: blogging +:END: ** [[https://ox-hugo.scripter.co][ox-hugo]]