refactor(sys): Modularize and move to `modules/system` or `pkgs`

3 files changed, 13 insertions, 5 deletions

diff --git a/sys/locale/default.nix b/modules/system/locale/default.nix
index 7912b45b..10569216 100644
--- a/sys/locale/default.nix
+++ b/modules/system/locale/default.nix
@@ -6,19 +6,27 @@
   cfg = config.soispha.locale;
 in {
   options.soispha.locale = {
-    enable = lib.mkEnableOption (lib.mdDoc "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 {
-    # Set your time zone.
-    time.timeZone = "Europe/Berlin";
+    time = {
+      inherit (cfg) timeZone;
+    };
 
-    # Select internationalisation properties.
     i18n = {
       defaultLocale = "en_CA.UTF-8";
       extraLocaleSettings = {
@@ -35,7 +43,7 @@ in {
 
     services.xserver.xkb.extraLayouts = {
       "us-modified" = {
-        description = "standard us with german and swedish extra chars.";
+        description = "standard us with caps as compose key.";
         languages = ["eng" "swe" "deu"];
         symbolsFile = ./keymaps/us_modified.xkb;
       };
diff --git a/sys/locale/keymaps/dvorak_modified.xkb b/modules/system/locale/keymaps/dvorak_modified.xkb
index 63f5d4fb..63f5d4fb 100644
--- a/sys/locale/keymaps/dvorak_modified.xkb
+++ b/modules/system/locale/keymaps/dvorak_modified.xkb
diff --git a/sys/locale/keymaps/us_modified.xkb b/modules/system/locale/keymaps/us_modified.xkb
index 6299a5e9..6299a5e9 100644
--- a/sys/locale/keymaps/us_modified.xkb
+++ b/modules/system/locale/keymaps/us_modified.xkb