emacs, guix: add back most packages unavailable in Guix proper

namely, the following:

- boxquote
- company-ebdb
- delight
- ebdb
- erc-scrolltoplace
- message-x
- mwim
- shrink-path
- unkillable-scratch

they are now packaged in my guix-bandali channel, and hopefully soon
in upstream guix as well.

diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm
new file mode 100644 (file)
index 0000000..9047b41
--- /dev/null
+++ b/.config/guix/channels.scm
@@ -0,0 +1,10 @@
+(list (channel
+       (name 'guix)
+       (url "https://git.savannah.gnu.org/git/guix.git")
+       (commit
+        "e920037793faeebf8fb2a918b50a1751b125a0af"))
+      (channel
+       (name 'guix-bandali)
+       (url "https://git.sr.ht/~bandali/guix-bandali")
+       (commit
+        "826fb6ff3669fd4a14dfb17a7aa89777507fb4d6")))

diff --git a/.config/guix/home-manifest.scm b/.config/guix/home-manifest.scm
index 7ba223b..0819274 100644 (file)
--- a/.config/guix/home-manifest.scm
+++ b/.config/guix/home-manifest.scm
@@ -5,27 +5,35 @@
     "emacs"
     "emacs-alert"
     "emacs-async"
     "emacs"
     "emacs-alert"
     "emacs-async"

+    "emacs-boxquote"

     "emacs-company"
     "emacs-company"

+    "emacs-company-ebdb"

     "emacs-crux"
     "emacs-dash"
     "emacs-debbugs"
     "emacs-crux"
     "emacs-dash"
     "emacs-debbugs"

+    "emacs-delight"

     "emacs-diff-hl"
     "emacs-diff-hl"

+    "emacs-ebdb"

     "emacs-emmet-mode"
     "emacs-emojify"
     "emacs-erc-hl-nicks"
     "emacs-emmet-mode"
     "emacs-emojify"
     "emacs-erc-hl-nicks"

+    "emacs-erc-scrolltoplace"

     "emacs-eshell-up"
     "emacs-exec-path-from-shell"
     "emacs-expand-region"
     "emacs-flycheck"
     "emacs-geiser"
     "emacs-eshell-up"
     "emacs-exec-path-from-shell"
     "emacs-expand-region"
     "emacs-flycheck"
     "emacs-geiser"

+    ;; "emacs-gnus-harvest"

     "emacs-go-mode"
     "emacs-guix"
     "emacs-helpful"
     "emacs-hl-todo"
     "emacs-ivy"
     "emacs-magit"
     "emacs-go-mode"
     "emacs-guix"
     "emacs-helpful"
     "emacs-hl-todo"
     "emacs-ivy"
     "emacs-magit"

+    "emacs-message-x"

     "emacs-multi-term"
     "emacs-multiple-cursors"
     "emacs-multi-term"
     "emacs-multiple-cursors"

+    "emacs-mwim"

     "emacs-org"
     "emacs-org-contrib"
     "emacs-org-ref"
     "emacs-org"
     "emacs-org-contrib"
     "emacs-org-ref"


@@ -34,9 +42,11 @@
     "emacs-pass"
     "emacs-pinentry"
     "emacs-projectile"
     "emacs-pass"
     "emacs-pinentry"
     "emacs-projectile"

+    "emacs-shrink-path"

     "emacs-smart-mode-line"
     "emacs-smex"
     "emacs-typo"
     "emacs-smart-mode-line"
     "emacs-smex"
     "emacs-typo"

+    "emacs-unkillable-scratch"

     "emacs-use-package"
     "emacs-web-mode"
     "emacs-which-key"
     "emacs-use-package"
     "emacs-web-mode"
     "emacs-which-key"

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 56a7bd1..9aff3e3 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1275,13 +1275,11 @@ For disabling the behaviour for certain buffers and/or modes."
          ("C-c j"   . crux-top-join-line)
          ("C-S-j"   . crux-top-join-line)))
 
          ("C-c j"   . crux-top-join-line)
          ("C-S-j"   . crux-top-join-line)))
 

