diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 2618a6c..d0b6633 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -32,10 +32,11 @@
       enable = true;
       theme = "vesper";
     };
+    locale = "uk_UA.UTF-8";
+    misc = {
+      opentabletdriver.enable = false;
+      qmk-vial.enable = true;
+    };
+    virt.libvirt.enable = true;
   };
-
-  locale.ukrainian.enable = true;
-  opentabletdriver.enable = false;
-  qmk-vial.enable = true;
-  virtual.libvirt.enable = true;
 }
diff --git a/hosts/eldrid/configuration.nix b/hosts/eldrid/configuration.nix
index c90c609..0331b45 100644
--- a/hosts/eldrid/configuration.nix
+++ b/hosts/eldrid/configuration.nix
@@ -40,12 +40,11 @@
     };
     stylix = {
       enable = true;
-      theme = "gruvbox-dark-pale";
+      theme = "vesper";
+    };
+    locale = "uk_UA.UTF-8";
+    misc = {
+      qmk-vial.enable = true;
     };
   };
-
-  locale.ukrainian.enable = true;
-  opentabletdriver.enable = false;
-  qmk-vial.enable = true;
-  virtual.libvirt.enable = false;
 }
diff --git a/hosts/legion/configuration.nix b/hosts/legion/configuration.nix
index 70cfd28..fb06add 100644
--- a/hosts/legion/configuration.nix
+++ b/hosts/legion/configuration.nix
@@ -35,8 +35,7 @@
       enable = true;
       theme = "gruvbox-dark-pale";
     };
+    locale = "uk_UA.UTF-8";
+    virt.libvirt.enable = true;
   };
-
-  locale.ukrainian.enable = true;
-  virtual.libvirt.enable = true;
 }
diff --git a/hosts/morphius/configuration.nix b/hosts/morphius/configuration.nix
index 231438e..8c2f727 100644
--- a/hosts/morphius/configuration.nix
+++ b/hosts/morphius/configuration.nix
@@ -42,8 +42,6 @@
       enable = true;
       theme = "vesper";
     };
+    locale = "uk_UA.UTF-8";
   };
-
-  locale.ukrainian.enable = true;
-  opentabletdriver.enable = false;
 }
diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix
index b9589db..c5cd681 100644
--- a/hosts/sarien/configuration.nix
+++ b/hosts/sarien/configuration.nix
@@ -47,10 +47,8 @@
       enable = true;
       theme = "gruvbox-dark-pale";
     };
+    locale = "uk_UA.UTF-8";
+    misc.qmk-vial.enable = true;
+    virt.libvirt.enable = true;
   };
-
-  locale.ukrainian.enable = true;
-  opentabletdriver.enable = false;
-  qmk-vial.enable = true;
-  virtual.libvirt.enable = true;
 }
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 737257f..6d29c97 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,7 +1,9 @@
 {
   imports = [
     ./common.nix
+    ./locale.nix
     ./misc
-    ./virtual
+    ./stylix
+    ./virt
   ];
 }
