modus modeline face cleanup

7 files changed, 31 insertions, 39 deletions

diff --git a/.config/emacs/modules/bd--browse.el b/.config/emacs/modules/bd--browse.el
index 531c7b2..77a5d93 100644
--- a/.config/emacs/modules/bd--browse.el
+++ b/.config/emacs/modules/bd--browse.el
@@ -58,12 +58,13 @@ icecat, or eww."
   (interactive "sURL or search string: ")
   (message "Ludu %s" url)
   (start-process "rip" nil
-		 "mpv" (concat (if (string-match "https://.*" url)
-				   "ytdl://"
-				 "ytdl://ytsearch:") url)))
+		 "mpv" "--force-window=yes"
+		 (concat (if (string-match "https://.*" url)
+			     "ytdl://"
+			   "ytdl://ytsearch:") url)))
 
 (setopt browse-url-handlers
-        `((,(regexp-opt '("youtube.com" "youtu.be")) .
+        `((,(regexp-opt '("youtube.com" "youtu.be" "deezer.page")) .
            (lambda (url &rest _) (rip url))))
         url-privacy-level '(email os emacs lastloc cookies))
 
diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 1924d7b..485d0b9 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -85,11 +85,6 @@ to.")
 (use-package rainbow-mode
   :hook css-mode)
 
-;; fix to force-load newest transient
-(use-package transient
-  :load-path (lambda () (car (directory-files
-                         "/home/bdunahu/.guix-home/profile/share/emacs/site-lisp/"
-                         t "transient-"))))
 (use-package magit
   :commands magit-status
   :custom
@@ -111,7 +106,12 @@ to.")
 	 emacs-lisp-mode
          lisp-mode
          scheme-mode
-         lisp-interaction-mode))
+         lisp-interaction-mode)
+  :config
+  (require 'eldoc)
+  (eldoc-add-command
+   'paredit-backward-delete
+   'paredit-close-round))
 
 
 (provide 'bd--devel)
diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index 3b6532b..184c16e 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -62,13 +62,13 @@ ARG can be one of the following:
 - file: set the specified file"
   (interactive "f")
   (let ((wall (expand-file-name "~/wf/wall/current")))
-    (and arg
-	 (cond
-	  ((file-regular-p arg) (copy-file arg wall t))
-	  ((file-directory-p arg)
-	   (let* ((images (f-files arg (lambda (f) (string-match-p "\\.jpeg\\'" f))))
-		  (rfile (nth (random (length images)) images)))
-	     (and rfile (copy-file rfile wall t))))))
+    (when arg
+      (cond
+       ((file-regular-p arg) (copy-file arg wall t))
+       ((file-directory-p arg)
+	(let* ((images (f-files arg (lambda (f) (string-match-p "\\.jpeg\\'" f))))
+	       (rfile (nth (random (length images)) images)))
+	  (and rfile (copy-file rfile wall t))))))
     (start-process "set wallpaper" nil "feh" "--bg-fill" wall)
     (message "Set wallpaper.")))
 (set-bg)
diff --git a/.config/emacs/modules/bd--shells.el b/.config/emacs/modules/bd--shells.el
index 1753fea..2ae63e4 100644
--- a/.config/emacs/modules/bd--shells.el
+++ b/.config/emacs/modules/bd--shells.el
@@ -20,15 +20,6 @@
   (eshell-banner-message (concat "\n" (propertize " " 'display (create-image (expand-file-name "images/raven.png" user-emacs-directory) 'png nil :scale 0.8 :align-to "center")) "\n")))
 
 (use-package em-prompt
-  :hook
-  ((modus-themes-post-load
-    . (lambda ()
-	(modus-themes-with-colors
-	  (set-face-attribute 'eshell-prompt nil
-			      :foreground fg-main
-			      :background bg-dim
-			      :height 1.1
-			      :extend t)))))
   :config
   (defun bd/get-prompt-path ()
     (abbreviate-file-name (eshell/pwd)))
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 3604be9..478f6fe 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -35,13 +35,17 @@ to.")
   :config
   ;; Disable all other themes to avoid awkward blending:
   (mapc #'disable-theme custom-enabled-themes)
-  (defun bd/pad-mode-line (&rest _)
-    "Inserts a large space around the modeline"
+  (defun bd/modus-set-faces (&rest _)
+    "Blends the modeline with the echo area,
+and some other minor face changes."
     (modus-themes-with-colors
       (custom-set-faces
-       `(mode-line ((,c :box (:line-width 7 :color ,bg-main))))
-       `(mode-line-inactive ((,c :box (:line-width 7 :color ,bg-main)))))))
-  (add-hook 'modus-themes-post-load-hook #'bd/pad-mode-line)
+       `(mode-line ((,c :overline ,bg-button-active)))
+       `(mode-line-inactive ((,c :overline ,bg-button-inactive)))
+       `(hl-line ((,c :background nil :underline ,fg-main)))
+       `(line-number-current-line ((,c :underline ,fg-main)))
+       `(eshell-prompt ((,c :foreground ,fg-main :background ,bg-dim :height 1.1 :extend t))))))
+  (add-hook 'modus-themes-post-load-hook #'bd/modus-set-faces)
   :custom
   (modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted))
   (modus-themes-mixed-fonts t)
@@ -56,7 +60,8 @@ to.")
      (t variable-pitch regular 1.0)))
 
   (modus-themes-common-palette-overrides
-   '((bg-mode-line-active bg-blue-nuanced)
+   '((bg-mode-line-active bg-main)
+     (bg-mode-line-inactive bg-main)
      (border-mode-line-active bg-main)
      (border-mode-line-inactive bg-main)
      (bg-line-number-active bg-dim)
@@ -64,11 +69,8 @@ to.")
      (fg-heading-1 fg-term-blue-bright)
      (fg-heading-2 fg-term-magenta-bright)
      (bg-tab-bar bg-main)
-     (bg-tab-current bg-blue-nuanced)
-     (bg-tab-other bg-mode-line-inactive)))
-
-  (modus-vivendi-tritanopia-palette-overrides
-   '((bg-blue-nuanced bg-red-subtle))))
+     (bg-tab-current bg-main)
+     (bg-tab-other bg-button-inactive))))
 
 (load-theme 'modus-vivendi-tinted :no-confirm)
 (run-hooks 'modus-themes-post-load-hook)
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
index 7b93b4c..4e4a128 100644
--- a/.config/guix/modules/emacs.scm
+++ b/.config/guix/modules/emacs.scm
@@ -40,7 +40,6 @@
    emacs-rainbow-delimiters
    emacs-rainbow-mode
    emacs-shackle
-   emacs-transient
    emacs-transmission
    emacs-yasnippet
 
diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm
index f3159d8..c649ad6 100644
--- a/.config/guix/modules/xorg.scm
+++ b/.config/guix/modules/xorg.scm
@@ -124,7 +124,6 @@ picom &
 eval \"$(ssh-agent -s)\"
 # emacs --daemon
 xss-lock -- slock &
-set-bg
 xset r rate 250 70
 xset s 600
 touchpad-defaults