nixos/desktop/locale: move from nixos/locale

thiagokokada · Sep 20, 2023 · a80f2f8 · a80f2f8
1 parent fecde9c
commit a80f2f8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./greetd.nix
+    ./locale.nix
     ./plymouth.nix
     ./tailscale.nix
     ./wayland.nix

diff --git a/nixos/desktop/locale.nix b/nixos/desktop/locale.nix
@@ -0,0 +1,29 @@
+{ config, lib, ... }:
+
+{
+  options.nixos.desktop.locale.enable = lib.mkEnableOption "locale config" // {
+    default = config.nixos.desktop.enable;
+  };
+
+  config = lib.mkIf config.nixos.desktop.locale.enable {
+    # Select internationalisation properties.
+    i18n = {
+      inputMethod.enabled = "fcitx5";
+      defaultLocale = lib.mkDefault "en_IE.UTF-8";
+      extraLocaleSettings = {
+        LC_CTYPE = lib.mkDefault "pt_BR.UTF-8"; # Fix ç in us-intl.
+      };
+    };
+
+    # Set X11 keyboard layout.
+    services.xserver = {
+      layout = lib.mkDefault "us";
+      xkbVariant = lib.mkDefault "intl";
+      # Remap Caps Lock to Esc, and use Super+Space to change layouts
+      xkbOptions = lib.mkDefault "caps:escape,grp:win_space_toggle";
+    };
+
+    # Set your time zone.
+    time.timeZone = lib.mkDefault "America/Sao_Paulo";
+  };
+}
diff --git a/nixos/locale.nix b/nixos/locale.nix
diff --git a/nixos/minimal.nix b/nixos/minimal.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./cli.nix
-    ./locale.nix
     ./meta.nix
     ./system
     ../modules