diff options
Diffstat (limited to 'modules/by-name/lo')
4 files changed, 31 insertions, 19 deletions
diff --git a/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb index 63f5d4fb..3893e605 100644 --- a/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb +++ b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb @@ -2,10 +2,18 @@ partial alphanumeric_keys xkb_symbols "dvorak-modified" { name[Group1]= "Dvorak English with additional keys"; + // German + key <AC01> {[ a, A, adiaeresis, Adiaeresis]}; key <AC02> {[ o, O, odiaeresis, Odiaeresis]}; key <AC04> {[ u, U, udiaeresis, Udiaeresis]}; - key <AC01> {type[Group1]="EIGHT_LEVEL", - [ a, A, adiaeresis, Adiaeresis, aring, Aring]}; + + // Missing Swedish letter (the rest is in the German ones) + key <AC07> {[ h, H, aring, Aring]}; + + // Slovenian + key <AC10> {[ s, S, scaron, Scaron]}; + key <AD08> {[ c, C, ccaron, Ccaron]}; + key <AB10> {[ z, Z, zcaron, Zcaron]}; include "us(dvorak)" diff --git a/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb.license b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb.license new file mode 100644 index 00000000..eae6a84c --- /dev/null +++ b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb.license @@ -0,0 +1,9 @@ +nixos-config - My current NixOS configuration + +Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> +SPDX-License-Identifier: GPL-3.0-or-later + +This file is part of my nixos-config. + +You should have received a copy of the License along with this program. +If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. diff --git a/modules/by-name/lo/locale/keymaps/us_modified.xkb b/modules/by-name/lo/locale/keymaps/us_modified.xkb deleted file mode 100644 index 6299a5e9..00000000 --- a/modules/by-name/lo/locale/keymaps/us_modified.xkb +++ /dev/null @@ -1,9 +0,0 @@ -partial alphanumeric_keys -xkb_symbols "us-modified" { - name[Group1]= "US English with caps lock key as compose key"; - - - include "us(basic)" - include "compose(caps)" -}; -// vim: ft=xkb diff --git a/modules/by-name/lo/locale/module.nix b/modules/by-name/lo/locale/module.nix index 10569216..3c9c646c 100644 --- a/modules/by-name/lo/locale/module.nix +++ b/modules/by-name/lo/locale/module.nix @@ -1,3 +1,12 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. { config, lib, @@ -28,10 +37,10 @@ in { }; i18n = { - defaultLocale = "en_CA.UTF-8"; + defaultLocale = "sv_SE.UTF-8"; extraLocaleSettings = { - LANGUAGE = "en_CA:en_US:en"; - LC_TIME = "en_DK.UTF-8"; + LANGUAGE = "sv_SE:en_CA:en_US:en"; + LC_TIME = "sv_SE.UTF-8"; LC_COLLATE = "C.UTF-8"; }; }; @@ -42,11 +51,6 @@ in { }; services.xserver.xkb.extraLayouts = { - "us-modified" = { - description = "standard us with caps as compose key."; - languages = ["eng" "swe" "deu"]; - symbolsFile = ./keymaps/us_modified.xkb; - }; "dvorak-modified" = { description = "standard dvorak english with german and swedish extra chars."; languages = ["eng" "swe" "deu"]; |