about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-02-20 12:13:02 +0100
committerAlyssa Ross <hi@alyssa.is>2024-02-20 12:13:02 +0100
commitf9b7c33053ed5de549947a4a148471fbbf480614 (patch)
treefc253ff3d71078a7e79f083aba1423e4a5bea5cd /modules
parenta5e1520e4538e29ecfbd4b168306f890566d7bfd (diff)
downloadnixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar.gz
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar.bz2
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar.lz
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar.xz
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.tar.zst
nixlib-f9b7c33053ed5de549947a4a148471fbbf480614.zip
Update xkb option names
Diffstat (limited to 'modules')
-rw-r--r--modules/workstation/hardware/keyboard/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/workstation/hardware/keyboard/default.nix b/modules/workstation/hardware/keyboard/default.nix
index 4760fbafbe7b..3bd9dc4280db 100644
--- a/modules/workstation/hardware/keyboard/default.nix
+++ b/modules/workstation/hardware/keyboard/default.nix
@@ -6,10 +6,10 @@ let
 in
 {
   console.useXkbConfig = true;
-  services.xserver.xkbVariant = "dvorak";
-  services.xserver.xkbOptions = "caps:escape,compose:menu,compose:prsc";
+  services.xserver.xkb.variant = "dvorak";
+  services.xserver.xkb.options = "caps:escape,compose:menu,compose:prsc";
 
-  environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout;
-  environment.variables.XKB_DEFAULT_VARIANT = xcfg.xkbVariant;
-  environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions;
+  environment.variables.XKB_DEFAULT_LAYOUT = xcfg.xkb.layout;
+  environment.variables.XKB_DEFAULT_VARIANT = xcfg.xkb.variant;
+  environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkb.options;
 }