diff --git a/common/laptop-things.nix b/common/laptop-things.nix
index 534e8c4..0fe5ed1 100644
--- a/common/laptop-things.nix
+++ b/common/laptop-things.nix
@@ -16,12 +16,12 @@
     # Configure keymap in X11
     xserver = {
       xkb = {
-        layout = lib.mkForce "neo_dvorak";
+        layout = lib.mkForce "neo_dvorak,us";
 
         extraLayouts = {
           neo_dvorak = {
             description = "Dvorak with Neo2 Extensions";
-            symbolsFile = ../xkb/symbols/neo_dvorak;
+            symbolsFile = ../res/xkb/symbols/neo_dvorak;
             languages = [ "eng" ];
           };
         };
diff --git a/xkb/set.sh b/res/xkb/set.sh
similarity index 100%
rename from xkb/set.sh
rename to res/xkb/set.sh
diff --git a/xkb/symbols/neo_dvorak b/res/xkb/symbols/neo_dvorak
similarity index 100%
rename from xkb/symbols/neo_dvorak
rename to res/xkb/symbols/neo_dvorak