diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix
index cb66f82..88d82fb 100644
--- a/hosts/reykjavik/default.nix
+++ b/hosts/reykjavik/default.nix
@@ -65,6 +65,17 @@ in
 
     server.vatnajokull.enable = true;
 
+    # - Keyboards -
+    system.kanata = {
+      enable = true;
+      devices = [
+        "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+        "/dev/input/by-path/pci-0000:00:14.0-usb-0:9:1.0-event-kbd"
+        "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:9:1.0-event-kbd"
+      ];
+    };
+    system.devices.voyager.enable = true;
+
     # - Desktop ----------------------------------
     desktop = {
       inherit wallpaper;
diff --git a/modules/desktop/grapheio.nix b/modules/desktop/grapheio.nix
index 9275a85..5127fd9 100644
--- a/modules/desktop/grapheio.nix
+++ b/modules/desktop/grapheio.nix
@@ -92,7 +92,6 @@ in
 
       system.audio.enable = true;
       system.brightness.enable = true;
-      system.kanata.enable = true;
 
       desktop = {
         # Window Manager
diff --git a/modules/system/devices/voyager.nix b/modules/system/devices/voyager.nix
new file mode 100644
index 0000000..70b02a4
--- /dev/null
+++ b/modules/system/devices/voyager.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.samfelag.modules.system.devices.voyager;
+in
+{
+  options.samfelag.modules.system.devices.voyager = {
+    enable = lib.mkEnableOption "voyager";
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.keyboard.zsa.enable = true;
+    environment.systemPackages = with pkgs; [
+      keymapp
+    ];
+  };
+}
diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix
index 8228d99..5626ec2 100644
--- a/modules/system/kanata.nix
+++ b/modules/system/kanata.nix
@@ -6,6 +6,11 @@ in
 {
   options.samfelag.modules.system.kanata = {
     enable = lib.mkEnableOption "kanata";
+    devices = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+      description = "Devices to use for kanata";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -17,6 +22,7 @@ in
       enable = true;
       keyboards = {
         internalKeyboard = {
+          devices = cfg.devices;
           extraDefCfg = "process-unmapped-keys yes";
           configFile = ../../config/kanata/kanata.kbd;
         };