emacs29->emacs30

4 files changed, 23 insertions, 21 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 4b7c413..81b59f8 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -78,7 +78,10 @@
 (setopt package-archives nil
         package-enable-at-startup t)
 (add-to-list 'load-path (expand-file-name "~/.guix-home/profile/share/emacs/site-lisp"))
-(guix-emacs-autoload-packages)
+(use-package guix-emacs
+  :demand t
+  :config
+  (guix-emacs-autoload-packages))
 
 (require 'use-package-ensure)
 
diff --git a/.config/emacs/modules/bd--shells.el b/.config/emacs/modules/bd--shells.el
index ae72981..f75e450 100644
--- a/.config/emacs/modules/bd--shells.el
+++ b/.config/emacs/modules/bd--shells.el
@@ -23,7 +23,7 @@
 	(modus-themes-with-colors
 	  (set-face-attribute 'eshell-prompt nil
 			      :foreground fg-main
-			      :background bg-alt
+			      :background bg-dim
 			      :height 1.1
 			      :extend t)))))
   :config
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 4ebe1b0..84924de 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -38,32 +38,31 @@ to.")
   :custom
   (modus-themes-mixed-fonts t)
   (modus-themes-italic-constructs t)
-  (modus-themes-tabs-accented nil)
   (modus-themes-bold-constructs t)
-  (modus-themes-subtle-line-numbers t)
   (modus-themes-variable-pitch-ui nil)
-  (modus-themes-mode-line '(borderless accented))
-  (modus-themes-org-blocks 'grayscale)
   (modus-themes-markup '(background intense))
   (modus-themes-region '(bg-only))
   (modus-themes-syntax 'alt-syntax)
   (modus-themes-headings
-   '((0 rainbow variable-pitch bold 1.5)
-     (1 rainbow variable-pitch bold 1.4)
-     (2 rainbow variable-pitch regular 1.3)
-     (3 rainbow variable-pitch regular 1.1)
-     (t rainbow variable-pitch regular 1.0)))
+   '((0 variable-pitch bold 1.5)
+     (1 variable-pitch bold 1.4)
+     (2 variable-pitch regular 1.3)
+     (3 variable-pitch regular 1.1)
+     (t variable-pitch regular 1.0)))
 
-  (modus-themes-vivendi-color-overrides
-   (mapcar (lambda (x)
-	     (cons (car x) (alist-get (cdr x) modus-themes-vivendi-colors)))
-	   '((bg-dim . bg-main)
-	     (bg-active . bg-main)
-	     (bg-tab-inactive-alt-accent . bg-main)
-	     (bg-tab-active . bg-active-accent)
-	     (bg-tab-inactive . bg-inactive)))))
+  (modus-themes-common-palette-overrides
+   '((bg-mode-line-active bg-blue-nuanced)
+     (border-mode-line-active bg-main)
+     (border-mode-line-inactive bg-main)
+     (bg-line-number-active bg-dim)
+     (bg-line-number-inactive bg-dim)
+     (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))))
 
-(load-theme 'modus-vivendi :no-confirm)
+(load-theme 'modus-vivendi-tinted :no-confirm)
 (run-hooks 'modus-themes-post-load-hook)
 
 
diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm
index 52ebf8b..f3159d8 100644
--- a/.config/guix/modules/xorg.scm
+++ b/.config/guix/modules/xorg.scm
@@ -35,7 +35,7 @@
   (list
    dmenu
    dunst
-   emacs
+   emacs-next
    libnotify
    pavucontrol
    picom