From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
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.
---
 modules/system/locale/default.nix                 | 57 -----------------------
 modules/system/locale/keymaps/dvorak_modified.xkb | 15 ------
 modules/system/locale/keymaps/us_modified.xkb     |  9 ----
 3 files changed, 81 deletions(-)
 delete mode 100644 modules/system/locale/default.nix
 delete mode 100644 modules/system/locale/keymaps/dvorak_modified.xkb
 delete mode 100644 modules/system/locale/keymaps/us_modified.xkb

(limited to 'modules/system/locale')

diff --git a/modules/system/locale/default.nix b/modules/system/locale/default.nix
deleted file mode 100644
index 10569216..00000000
--- a/modules/system/locale/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  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;
-      };
-    };
-  };
-}
diff --git a/modules/system/locale/keymaps/dvorak_modified.xkb b/modules/system/locale/keymaps/dvorak_modified.xkb
deleted file mode 100644
index 63f5d4fb..00000000
--- a/modules/system/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 <AC02>  {[  o,  O,  odiaeresis,  Odiaeresis]};
-    key <AC04>  {[  u,  U,  udiaeresis,  Udiaeresis]};
-    key <AC01>  {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/system/locale/keymaps/us_modified.xkb b/modules/system/locale/keymaps/us_modified.xkb
deleted file mode 100644
index 6299a5e9..00000000
--- a/modules/system/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