diff --git a/home-modules/sway/default.nix b/home-modules/sway/default.nix
index 4ab4c7e..f976842 100644
--- a/home-modules/sway/default.nix
+++ b/home-modules/sway/default.nix
@@ -18,6 +18,7 @@ in
       enable = true;
       config = {
         output = {
+          # Main Desktop
           "Acer Technologies Acer AL1717 0x70201097" = {
             mode = "1280x1024@75.025Hz";
             pos = "2560 0";
@@ -32,6 +33,18 @@ in
             transform = "270";
             pos = "-1080 0";
           };
+          # FrameWork 16
+          "BOE 0x0BC9 Unknown" = {
+            mode = "2560x1600@165.000Hz";
+            pos = "0 0";
+          };
+        };
+        input = {
+          "12972:18:Framework_Laptop_16_Keyboard_Module_-_ANSI_Keyboard" = {
+            "xkb_layout" = "us";
+            "xkb_variant" = "altgr-intl";
+            "xkb_model" = "pc104";
+          };
         };
       };
     };
diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix
index 6044e98..852759e 100644
--- a/modules/keyboard/default.nix
+++ b/modules/keyboard/default.nix
@@ -26,7 +26,7 @@ in
     };
     console = {
       enable = true;
-      keyMap = "de";
+      keyMap = cfg.layout;
     };
   };
 }