diff --git a/configs/colemak.nix b/configs/colemak.nix index b15544f..2dd1a98 100644 --- a/configs/colemak.nix +++ b/configs/colemak.nix @@ -1,22 +1,7 @@ { config , lib -, isUnstable , ... }: -let - unstableVariant = - if isUnstable then { - xkb = { - options = "ctrl:swapcaps,compose:ralt"; - variant = "colemak"; - layout = "us"; - }; - } else { - xkbVariant = "colemak"; - xkbOptions = "ctrl:swapcaps,compose:ralt"; - layout = "us"; - }; -in with lib; { options = { colemak = { @@ -32,6 +17,11 @@ with lib; { config = mkIf config.colemak.enable { console = { keyMap = "colemak"; }; services.xserver = { + xkb = { + options = "ctrl:swapcaps,compose:ralt"; + variant = "colemak"; + layout = "us"; + }; inputClassSections = [ '' Identifier "precursor" @@ -50,6 +40,6 @@ with lib; { Option "XkbVariant" "basic" '' ]; - } // unstableVariant; + }; }; }