X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/f8e11b0e6f2d8dfe7a65d407288576f556241708..cc7b1957e09ef7847db5bbf0e1628b80cc386944:/init.org?ds=sidebyside diff --git a/init.org b/init.org index c341674..8240b51 100644 --- a/init.org +++ b/init.org @@ -718,6 +718,12 @@ for this. (setq-default cursor-type 'bar) #+end_src +*** Allow scrolling in Isearch + +#+begin_src emacs-lisp +(setq isearch-allow-scroll t) +#+end_src + ** Bindings #+begin_src emacs-lisp @@ -963,6 +969,19 @@ Recently opened files. (setq recentf-max-saved-items 40)) #+end_src +*** smex + +#+begin_quote +A smart M-x enhancement for Emacs. +#+end_quote + +Mostly because =counsel= needs it to remember history. + +#+begin_src emacs-lisp +(use-package smex + :defer t) +#+end_src + *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends) #+begin_quote @@ -1194,70 +1213,19 @@ There's no way I could top that, so I won't attempt to. :hook (dired-mode . dired-hide-details-mode)) #+end_src -*** =diff-hl= - -Highlight uncommitted changes in the left fringe. +*** Help #+begin_src emacs-lisp -(use-package diff-hl - :config - (setq diff-hl-draw-borders nil) - (global-diff-hl-mode) - (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)) -#+end_src - -*** Borg's =layer/essentials= -:PROPERTIES: -:CUSTOM_ID: borg-essentials -:END: - -TODO: break this giant source block down into individual org sections. - -#+begin_src emacs-lisp -(use-package dash - :config (dash-enable-font-lock)) - -(use-feature eldoc - :when (version< "25" emacs-version) - :config (global-eldoc-mode)) - (use-feature help :defer t :config (temp-buffer-resize-mode) (setq help-window-select t)) +#+end_src -(progn ; `isearch' - (setq isearch-allow-scroll t)) - -(use-feature lisp-mode - :config - (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) - (add-hook 'emacs-lisp-mode-hook 'reveal-mode) - (defun indent-spaces-mode () - (setq indent-tabs-mode nil)) - (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) - -(use-feature man - :defer t - :config (setq Man-width 80)) - -(use-feature paren - :config (show-paren-mode)) - -(use-feature prog-mode - :config (global-prettify-symbols-mode) - (defun indicate-buffer-boundaries-left () - (setq indicate-buffer-boundaries 'left)) - (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) - -(use-feature simple - :config (column-number-mode)) - -(progn ; `text-mode' - (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left) - (add-hook 'text-mode-hook #'abbrev-mode)) +*** Tramp +#+begin_src emacs-lisp (use-feature tramp :defer t :config @@ -1265,7 +1233,14 @@ TODO: break this giant source block down into individual org sections. (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) (add-to-list 'tramp-default-proxies-alist (list (regexp-quote (system-name)) nil nil))) +#+end_src +*** Dash + +#+begin_src emacs-lisp +(use-package dash + :defer t + :config (dash-enable-font-lock)) #+end_src * Editing @@ -1273,6 +1248,37 @@ TODO: break this giant source block down into individual org sections. :CUSTOM_ID: editing :END: +** =diff-hl= + +Highlight uncommitted changes in the left fringe. + +#+begin_src emacs-lisp +(use-package diff-hl + :config + (setq diff-hl-draw-borders nil) + (global-diff-hl-mode) + :hook (magit-post-refresh . diff-hl-magit-post-refresh)) +#+end_src + +** ElDoc + +Display Lisp objects at point in the echo area. + +#+begin_src emacs-lisp +(use-feature eldoc + :when (version< "25" emacs-version) + :config (global-eldoc-mode)) +#+end_src + +** paren + +Highlight matching parens. + +#+begin_src emacs-lisp +(use-feature paren + :config (show-paren-mode)) +#+end_src + ** =savehist= Save minibuffer history. @@ -1292,7 +1298,25 @@ Automatically save place in each file. :config (save-place-mode)) #+end_src -** COMMENT Company +** =prog-mode= + +#+begin_src emacs-lisp +(use-feature prog-mode + :config (global-prettify-symbols-mode) + (defun indicate-buffer-boundaries-left () + (setq indicate-buffer-boundaries 'left)) + (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) +#+end_src + +** =text-mode= + +#+begin_src emacs-lisp +(use-feature text-mode + :hook ((text-mode . indicate-buffer-boundaries-left) + (text-mode . abbrev-mode))) +#+end_src + +** Company #+begin_src emacs-lisp (use-package company @@ -1311,10 +1335,7 @@ Automatically save place in each file. (global-company-mode t)) #+end_src -* COMMENT Syntax and spell checking -:PROPERTIES: -:CUSTOM_ID: syntax-spell-checking -:END: +** Flycheck #+begin_src emacs-lisp (use-package flycheck @@ -1358,15 +1379,28 @@ Automatically save place in each file. #'endless/replace-quote)) #+end_src -* COMMENT Programming modes +* Programming modes :PROPERTIES: :CUSTOM_ID: programming-modes :END: +** Lisp + +#+begin_src emacs-lisp +(use-feature lisp-mode + :config + (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) + (add-hook 'emacs-lisp-mode-hook 'reveal-mode) + (defun indent-spaces-mode () + (setq indent-tabs-mode nil)) + (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) +#+end_src + ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]]) #+begin_src emacs-lisp (use-package alloy-mode + :straight (:host github :repo "dwwmmn/alloy-mode") :defer t :config (setq alloy-basic-offset 2)) #+end_src @@ -1374,9 +1408,8 @@ Automatically save place in each file. ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]]) #+begin_src emacs-lisp -(use-package proof-site ; Proof General - :defer t - :load-path "lib/proof-site/generic/") +(use-package proof-general + :defer t) #+end_src ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]]) @@ -1586,7 +1619,7 @@ instead. ("C-c l l" . hs-lint))) #+end_src -** Web dev +** Web *** SGML and HTML @@ -1713,28 +1746,35 @@ treemacs :after (treemacs)) #+end_src -** geiser +** COMMENT geiser #+begin_src emacs-lisp (use-package geiser) -(use-package geiser-guile +(use-feature geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) #+end_src -** guix +** COMMENT guix #+begin_src emacs-lisp -(use-package guix - :load-path "lib/guix/elisp") +(use-package guix) #+end_src -* COMMENT Emacs enhancements +* Emacs enhancements :PROPERTIES: :CUSTOM_ID: emacs-enhancements :END: +** man + +#+begin_src emacs-lisp +(use-feature man + :defer t + :config (setq Man-width 80)) +#+end_src + ** [[https://github.com/justbur/emacs-which-key][which-key]] #+begin_quote @@ -1837,7 +1877,7 @@ Emacs package that displays available keybindings in popup ** [[https://github.com/bbatsov/crux][crux]] #+begin_src emacs-lisp -(use-package crux +(use-package crux ; results in Waiting for git... [2 times] :defer 1 :bind (("C-c b k" . crux-kill-other-buffers) ("C-c d" . crux-duplicate-current-line-or-region) @@ -2075,7 +2115,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ("a" . mc/mark-all-like-this)))) #+end_src -* COMMENT Email +* Email :PROPERTIES: :CUSTOM_ID: email :END: @@ -2094,7 +2134,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. mail-user-agent 'gnus-user-agent read-mail-command 'gnus) -(use-package gnus +(use-feature gnus :bind (("s-m" . gnus) ("s-M" . gnus-unplugged)) :init @@ -2127,7 +2167,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. gnus-interactive-exit nil gnus-gcc-mark-as-read t)) -(use-package gnus-art +(use-feature gnus-art :config (setq gnus-visible-headers @@ -2156,7 +2196,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ("R" . gnus-article-wide-reply-with-original) ("M-L" . org-store-link))) -(use-package gnus-sum +(use-feature gnus-sum :bind (:map gnus-summary-mode-map :prefix-map a/gnus-summary-prefix-map :prefix "v" @@ -2171,7 +2211,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ("M-L" . org-store-link)) :hook (gnus-summary-mode . a/no-mouse-autoselect-window)) -(use-package gnus-msg +(use-feature gnus-msg :config (setq gnus-posting-styles '((".*" @@ -2188,19 +2228,19 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (address "abandali@uwaterloo.ca") (gcc "\"nnimap+uwaterloo:Sent Items\""))))) -(use-package gnus-topic +(use-feature gnus-topic :hook (gnus-group-mode . gnus-topic-mode)) -(use-package gnus-agent +(use-feature gnus-agent :config (setq gnus-agent-synchronize-flags 'ask) :hook (gnus-group-mode . gnus-agent-mode)) -(use-package gnus-group +(use-feature gnus-group :config (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)")) -(use-package mm-decode +(use-feature mm-decode :config (setq mm-discouraged-alternatives '("text/html" "text/richtext"))) #+end_src @@ -2208,7 +2248,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ** sendmail #+begin_src emacs-lisp -(use-package sendmail +(use-feature sendmail :config (setq sendmail-program "/usr/bin/msmtp" ;; message-sendmail-extra-arguments '("-v" "-d") @@ -2219,7 +2259,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ** message #+begin_src emacs-lisp -(use-package message +(use-feature message :config (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") (defconst message-cite-style-bandali @@ -2264,7 +2304,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. Convenient footnotes in =message-mode=. #+begin_src emacs-lisp -(use-package footnote +(use-feature footnote :after message :bind (:map message-mode-map @@ -2294,7 +2334,7 @@ Convenient footnotes in =message-mode=. (with-eval-after-load 'swiper (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) -(use-package ebdb-com +(use-feature ebdb-com :after ebdb) ;; (use-package ebdb-complete @@ -2311,7 +2351,7 @@ Convenient footnotes in =message-mode=. (add-to-list (make-local-variable 'company-backends) 'company-ebdb)))) -(use-package ebdb-gnus +(use-feature ebdb-gnus :after ebdb :custom (ebdb-gnus-window-configuration @@ -2322,7 +2362,7 @@ Convenient footnotes in =message-mode=. (article 1.0) (ebdb-gnus 0.3)))))) -(use-package ebdb-mua +(use-feature ebdb-mua :after ebdb ;; :custom (ebdb-mua-pop-up nil) )