From 482bcef47a3b7ee63553c58d200065857ec42b1c Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 2 Mar 2024 20:30:02 +0300
Subject: 2024-03-02

---
 modules/common/emacs/default.nix    | 8 ++++----
 modules/common/emacs/doom/config.el | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/common/emacs')

diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 4d17e92..6c5ee1e 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -19,7 +19,6 @@ in {
     };
 
     nixfiles.modules = {
-      fonts.enable = true;
       git.client.enable = true;
       gnupg.enable = true;
       password-store.enable = true;
@@ -28,6 +27,8 @@ in {
     };
 
     hm = {
+      stylix.targets.emacs.enable = false;
+
       xdg.configFile = mapAttrs (_: value:
         value
         // {
@@ -171,10 +172,9 @@ in {
 
                 (appendq! auth-sources '(("${config.secrets.authinfo.path}")))
 
-                ;; The font must be set to n+2, otherwise it looks too small.
                 (setq doom-font (font-spec
-                                  :family "${config.fontScheme.monospaceFont.family}"
-                                  :size ${toString (config.fontScheme.monospaceFont.size + 2)})
+                                  :family "${config.stylix.fonts.monospace.name}"
+                                  :size 16)
                       doom-unicode-font doom-font)
 
                 ;; :input japanese
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 8fd2afc..9e3d603 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -9,7 +9,7 @@
   scroll-margin 10
   hscroll-margin 10)
 
-(when IS-LINUX
+(when (featurep :system 'linux)
   (setq browse-url-generic-program (executable-find "firefox")
         browse-url-browser-function 'browse-url-generic))
 
@@ -17,7 +17,7 @@
 ;;; Doom-specific
 ;;
 
-(setq doom-theme 'doom-tomorrow-night
+(setq doom-theme 'modus-vivendi
       doom-modeline-icon nil
       doom-modeline-indent-info t
       doom-modeline-total-line-number t
@@ -190,7 +190,7 @@
                   :tls t
                   :user ,(concat circe-default-user "/" server)
                   :pass ,(lambda (&rest _)
-                           (+pass-get-secret "server/soju.manwe.shire.net/azahi"))))
+                           (+pass-get-secret ""))))
               '("libera" "oftc" "hackint" "rizon")))
 
 ;;
-- 
cgit v1.2.3