From 69b24a1e3574f2cf2b61b9bc9c267541c10fe02b Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 13:49:04 -0500 Subject: [PATCH 01/16] [emacs][wip] enable ivy (and friends) & the rest of my core packages --- init.org | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/init.org b/init.org index a1ba40b..1e97ebc 100644 --- a/init.org +++ b/init.org @@ -951,7 +951,7 @@ Not just how I do git, but /the/ way to do git. :custom-face (magit-diff-file-heading ((t (:weight normal))))) #+end_src -*** COMMENT [[https://github.com/abo-abo/swiper][Ivy]] (and friends) +*** [[https://github.com/abo-abo/swiper][Ivy]] (and friends) #+begin_quote Ivy - a generic completion frontend for Emacs, Swiper - isearch with @@ -964,7 +964,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package ivy - :defer 1 + :defer 0.6 :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -985,6 +985,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package swiper + :after ivy :bind (("C-s" . swiper) ("C-r" . swiper) ("C-S-s" . isearch-forward))) @@ -994,7 +995,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package counsel - :defer 1 + :after ivy :bind (([remap execute-extended-command] . counsel-M-x) ([remap find-file] . counsel-find-file) ("s-r" . counsel-recentf) @@ -1007,10 +1008,10 @@ There's no way I could top that, so I won't attempt to. (defalias 'locate #'counsel-locate)) #+end_src -*** COMMENT eshell +*** eshell #+begin_src emacs-lisp -(use-package eshell +(use-feature eshell :defer 1 :commands eshell :bind ("C-c a s e" . eshell) @@ -1044,10 +1045,10 @@ There's no way I could top that, so I won't attempt to. (eshell-input-filter 'eshell-input-filter-initial-space)) #+end_src -*** COMMENT Ibuffer +*** Ibuffer #+begin_src emacs-lisp -(use-package ibuffer +(use-feature ibuffer :defer t :bind (("C-x C-b" . ibuffer-other-window) @@ -1115,10 +1116,10 @@ There's no way I could top that, so I won't attempt to. :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) #+end_src -*** COMMENT Outline +*** Outline #+begin_src emacs-lisp -(use-package outline +(use-feature outline :defer t :hook (prog-mode . outline-minor-mode) :bind -- 2.20.1 From 633dee4dc61935600273cf5035d05eda15ebc792 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 13:52:48 -0500 Subject: [PATCH 02/16] [emacs][wip] enable Borg's layer/essentials packages --- init.org | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/init.org b/init.org index 1e97ebc..08b1404 100644 --- a/init.org +++ b/init.org @@ -1138,7 +1138,7 @@ There's no way I could top that, so I won't attempt to. ("s" . outline-show-subtree))) #+end_src -* COMMENT Borg's =layer/essentials= +* Borg's =layer/essentials= :PROPERTIES: :CUSTOM_ID: borg-essentials :END: @@ -1155,10 +1155,10 @@ TODO: break this giant source block down into individual org sections. (global-diff-hl-mode) (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)) -(use-package ls-lisp +(use-feature ls-lisp :custom (ls-lisp-dirs-first t)) -(use-package dired +(use-feature dired :defer t :config (setq dired-listing-switches "-alh" @@ -1195,11 +1195,11 @@ TODO: break this giant source block down into individual org sections. (a/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) -(use-package eldoc +(use-feature eldoc :when (version< "25" emacs-version) :config (global-eldoc-mode)) -(use-package help +(use-feature help :defer t :config (temp-buffer-resize-mode) @@ -1208,7 +1208,7 @@ TODO: break this giant source block down into individual org sections. (progn ; `isearch' (setq isearch-allow-scroll t)) -(use-package lisp-mode +(use-feature lisp-mode :config (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) (add-hook 'emacs-lisp-mode-hook 'reveal-mode) @@ -1216,40 +1216,40 @@ TODO: break this giant source block down into individual org sections. (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-package man +(use-feature man :defer t :config (setq Man-width 80)) -(use-package paren +(use-feature paren :config (show-paren-mode)) -(use-package prog-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-package recentf +(use-feature recentf :defer 0.5 :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") (setq recentf-max-saved-items 40)) -(use-package savehist +(use-feature savehist :config (savehist-mode)) -(use-package saveplace +(use-feature saveplace :when (version< "25" emacs-version) :config (save-place-mode)) -(use-package simple +(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)) -(use-package tramp +(use-feature tramp :defer t :config (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) -- 2.20.1 From 41d73018804a062cb1cdd328a6f0f8230e98b080 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:24:27 -0500 Subject: [PATCH 03/16] [emacs][wip] bring layer/essentials under Core and break out Dired --- init.org | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/init.org b/init.org index 08b1404..c0078b4 100644 --- a/init.org +++ b/init.org @@ -1138,23 +1138,9 @@ There's no way I could top that, so I won't attempt to. ("s" . outline-show-subtree))) #+end_src -* Borg's =layer/essentials= -:PROPERTIES: -:CUSTOM_ID: borg-essentials -:END: - -TODO: break this giant source block down into individual org sections. +*** Dired #+begin_src emacs-lisp -(use-package dash - :config (dash-enable-font-lock)) - -(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)) - (use-feature ls-lisp :custom (ls-lisp-dirs-first t)) @@ -1194,6 +1180,24 @@ TODO: break this giant source block down into individual org sections. (interactive) (a/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) +#+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-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)) (use-feature eldoc :when (version< "25" emacs-version) -- 2.20.1 From d2cb5b82a9008909778edb9bd79585bf1e5b6034 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:28:15 -0500 Subject: [PATCH 04/16] [emacs][wip] break out recentf and diff-hl --- init.org | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/init.org b/init.org index c0078b4..074b892 100644 --- a/init.org +++ b/init.org @@ -951,6 +951,18 @@ Not just how I do git, but /the/ way to do git. :custom-face (magit-diff-file-heading ((t (:weight normal))))) #+end_src +*** recentf + +Recently opened files. + +#+begin_src emacs-lisp +(use-feature recentf + :defer 0.5 + :config + (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") + (setq recentf-max-saved-items 40)) +#+end_src + *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends) #+begin_quote @@ -1182,6 +1194,18 @@ 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. + +#+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 @@ -1193,12 +1217,6 @@ TODO: break this giant source block down into individual org sections. (use-package dash :config (dash-enable-font-lock)) -(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)) - (use-feature eldoc :when (version< "25" emacs-version) :config (global-eldoc-mode)) @@ -1233,12 +1251,6 @@ TODO: break this giant source block down into individual org sections. (setq indicate-buffer-boundaries 'left)) (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) -(use-feature recentf - :defer 0.5 - :config - (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") - (setq recentf-max-saved-items 40)) - (use-feature savehist :config (savehist-mode)) -- 2.20.1 From f8e11b0e6f2d8dfe7a65d407288576f556241708 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:39:33 -0500 Subject: [PATCH 05/16] [emacs][wip] break out savehist and saveplace --- init.org | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/init.org b/init.org index 074b892..c341674 100644 --- a/init.org +++ b/init.org @@ -1251,13 +1251,6 @@ TODO: break this giant source block down into individual org sections. (setq indicate-buffer-boundaries 'left)) (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) -(use-feature savehist - :config (savehist-mode)) - -(use-feature saveplace - :when (version< "25" emacs-version) - :config (save-place-mode)) - (use-feature simple :config (column-number-mode)) @@ -1275,12 +1268,31 @@ TODO: break this giant source block down into individual org sections. #+end_src -* COMMENT Editing +* Editing :PROPERTIES: :CUSTOM_ID: editing :END: -** Company +** =savehist= + +Save minibuffer history. + +#+begin_src emacs-lisp +(use-feature savehist + :config (savehist-mode)) +#+end_src + +** =saveplace= + +Automatically save place in each file. + +#+begin_src emacs-lisp +(use-feature saveplace + :when (version< "25" emacs-version) + :config (save-place-mode)) +#+end_src + +** COMMENT Company #+begin_src emacs-lisp (use-package company -- 2.20.1 From 5023c31042541667f71ce802dc1c79fe24eedee1 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:42:01 -0500 Subject: [PATCH 06/16] [emacs][wip] move diff-hl to Editing --- init.org | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/init.org b/init.org index c341674..8484b7b 100644 --- a/init.org +++ b/init.org @@ -1194,18 +1194,6 @@ 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. - -#+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 @@ -1273,6 +1261,18 @@ 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 + ** =savehist= Save minibuffer history. -- 2.20.1 From a8d0c7ad0aa7d9355117337046763e620b908907 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:45:06 -0500 Subject: [PATCH 07/16] [emacs][wip] break out Help and ElDoc --- init.org | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/init.org b/init.org index 8484b7b..dc1e7dd 100644 --- a/init.org +++ b/init.org @@ -1194,6 +1194,16 @@ There's no way I could top that, so I won't attempt to. :hook (dired-mode . dired-hide-details-mode)) #+end_src +*** Help + +#+begin_src emacs-lisp +(use-feature help + :defer t + :config + (temp-buffer-resize-mode) + (setq help-window-select t)) +#+end_src + *** Borg's =layer/essentials= :PROPERTIES: :CUSTOM_ID: borg-essentials @@ -1205,16 +1215,6 @@ TODO: break this giant source block down into individual org sections. (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)) - (progn ; `isearch' (setq isearch-allow-scroll t)) @@ -1273,6 +1273,16 @@ Highlight uncommitted changes in the left fringe. :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 + ** =savehist= Save minibuffer history. -- 2.20.1 From 6540f2c44d2948362e052c0048751d2bbfd2729a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:49:04 -0500 Subject: [PATCH 08/16] [emacs][wip] break out isearch and paren --- init.org | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/init.org b/init.org index dc1e7dd..2c534da 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 @@ -1215,9 +1221,6 @@ TODO: break this giant source block down into individual org sections. (use-package dash :config (dash-enable-font-lock)) -(progn ; `isearch' - (setq isearch-allow-scroll t)) - (use-feature lisp-mode :config (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode) @@ -1230,9 +1233,6 @@ TODO: break this giant source block down into individual org sections. :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 () @@ -1283,6 +1283,15 @@ Display Lisp objects at point in the echo area. :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. -- 2.20.1 From 5097c774acfc92aaa442371ea20e558901781bdd Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:54:18 -0500 Subject: [PATCH 09/16] [emacs][wip] break out prog-mode, text-mode, and lisp-mode --- init.org | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/init.org b/init.org index 2c534da..0d3760b 100644 --- a/init.org +++ b/init.org @@ -1221,31 +1221,13 @@ TODO: break this giant source block down into individual org sections. (use-package dash :config (dash-enable-font-lock)) -(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 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)) - (use-feature tramp :defer t :config @@ -1311,6 +1293,36 @@ Automatically save place in each file. :config (save-place-mode)) #+end_src +** =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 + +** =lisp-mode= + +#+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 + ** COMMENT Company #+begin_src emacs-lisp -- 2.20.1 From 9f120b4f64519184aa763042042e06010cdc380d Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 14:59:32 -0500 Subject: [PATCH 10/16] [emacs][wip] move out the rest of Borg layer/essentials --- init.org | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/init.org b/init.org index 0d3760b..7a75546 100644 --- a/init.org +++ b/init.org @@ -1210,24 +1210,9 @@ There's no way I could top that, so I won't attempt to. (setq help-window-select t)) #+end_src -*** Borg's =layer/essentials= -:PROPERTIES: -:CUSTOM_ID: borg-essentials -:END: - -TODO: break this giant source block down into individual org sections. +*** Tramp #+begin_src emacs-lisp -(use-package dash - :config (dash-enable-font-lock)) - -(use-feature man - :defer t - :config (setq Man-width 80)) - -(use-feature simple - :config (column-number-mode)) - (use-feature tramp :defer t :config @@ -1235,7 +1220,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 @@ -1766,6 +1758,14 @@ treemacs :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 -- 2.20.1 From ab0674a210ad15c260261259076d00d5507b6e28 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:01:17 -0500 Subject: [PATCH 11/16] [emacs][wip] enable company --- init.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.org b/init.org index 7a75546..f68f5dd 100644 --- a/init.org +++ b/init.org @@ -1315,7 +1315,7 @@ Automatically save place in each file. (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) #+end_src -** COMMENT Company +** Company #+begin_src emacs-lisp (use-package company -- 2.20.1 From de000e57d29fb5fb0f4f77531189039c4d88bf3a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:17:59 -0500 Subject: [PATCH 12/16] [emacs][wip] move Syntax and Spell checking under Editing --- init.org | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/init.org b/init.org index f68f5dd..1d6b1f9 100644 --- a/init.org +++ b/init.org @@ -1334,10 +1334,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 -- 2.20.1 From 520aebd55edb4f467b4d86228ecf8cd640525c78 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:33:17 -0500 Subject: [PATCH 13/16] [emacs][wip] enable some programming modes and update versions --- init.org | 38 ++++++++++++++++++------------------ straight/versions/default.el | 17 +++++++++++++++- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/init.org b/init.org index 1d6b1f9..d3f3a64 100644 --- a/init.org +++ b/init.org @@ -1303,18 +1303,6 @@ Automatically save place in each file. (text-mode . abbrev-mode))) #+end_src -** =lisp-mode= - -#+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 - ** Company #+begin_src emacs-lisp @@ -1378,15 +1366,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 @@ -1394,9 +1395,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]]) @@ -1606,7 +1606,7 @@ instead. ("C-c l l" . hs-lint))) #+end_src -** Web dev +** COMMENT Web dev *** SGML and HTML @@ -1733,7 +1733,7 @@ treemacs :after (treemacs)) #+end_src -** geiser +** COMMENT geiser #+begin_src emacs-lisp (use-package geiser) @@ -1743,7 +1743,7 @@ treemacs (setq geiser-guile-load-path "~/src/git/guix")) #+end_src -** guix +** COMMENT guix #+begin_src emacs-lisp (use-package guix diff --git a/straight/versions/default.el b/straight/versions/default.el index 2df0a79..33d04d1 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,14 +1,26 @@ -(("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") +(("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8") + ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f") + ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04") + ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b") + ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d") ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584") + ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021") + ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d") ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48") + ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45") + ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278") ("ghub" . "db15d00d01b8bd9187079a0b538d878d241743a8") ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da") ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1") ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d") + ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b") + ("hlint-refactor-mode" . "92c69aa01c65968e86c15db087bb1ea785e4736c") + ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f") + ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499") ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a") ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af") ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642") @@ -16,8 +28,11 @@ ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020") ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5") ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa") + ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e") + ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90") ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b") + ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717") ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d") ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce") ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")) -- 2.20.1 From 42b1fa9b023f964d566a74adc01376529d3e4e5a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:41:51 -0500 Subject: [PATCH 14/16] [emacs][wip] enable web packages --- init.org | 7 +++---- straight/versions/default.el | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/init.org b/init.org index d3f3a64..9927089 100644 --- a/init.org +++ b/init.org @@ -1606,7 +1606,7 @@ instead. ("C-c l l" . hs-lint))) #+end_src -** COMMENT Web dev +** Web *** SGML and HTML @@ -1738,7 +1738,7 @@ treemacs #+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 @@ -1746,8 +1746,7 @@ treemacs ** COMMENT guix #+begin_src emacs-lisp -(use-package guix - :load-path "lib/guix/elisp") +(use-package guix) #+end_src * COMMENT Emacs enhancements diff --git a/straight/versions/default.el b/straight/versions/default.el index 33d04d1..e4b9a3b 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -7,6 +7,7 @@ ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584") ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") + ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70") ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d") @@ -35,5 +36,6 @@ ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717") ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d") ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce") + ("web-mode" . "5da977bec7714c09d41b556e2d651ccb269a14a2") ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")) :saturn -- 2.20.1 From e738f03b3599a28b260f6b0f502e886564994a41 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:52:55 -0500 Subject: [PATCH 15/16] [emacs][wip] enable Emacs Enhancements --- init.org | 4 ++-- straight/versions/default.el | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/init.org b/init.org index 9927089..9985ae5 100644 --- a/init.org +++ b/init.org @@ -1749,7 +1749,7 @@ treemacs (use-package guix) #+end_src -* COMMENT Emacs enhancements +* Emacs enhancements :PROPERTIES: :CUSTOM_ID: emacs-enhancements :END: @@ -1864,7 +1864,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) diff --git a/straight/versions/default.el b/straight/versions/default.el index e4b9a3b..a6b6713 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,16 +1,25 @@ (("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8") + ("all-the-icons.el" . "52d1f2d36468146c93aaf11399f581401a233306") ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f") ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") + ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5") ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04") ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b") + ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859") ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d") ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584") ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b") + ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") + ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318") + ("emacs-memoize" . "9a561268ffb550b257a08710489a95cd087998b6") + ("emacs-which-key" . "43e3e3d7641a8e1c298b37e6a277612bf0898708") ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70") ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") + ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519") ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d") + ("expand-region.el" . "ed3292473035dc8f3d2f321e82974ef87327808f") ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48") ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45") ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278") @@ -19,22 +28,37 @@ ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1") ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d") ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b") + ("helpful" . "039345ef60b4722d050c94ab1978540137df35f9") + ("hl-todo" . "24b9925b1b2c7ad6bf7b66800395f74abf035c5f") ("hlint-refactor-mode" . "92c69aa01c65968e86c15db087bb1ea785e4736c") ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f") ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499") ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a") + ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c") ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af") ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642") ("melpa" . "5487adde3bbb1bfd875c51932c63ceef541d6b6f") + ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f") + ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff") + ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85") ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020") ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5") + ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb") ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa") + ("page-break-lines" . "87e801efb816b24e83ebf84c052001e178e180bc") ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") + ("projectile" . "d625ecb09e3a9fb319740686402197bdf6fc109b") + ("rich-minority" . "a50d9b2fd059f6a0e5b22063a5375851a087f61a") ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e") ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90") + ("shrink-path.el" . "9d06c453d1537df46a4b703a29213cc7f7857aa0") + ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce") + ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490") ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b") ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717") ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d") + ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294") + ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9") ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce") ("web-mode" . "5da977bec7714c09d41b556e2d651ccb269a14a2") ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")) -- 2.20.1 From d4b2a7ef4e846259edb37593e399d4260afe168f Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 24 Dec 2018 15:59:57 -0500 Subject: [PATCH 16/16] [emacs][wip] enable Email --- init.org | 30 +++++++++++++++--------------- straight/versions/default.el | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/init.org b/init.org index 9985ae5..16351aa 100644 --- a/init.org +++ b/init.org @@ -2102,7 +2102,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: @@ -2121,7 +2121,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 @@ -2154,7 +2154,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 @@ -2183,7 +2183,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" @@ -2198,7 +2198,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 '((".*" @@ -2215,19 +2215,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 @@ -2235,7 +2235,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") @@ -2246,7 +2246,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 @@ -2291,7 +2291,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 @@ -2321,7 +2321,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 @@ -2338,7 +2338,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 @@ -2349,7 +2349,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) ) diff --git a/straight/versions/default.el b/straight/versions/default.el index a6b6713..e5e1e48 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -4,11 +4,13 @@ ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f") ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5") ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04") + ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6") ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b") ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859") ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d") ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584") ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b") + ("ebdb" . "51733ece51fcae699e977703d61f2f2ebaea70b1") ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318") -- 2.20.1