From 9ac64328603d44bd272175942d3ea3eaadcabd04 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 18 Apr 2024 10:52:45 +0300
Subject: 2024-04-18

---
 modules/common/emacs/doom/config.el | 28 ++++++++++++----------------
 modules/common/profiles/email.nix   |  2 +-
 modules/nixos/common/locale.nix     |  6 ++++--
 3 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'modules')

diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 329931b..c893e7f 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -171,6 +171,18 @@
       elfeed-goodies/entry-pane-size 0.75
       elfeed-goodies/entry-pane-position 'bottom)
 
+(add-hook! 'elfeed-new-entry-hook
+           '((elfeed-make-tagger :before "2 weeks ago"
+                                 :remove 'unread)
+             (elfeed-make-tagger :feed-title "SberMarket Tech"
+                                 :entry-title (not ".*(DevOps|Golang).*")
+                                 :add 'junk
+                                 :remove 'unread)
+             (elfeed-make-tagger :feed-title "dotconferences"
+                                 :entry-title (not ".*dotGo.*")
+                                 :add 'junk
+                                 :remove 'unread)))
+
 ;;
 ;;; mu4e
 ;;
@@ -235,19 +247,3 @@
                                  (setq-local company-idle-delay 0.1))))
   :init
   (setq hledger-input-buffer-height 20))
-
-;;
-;;; elfeed
-;;
-
-(add-hook! 'elfeed-new-entry-hook
-           '((elfeed-make-tagger :before "2 weeks ago"
-                                 :remove 'unread)
-             (elfeed-make-tagger :feed-title "SberMarket Tech"
-                                 :entry-title (not ".*(DevOps|Golang).*")
-                                 :add 'junk
-                                 :remove 'unread)
-             (elfeed-make-tagger :feed-title "dotconferences"
-                                 :entry-title (not ".*dotGo.*")
-                                 :add 'junk
-                                 :remove 'unread)))
diff --git a/modules/common/profiles/email.nix b/modules/common/profiles/email.nix
index a525692..cf4169c 100644
--- a/modules/common/profiles/email.nix
+++ b/modules/common/profiles/email.nix
@@ -75,7 +75,7 @@ in
               realName = my.fullname;
               gpg = {
                 inherit (my.pgp) key;
-                signByDefault = true;
+                signByDefault = false;
                 encryptByDefault = false;
               };
 
diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix
index 0f79cb7..8b91a5a 100644
--- a/modules/nixos/common/locale.nix
+++ b/modules/nixos/common/locale.nix
@@ -17,7 +17,7 @@ with lib;
     ];
 
     inputMethod = {
-      enabled = "fcitx5";
+      enabled = null; # FIXME Breaks on Wayland.
       fcitx5 = {
         addons = with pkgs; [
           fcitx5-configtool
@@ -29,10 +29,12 @@ with lib;
   };
 
   services.xserver.xkb = {
-    layout = "us";
+    layout = "us,ru";
+    variant = ",phonetic";
     options = concatStringsSep "," [
       "caps:escape"
       "compose:menu"
+      "grp:win_space_toggle"
       "terminate:ctrl_alt_bksp"
     ];
   };
-- 
cgit 1.4.1