Zathura epub, fix conflicting paredit/consult keybinds, refine paredit hooks

4 files changed, 21 insertions, 18 deletions

diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 1c5c64f..c80b5a5 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -26,6 +26,7 @@ to.")
 
 
 (setq compilation-always-kill t)
+(keymap-set prog-mode-map "C-," #'recompile)
 
 (add-hook 'prog-mode-hook (lambda ()
                             (font-lock-add-keywords
@@ -39,8 +40,6 @@ to.")
 ;; questionable default
 (indent-tabs-mode 0)
 
-(electric-pair-mode 1)
-
 
 (use-package rainbow-mode
   :hook css-mode)
@@ -50,7 +49,6 @@ to.")
   :custom
   (magit-define-global-key-bindings 'recommended))
 
-
 (use-package tex
   :ensure auctex
   :hook
@@ -63,7 +61,6 @@ to.")
   ;; better support for latex packages
   (TeX-parse-self t))
 
-
 (use-package slime
   :commands slime
   :config
@@ -78,7 +75,12 @@ to.")
   :hook prog-mode)
 
 (use-package paredit
-  :hook prog-mode)
+  :hook (lisp-mode
+         scheme-mode
+         ;; REPLs
+         eshell-mode
+         geiser-repl-mode
+         slime-repl-mode))
 
 
 (provide 'bd--devel)
diff --git a/.config/emacs/modules/bd--minibuffer.el b/.config/emacs/modules/bd--minibuffer.el
index 5181868..450f579 100644
--- a/.config/emacs/modules/bd--minibuffer.el
+++ b/.config/emacs/modules/bd--minibuffer.el
@@ -35,15 +35,15 @@
 
 (use-package consult
   :bind (("C-x b" . consult-buffer)
-         ("M-s d" . consult-find)
-         ("M-s c" . consult-locate)
-         ("M-s g" . consult-grep)
-         ("M-s G" . consult-git-grep)
-         ("M-s r" . consult-ripgrep)
-         ("M-s l" . consult-line)
-         ("M-s L" . consult-line-multi)
-         ("M-s k" . consult-keep-lines)
-         ("M-s u" . consult-focus-lines)))
+         ("H-s d" . consult-find)
+         ("H-s c" . consult-locate)
+         ("H-s g" . consult-grep)
+         ("H-s G" . consult-git-grep)
+         ("H-s r" . consult-ripgrep)
+         ("H-s l" . consult-line)
+         ("H-s L" . consult-line-multi)
+         ("H-s k" . consult-keep-lines)
+         ("H-s u" . consult-focus-lines)))
 
 
 (provide 'bd--minibuffer)
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index c7559ed..231ab9d 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -56,6 +56,7 @@
     "sbcl"
     "stow"
     "texlive"
+    "unzip"
     "vim"
     ))
 
@@ -165,11 +166,11 @@ PATH=${HOME}/.local/bin:$PATH")))
              (desktop "$HOME")
              (documents "$HOME/dc")
              (download "$HOME/dl")
-             (music "$HOME/ik")
-             (pictures "$HOME/wf")
+             (music "$HOME/ik/music")
+             (pictures "$HOME/md/ig")
              (publicshare "$HOME")
              (templates "$HOME")
-             (videos "$HOME/md")))
+             (videos "$HOME/md/vi")))
 
    (service home-xdg-mime-applications-service-type
             (home-xdg-mime-applications-configuration
diff --git a/.config/guix/modules/desktop.scm b/.config/guix/modules/desktop.scm
index 132f735..f881798 100644
--- a/.config/guix/modules/desktop.scm
+++ b/.config/guix/modules/desktop.scm
@@ -44,7 +44,7 @@
     "sxiv"
     "xprop"
     "zathura"
-    "zathura-pdf-poppler"
+    "zathura-pdf-mupdf"
     ))
 
 (define x-server