From ce211810996eba7e304b04232d1d18df84690a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sat, 26 Jul 2025 01:13:59 +0200
Subject: [PATCH] vanadium: use xkb compose key directly, drop dvorak french

---
 nix/configurations/vanadium.nix             |  1 -
 nix/configurations/vanadium/nixos/input.nix | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index d62adccd..864c0802 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -98,7 +98,6 @@ in
       ../nixosModules/common/sudo-conf.nix
       ../nixosModules/common/system-nixconf.nix
 
-      ../nixosModules/extra/layouts
       ../nixosModules/extra/zram.nix
       ../nixosModules/extra/leana.nix
 
diff --git a/nix/configurations/vanadium/nixos/input.nix b/nix/configurations/vanadium/nixos/input.nix
index 068207ab..246d07f6 100644
--- a/nix/configurations/vanadium/nixos/input.nix
+++ b/nix/configurations/vanadium/nixos/input.nix
@@ -29,4 +29,14 @@
   #   users = ["leana"];
   #   openFirewall = true;
   # };
+
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "dvorak";
+    options = builtins.concatStringsSep "," [
+      "caps:swapescape"
+      "compose:ralt"
+    ];
+  };
+  console.useXkbConfig = true;
 }