-(comment
-  ;; TODO
-  (use-package mwim
-    :bind (("C-a"    . mwim-beginning-of-code-or-line)
-           ("C-e"    . mwim-end-of-code-or-line)
-           ("<home>" . mwim-beginning-of-line-or-code)
-           ("<end>"  . mwim-end-of-line-or-code))))
+(use-package mwim
+  :bind (("C-a"    . mwim-beginning-of-code-or-line)
+         ("C-e"    . mwim-end-of-code-or-line)
+         ("<home>" . mwim-beginning-of-line-or-code)
+         ("<end>"  . mwim-end-of-line-or-code)))

 
 (use-package projectile
   :defer 0.5
 
 (use-package projectile
   :defer 0.5


@@ -1326,45 +1324,41 @@ For disabling the behaviour for certain buffers and/or modes."
    ("C-S-h k" . helpful-key)
    ("C-S-h p" . helpful-at-point)))
 
    ("C-S-h k" . helpful-key)
    ("C-S-h p" . helpful-at-point)))
 

-(comment
-  ;; TODO
-  (use-package unkillable-scratch
-    :defer 0.6
-    :config
-    (unkillable-scratch 1)
-    :custom
-    (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$"))))
+(use-package unkillable-scratch
+  :defer 0.6
+  :config
+  (unkillable-scratch 1)
+  :custom
+  (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))

 
 

-(comment
-  ;; TODO
-  ;; ,----
-  ;; | make pretty boxed quotes like this
-  ;; `----
-  (use-package boxquote
-    :defer 0.6
-    :bind
-    (:prefix-map b/boxquote-prefix-map
-                 :prefix "C-c q"
-                 ("b"   . boxquote-buffer)
-                 ("B"   . boxquote-insert-buffer)
-                 ("d"   . boxquote-defun)
-                 ("F"   . boxquote-insert-file)
-                 ("hf"  . boxquote-describe-function)
-                 ("hk"  . boxquote-describe-key)
-                 ("hv"  . boxquote-describe-variable)
-                 ("hw"  . boxquote-where-is)
-                 ("k"   . boxquote-kill)
-                 ("p"   . boxquote-paragraph)
-                 ("q"   . boxquote-boxquote)
-                 ("r"   . boxquote-region)
-                 ("s"   . boxquote-shell-command)
-                 ("t"   . boxquote-text)
-                 ("T"   . boxquote-title)
-                 ("u"   . boxquote-unbox)
-                 ("U"   . boxquote-unbox-region)
-                 ("y"   . boxquote-yank)
-                 ("M-q" . boxquote-fill-paragraph)
-                 ("M-w" . boxquote-kill-ring-save))))
+;; ,----
+;; | make pretty boxed quotes like this
+;; `----
+(use-package boxquote
+  :defer 0.6
+  :bind
+  (:prefix-map b/boxquote-prefix-map
+               :prefix "C-c q"
+               ("b"   . boxquote-buffer)
+               ("B"   . boxquote-insert-buffer)
+               ("d"   . boxquote-defun)
+               ("F"   . boxquote-insert-file)
+               ("hf"  . boxquote-describe-function)
+               ("hk"  . boxquote-describe-key)
+               ("hv"  . boxquote-describe-variable)
+               ("hw"  . boxquote-where-is)
+               ("k"   . boxquote-kill)
+               ("p"   . boxquote-paragraph)
+               ("q"   . boxquote-boxquote)
+               ("r"   . boxquote-region)
+               ("s"   . boxquote-shell-command)
+               ("t"   . boxquote-text)
+               ("T"   . boxquote-title)
+               ("u"   . boxquote-unbox)
+               ("U"   . boxquote-unbox-region)
+               ("y"   . boxquote-yank)
+               ("M-q" . boxquote-fill-paragraph)
+               ("M-w" . boxquote-kill-ring-save)))

 
 (use-package orgalist
   ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html
 
 (use-package orgalist
   ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html


@@ -1386,23 +1380,21 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (global-hl-todo-mode))
 
   :config
   (global-hl-todo-mode))
 

-(comment
-  ;; TODO
-  (use-package shrink-path
-    :defer 0.5
-    :after eshell
-    :config
-    (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
-    (defun +eshell/prompt ()
-      (let ((base/dir (shrink-path-prompt default-directory)))
-        (concat (propertize user-@-host 'face 'default)
-                (propertize (car base/dir)
-                            'face 'font-lock-comment-face)
-                (propertize (cdr base/dir)
-                            'face 'font-lock-constant-face)
-                (propertize "> " 'face 'default))))
-    (setq eshell-prompt-regexp (concat user-@-host ".*> ")
-          eshell-prompt-function #'+eshell/prompt)))
+(use-package shrink-path
+  :defer 0.5
+  :after eshell
+  :config
+  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+  (defun +eshell/prompt ()
+    (let ((base/dir (shrink-path-prompt default-directory)))
+      (concat (propertize user-@-host 'face 'default)
+              (propertize (car base/dir)
+                          'face 'font-lock-comment-face)
+              (propertize (cdr base/dir)
+                          'face 'font-lock-constant-face)
+              (propertize "> " 'face 'default))))
+  (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+        eshell-prompt-function #'+eshell/prompt))

 
 (use-package eshell-up
   :after eshell
 
 (use-package eshell-up
   :after eshell


@@ -1781,11 +1773,9 @@ For disabling the behaviour for certain buffers and/or modes."
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t)
   :config

-  (comment
-    ;; TODO
-    (require 'ebdb)
-    (require 'ebdb-mua)
-    (require 'ebdb-gnus))
+  (require 'ebdb)
+  (require 'ebdb-mua)
+  (require 'ebdb-gnus)

 
   ;; (gnus-registry-initialize)
 
 
   ;; (gnus-registry-initialize)
 


@@ -1945,9 +1935,7 @@ https://bandalis.org")
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")

-  (comment
-    ;; TODO
-    (require 'company-ebdb))
+  (require 'company-ebdb)

   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
          (message-mode . (lambda ()


@@ -1987,56 +1975,49 @@ https://bandalis.org")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 

-(comment
-  ;; TODO
-  (use-package ebdb
-    :straight (:host github :repo "girzel/ebdb")
-    :after gnus
-    :bind (:map gnus-group-mode-map ("e" . ebdb))
-    :config
-    (setq ebdb-sources (b/var "ebdb"))
-    (with-eval-after-load 'swiper
-      (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
-
-  (use-package ebdb-com
-    :after ebdb)
+(use-package ebdb
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . ebdb))
+  :config
+  (setq ebdb-sources (b/var "ebdb"))
+  (with-eval-after-load 'swiper
+    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))

 
 

-  ;; (use-package ebdb-complete
-  ;;   :after ebdb
-  ;;   :config
-  ;;   (ebdb-complete-enable))
+(use-package ebdb-com
+  :after ebdb)

 
 

-  (use-package company-ebdb
-    :config
-    (defun company-ebdb--post-complete (_) nil))
+;; (use-package ebdb-complete
+;;   :after ebdb
+;;   :config
+;;   (ebdb-complete-enable))

 
 

-  (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 company-ebdb
+  :config
+  (defun company-ebdb--post-complete (_) nil))

 
 

-  ;; (use-package ebdb-message
-  ;;   :after 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)
-  )
+;; (use-package ebdb-vcard
+;;   :after ebdb)

 
 

-(comment
-  ;; TODO
-  (use-package message-x))
+(use-package message-x)

 
 (comment
   (use-package message-x
 
 (comment
   (use-package message-x


@@ -2090,9 +2071,7 @@ https://bandalis.org")
   (add-to-list 'erc-modules 'keep-place)
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)
   (add-to-list 'erc-modules 'keep-place)
   (add-to-list 'erc-modules 'notifications)
   (add-to-list 'erc-modules 'spelling)

-  (comment
-    ;; TODO
-    (add-to-list 'erc-modules 'scrolltoplace))
+  (add-to-list 'erc-modules 'scrolltoplace)

   (erc-update-modules))
 
 (use-package erc-fill
   (erc-update-modules))
 
 (use-package erc-fill


@@ -2119,10 +2098,8 @@ https://bandalis.org")
 (use-package erc-hl-nicks
   :after erc)
 
 (use-package erc-hl-nicks
   :after erc)
 

-(comment
-  ;; TODO
-  (use-package erc-scrolltoplace
-    :after erc))
+(use-package erc-scrolltoplace
+  :after erc)

 
 (use-package znc
   :load-path "lisp/znc.el/"
 
 (use-package znc
   :load-path "lisp/znc.el/"