diff --git a/modules/nixos/system/misc/locale.nix b/modules/nixos/system/locale.nix
similarity index 68%
rename from modules/nixos/system/misc/locale.nix
rename to modules/nixos/system/locale.nix
index 280a52c..f98f7d9 100644
--- a/modules/nixos/system/misc/locale.nix
+++ b/modules/nixos/system/locale.nix
@@ -3,16 +3,18 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkEnableOption;
-  cfg = config.locale.ukrainian;
+  inherit (lib) types mkOption;
 in {
   options = {
-    locale.ukrainian.enable =
-      mkEnableOption "enables ukrainian locale";
+    module.locale = mkOption {
+      type = types.strMatching "[a-z]{2}_[A-Z]{2}\\.UTF-8";
+      default = "en_US.UTF-8";
+      description = "set locale";
+    };
   };
-  config = mkIf cfg.enable {
+  config = {
     i18n = let
-      locale = "uk_UA.UTF-8";
+      inherit (config.module) locale;
     in {
       defaultLocale = locale;
       extraLocaleSettings = {
diff --git a/modules/nixos/system/misc/default.nix b/modules/nixos/system/misc/default.nix
index 1637305..5b2f67f 100644
--- a/modules/nixos/system/misc/default.nix
+++ b/modules/nixos/system/misc/default.nix
@@ -1,8 +1,6 @@
 {
   imports = [
-    ./locale.nix
     ./opentabletdriver.nix
     ./qmk-vial.nix
-    ./stylix
   ];
 }
diff --git a/modules/nixos/system/misc/opentabletdriver.nix b/modules/nixos/system/misc/opentabletdriver.nix
index 5a0fa03..d2fcf65 100644
--- a/modules/nixos/system/misc/opentabletdriver.nix
+++ b/modules/nixos/system/misc/opentabletdriver.nix
@@ -6,10 +6,10 @@
   inherit (lib) mkIf mkEnableOption;
 in {
   options = {
-    opentabletdriver.enable =
+    module.misc.opentabletdriver.enable =
       mkEnableOption "enables opentabletdriver";
   };
-  config = mkIf config.opentabletdriver.enable {
+  config = mkIf config.module.misc.opentabletdriver.enable {
     hardware.opentabletdriver = {
       enable = true;
       daemon.enable = true;
diff --git a/modules/nixos/system/misc/qmk-vial.nix b/modules/nixos/system/misc/qmk-vial.nix
index 3459611..8dd01a3 100644
--- a/modules/nixos/system/misc/qmk-vial.nix
+++ b/modules/nixos/system/misc/qmk-vial.nix
@@ -6,10 +6,10 @@
   inherit (lib) mkIf mkEnableOption;
 in {
   options = {
-    qmk-vial.enable =
+    module.misc.qmk-vial.enable =
       mkEnableOption "adds a udev rule for vial keyboards";
   };
-  config = mkIf config.qmk-vial.enable {
+  config = mkIf config.module.misc.qmk-vial.enable {
     services.udev.extraRules = ''
       KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
     '';
diff --git a/modules/nixos/system/misc/stylix/default.nix b/modules/nixos/system/stylix/default.nix
similarity index 100%
rename from modules/nixos/system/misc/stylix/default.nix
rename to modules/nixos/system/stylix/default.nix
diff --git a/modules/nixos/system/virtual/default.nix b/modules/nixos/system/virt/default.nix
similarity index 100%
rename from modules/nixos/system/virtual/default.nix
rename to modules/nixos/system/virt/default.nix
diff --git a/modules/nixos/system/virtual/docker.nix b/modules/nixos/system/virt/docker.nix
similarity index 87%
rename from modules/nixos/system/virtual/docker.nix
rename to modules/nixos/system/virt/docker.nix
index f35dce2..7333aa6 100644
--- a/modules/nixos/system/virtual/docker.nix
+++ b/modules/nixos/system/virt/docker.nix
@@ -5,10 +5,10 @@
   ...
 }:
 with lib; let
-  cfg = config.virtual.docker;
+  cfg = config.module.virt.docker;
 in {
   options = {
-    virtual.docker.enable =
+    module.virt.docker.enable =
       mkEnableOption "enable docker";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/system/virtual/libvirt.nix b/modules/nixos/system/virt/libvirt.nix
similarity index 89%
rename from modules/nixos/system/virtual/libvirt.nix
rename to modules/nixos/system/virt/libvirt.nix
index 2270b99..05c91bb 100644
--- a/modules/nixos/system/virtual/libvirt.nix
+++ b/modules/nixos/system/virt/libvirt.nix
@@ -5,10 +5,10 @@
   ...
 }:
 with lib; let
-  cfg = config.virtual.libvirt;
+  cfg = config.module.virt.libvirt;
 in {
   options = {
-    virtual.libvirt.enable =
+    module.virt.libvirt.enable =
       mkEnableOption "enables virtualisation";
   };
   config = mkIf cfg.enable {
diff --git a/modules/nixos/system/virtual/podman.nix b/modules/nixos/system/virt/podman.nix
similarity index 87%
rename from modules/nixos/system/virtual/podman.nix
rename to modules/nixos/system/virt/podman.nix
index 1100917..3d7a816 100644
--- a/modules/nixos/system/virtual/podman.nix
+++ b/modules/nixos/system/virt/podman.nix
@@ -5,10 +5,10 @@
   ...
 }:
 with lib; let
-  cfg = config.virtual.podman;
+  cfg = config.module.virt.podman;
 in {
   options = {
-    virtual.podman.enable =
+    module.virt.podman.enable =
       mkEnableOption "enables podman";
   };
   config = mkIf cfg.enable {