From 3d95472103e682970945f2e384dbaddd97d86683 Mon Sep 17 00:00:00 2001
From: Konstantin Nazarov <mail@knazarov.com>
Date: Thu, 27 Jun 2024 21:46:31 +0100
Subject: [PATCH] Bring back keyd and remove evil-collection hacks

---
 configuration.nix | 32 ++++++++++++++------------------
 emacs.el          |  1 +
 flake.lock        |  6 +++---
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 547d80e..1a3af20 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -18,10 +18,6 @@ let
       epkgs.treesit-grammars.with-all-grammars
       epkgs.evil-collection
     ];
-    override = final: prev: {
-      evil-collection = prev.melpaPackages.evil-collection.overrideAttrs
-        (old: { patches = [ ./evil-collection.patch ]; });
-    };
   });
 
 in {
@@ -323,20 +319,20 @@ in {
     enable = true;
     keyboards = {
 
-      #default = {
-        #ids = [ "*" ];
-        #settings = {
-          #main = {
-            #capslock = "overload(control, esc)";
-            #leftalt = "layer(meta_mac)";
-            #leftmeta = "layer(alt)";
-          #};
-          #"meta_mac:M" = {
-            #c = "C-insert";
-            #v = "S-insert";
-          #};
-        #};
-      #};
+      default = {
+        ids = [ "*" ];
+        settings = {
+          main = {
+            capslock = "overload(control, esc)";
+            leftalt = "layer(meta_mac)";
+            leftmeta = "layer(alt)";
+          };
+          "meta_mac:M" = {
+            c = "C-insert";
+            v = "S-insert";
+          };
+        };
+      };
     };
   };
 
diff --git a/emacs.el b/emacs.el
index 8bd4460..977ab41 100755
--- a/emacs.el
+++ b/emacs.el
@@ -1207,6 +1207,7 @@ Intended for `after-make-frame-functions'."
   :ensure t
   :mode "\\.go$"
   :config
+  (setq gofmt-show-errors 'echo)
   (add-hook 'before-save-hook #'gofmt-before-save)
   )
 
diff --git a/flake.lock b/flake.lock
index ca3f659..3af32c0 100755
--- a/flake.lock
+++ b/flake.lock
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718058306,
-        "narHash": "sha256-xEcT7D3brIiWCYlsN6CT093i0bZ6e0mhmvhzTFaYiDA=",
+        "lastModified": 1719265590,
+        "narHash": "sha256-SScslqk325Ld6+9QMq+it1Wlisq8osZ2BQDrWBE4Cp8=",
         "owner": "~knazarov",
         "repo": "knazarov.com",
-        "rev": "fa1d523bd1e0b65369ee9c6a0af28a162cdfbb16",
+        "rev": "9e2f8c466d5559eaf19ce8af7ae8c8d4674d4dcf",
         "type": "sourcehut"
       },
       "original": {