diff options
| -rw-r--r-- | modules/workstation/hardware/keyboard/default.nix | 10 | ||||
| -rw-r--r-- | sys/mbp.nix | 2 |
2 files changed, 6 insertions, 6 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; } diff --git a/sys/mbp.nix b/sys/mbp.nix index 2b9c4f472594..79117cb4e8de 100644 --- a/sys/mbp.nix +++ b/sys/mbp.nix @@ -118,7 +118,7 @@ hardware.opengl.enable = false; - services.xserver.xkbOptions = "compose:ralt"; + services.xserver.xkb.options = "compose:ralt"; programs.sway.extraConfig = '' output Unknown-1 scale 2 |