modified: .sops.yaml

modified:   flake.nix
	modified:   home/git.nix
	modified:   home/nvchad.nix
	modified:   home/ssh.nix
	modified:   home/zsh.nix
	new file:   hosts/virtualbox/README.md
	new file:   hosts/virtualbox/configuration.nix
	new file:   hosts/virtualbox/default.nix
	new file:   hosts/virtualbox/hardware-configuration.nix
	modified:   lib/hosts.nix
	modified:   modules/core/README.md
	new file:   modules/core/core.nix
	modified:   modules/core/default.nix
	new file:   modules/core/pkg.nix
	modified:   modules/core/sops.nix
	modified:   modules/desktop/README.md
	modified:   modules/desktop/apps.nix
	modified:   modules/desktop/default.nix
	new file:   modules/desktop/fcitx5.nix
	new file:   modules/desktop/pkg.nix
	modified:   modules/server/README.md
	modified:   modules/server/default.nix
	modified:   modules/server/docker.nix
	new file:   modules/server/pkg.nix
	modified:   modules/server/ssh.nix
	new file:   modules/server/virtualbox-guest.nix
	new file:   modules/server/vscode-server.nix
	modified:   modules/wsl/configuration.nix
	new file:   profiles/virtualbox.nix
	modified:   profiles/wsl.nix
	modified:   secrets/users/README.md
	modified:   secrets/users/luochen570.enc.yaml.example

modules/desktop/README.md

@@ -5,8 +5,9 @@
 ## 🌲 目录树
 ```text
 🖥️ modules/desktop
-├─ 📦 default.nix   # 聚合入口（de + apps）
+├─ 📦 default.nix   # 聚合入口（de + pkg + apps）
 ├─ 🧭 de/           # 桌面环境模块（例如 KDE）
 ├─ 🪟 wm/           # 窗口管理器模块（预留）
+├─ 📦 pkg.nix       # 桌面软件包
 └─ 📱 apps.nix      # 桌面应用与默认浏览器关联
 ```

modules/desktop/apps.nix

@@ -1,19 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  environment.systemPackages = with pkgs; [
-    firefox
-    google-chrome
-    linuxqq
-    wechat-uos
-    xterm
-    kdePackages.kate
-    kdePackages.konsole
-  ];
-
   xdg.mime.enable = true;
   xdg.mime.defaultApplications = {
     "text/html" = [ "google-chrome.desktop" ];
+    "application/xhtml+xml" = [ "google-chrome.desktop" ];
     "x-scheme-handler/http" = [ "google-chrome.desktop" ];
     "x-scheme-handler/https" = [ "google-chrome.desktop" ];
   };
-}
+}

modules/desktop/default.nix

@@ -2,6 +2,8 @@
 {
   imports = [
     ./de
+    ./pkg.nix
     ./apps.nix
+    ./fcitx5.nix
   ];
-}
+}

modules/desktop/fcitx5.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-rime
+      fcitx5-configtool
+      fcitx5-gtk
+      fcitx5-chinese-addons
+    ];
+  };
+
+  environment.sessionVariables = {
+    GTK_IM_MODULE = "fcitx";
+    QT_IM_MODULE = "fcitx";
+    XMODIFIERS = "@im=fcitx";
+    SDL_IM_MODULE = "fcitx";
+    GLFW_IM_MODULE = "fcitx";
+  };
+}

modules/desktop/pkg.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    firefox
+    google-chrome
+    linuxqq
+    wechat-uos
+    xterm
+    kdePackages.kate
+    kdePackages.konsole
+  ];
+}