configs/colemak: remove isUnstable check

This commit is contained in:
Aaron Bieber 2024-05-31 08:08:56 -06:00
parent 84e9d81b71
commit c4bf11b1c4
No known key found for this signature in database

View File

@ -1,22 +1,7 @@
{ config { config
, lib , 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; { with lib; {
options = { options = {
colemak = { colemak = {
@ -32,6 +17,11 @@ with lib; {
config = mkIf config.colemak.enable { config = mkIf config.colemak.enable {
console = { keyMap = "colemak"; }; console = { keyMap = "colemak"; };
services.xserver = { services.xserver = {
xkb = {
options = "ctrl:swapcaps,compose:ralt";
variant = "colemak";
layout = "us";
};
inputClassSections = [ inputClassSections = [
'' ''
Identifier "precursor" Identifier "precursor"
@ -50,6 +40,6 @@ with lib; {
Option "XkbVariant" "basic" Option "XkbVariant" "basic"
'' ''
]; ];
} // unstableVariant; };
}; };
} }