From 44058865fee110fb420cff8034183932c6d22f4f Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 28 Jun 2024 17:42:21 -0700 Subject: [PATCH] Change locale --- common/users.nix | 15 ++++++----- linux/blitzar/default.nix | 1 - linux/blitzar/device.nix | 46 ++++++++++++++++++++++++++++++++ linux/blitzar/gui.nix | 7 ++++- linux/blitzar/locale.nix | 56 --------------------------------------- 5 files changed, 61 insertions(+), 64 deletions(-) delete mode 100644 linux/blitzar/locale.nix diff --git a/common/users.nix b/common/users.nix index ca6daf0..53f49b6 100644 --- a/common/users.nix +++ b/common/users.nix @@ -120,12 +120,15 @@ in }; }; - i18n.supportedLocales = [ - "C.UTF-8/UTF-8" - "en_US.UTF-8/UTF-8" - "ja_JP.UTF-8/UTF-8" - "zh_CN.UTF-8/UTF-8" - ]; + i18n = { + defaultLocale = "zh_CN.UTF-8"; + supportedLocales = [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + "ja_JP.UTF-8/UTF-8" + "zh_CN.UTF-8/UTF-8" + ]; + }; programs = { fish.enable = true; diff --git a/linux/blitzar/default.nix b/linux/blitzar/default.nix index f860f71..9a377ca 100644 --- a/linux/blitzar/default.nix +++ b/linux/blitzar/default.nix @@ -11,7 +11,6 @@ ./gui.nix ./hardware-configuration.nix ./network.nix - ./locale.nix ./syncthing.nix ./tailscale.nix ./zfs.nix diff --git a/linux/blitzar/device.nix b/linux/blitzar/device.nix index a98ba95..042fc94 100644 --- a/linux/blitzar/device.nix +++ b/linux/blitzar/device.nix @@ -29,6 +29,52 @@ in openFirewall = true; }; fwupd.enable = true; + kanata = { + enable = true; + keyboards.core = { + devices = [ "/dev/input/by-id/usb-ASUSTeK_Computer_Inc._N-KEY_Device-if02-event-kbd" ]; + config = '' + (defsrc + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft up + lctl lmet lalt spc ralt rctl left down rght + ) + (deflayer base + _ _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ @li _ _ _ + ) + (deflayer index + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX @lb XX @lm XX XX XX XX XX + XX XX XX XX XX XX XX XX XX + ) + (deflayer media + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX XX XX XX XX XX + XX XX XX XX XX XX XX XX prev next XX XX XX + XX XX XX pp XX @li XX XX XX + ) + (defalias + li (layer-toggle index) + lb (layer-switch base) + lm (layer-switch media) + ) + ''; + }; + }; + pipewire = { enable = true; alsa = { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 466a481..44dddbc 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: let usr = config.constants.userName; in { home-manager.users.${usr} = { config, pkgs, ... }: @@ -95,6 +95,11 @@ let usr = config.constants.userName; in { }; }; + i18n.inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ fcitx5-nord fcitx5-rime ]; + }; + programs = { dconf.enable = true; steam.enable = true; diff --git a/linux/blitzar/locale.nix b/linux/blitzar/locale.nix deleted file mode 100644 index 6f9ab5a..0000000 --- a/linux/blitzar/locale.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ pkgs, ... }: - -{ - # Configure input methods - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ fcitx5-nord fcitx5-rime ]; - }; - - # Configure keyboard mapping - services.kanata = { - enable = true; - keyboards.core = { - devices = [ "/dev/input/by-id/usb-ASUSTeK_Computer_Inc._N-KEY_Device-if02-event-kbd" ]; - config = '' - (defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft up - lctl lmet lalt spc ralt rctl left down rght - ) - (deflayer base - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ @li _ _ _ - ) - (deflayer index - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX @lb XX @lm XX XX XX XX XX - XX XX XX XX XX XX XX XX XX - ) - (deflayer media - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX XX XX XX XX XX - XX XX XX XX XX XX XX XX prev next XX XX XX - XX XX XX pp XX @li XX XX XX - ) - (defalias - li (layer-toggle index) - lb (layer-switch base) - lm (layer-switch media) - ) - ''; - }; - }; -}