diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | modules/common/emacs/doom/config.el | 28 | ||||
| -rw-r--r-- | modules/common/profiles/email.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/common/locale.nix | 6 |
4 files changed, 38 insertions, 40 deletions
diff --git a/flake.lock b/flake.lock index 190c86d..26c41bb 100644 --- a/flake.lock +++ b/flake.lock @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1713131281, - "narHash": "sha256-/Jm1X9MPfLXAxZSCdWmQAFNUQggEfNWHol5jSyyzFzw=", + "lastModified": 1713294767, + "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f32c66a51d05e6d4ec0dea555bbff9135749ec7", + "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1712970252, - "narHash": "sha256-3flJKxsxg+V0jHQ9SB4tdRCYgxKsgzF/g8ERhj9BN0E=", + "lastModified": 1713316655, + "narHash": "sha256-9RrR91JlhQFdrANMMgBJP3QYTOKUSkczV2xfn3q7eKs=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "017d276fa8bc6a73520564dd6b0bf2469363612d", + "rev": "40ad0f919af82dde9664732351871108c1f03215", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713377320, + "narHash": "sha256-OrBm62B+X9jylr6cPgKc+5OSgF2PRW9IY0ARCOtURMY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "f2d364de6589f7a029624983593eafc3c4dac726", "type": "github" }, "original": { @@ -538,11 +538,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713128889, - "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=", + "lastModified": 1713254108, + "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa", + "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "type": "github" }, "original": { @@ -554,11 +554,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713161803, - "narHash": "sha256-bmtqFupVc7eJSbN6Ktar+AP8IgZQdKJJCBP/x0ultHA=", + "lastModified": 1713385445, + "narHash": "sha256-h8dbHXiFMHBVxiOhUtIDCQXkp5p0T+Z2AespYrIJ1a0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c092112f4d6492e3f9e101fd0708f5b7d2058001", + "rev": "0edd8f2a9f5768eb115f84e8ac848fd6c14ba8e7", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713158720, - "narHash": "sha256-1cpJgfuRKIfPOCD156t5yS5A7EHVwX12sfTGWGa3E2g=", + "lastModified": 1713384257, + "narHash": "sha256-p02PQxiyp4FjuoQLpqBcC3WMV1/GiNwMWJ2f9Iq43g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6503c38cf0d34cd9dd0f8eaa7ff5e2c8d20570be", + "rev": "429d6735f20e1741e096aa1c72ffa3d0127cf78e", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1713152146, - "narHash": "sha256-9YWu+pJRPUPic/7U6vjcfW4EQ0OKAYJoICUy8IKW5Y8=", + "lastModified": 1713316726, + "narHash": "sha256-VIQkEgU1xUD4nEh7w3uL0xRsTYZdC7p5+v35G9wv8U0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "926cfa719fef55c3dab86d19b41fd8ee1fc8ea21", + "rev": "c1b75aedd50054ff43bb26ddb2702a2ac3475ea2", "type": "github" }, "original": { 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" ]; }; |