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/core/README.md

@@ -6,6 +6,7 @@
 ```text
 🧭 modules/core
 ├─ 🧩 default.nix  # 基础 imports + 时区/镜像源/flakes 等默认设置
+├─ 📦 pkg.nix      # 全局基础软件包
 ├─ 👤 users.nix    # 用户、默认 shell、密码与公钥
 └─ 🔐 sops.nix     # sops-nix secret 映射
 ```

modules/core/core.nix

@@ -0,0 +1,30 @@
+{ lib, ... }:
+{
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    auto-optimise-store = true;
+    substituters = [
+      "https://cache.nixos.org"
+      "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
+      "https://mirror.sjtu.edu.cn/nix-channels/store"
+    ];
+    trusted-public-keys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbtr1HEhF2M7wP6+jJj6Jm23UM="
+    ];
+  };
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 14d";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  time.timeZone = lib.mkDefault "Asia/Shanghai";
+  i18n.defaultLocale = lib.mkDefault "zh_CN.UTF-8";
+
+  networking.firewall.enable = lib.mkDefault true;
+
+  system.stateVersion = lib.mkDefault "25.05";
+}

modules/core/default.nix

@@ -1,46 +1,9 @@
-{ lib, pkgs, ... }:
+{ ... }:
 {
   imports = [
+    ./core.nix
+    ./pkg.nix
     ./users.nix
     ./sops.nix
   ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    auto-optimise-store = true;
-    substituters = [
-      "https://cache.nixos.org"
-      "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
-      "https://mirror.sjtu.edu.cn/nix-channels/store"
-    ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbtr1HEhF2M7wP6+jJj6Jm23UM="
-    ];
-  };
-
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 14d";
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  time.timeZone = lib.mkDefault "Asia/Shanghai";
-  i18n.defaultLocale = lib.mkDefault "zh_CN.UTF-8";
-
-  networking.firewall.enable = lib.mkDefault true;
-
-  environment.systemPackages = with pkgs; [
-    curl
-    eza
-    git
-    htop
-    ranger
-    vim
-    wget
-  ];
-
-  system.stateVersion = lib.mkDefault "25.05";
-}
-
+}

modules/core/pkg.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    curl
+    eza
+    git
+    htop
+    ranger
+    vim
+    wget
+  ];
+}

modules/core/sops.nix

@@ -11,6 +11,11 @@ in
     defaultSopsFile = secretFile;
     secrets = lib.mkIf (builtins.pathExists secretFile) {
       "users/luochen570/authorized_key" = {};
+      "users/luochen570/ssh_private_key" = {
+        owner = "luochen570";
+        group = "users";
+        mode = "0400";
+      };
       "users/luochen570/ssh_config" = {
         owner = "luochen570";
         group = "users";