diff --git a/home-manager/modules/emacs/config.org b/home-manager/modules/emacs/config.org
index 96666db..83aa112 100644
--- a/home-manager/modules/emacs/config.org
+++ b/home-manager/modules/emacs/config.org
@@ -439,6 +439,7 @@ Set fonts.
       (set-face-attribute 'default frame :height font-height)))
 
   (add-hook 'server-after-make-frame-hook 'my/set-font-size)
+  (add-hook 'after-make-frame-functions 'my/set-font-size)
 
   (defun my/setup-fonts ()
     (set-face-attribute 'default nil :family my/default-font :weight 'light)
diff --git a/home-manager/modules/ssh/default.nix b/home-manager/modules/ssh/default.nix
index d6c7d0e..12179f7 100644
--- a/home-manager/modules/ssh/default.nix
+++ b/home-manager/modules/ssh/default.nix
@@ -5,8 +5,8 @@
 with lib; let
   cfg = config.eboskma.programs.ssh;
   var = config.eboskma.var;
-  personalKey = "~/.ssh/id_ed25519";
-  horusKey = "~/.ssh/id_ed25519";
+  personalKey = "~/.ssh/id_ed25519_sk_personal.pub";
+  horusKey = "~/.ssh/id_ed25519_sk_horus.pub";
 in
 {
   options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; };
diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index ca9ede2..db8a926 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -54,7 +54,7 @@
       wallpaper = ../../wallpapers/river-3840.png;
     };
     kanata = {
-      enable = true;
+      enable = false;
       devices = [
         "/dev/input/by-id/usb-04d9_USB-HID_Keyboard-event-kbd"
       ];
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index b6c06ac..43b7944 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -96,7 +96,7 @@ in
             enable = true;
             name = "Erwin Boskma";
             email = "erwin@horus.nu";
-            signingKey = "~/.ssh/id_ed25519_sk";
+            signingKey = "~/.ssh/id_ed25519_sk_horus.pub";
             signingKeyFormat = "ssh";
           };
           gpg.enable = true;
@@ -161,9 +161,10 @@ in
             };
             input = {
               "1241:662:USB-HID_Keyboard" = {
-                xkb_layout = "us";
-                xkb_options = "lv3:ralt_switch,eurosign:5";
-                xkb_numlock = "enable";
+                xkb_layout = "us,us";
+                xkb_variant = "colemak,";
+                xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps";
+                xkb_numlock = "enabled";
               };
               "1133:49257:Logitech_USB_Laser_Mouse" = {
                 natural_scroll = "enabled";
@@ -265,11 +266,9 @@ in
           wayvnc
           winetricks
           wineWowPackages.stable
+          wl-clipboard
           zathura
           zeal
-
-          # localSessionScript
-          # remoteSessionScript
         ]
         ++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);