diff --git a/hostconfig/minus/nixos.nix b/hostconfig/minus/nixos.nix
index 3eac3a0..e528eb5 100644
--- a/hostconfig/minus/nixos.nix
+++ b/hostconfig/minus/nixos.nix
@@ -35,8 +35,8 @@ in
   };
 
   services.xserver = {
-    layout = "us";
-    xkbVariant = "dvp";
+    layout = "fr";
+    xkbVariant = "ergol";
   };
 
   hardware.pulseaudio.enable = false;
diff --git a/wm/hm.nix b/wm/hm.nix
index 0ea7363..cbf05d8 100644
--- a/wm/hm.nix
+++ b/wm/hm.nix
@@ -147,32 +147,32 @@
         moveModifier = "Shift";
         definitions = {
           "1:" = {
-            key = "ampersand";
+            key = "1";
           };
           "2:" = {
-            key = "bracketleft";
+            key = "2";
           };
           "3:" = {
-            key = "braceleft";
+            key = "3";
           };
           "4" = {
-            key = "braceright";
+            key = "4";
           };
           "5" = {
-            key = "parenleft";
+            key = "5";
           };
           "6" = {
-            key = "equal";
+            key = "6";
           };
           "7" = {
-            key = "asterisk";
+            key = "7";
           };
           "" = {
-            key = "parenright";
+            key = "8";
             assign = [ "Spotify" ];
           };
           "" = {
-            key = "w";
+            key = "g";
             assign = [
               "Element"
               "Signal"
@@ -180,7 +180,7 @@
             ];
           };
           "" = {
-            key = "m";
+            key = "h";
             assign = [ "Thunderbird" ];
           };
         };
@@ -229,7 +229,7 @@
         "${mod}+comma" = "layout tabbed";
 
         # Misc
-        "${mod}+Shift+semicolon" = "kill";
+        "${mod}+Shift+Q" = "kill";
         "${mod}+Shift+J" = "reload";
         "${mod}+Return" = "exec ${config.terminal.command}";
         "${mod}+p" = "mode resize";
diff --git a/wm/nixos.nix b/wm/nixos.nix
index 17f52bb..75f5877 100644
--- a/wm/nixos.nix
+++ b/wm/nixos.nix
@@ -19,8 +19,8 @@
   nixpkgs.overlays = [
     (self: super: {
       cage = pkgs.writeShellScriptBin "cage" ''
-        export XKB_DEFAULT_LAYOUT=us
-        export XKB_DEFAULT_VARIANT=dvp
+        export XKB_DEFAULT_LAYOUT=fr
+        export XKB_DEFAULT_VARIANT=ergol
         exec ${self.lib.getExe super.cage} "$@"
       '';
     })
diff --git a/wm/sway.nix b/wm/sway.nix
index 72eec1b..79a371c 100644
--- a/wm/sway.nix
+++ b/wm/sway.nix
@@ -317,7 +317,7 @@ in
                 {
                   name = "type:keyboard";
                   value = {
-                    xkb_layout = "us(dvp),us";
+                    xkb_layout = "fr(ergol),us";
                     xkb_options = "compose:102";
                   };
                 }