From 368cb6b0d25db2ae23be42ad51584de059997e51 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 20 May 2024 16:10:21 +0200 Subject: refactor(sys): Modularize and move to `modules/system` or `pkgs` --- sys/locale/default.nix | 49 ---------------------------------- sys/locale/keymaps/dvorak_modified.xkb | 15 ----------- sys/locale/keymaps/us_modified.xkb | 9 ------- 3 files changed, 73 deletions(-) delete mode 100644 sys/locale/default.nix delete mode 100644 sys/locale/keymaps/dvorak_modified.xkb delete mode 100644 sys/locale/keymaps/us_modified.xkb (limited to 'sys/locale') diff --git a/sys/locale/default.nix b/sys/locale/default.nix deleted file mode 100644 index 7912b45b..00000000 --- a/sys/locale/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.soispha.locale; -in { - options.soispha.locale = { - enable = lib.mkEnableOption (lib.mdDoc "locale"); - keyMap = lib.mkOption { - type = lib.types.str; - example = "us"; - default = "dvorak"; - }; - }; - - config = lib.mkIf cfg.enable { - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - 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 german and swedish extra chars."; - 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; - }; - }; - }; -} diff --git a/sys/locale/keymaps/dvorak_modified.xkb b/sys/locale/keymaps/dvorak_modified.xkb deleted file mode 100644 index 63f5d4fb..00000000 --- a/sys/locale/keymaps/dvorak_modified.xkb +++ /dev/null @@ -1,15 +0,0 @@ -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/sys/locale/keymaps/us_modified.xkb b/sys/locale/keymaps/us_modified.xkb deleted file mode 100644 index 6299a5e9..00000000 --- a/sys/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 -- cgit 1.4.1