From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 18 Oct 2024 17:07:46 +0200 Subject: refactor(modules): Move all system modules to `by-name` From now on all modules should be added to the new `by-name` directory. This should help remove the (superficial and utterly useless) distinction between `home-manager` and `NixOS` modules. --- .../by-name/lo/locale/keymaps/dvorak_modified.xkb | 15 ++++++ modules/by-name/lo/locale/keymaps/us_modified.xkb | 9 ++++ modules/by-name/lo/locale/module.nix | 57 ++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 modules/by-name/lo/locale/keymaps/dvorak_modified.xkb create mode 100644 modules/by-name/lo/locale/keymaps/us_modified.xkb create mode 100644 modules/by-name/lo/locale/module.nix (limited to 'modules/by-name/lo') diff --git a/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb new file mode 100644 index 00000000..63f5d4fb --- /dev/null +++ b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb @@ -0,0 +1,15 @@ +partial alphanumeric_keys +xkb_symbols "dvorak-modified" { + name[Group1]= "Dvorak English with additional keys"; + + key {[ o, O, odiaeresis, Odiaeresis]}; + key {[ u, U, udiaeresis, Udiaeresis]}; + key {type[Group1]="EIGHT_LEVEL", + [ a, A, adiaeresis, Adiaeresis, aring, Aring]}; + + + include "us(dvorak)" + include "level3(caps_switch)" + include "level5(ralt_switch)" +}; +// vim: ft=xkb diff --git a/modules/by-name/lo/locale/keymaps/us_modified.xkb b/modules/by-name/lo/locale/keymaps/us_modified.xkb new file mode 100644 index 00000000..6299a5e9 --- /dev/null +++ b/modules/by-name/lo/locale/keymaps/us_modified.xkb @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..10569216 --- /dev/null +++ b/modules/by-name/lo/locale/module.nix @@ -0,0 +1,57 @@ +{ + config, + lib, + ... +}: let + cfg = config.soispha.locale; +in { + options.soispha.locale = { + enable = lib.mkEnableOption "locale setup"; + + keyMap = lib.mkOption { + type = lib.types.str; + example = "us"; + default = "dvorak"; + description = "The console key map language to use"; + }; + + timeZone = lib.mkOption { + type = lib.types.str; + default = "Europe/Berlin"; + description = "The time zone to use"; + }; + }; + + config = lib.mkIf cfg.enable { + time = { + inherit (cfg) timeZone; + }; + + i18n = { + defaultLocale = "en_CA.UTF-8"; + extraLocaleSettings = { + LANGUAGE = "en_CA:en_US:en"; + LC_TIME = "en_DK.UTF-8"; + LC_COLLATE = "C.UTF-8"; + }; + }; + + # Layout + console = { + inherit (cfg) keyMap; + }; + + 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"]; + symbolsFile = ./keymaps/dvorak_modified.xkb; + }; + }; + }; +} -- cgit 1.4.1