diff --git a/README.md b/README.md
index e8d2844..d22116b 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,6 @@
 > das ist ja pure poesie —[riotbib](https://github.com/riotbib/)
 
 > Deine Configs sind wunderschön <3 —[flxai](https://github.com/flxai/)
+
+## To do
+- [ ] `services.xserver.xkb.extraLayouts`
diff --git a/configs/default.nix b/configs/default.nix
index e92d306..2529126 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -215,10 +215,9 @@ in
     ./uni.nix
     ./i3.nix
     ./i3status-rust.nix
-    ./keyboard.nix
+    ./keyboard
     ./mycelium.nix
     ./kdeconnect.nix
-    { home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose; }
     { services.upower.enable = true; }
     ./lb.nix
     ./mpv.nix
diff --git a/lib/keyboards/XCompose b/configs/keyboard/XCompose
similarity index 100%
rename from lib/keyboards/XCompose
rename to configs/keyboard/XCompose
diff --git a/lib/keyboards/avestan b/configs/keyboard/avestan
similarity index 100%
rename from lib/keyboards/avestan
rename to configs/keyboard/avestan
diff --git a/lib/keyboards/coptic b/configs/keyboard/coptic
similarity index 100%
rename from lib/keyboards/coptic
rename to configs/keyboard/coptic
diff --git a/configs/keyboard.nix b/configs/keyboard/default.nix
similarity index 89%
rename from configs/keyboard.nix
rename to configs/keyboard/default.nix
index ba8843a..e9f68b0 100644
--- a/configs/keyboard.nix
+++ b/configs/keyboard/default.nix
@@ -27,10 +27,10 @@ let
     arabic = {
       code = "ara";
       variant = "buckwalter";
-    }; # ../lib/keyboards/arabic;
-    coptic = ../lib/keyboards/coptic;
-    avestan = ../lib/keyboards/avestan;
-    gothic = ../lib/keyboards/gothic;
+    };
+    coptic = ./coptic;
+    avestan = ./avestan;
+    gothic = ./gothic;
     farsi = {
       code = "ir";
       variant = "qwerty";
@@ -81,7 +81,7 @@ in
           ++ [
             {
               name = "symbols/ir";
-              path = ../lib/keyboards/farsi;
+              path = ./farsi;
             }
           ]
         ))
@@ -93,10 +93,15 @@ in
 
   home-manager.users.me = {
     home.file =
-      lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
-        (lib.filterAttrs (_: value: !(value ? "code")) languages) // {
-          ".xkb/symbols/ir".source = ../lib/keyboards/farsi;
-        };
+      lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; }) (
+        lib.filterAttrs (_: value: !(value ? "code")) languages
+      )
+      // {
+        ".xkb/symbols/ir".source = ./farsi;
+      }
+      // {
+        ".XCompose".source = ./XCompose;
+      };
   };
 
   console.keyMap = "de";
diff --git a/lib/keyboards/farsi b/configs/keyboard/farsi
similarity index 100%
rename from lib/keyboards/farsi
rename to configs/keyboard/farsi
diff --git a/lib/keyboards/gothic b/configs/keyboard/gothic
similarity index 100%
rename from lib/keyboards/gothic
rename to configs/keyboard/gothic
diff --git a/lib/default.nix b/lib/default.nix
index cc24138..ed8fa45 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -91,7 +91,22 @@ in
     lib.filterAttrs (_: v: v ? "syncthingId") systems
   );
 
-  email = import ./email.nix;
+  email =
+    let
+      thunderbirdProfile = "donnervogel";
+    in
+    {
+      inherit thunderbirdProfile;
+      defaults = {
+        thunderbird = {
+          enable = true;
+          profiles = [ thunderbirdProfile ];
+        };
+        aerc.enable = true;
+        realName = "Kierán Meinhardt";
+        folders.inbox = "INBOX";
+      };
+    };
 
   systems = systems;
 
@@ -99,6 +114,17 @@ in
     github = "kmein";
     email = "kmein@posteo.de";
     name = "Kierán Meinhardt";
+    pronouns = builtins.concatStringsSep "/" [
+      "er"
+      "he"
+      "is"
+      "οὗτος"
+      "هو"
+      "ⲛ̄ⲧⲟϥ"
+      "он"
+      "han"
+      "सः"
+    ];
     sshKeys = [
       systems.fatteh.sshKey
       systems.manakish.sshKey
diff --git a/lib/email.nix b/lib/email.nix
deleted file mode 100644
index 4362d0f..0000000
--- a/lib/email.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-let
-  thunderbirdProfile = "donnervogel";
-in
-{
-  inherit thunderbirdProfile;
-  pronouns = builtins.concatStringsSep "/" [
-    "er"
-    "he"
-    "is"
-    "οὗτος"
-    "هو"
-    "ⲛ̄ⲧⲟϥ"
-    "он"
-    "han"
-    "सः"
-  ];
-  defaults = {
-    thunderbird = {
-      enable = true;
-      profiles = [ thunderbirdProfile ];
-    };
-    aerc.enable = true;
-    realName = "Kierán Meinhardt";
-    folders.inbox = "INBOX";
-  };
-}
diff --git a/lib/keyboards/arabic b/lib/keyboards/arabic
deleted file mode 100644
index a68e292..0000000
--- a/lib/keyboards/arabic
+++ /dev/null
@@ -1,23 +0,0 @@
-// Arabic keyboard using Buckwalter transliteration
-// http://www.qamus.org/transliteration.htm
-// Martin Vidner
-// stolen from https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/2505a3ec2605ea7303bc6de68acf96578f0fd424/symbols/ara#L179
-
-// TODO 06CC ARABIC LETTER FARSI YEH
-
-default partial alphanumeric_keys
-xkb_symbols "buckwalter" {
-  include "ara(buckwalter)"
-  name[Group1] = "Arabic (Buckwalter + Persian)";
-
-  key <AE09> {[ 0x1000669, parenleft ] };
-  key <AE10> {[ 0x1000660, parenright ] };
-  key <AD10> {[ Arabic_tehmarbuta, 0x100067E ] }; // پ
-  key <AD11> {[ 0x100200C, 0x1000671 ] }; // alif wasla, ZWNJ
-  key <AD12> {[ 0x10006C0, Arabic_hamzaonyeh ] }; // ۀ
-  key <AC05> {[ Arabic_ghain, 0x10006AF ] }; // گ
-  key <AC07> {[ Arabic_jeem, 0x1000686 ] }; // چ
-  key <AB03> {[ 0x10006A9, 0x1000698 ] }; // ک ژ
-  key <AB04> {[ Arabic_theh, 0x10006A4 ] }; // ڤ
-  key <AB09> {[ period, Arabic_hamzaonalef ] };
-};
diff --git a/systems/kibbeh/configuration.nix b/systems/kibbeh/configuration.nix
index df61ccb..c44efd8 100644
--- a/systems/kibbeh/configuration.nix
+++ b/systems/kibbeh/configuration.nix
@@ -9,7 +9,7 @@
     ./hardware-configuration.nix
     ../../configs/spacetime.nix
     ../../configs/admin-essentials.nix
-    ../../configs/keyboard.nix
+    ../../configs/keyboard
     ../../configs/sound.nix
     ../../configs/printing.nix
     ../../configs/nix.nix