diff --git a/home-manager/modules/river/default.nix b/home-manager/modules/river/default.nix index 41956a6..6fda1fe 100644 --- a/home-manager/modules/river/default.nix +++ b/home-manager/modules/river/default.nix @@ -89,7 +89,8 @@ in hide-cursor = "when-typing enabled"; set-cursor-warp = "on-output-change"; - keyboard-layout-file = toString ./keyboard-layout; + # keyboard-layout-file = toString ./keyboard-layout; + keyboard-layout = "-variant kyria us"; map = { normal = @@ -213,5 +214,9 @@ in ${cfg.package}/bin/rivertile -view-padding 5 -outer-padding 5 & ''; }; + + home.file.".xkb/symbols/us" = { + source = ./keyboard-layout.xkb; + }; }; } diff --git a/home-manager/modules/river/keyboard-layout b/home-manager/modules/river/keyboard-layout deleted file mode 100644 index b7396fc..0000000 --- a/home-manager/modules/river/keyboard-layout +++ /dev/null @@ -1,9 +0,0 @@ -// mode: c-ts-mode - -default partial alphanumeric_keys; - -xkb_symbols "basic" { - include "us(altgr-intl)"; - include "eurosign(5)"; - name[Group1] = "English (US, international with AltGr and Euro sign)"; -}; diff --git a/home-manager/modules/river/keyboard-layout.xkb b/home-manager/modules/river/keyboard-layout.xkb new file mode 100644 index 0000000..12df907 --- /dev/null +++ b/home-manager/modules/river/keyboard-layout.xkb @@ -0,0 +1,4 @@ +xkb_symbols "kyria" { + include "us(altgr-intl)" + include "eurosign(5)" +};