更新到25.11

增加sqlite和jq
增加 1. apc ups 服务 2. flatpak desktop目录
2025-08-18 12:03:21 +08:00 · 2025-05-29 18:44:22 +08:00 · 2025-05-28 14:30:28 +08:00 · 2025-05-19 10:41:29 +08:00 · 2025-05-19 10:20:28 +08:00 · 2025-05-09 14:40:19 +08:00
58 changed files with 1083 additions and 716 deletions
--- a/README.md
+++ b/README.md
@@ -10,27 +10,26 @@
 │  ├── desktop.nix        # 桌面环境配置
 │  └── server.nix         # 服务器配置
 ├── libs                  # 自定义库函数
-│  ├── default.nix        # 导出所有库函数
-│  └── mkNixosSystem.nix  # 创建nixosSystem的通用函数
 ├── modules               # 通用模块，不同机器可以根据的需要引入
 │  ├── home               # home manager 通用模块
-│  │  └── -               # home manager 通用模块
 │  └── nixos              # nixos 通用模块
-│     └── -               # nixos 通用模块
 ├── overlays              # 安装包的修改配置
-│  └── -                  # 安装包的修改配置
+│  └── default.nix        # 覆盖配置入口
 ├── pkgs                  # 自定义软件包
-│  └── -
 ├── profiles              # 不同机器的配置文件, 放置只有特定主机可以使用的配置
 │  ├── apollo             # 主服务器配置
-│  │  ├── configuration.nix # 主要配置文件，包含系统模块、服务、用户设置等
-│  │  └── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│  │  ├── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│  │  ├── home            # apollo的home-manager配置
+│  │  └── nixos           # apollo的NixOS配置
+│  │     └── network.nix  # 网络配置
 │  ├── gaea               # 主用机配置
-│  │  ├── configuration.nix # 主要配置文件，包含系统模块、服务、用户设置等
-│  │  └── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│  │  ├── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│  │  ├── home            # gaea的home-manager配置
+│  │  └── nixos           # gaea的NixOS配置
 │  └── luna               # 虚拟机配置
-│     ├── configuration.nix # 主要配置文件，包含系统模块、服务、用户设置等
-│     └── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│     ├── default.nix     # 入口文件，负责创建nixosSystem并选择使用的nixpkgs版本
+│     ├── hardware-configuration.nix # 硬件配置
+│     └── network.nix     # 网络配置
 ├── flake.lock            # flake 锁定文件
 ├── flake.nix             # nix flake 入口
 ├── nixos-install.sh      # nixos 全新安装脚本
@@ -170,3 +169,45 @@ nixos-switch
 2. **profiles/[hostname]/default.nix** - 这是配置的入口文件，负责选择使用的 nixpkgs 版本并调用 libs.mkNixosSystem 函数。

 3. **profiles/[hostname]/configuration.nix** - 包含实际的配置内容，如系统模块、服务、用户设置等。
+
+## 垃圾清理
+
+home-manager profiles 文件夹
+
+```bash
+~/.local/state/nix/profiles/
+```
+
+1. 列出历史版本
+
+```bash
+# 最新api
+nix profile history --profile /nix/var/nix/profiles/system
+nix profile history --profile ~/.local/state/nix/profiles/home-manager
+
+# nixos系统api
+nixos-rebuild list-generations
+
+# 旧版api
+nix-env --list-generations -p /nix/var/nix/profiles/system
+```
+
+2. 查看根依赖
+
+```bash
+nix-store --query --roots /nix/store/ijr7hck016n92ds7zh9syv51qv4cl8zg-wechat-uos-4.0.0.23
+```
+
+3. 删除历史generations
+
+```bash
+nix profile wipe-history --profile  ~/.local/state/nix/profiles/home-manager # 清除所有非当前
+nix profile wipe-history --older-than 1d --profile /nix/var/nix/profiles/system # 保留最近7天
+nix profile wipe-history --older-than 7d --profile ~/.local/state/nix/profiles/home-manager # home-manager单独清除
+```
+4. 删除旧版本
+
+```bash
+nix-collect-garbage --delete-older-than 30d
+nix-collect-garbage -d # --delete-old 清除所有未使用的
+```
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744743431,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+        "lastModified": 1747688870,
+        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+        "rev": "d5f1f641b289553927b3801580598d200a501863",
        "type": "github"
      },
      "original": {
@@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745205007,
-        "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=",
+        "lastModified": 1755442500,
+        "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c",
+        "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3",
        "type": "github"
      },
      "original": {
@@ -58,11 +58,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744440957,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
        "type": "github"
      },
      "original": {
@@ -74,11 +74,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1755186698,
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,19 @@
      useremail = "reizero@live.com";
      sourcepath = "/home/${username}/.nix";
      libs = import ./libs;
+
+      nixos = {
+        stable = {
+          nixpkgs = nixpkgs;
+          home-manager = home-manager;
+          version = "25.05";
+        };
+        unstable = {
+          nixpkgs = nixpkgs-unstable;
+          home-manager = home-manager-unstable;
+          version = "25.11";
+        };
+      };
    in
    rec {
      # Your custom packages and modifications, exported as overlays
@@ -20,7 +33,8 @@
          (profile: {
            name = profile;
            value = import ./profiles/${profile} {
-              inherit self inputs outputs libs sourcepath username useremail;
+              inherit self inputs outputs libs nixos profile sourcepath username useremail;
+              hostname = profile;
            };
          })
          (attrNames (readDir ./profiles))
@@ -35,7 +49,7 @@
          extraSpecialArgs = {
            inherit inputs outputs username useremail;
            hyprland = inputs.hyprland;
-            sysversion = "unstable";
+            version = "${nixos.unstable.version}";
          };
          modules = [
            # > Our main home-manager configuration file <
--- a/home/core.nix
+++ b/home/core.nix
@@ -1,7 +1,10 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)

-{ outputs, pkgs, username, useremail, sysversion, ... }: {
+{ self, outputs, pkgs, username, useremail, version, ... }: {
+  imports = [
+    "${self}/libs/home-libs.nix"
+  ];

  home = {
    inherit username;
@@ -108,5 +111,5 @@
  systemd.user.startServices = "sd-switch";

  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = sysversion;
+  home.stateVersion = version;
 }
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -13,10 +13,9 @@

    # You can also split up your configuration and import pieces of it here:
    ./core.nix
-    ../modules/home/hyprland
    ../modules/home/vscode
    ../modules/home/zsh
-    ../modules/home/xdg.nix
+    ../modules/home/xdg
    ../modules/home/theme.nix
    ../modules/home/fcitx.nix
    ../modules/home/wechat.nix
--- a/modules/home/develop.nix
+++ b/modules/home/develop.nix
@@ -11,8 +11,10 @@
      nodejs
      yarn

-      steam-run
-      jetbrains.idea-community
+      sqlite
+      jq
+      # steam-run
+      # jetbrains.idea-community # use prebuild binary
    ];

    sessionVariables = {
--- a/modules/home/fcitx.nix
+++ b/modules/home/fcitx.nix
@@ -1,16 +1,21 @@
 # 输入法配置模块
 { config, lib, pkgs, ... }: {

-  i18n.inputMethod = {
+  i18n.inputMethod = (if lib.versionAtLeast config.home.stateVersion "25.05" then {
+    enable = true;
+    type = "fcitx5";
+  } else {
    enabled = "fcitx5";
+  }) // {
    fcitx5 = {
      addons = with pkgs; [
        fcitx5-gtk
        fcitx5-chinese-addons
        fcitx5-nord
      ];
-      waylandFrontend = true; # available in home-manager-25.05
-    };
+    } // (lib.optionalAttrs (lib.versionAtLeast config.home.stateVersion "25.05") {
+      waylandFrontend = true;
+    });
  };

  gtk = {
--- a/modules/home/hyprland/conf/hypr/hyprland.conf
+++ b/modules/home/hyprland/conf/hypr/hyprland.conf
@@ -30,6 +30,7 @@ exec-once = waybar # launch the system panel
 exec-once = blueman-applet # systray app for BT
 exec-once = mako # start notification demon
 exec-once = fcitx5 -d -r
+exec-once = swww-daemon
 # exec-once = nm-applet --indicator # systray app for Network/Wifi
 # exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
 # exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
--- a/modules/home/hyprland/conf/hypr/keybindings.conf
+++ b/modules/home/hyprland/conf/hypr/keybindings.conf
@@ -8,7 +8,7 @@
 ################################################
 # Main modifier
 ################################################
-$mainMod = SUPER # windows key
+$mod = SUPER # windows key
 $terminal = kitty
 $filemanager = dolphin

@@ -17,27 +17,27 @@ $filemanager = dolphin
 ################################################
 # Main actions
 ################################################
-bind = $mainMod, C, killactive # killactive, kill the window on focus
-bind = $mainMod CTRL, delete, exit, # kill hyperland session
-bind = $mainMod, F, togglefloating, # toggle the window on focus to float
-bind = $mainMod CTRL, L, exec, swaylock # lock screen
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, S, togglesplit, # split screen
-bind = $mainMod, return, fullscreen, # toggle the window on focus to fullscreen
+bind = $mod, C, killactive # killactive, kill the window on focus
+bind = $mod CTRL, delete, exit, # kill hyperland session
+bind = $mod, F, togglefloating, # toggle the window on focus to float
+bind = $mod CTRL, L, exec, swaylock # lock screen
+bind = $mod, P, pseudo, # dwindle
+bind = $mod, S, togglesplit, # split screen
+bind = $mod, return, fullscreen, # toggle the window on focus to fullscreen
+bind = $mod, F1, exec, ~/.config/hypr/scripts/keybinds.sh

 # Application shortcuts
-bind = $mainMod, grave, exec, $terminal  # ~ open terminal
-bind = $mainMod, E, exec, $filemanager # open file manager
-bind = $mainMod, V, exec, code # open vscode
+bind = $mod, grave, exec, $terminal  # ~ open terminal
+bind = $mod, E, exec, $filemanager # open file manager
+bind = $mod, V, exec, code # open vscode

 ################################################
 # Control actions
 ################################################
 # Rofi is toggled on/off if you repeat the key presses
-bind = $mainMod, SPACE, exec, pkill rofi || rofi -show drun # launch desktop applications
-bind = $mainMod, tab, exec, pkill rofi || rofi -show window # switch between desktop applications
-bind = $mainMod, E, exec, pkill rofi || rofi -show filebrowser # browse system files
-bind = $mainMod, R, exec, pkill rofi || rofi -show run # run a command
+bind = $mod, SPACE, exec, pkill rofi || rofi -show drun # launch desktop applications
+bind = $mod, E, exec, pkill rofi || rofi -show filebrowser # browse system files
+bind = $mod, R, exec, pkill rofi || rofi -show run # run a command

 # Audio control
 # bind  = , F10, exec, ~/.config/hypr/scripts/volumecontrol.sh -o m # toggle audio mute
@@ -53,94 +53,101 @@ bind  = , XF86AudioNext, exec, playerctl next
 bind  = , XF86AudioPrev, exec, playerctl previous

 # Screenshot/screencapture
-bind = , PRINT, exec, hyprshot -m window 
-bind = ALT, PRINT, exec, hyprshot -m region 
+bind = , PRINT, exec, hyprshot -z -m window 
+bind = ALT, PRINT, exec, hyprshot -z -m region 


 ################################################
 # Exec custom scripts
 ################################################
-bind = $mainMod, G, exec, ~/.config/hypr/scripts/gamemode.sh # disable hypr effects for gamemode
+bind = $mod, G, exec, ~/.config/hypr/scripts/gamemode.sh # disable hypr effects for gamemode



 ################################################
 # Window actions
 ################################################
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, down, movefocus, d
-bind = $mainMod, J, movefocus, d
+# Move focus with mod + arrow keys
+bind = $mod, left, movefocus, l
+bind = $mod, H, movefocus, l
+bind = $mod, right, movefocus, r
+bind = $mod, L, movefocus, r
+bind = $mod, up, movefocus, u
+bind = $mod, K, movefocus, u
+bind = $mod, down, movefocus, d
+bind = $mod, J, movefocus, d

 # Resize windows
-binde = $mainMod CONTROL, right, resizeactive, 10 0
-binde = $mainMod CONTROL, left, resizeactive, -10 0
-binde = $mainMod CONTROL, up, resizeactive, 0 -10
-binde = $mainMod CONTROL, down, resizeactive, 0 10
+binde = $mod CONTROL, right, resizeactive, 10 0
+binde = $mod CONTROL, H, resizeactive, 10 0
+binde = $mod CONTROL, left, resizeactive, -10 0
+binde = $mod CONTROL, L, resizeactive, -10 0
+binde = $mod CONTROL, up, resizeactive, 0 -10
+binde = $mod CONTROL, K, resizeactive, 0 -10
+binde = $mod CONTROL, down, resizeactive, 0 10
+binde = $mod CONTROL, J, resizeactive, 0 10

-# Move Window with mainMod + SHIFT + arrow keys
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d
+# Move Window with mod + SHIFT + arrow keys
+bind = $mod SHIFT, left, movewindow, l
+bind = $mod SHIFT, H, movewindow, l
+bind = $mod SHIFT, right, movewindow, r
+bind = $mod SHIFT, L, movewindow, r
+bind = $mod SHIFT, up, movewindow, u
+bind = $mod SHIFT, K, movewindow, u
+bind = $mod SHIFT, down, movewindow, d
+bind = $mod SHIFT, J, movewindow, d

-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+# Move/resize windows with mod + LMB/RMB and dragging
+bindm = $mod, mouse:272, movewindow
+bindm = $mod, mouse:273, resizewindow


 ################################################
 # Workspace actions
 ################################################
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+# Switch workspaces with mod + [0-9]
+bind = $mod, 1, workspace, 1
+bind = $mod, 2, workspace, 2
+bind = $mod, 3, workspace, 3
+bind = $mod, 4, workspace, 4
+bind = $mod, 5, workspace, 5
+bind = $mod, 6, workspace, 6
+bind = $mod, 7, workspace, 7
+bind = $mod, 8, workspace, 8
+bind = $mod, 9, workspace, 9
+bind = $mod, 0, workspace, 10

-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+# Move active window to a workspace with mod + SHIFT + [0-9]
+bind = $mod SHIFT, 1, movetoworkspace, 1
+bind = $mod SHIFT, 2, movetoworkspace, 2
+bind = $mod SHIFT, 3, movetoworkspace, 3
+bind = $mod SHIFT, 4, movetoworkspace, 4
+bind = $mod SHIFT, 5, movetoworkspace, 5
+bind = $mod SHIFT, 6, movetoworkspace, 6
+bind = $mod SHIFT, 7, movetoworkspace, 7
+bind = $mod SHIFT, 8, movetoworkspace, 8
+bind = $mod SHIFT, 9, movetoworkspace, 9
+bind = $mod SHIFT, 0, movetoworkspace, 10

 # Move window to workspace Super + Alt + [0-9]
-bind = $mainMod ALT, 1, movetoworkspacesilent, 1
-bind = $mainMod ALT, 2, movetoworkspacesilent, 2
-bind = $mainMod ALT, 3, movetoworkspacesilent, 3
-bind = $mainMod ALT, 4, movetoworkspacesilent, 4
-bind = $mainMod ALT, 5, movetoworkspacesilent, 5
-bind = $mainMod ALT, 6, movetoworkspacesilent, 6
-bind = $mainMod ALT, 7, movetoworkspacesilent, 7
-bind = $mainMod ALT, 8, movetoworkspacesilent, 8
-bind = $mainMod ALT, 9, movetoworkspacesilent, 9
-bind = $mainMod ALT, 0, movetoworkspacesilent, 10
+bind = $mod ALT, 1, movetoworkspacesilent, 1
+bind = $mod ALT, 2, movetoworkspacesilent, 2
+bind = $mod ALT, 3, movetoworkspacesilent, 3
+bind = $mod ALT, 4, movetoworkspacesilent, 4
+bind = $mod ALT, 5, movetoworkspacesilent, 5
+bind = $mod ALT, 6, movetoworkspacesilent, 6
+bind = $mod ALT, 7, movetoworkspacesilent, 7
+bind = $mod ALT, 8, movetoworkspacesilent, 8
+bind = $mod ALT, 9, movetoworkspacesilent, 9
+bind = $mod ALT, 0, movetoworkspacesilent, 10

 # Special workspaces (scratchpad) 
-bind = $mainMod ALT, S, movetoworkspacesilent, special
-bind = $mainMod CONTROL, S, togglespecialworkspace,
+bind = $mod ALT, S, movetoworkspacesilent, special
+bind = $mod CONTROL, S, togglespecialworkspace,

-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod CTRL, right, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e+1
-bind = ALT, Tab, workspace, e+1
+# Scroll through existing workspaces with mod + scroll
+bind = $mod CTRL, right, workspace, e+1

-bind = $mainMod CTRL, left, workspace, e-1
-bind = $mainMod, mouse_down, workspace, e-1
+bind = $mod CTRL, left, workspace, e-1
+
+bind = $mod, TAB, exec, ~/.config/hypr/scripts/switch.sh
--- a/modules/home/hyprland/conf/hypr/scripts/keybinds.sh
+++ b/modules/home/hyprland/conf/hypr/scripts/keybinds.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# 简单示例：从 hyprland.conf 提取非注释的 bind= 行
+# 注意：这可能需要根据你的配置复杂性进行调整（例如处理逗号后的空格、多行绑定等）
+grep '^bind =' ~/.config/hypr/keybindings.conf | \
+sed 's/^bind = //; s/, /\t/' | \
+# 可以进一步处理，比如移除 exec 后面的命令细节，只留动作描述
+# sed -E 's/,(.+)/ : \1/' | # 简单替换
+column -t -s $'\t' | \
+rofi -dmenu -i -p "Hyprland Keybinds" -markup-rows -config ~/.config/rofi/config-keybinds.rasi
+# 或者使用 wofi:
+# wofi --dmenu --prompt "Hyprland Keybinds" --insensitive
--- a/modules/home/hyprland/conf/hypr/scripts/switch.sh
+++ b/modules/home/hyprland/conf/hypr/scripts/switch.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# 获取窗口列表，格式为 "ADDRESS    [Workspace] Class: Title"
+# 使用 jq 解析 hyprctl clients -j 的 JSON 输出
+# select(.workspace.id != -1) 过滤掉特殊工作区（如概览）的窗口
+WINDOWS_LIST=$(hyprctl clients -j | jq -r '.[] | select(.workspace.id != -1) | "\(.address)\t[\(.workspace.name)] \(.class): \(.title)"')
+
+# 如果没有窗口，显示提示并退出
+if [ -z "$WINDOWS_LIST" ]; then
+    rofi -e "No open windows found."
+    exit 1
+fi
+
+# 使用 Rofi 显示窗口列表，允许用户选择
+# -dmenu: dmenu 模式
+# -i: 不区分大小写搜索
+# -p: 提示符文本
+# -markup-rows: (可选) 如果你想在列表中使用 Pango 标记
+# -format 's': 输出选择的完整行
+CHOSEN_WINDOW_LINE=$(echo -e "$WINDOWS_LIST" | rofi -dmenu -i -p "󰖯 Switch Window" -format 's')
+# 你可以使用其他图标，例如  或 Window:
+
+# 如果用户取消了选择 (Rofi 返回空)，则退出
+if [ -z "$CHOSEN_WINDOW_LINE" ]; then
+    exit 0
+fi
+
+# 从选择的行中提取窗口地址 (它是第一个字段，以制表符分隔)
+CHOSEN_ADDRESS=$(echo "$CHOSEN_WINDOW_LINE" | awk -F'\t' '{print $1}')
+
+# 使用 hyprctl 切换到选定的窗口
+hyprctl dispatch focuswindow address:"$CHOSEN_ADDRESS"
+
+exit 0
--- a/modules/home/hyprland/conf/hypr/windowrules.conf
+++ b/modules/home/hyprland/conf/hypr/windowrules.conf
@@ -10,8 +10,8 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more

 # Float rules for system dialogs and popups
-windowrulev2 = float,class:^(.*)$,title:^(Open [Ff]ile)
-windowrulev2 = center,class:^(.*)$,title:^(Open [Ff]ile)
+windowrulev2 = float,class:^(.*)$,title:^(Open [Ff]iles?)
+windowrulev2 = center,class:^(.*)$,title:^(Open [Ff]iles?)

 windowrulev2 = float,class:^(.*)$,title:^(Open [Ff]older)
 windowrulev2 = center,class:^(.*)$,title:^(Open [Ff]older)
@@ -35,6 +35,5 @@ windowrulev2 = float,class:^(blueman-manager)$
 windowrulev2 = opacity 0.80 0.70,class:^(blueman-manager)$


-windowrulev2 = opacity 0.50 0.50,class:^(Code)$
+windowrulev2 = opacity 1.00 1.00,class:^(code)$
 windowrulev2 = opacity 0.80 0.80,class:^(code-url-handler)$
-windowrulev2 = opacity 0.80 0.80,class:^(kitty)$
--- a/modules/home/hyprland/conf/kitty/kitty.conf
+++ b/modules/home/hyprland/conf/kitty/kitty.conf
@@ -1,11 +1,27 @@
-# vim:ft=kitty
+# 背景透明度
+background_opacity 0.6

-## name:     Catppuccin Latte 🐑 
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
-## blurb:    Soothing pastel theme for the high-spirited!
+# 开启抗锯齿
+enable_ligatures yes
+# 开启字体平滑
+font_antialias true
+# 开启子像素渲染
+font_hinting full

+# 终端兼容性设置
+term xterm-256color
+shell_integration no-rc
+
+# 修复 SSH 退格键问题
+map ctrl+h send_text all \x08
+backspace_sends_backspace yes
+
+# 设置四周边距（单位：像素）
+window_padding_width 8
+
+map ctrl+shift+equal change_font_size all +1
+map ctrl+shift+minus change_font_size all -1
+map ctrl+shift+backspace change_font_size all 0


 # The basic colors
@@ -77,12 +93,4 @@ color14 #179299

 # white
 color7  #ACB0BE
-color15 #ACB0BE
-
-# 终端兼容性设置
-term xterm-256color
-shell_integration no-rc
-
-# 修复 SSH 退格键问题
-map ctrl+h send_text all \x08
-backspace_sends_backspace yes
+color15 #ACB0BE
--- a/modules/home/hyprland/conf/rofi/config.rasi
+++ b/modules/home/hyprland/conf/rofi/config.rasi
@@ -33,8 +33,8 @@ configuration {
 window {
  background-color: @bg0;
  location: center;
-  width: 560px;
-  height: 450px;
+  width: 720px;
+  height: 500px;
  border-radius: 8px;
  border: 1px;
  border-color: @bg1;
--- a/modules/home/hyprland/conf/waybar/config.jsonc
+++ b/modules/home/hyprland/conf/waybar/config.jsonc
@@ -10,10 +10,10 @@
  "modules-left": [
    "custom/lr",
    "hyprland/workspaces",
-    "custom/rr",
-    "custom/lr",
-    "hyprland/window",
    "custom/rr"
+    // "custom/lr",
+    // "hyprland/window",
+    // "custom/rr"
  ],
  "modules-center": ["custom/lr", "clock", "custom/rr"],
  "modules-right": [
@@ -76,17 +76,18 @@
      "title<.*youtube.*>": "",
      "rofi": "󱓞",
      "kitty": "",
-      "org.gnome.Nautilus": "󰪶",
+      "nemo": "󰪶",
      "wechat": "",
      "wps": "󰈬",
-      "class<et>": "󰈛"
+      "class<et>": "󰈛",
+      "vlc": "󰕼"
    }
  },

  "hyprland/window": {
    "format": "{title}",
-    "tooltip-format": "{title}",
-    "rewrite": { "^(.{30}).+": "$1..." },
+    "tooltip-format": "[{class}]: {title}",
+    "max-length": 30,
    "separate-outputs": true
  },

--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -1,6 +1,5 @@
 { config, libs, pkgs, ... }:
 let
-  conf = [ "hypr" "waybar" "rofi" "kitty" "mako" "wlogout" ];
  confPath = "modules/home/hyprland/conf";
 in
 {
@@ -19,30 +18,22 @@ in
  };

  home.packages = with pkgs; [
+    hyprshot #screenshot
    waybar # the status bar
    swww # wallpaper
    libnotify # for notify-send command
    mako # notify daemon
-    hyprshot #screenshot
    rofi # app launcher
    kitty # terminal
    wlogout # logout menu
    killall
    pavucontrol # audio control
-    nautilus #file manager for GNOME
+    nemo #file manager
+    jq # json query util
  ];


  programs = {
-    bash = {
-      initExtra = ''
-          if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ];
-        then
-        echo 'Welcome! '
-        fi
-      '';
-    };
-
    swaylock.enable = true;
  };

@@ -55,7 +46,7 @@ in
          source = config.home-libs.mkOutOfStoreSymlink "${confPath}/${name}";
        };
      })
-      conf
+      (builtins.attrNames (builtins.readDir ./conf))
    );
 }

--- a/modules/home/vscode/conf/keybindings.json
+++ b/modules/home/vscode/conf/keybindings.json
--- a/modules/home/vscode/conf/settings.json
+++ b/modules/home/vscode/conf/settings.json
@@ -48,5 +48,10 @@
  "workbench.colorTheme": "Default Light Modern",
  "augment.chat.userGuidelines": "Always response in 中文",
  "augment.completions.enableAutomaticCompletions": true,
-  "editor.fontFamily": "'Source Code Pro', 'JetBrainsMono Nerd Font'"
+  "editor.fontFamily": "'Source Code Pro', 'JetBrainsMono Nerd Font'",
+  "github.copilot.nextEditSuggestions.enabled": true,
+  "update.mode": "none",
+  "github.copilot.chat.localeOverride": "zh-CN",
+  "github.copilot.selectedCompletionModel": "GPT-4.1",
+  "diffEditor.ignoreTrimWhitespace": false
 }
--- a/modules/home/vscode/default.nix
+++ b/modules/home/vscode/default.nix
@@ -1,33 +1,39 @@
-{ config, pkgs, libs, ... }:
-
+{ config, pkgs, lib, libs, ... }:
+let
+  extensions = with pkgs.vscode-extensions; [
+    bierner.markdown-mermaid
+    esbenp.prettier-vscode
+    foxundermoon.shell-format
+    github.copilot
+    github.copilot-chat
+    golang.go
+    jnoortheen.nix-ide
+    pkief.material-icon-theme
+  ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+  ];
+in
 {
  imports = [
  ];
  programs = {
    vscode = {
      enable = true;
-      profiles.default = {
-        extensions = with pkgs.vscode-extensions; [
-          bierner.markdown-mermaid
-          esbenp.prettier-vscode
-          foxundermoon.shell-format
-          github.copilot
-          github.copilot-chat
-          golang.go
-          jnoortheen.nix-ide
-          pkief.material-icon-theme
-        ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        ];
-      };
-    };
+    } // (if lib.versionAtLeast config.home.stateVersion "25.05" then {
+      profiles.default = { inherit extensions; };
+    } else {
+      inherit extensions;
+    });
  };

-  xdg.configFile = {
-    "Code/User/keybindings.json" = {
-      source = config.home-libs.mkOutOfStoreSymlink "modules/home/vscode/keybindings.json";
-    };
-    "Code/User/settings.json" = {
-      source = config.home-libs.mkOutOfStoreSymlink "modules/home/vscode/settings.json";
-    };
-  };
+  # 使用map函数循环 conf 变量，动态的生成 home.file.<user>.config.${i}
+  xdg.configFile = builtins.listToAttrs
+    (builtins.map
+      (name: {
+        name = "Code/User/${name}";
+        value = {
+          source = config.home-libs.mkOutOfStoreSymlink "modules/home/vscode/conf/${name}";
+        };
+      })
+      (builtins.attrNames (builtins.readDir ./conf))
+    );
 }
--- a/modules/home/xdg.nix
+++ b/modules/home/xdg.nix
@@ -1,92 +0,0 @@
-# XDG stands for "Cross-Desktop Group", with X used to mean "cross".
-# It's a bunch of specifications from freedesktop.org intended to standardize desktops and
-# other GUI applications on various systems (primarily Unix-like) to be interoperable:
-#   https://www.freedesktop.org/wiki/Specifications/
-{ config, pkgs, ... }: {
-  home.packages = with pkgs; [
-    xdg-utils # provides cli tools such as `xdg-mime` `xdg-open`
-    xdg-user-dirs
-  ];
-
-  xdg = {
-    enable = true;
-    cacheHome = config.home.homeDirectory + "/.cache";
-
-    # manage $XDG_CONFIG_HOME/mimeapps.list
-    # xdg search all desktop entries from $XDG_DATA_DIRS, check it by command:
-    #  echo $XDG_DATA_DIRS
-    # the system-level desktop entries can be list by command:
-    #   ls -l /run/current-system/sw/share/applications/
-    # the user-level desktop entries can be list by command(user ryan):
-    #  ls /etc/profiles/per-user/ryan/share/applications/
-    mimeApps = {
-      enable = true;
-      defaultApplications =
-        let
-          browser = [ "microsoft-edge.desktop" ];
-        in
-        {
-          "application/json" = browser;
-          "application/pdf" = browser; # TODO: pdf viewer
-
-          "text/html" = browser;
-          "text/xml" = browser;
-          "application/xml" = browser;
-          "application/xhtml+xml" = browser;
-          "application/xhtml_xml" = browser;
-          "application/rdf+xml" = browser;
-          "application/rss+xml" = browser;
-          "application/x-extension-htm" = browser;
-          "application/x-extension-html" = browser;
-          "application/x-extension-shtml" = browser;
-          "application/x-extension-xht" = browser;
-          "application/x-extension-xhtml" = browser;
-
-          "x-scheme-handler/about" = browser;
-          "x-scheme-handler/ftp" = browser;
-          "x-scheme-handler/http" = browser;
-          "x-scheme-handler/https" = browser;
-          "x-scheme-handler/unknown" = browser;
-
-          "x-scheme-handler/discord" = [ "discord.desktop" ];
-          "x-scheme-handler/tg" = [ "telegramdesktop.desktop" ];
-
-          "audio/*" = [ "vlc.desktop" ];
-          "video/*" = [ "vlc.dekstop" ];
-          "image/*" = [ "imv.desktop" ];
-          "image/gif" = [ "imv.desktop" ];
-          "image/jpeg" = [ "imv.desktop" ];
-          "image/png" = [ "imv.desktop" ];
-          "image/webp" = [ "imv.desktop" ];
-
-          "inode/directory" = [ ]
-            ++ (if config.xdg.enable then [ "xdg-open.desktop" ] else [ ])
-            ++ (if config.xdg.enable then [ "nemo.desktop" ] else [ ])
-            ++ (if config.xdg.enable then [ "thunar.desktop" ] else [ ])
-            ++ (if config.xdg.enable then [ "nemo.desktop" ] else [ ])
-            ++ (if config.xdg.enable then [ "org.gnome.Nautilus.desktop" ] else [ ]);
-        };
-
-      associations.removed =
-        {
-          # ......
-        };
-    };
-
-    userDirs = {
-      enable = true;
-      createDirectories = false;
-      documents = config.home.homeDirectory + "/doc";
-      music = config.home.homeDirectory + "/doc/music";
-      desktop = config.home.homeDirectory + "/tmp";
-      download = config.home.homeDirectory + "/tmp";
-      videos = config.home.homeDirectory + "/tmp";
-      pictures = config.home.homeDirectory + "/tmp";
-      # templates = config.home.homeDirectory + "/tmp";
-      # publicShare = config.home.homeDirectory + "/tmp";
-      extraConfig = {
-        XDG_SCREENSHOTS_DIR = config.home.homeDirectory + "/tmp/Screenshots";
-      };
-    };
-  };
-}
--- a/modules/home/xdg/conf/mimeapps.list
+++ b/modules/home/xdg/conf/mimeapps.list
@@ -0,0 +1,31 @@
+[Default Applications]
+application/json=microsoft-edge.desktop
+application/pdf=microsoft-edge.desktop
+application/rdf+xml=microsoft-edge.desktop
+application/rss+xml=microsoft-edge.desktop
+application/x-extension-htm=microsoft-edge.desktop
+application/x-extension-html=microsoft-edge.desktop
+application/x-extension-shtml=microsoft-edge.desktop
+application/x-extension-xht=microsoft-edge.desktop
+application/x-extension-xhtml=microsoft-edge.desktop
+application/xhtml+xml=microsoft-edge.desktop
+application/xhtml_xml=microsoft-edge.desktop
+application/xml=microsoft-edge.desktop
+audio/*=vlc.desktop
+image/*=imv.desktop
+image/gif=imv.desktop
+image/jpeg=imv.desktop
+image/png=imv.desktop
+image/webp=imv.desktop
+inode/directory=nemo.desktop;xdg-open.desktop;nemo.desktop;thunar.desktop;org.gnome.Nautilus.desktop
+text/html=microsoft-edge.desktop
+text/xml=microsoft-edge.desktop
+video/*=vlc.dekstop
+x-scheme-handler/about=microsoft-edge.desktop
+x-scheme-handler/discord=discord.desktop
+x-scheme-handler/ftp=microsoft-edge.desktop
+x-scheme-handler/http=microsoft-edge.desktop
+x-scheme-handler/https=microsoft-edge.desktop
+x-scheme-handler/tg=telegramdesktop.desktop
+x-scheme-handler/unknown=microsoft-edge.desktop
+text/plain=code.desktop
--- a/modules/home/xdg/default.nix
+++ b/modules/home/xdg/default.nix
@@ -0,0 +1,50 @@
+# XDG stands for "Cross-Desktop Group", with X used to mean "cross".
+# It's a bunch of specifications from freedesktop.org intended to standardize desktops and
+# other GUI applications on various systems (primarily Unix-like) to be interoperable:
+#   https://www.freedesktop.org/wiki/Specifications/
+{ config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    xdg-utils # provides cli tools such as `xdg-mime` `xdg-open`
+    xdg-user-dirs
+  ];
+
+  xdg = {
+    enable = true;
+    cacheHome = config.home.homeDirectory + "/.cache";
+
+    systemDirs = {
+      data = [
+        "${config.home.homeDirectory}/.local/share/flatpak/exports/share"
+        "/var/lib/flatpak/exports/share"
+      ];
+    };
+
+    userDirs = {
+      enable = true;
+      createDirectories = false;
+      documents = config.home.homeDirectory + "/doc";
+      music = config.home.homeDirectory + "/doc/music";
+      desktop = config.home.homeDirectory + "/tmp";
+      download = config.home.homeDirectory + "/tmp";
+      videos = config.home.homeDirectory + "/tmp";
+      pictures = config.home.homeDirectory + "/tmp";
+      # templates = config.home.homeDirectory + "/tmp";
+      # publicShare = config.home.homeDirectory + "/tmp";
+      extraConfig = {
+        XDG_SCREENSHOTS_DIR = config.home.homeDirectory + "/tmp/Screenshots";
+      };
+    };
+  };
+
+  # 使用map函数循环 conf 变量，动态的生成 home.file.<user>.config.${i}
+  xdg.configFile = builtins.listToAttrs
+    (builtins.map
+      (name: {
+        inherit name;
+        value = {
+          source = config.home-libs.mkOutOfStoreSymlink "modules/home/xdg/conf/${name}";
+        };
+      })
+      (builtins.attrNames (builtins.readDir ./conf))
+    );
+}
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -37,10 +37,5 @@
        }
      ];
    };
-
-    thefuck = {
-      enable = true;
-      enableZshIntegration = true; # 自动为 Zsh 设置别名 (通常是 'fuck')
-    };
  };
 }
--- a/modules/nixos/core/boot.nix
+++ b/modules/nixos/core/boot.nix
@@ -15,8 +15,5 @@
        device = "nodev";
      };
    };
-
-    # Allow to modify store. It's dangerous!!
-    readOnlyNixStore = lib.mkDefault true;
  };
 }
--- a/modules/nixos/core/default.nix
+++ b/modules/nixos/core/default.nix
@@ -1,14 +1,21 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 {
  imports = [
    ./boot.nix
    ./system.nix
+    ./nixfhs.nix
+    ../user.nix
  ];

+  environment = {
+    systemPackages = with pkgs;
+      [
+        smartmontools
+      ];
+  };
+
  programs = {
    git.enable = true;
-    dconf.enable = true;
-    nix-ld.enable = true;
  };

  # Configure firewall
@@ -19,18 +26,19 @@
  };

  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "zh_CN.UTF-8";
-    LC_IDENTIFICATION = "zh_CN.UTF-8";
-    LC_MEASUREMENT = "zh_CN.UTF-8";
-    LC_MONETARY = "zh_CN.UTF-8";
-    LC_NAME = "zh_CN.UTF-8";
-    LC_NUMERIC = "zh_CN.UTF-8";
-    LC_PAPER = "zh_CN.UTF-8";
-    LC_TELEPHONE = "zh_CN.UTF-8";
-    LC_TIME = "zh_CN.UTF-8";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "zh_CN.UTF-8";
+      LC_IDENTIFICATION = "zh_CN.UTF-8";
+      LC_MEASUREMENT = "zh_CN.UTF-8";
+      LC_MONETARY = "zh_CN.UTF-8";
+      LC_NAME = "zh_CN.UTF-8";
+      LC_NUMERIC = "zh_CN.UTF-8";
+      LC_PAPER = "zh_CN.UTF-8";
+      LC_TELEPHONE = "zh_CN.UTF-8";
+      LC_TIME = "zh_CN.UTF-8";
+    };
  };

  time.timeZone = "Asia/Shanghai";
--- a/modules/nixos/core/nixfhs.nix
+++ b/modules/nixos/core/nixfhs.nix
@@ -0,0 +1,143 @@
+{ config, lib, pkgs, ... }:
+let
+  conf = config.services.nix-fhs;
+  inherit (lib) mkOption mkEnableOption types;
+in
+{
+  options.services.nix-fhs = with lib; {
+    enable = mkEnableOption "nix-fhs module";
+    gui.enable = mkEnableOption "图形/GUI/多媒体/视频相关库";
+
+    # 在这里定义其他选项
+    extraPackages = mkOption {
+      type = types.listOf types.package;
+      default = [ ];
+      example = [ pkgs.gcc pkgs.gdb ];
+      description = "额外的nix-ld库";
+    };
+  };
+
+  config = lib.mkIf conf.enable {
+    # NixOS 系统级配置
+    programs.nix-ld = {
+      enable = true;
+
+      # 这里可以添加其他nix-ld相关的配置  
+      libraries = with pkgs;[
+        bzip2 # 高质量的数据压缩库
+        cups # 通用Unix打印系统，提供打印功能
+        curlWithGnuTls # 使用GnuTLS的URL传输库，用于网络请求
+        dbus # 进程间通信系统，用于应用程序之间的通信
+        dbus-glib # D-Bus的GLib绑定
+        e2fsprogs # ext2/3/4文件系统工具
+        expat # XML解析库
+        fontconfig # 字体配置和自定义库
+        freetype # 字体渲染引擎
+        fribidi # Unicode双向文本算法实现
+        fuse # 用户空间文件系统接口
+        fuse3 # FUSE的第3版，用户空间文件系统接口
+        gmp # GNU多精度算术库
+        icu # 国际化组件，提供Unicode和全球化支持
+        keyutils.lib # Linux密钥管理工具库
+        libcap # POSIX能力库
+        libgcrypt # GNU加密库
+        libgpg-error # GnuPG错误报告库
+        libidn # 国际化域名库
+        libpng12 # PNG图像编解码库1.2版本
+        libsamplerate # 音频采样率转换库
+        libuuid # UUID生成和解析库
+        libxcrypt-legacy # 旧版密码哈希库
+        libxml2 # XML解析和生成库
+        nspr # Netscape可移植运行时
+        nss # 网络安全服务
+        openssl # 安全套接字层库
+        p11-kit # PKCS#11模块加载库
+        pixman # 像素操作库
+        python3 # Python编程语言解释器
+        stdenv.cc.cc # 标准C编译器
+        tbb # 英特尔线程构建块库
+        udev # 设备管理器
+      ] ++
+      (lib.optionals conf.gui.enable [
+        atk # 辅助技术工具包，提供辅助功能支持
+        cairo # 2D图形渲染库，支持多种输出设备
+        desktop-file-utils # 用于处理桌面条目文件的工具
+        gdk-pixbuf # 图像加载库，GNOME的一部分
+        glib # 通用工具库，提供数据结构处理、移植等功能
+        gtk2 # 图形用户界面工具包第2版
+        gtk3 # 图形用户界面工具包第3版
+        harfbuzz # 文本整形引擎
+        pango # 文本布局和渲染库
+        alsa-lib # 高级Linux声音架构库，提供音频功能
+        flac # 无损音频编解码器
+        libcanberra # 声音主题规范的实现
+        libjack2 # JACK音频连接套件第2版
+        libmikmod # 模块音乐库
+        libogg # Ogg多媒体容器格式库
+        libvorbis # Vorbis音频编解码库
+        speex # 语音压缩格式
+        freeglut # OpenGL实用工具包，用于创建OpenGL上下文
+        glew110 # OpenGL扩展加载库1.10版本
+        gst_all_1.gst-plugins-base # GStreamer基础插件集
+        gst_all_1.gst-plugins-ugly # GStreamer非自由插件集
+        gst_all_1.gstreamer # 多媒体框架
+        libGL # OpenGL库
+        libGLU # OpenGL实用工具库
+        librsvg # SVG渲染库
+        libtheora # Theora视频编解码库
+        libtiff # TIFF图像编解码库
+        libvdpau # 视频解码和呈现API
+        libvpx # VP8/VP9视频编解码库
+        mesa # 开源OpenGL实现
+        vulkan-loader # Vulkan图形API加载器
+        wayland # 显示服务器协议
+        at-spi2-atk # 辅助技术服务提供者接口，连接ATK和AT-SPI
+        at-spi2-core # 辅助技术服务提供者接口核心组件
+        libappindicator-gtk2 # 应用程序指示器库，用于系统托盘图标
+        libcaca # 彩色ASCII艺术库
+        libclang.lib # Clang编译器库
+        libdbusmenu # D-Bus菜单库
+        libjpeg # JPEG图像编解码库
+        libudev0-shim # 旧版udev库兼容层
+        libusb1 # USB设备访问库
+        libxkbcommon
+        mesa # 开源OpenGL实现
+      ]) ++
+      (lib.optionals (lib.versionAtLeast config.system.stateVersion "25.05") [
+        pkgs.libgbm # 通用缓冲区管理库，25.05之前包含在mesa中
+      ]) ++ (
+        if config.services.xserver.enable then
+          [
+            xorg.libICE # X11 Inter-Client Exchange库
+            xorg.libSM # X11会话管理库
+            xorg.libX11 # X11客户端库
+            xorg.libXScrnSaver # X11屏幕保护扩展库
+            xorg.libXcomposite # X11合成扩展库
+            xorg.libXcursor # X11光标管理库
+            xorg.libXdamage # X11损坏扩展库
+            xorg.libXext # X11通用扩展库
+            xorg.libXfixes # X11修复扩展库
+            xorg.libXft # X11 FreeType接口库
+            xorg.libXi # X11输入扩展库
+            xorg.libXinerama # X11多显示器扩展库
+            xorg.libXmu # X11杂项实用工具库
+            xorg.libXrandr # X11调整大小和旋转扩展库
+            xorg.libXrender # X11渲染扩展库
+            xorg.libXt # X11工具包内省库
+            xorg.libXtst # X11测试扩展库
+            xorg.libXxf86vm # X11 XFree86视频模式扩展库
+            xorg.libpciaccess # X11 PCI访问库
+            xorg.libxcb # X11 C绑定库
+            xorg.xcbutil # XCB实用工具库
+            xorg.xcbutilimage # XCB图像实用工具库
+            xorg.xcbutilkeysyms # XCB键符号实用工具库
+            xorg.xcbutilrenderutil # XCB渲染实用工具库
+            xorg.xcbutilwm # XCB窗口管理实用工具库
+            xorg.xkeyboardconfig # X11键盘配置数据库
+          ]
+        else
+          [ ]
+      ) ++ conf.extraPackages;
+    };
+  };
+}
--- a/modules/nixos/core/system.nix
+++ b/modules/nixos/core/system.nix
@@ -10,6 +10,7 @@
    printing.enable = true;
    acpid.enable = true;
    upower.enable = true;
+    nix-fhs.enable = true;

    openssh = {
      enable = true;
@@ -23,6 +24,7 @@
      };
    };

+    # Enable the Avahi daemon for mDNS/DNS-SD support
    avahi = {
      enable = true;
      nssmdns4 = true; # 非常重要，允许系统解析 .local 地址
--- a/modules/nixos/fonts/default.nix
+++ b/modules/nixos/fonts/default.nix
@@ -29,17 +29,19 @@
      source-han-serif # 思源宋体

      # wqy_zenhei # 文泉驿正黑
-
+    ] ++ (
      # nerdfonts
-      nerd-fonts.jetbrains-mono
-      # (nerdfonts.override {
-      #   fonts = [
-      #     # "FiraCode"
-      #     "JetBrainsMono"
-      #     # "Iosevka"
-      #   ];
-      # })
-
-    ];
+      if lib.versionAtLeast config.system.stateVersion "25.05" then
+        [ nerd-fonts.jetbrains-mono ]
+      else [
+        (nerdfonts.override {
+          fonts = [
+            # "FiraCode"
+            "JetBrainsMono"
+            # "Iosevka"
+          ];
+        })
+      ]
+    );
  };
 }
--- a/modules/nixos/gnome.nix
+++ b/modules/nixos/gnome.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, lib, username, ... }: {
  services.xserver = {
    enable = true;
    displayManager.gdm.enable = true;
@@ -8,22 +7,21 @@

  environment = {
    systemPackages = (with pkgs;[
-      gnome.gnome-tweaks
+      gnome-tweaks
+      gnome-shell-extensions
    ]) ++ (with pkgs.gnomeExtensions;[
      dash-to-dock
-      captivate # cap button indicator
      appindicator # tray icon
    ]);

    gnome.excludePackages = (with pkgs; [
+      atomix # puzzle game
+      cheese # webcam tool
      gnome-photos
      gnome-tour
      gnome-text-editor
-    ]) ++ (with pkgs.gnome; [
-      atomix # puzzle game
-      cheese # webcam tool
      epiphany # web browser
-      # geary # email reader
+      geary # email reader
      evince # document viewer
      gedit # text editor
      gnome-contacts
@@ -39,9 +37,126 @@
      tali # poker game
      yelp # help viewer
    ]);
+
+    variables = {
+      "GTK_IM_MODULE" = "fcitx";
+      "QT_IM_MODULE" = "fcitx";
+      "XMODIFIERS" = "@im=fcitx";
+      "SDL_IM_MODULE" = "fcitx";
+      "GLFW_IM_MODULE" = "ibus";
+    };
+  };
+
+  programs = {
+    dconf = {
+      enable = true;
+      profiles = {
+        # TODO: Investigate customizing gdm greeter.
+        user.databases = [{
+          settings = with lib.gvariant; {
+
+            "org/gnome/desktop/interface" = {
+              clock-show-weekday = true;
+              cursor-size = mkUint32 16;
+              cursor-theme = "capitaine-cursors";
+              enable-hot-corners = false;
+              icon-theme = "Papirus-Dark";
+              locate-pointer = false;
+              monospace-font-name = "JetBrainsMono Nerd Font Mono 10";
+              overlay-scrolling = true;
+            };
+
+            "org/gnome/mutter" = {
+              edge-tiling = true;
+              attach-modal-dialogs = true;
+              experimental-features = [ "scale-monitor-framebuffer" ];
+            };
+
+            "org/gnome/shell" = {
+              last-selected-power-profile = "power-saver";
+            };
+
+            "org/gnome/desktop/session" = {
+              idle-delay = mkUint32 900;
+            };
+
+            "org/gnome/settings-daemon/plugins/power" = {
+              power-button-action = "interactive";
+              sleep-inactive-ac-timeout = mkUint32 7200;
+              sleep-inactive-ac-type = "nothing";
+            };
+
+            "org/gtk/gtk4/settings/file-chooser" = {
+              sort-directories-first = true;
+              # show-hidden = true;
+              view-type = "list";
+            };
+
+            "org/gnome/desktop/wm/keybindings" = {
+              minimize = mkEmptyArray type.string;
+              move-to-workspace-1 = [ "<Shift><Super>1" ];
+              move-to-workspace-2 = [ "<Shift><Super>2" ];
+              move-to-workspace-3 = [ "<Shift><Super>3" ];
+              move-to-workspace-4 = [ "<Shift><Super>4" ];
+              switch-to-workspace-1 = [ "<Super>1" ];
+              switch-to-workspace-2 = [ "<Super>2" ];
+              switch-to-workspace-3 = [ "<Super>3" ];
+              switch-to-workspace-4 = [ "<Super>4" ];
+              switch-to-workspace-left = [ "<Control><Super>h" ];
+              switch-to-workspace-right = [ "<Control><Super>l" ];
+              switch-windows = [ "<Alt>Tab" ];
+              switch-windows-backward = [ "<Shift><Alt>Tab" ];
+              switch-applications = [ "<Super>Tab" ];
+              switch-applications-backward = [ "<Shift><Super>Tab" ];
+            };
+
+            "org/gnome/shell/keybindings" = {
+              # Following binds are replaced by the ones above.
+              switch-to-application-1 = mkEmptyArray type.string;
+              switch-to-application-2 = mkEmptyArray type.string;
+              switch-to-application-3 = mkEmptyArray type.string;
+              switch-to-application-4 = mkEmptyArray type.string;
+            };
+
+            "org/gnome/shell" = {
+              enabled-extensions = [
+                "appindicatorsupport@rgcjonas.gmail.com"
+                "dash-to-dock@micxgx.gmail.com"
+                "status-icons@gnome-shell-extensions.gcampax.github.com"
+                "system-monitor@gnome-shell-extensions.gcampax.github.com"
+              ];
+            };
+
+            "org/gnome/shell/extensions/dash-to-panel" = {
+              apply-custom-theme = false;
+              background-opacity = 0.8;
+              click-action = "previews";
+              custom-background-color = false;
+              custom-theme-shrink = true;
+              dash-max-icon-size = mkUint32 40;
+              dock-position = "BOTTOM";
+              extend-height = false;
+              height-fraction = 0.9;
+              hot-keys = false;
+              icon-size-fixed = true;
+              isolate-monitors = true;
+              max-alpha = 0.8;
+              multi-monitor = true;
+              preview-size-scale = 0.0;
+              running-indicator-style = "DOTS";
+              scroll-action = "cycle-windows";
+              show-mounts = false;
+              show-mounts-only-mounted = true;
+              transparency-mode = "DYNAMIC";
+            };
+            "org/gnome/shell/extensions/system-monitor" = {
+              show-download = true;
+              show-swap = false;
+              show-upload = false;
+            };
+          };
+        }];
+      };
+    };
  };
 }
-
-
-
-
--- a/modules/nixos/user.nix
+++ b/modules/nixos/user.nix
@@ -17,8 +17,8 @@ in
      extraGroups = [
        "users"
        "wheel"
-        "networkmanager"
        "audio"
+        "networkmanager"
      ];
      openssh.authorizedKeys.keys = [
        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCc62MxAVqX8LDFAiDiXlc8d3JU1S3xYVO8WpfgoVYPyrd2fkK2Dr1tSedJyGWc3ADOxzUbsTic8b1BOdmbx4ZPwI+a3nJrVVkmIRSAs5haEZqG8NXDv1kl4xL+J9tVA2jwScl6MRzqyVMgtIAvnsVW9+DrL2Y2b20NvuWz3XndZ8vEUFZLLCQJQRpGrY2ZnTvNXZo12GrD5daiMii52ZuhfNBx17oFnf70sj+phZbp5m2mKL9jfKaDSG+E7Pa/IbB/iivD/QSm0SueYXbsdtMBhtsxvH/i0pJogUlVpa42CRIDUVoHOvfk0Hk83xyIIl2b78xfGEyCQBBU6sSk726xXpqzfxJJ7FiYqhLMKKDFmD28EOs4BUveyZudWNcP0a1+uBBcrefNAwU6EOSg65BOxxvZFbNG1I7YDTiKvYFy965+WkN5QKbBVSy08ziS1MQt224ZooAdxCKESGRr9IqKvq9ONnb0MtmC4ht/n8U9VaeLVq3XDXZZHEUq0cw748k= alex@gaea"
--- a/modules/nixos/virtualize/docker.nix
+++ b/modules/nixos/virtualize/docker.nix
@@ -4,6 +4,17 @@
  virtualisation.docker = {
    enable = true;
    storageDriver = "btrfs";
+    daemon.settings = {
+      userland-proxy = false;
+      experimental = true;
+      ipv6 = true;
+      ip6tables = true;
+      fixed-cidr-v6 = "fd00::/80";
+      metrics-addr = "0.0.0.0:9323";
+      log-driver = "json-file";
+      log-opts.max-size = "10m";
+      log-opts.max-file = "3";
+    };
  };

  # Enable Podman
--- a/profiles/apollo/configuration.nix
+++ b/profiles/apollo/configuration.nix
@@ -1,59 +0,0 @@
-args@{ self, pkgs, home-manager, username, sysversion, ... }: {
-  # You can import other NixOS modules here
-  imports = [
-    ./mount.nix
-    ./network.nix
-    ./hardware-configuration.nix
-
-    "${self}/modules/nixos/core"
-    "${self}/modules/nixos/fonts"
-    "${self}/modules/nixos/user.nix"
-    "${self}/modules/nixos/audio.nix"
-
-    "${self}/modules/nixos/samba.nix"
-    "${self}/modules/nixos/virtualize/appimage.nix"
-    "${self}/modules/nixos/virtualize/docker.nix"
-
-    home-manager.nixosModules.home-manager
-    {
-      # home-manager.useGlobalPkgs = true;
-      # home-manager.useUserPackages = true;
-      home-manager = {
-        extraSpecialArgs = {
-          inherit (args) self inputs outputs libs sourcepath hostname username useremail sysversion;
-        };
-        users."${username}" = { ... }: {
-          imports = [
-            ./hm
-            "${self}/libs/home-libs.nix"
-            "${self}/home/desktop.nix"
-            "${self}/modules/home/develop.nix"
-          ];
-        };
-      };
-    }
-  ];
-
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vaapiIntel
-      intel-media-driver
-    ];
-  };
-
-  services = {
-    gnome.gnome-keyring.enable = true;
-  };
-
-  security.pam.services.swaylock = { };
-
-  programs.zsh = {
-    enable = true;
-  };
-
-  users.users."${username}".shell = pkgs.zsh;
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = sysversion;
-}
--- a/profiles/apollo/default.nix
+++ b/profiles/apollo/default.nix
@@ -1,15 +1,30 @@
-args@{ libs, inputs, ... }:
+args@{ libs, inputs, nixos, ... }:
 let
-  # 这里可以选择使用稳定版或不稳定版的nixpkgs
-  # nixpkgs = inputs.nixpkgs;
-  nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
-  home-manager = inputs.home-manager-unstable;
-  sysversion = "25.05";
-  sysArgs = args // { inherit home-manager sysversion; };
+  # 使用pkgs.unstable中的nixpkgs和home-manager
+  inherit (nixos.unstable) nixpkgs home-manager version;
+  specialArgs = args // { inherit home-manager version; };
+
+  configuration = conf-args@{ self, pkgs, home-manager, username, version, ... }: {
+    imports = [
+      ./nixos
+
+      home-manager.nixosModules.home-manager
+      {
+        # home-manager.useGlobalPkgs = true;
+        # home-manager.useUserPackages = true;
+        home-manager = {
+          extraSpecialArgs = {
+            inherit (conf-args) self inputs outputs libs sourcepath hostname username useremail version;
+          };
+          users."${username}" = ./home;
+        };
+      }
+    ];
+  };
 in
-# 使用libs.mkNixosSystem创建nixosSystem
-libs.mkNixosSystem {
-  inherit nixpkgs;
-  args = sysArgs;
-  path = ./.;
+nixpkgs.lib.nixosSystem {
+  inherit specialArgs;
+  modules = [
+    configuration
+  ];
 }
--- a/profiles/apollo/hm/default.nix
+++ b/profiles/apollo/hm/default.nix
@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ./ssh
-    ./hyprland.nix
-  ];
-
-  home.packages = with pkgs; [
-    nextcloud-client
-    kodi-wayland
-  ];
-}
--- a/profiles/apollo/hm/ssh/config
+++ b/profiles/apollo/hm/ssh/config
@@ -1,66 +0,0 @@
-
-
-Host *
-  ForwardAgent no
-  AddKeysToAgent no
-  Compression no
-  ServerAliveInterval 0
-  ServerAliveCountMax 3
-  HashKnownHosts no
-  UserKnownHostsFile ~/.ssh/known_hosts
-  ControlMaster no
-  ControlPath ~/.ssh/master-%r@%n:%p
-  ControlPersist no
-
-  Host gaea
-    HostName 10.7.43.20
-  
-  Host zion
-    HostName 10.7.43.1
-    User root
-  
-  Host themis
-    HostName 10.7.43.30
-  
-  Host armor
-    HostName armor.synebula.com
-  
-  Host server.company
-    HostName file.xzdcbj.com.cn
-    User xzdc
-    Port 57982
-  
-  Host server.info
-    HostName info.xzdcbj.com.cn
-    User info
-  
-  Host server.file
-    HostName file.xzdcbj.com.cn
-    User file
-  
-  Host server.armor
-    HostName armor.synebula.com
-  
-  Host ems.hc
-    Port 57991
-    User root
-  
-  Host ems.cx
-    Port 57996
-  
-  Host ems.ph
-    Port 57996
-  
-  Host ems.yt
-    Port 57996
-    User xzdc
-  
-  Host ems.*
-    HostName file.xzdcbj.com.cn
-    User ems
-  
-  Host *
-    Port 22
-    User alex
-    IdentityFile ~/.ssh/id_rsa
-  
--- a/profiles/apollo/home/default.nix
+++ b/profiles/apollo/home/default.nix
@@ -0,0 +1,12 @@
+{ self, pkgs, ... }: {
+  imports = [
+    ./ssh
+    "${self}/home/desktop.nix"
+    "${self}/modules/home/develop.nix"
+  ];
+
+  home.packages = with pkgs; [
+    nextcloud-client
+    kodi
+  ];
+}
--- a/profiles/apollo/home/hyprland.nix
+++ b/profiles/apollo/home/hyprland.nix
--- a/profiles/apollo/home/ssh/config
+++ b/profiles/apollo/home/ssh/config
@@ -0,0 +1,64 @@
+Host *
+ForwardAgent no
+AddKeysToAgent no
+Compression no
+ServerAliveInterval 0
+ServerAliveCountMax 3
+HashKnownHosts no
+UserKnownHostsFile ~/.ssh/known_hosts
+ControlMaster no
+ControlPath ~/.ssh/master-%r@%n:%p
+ControlPersist no
+
+Host gaea
+  HostName 10.7.43.20
+
+Host zion
+  HostName 10.7.43.1
+  User root
+
+Host themis
+  HostName 10.7.43.30
+
+Host armor
+  HostName armor.synebula.com
+
+Host server.company
+  HostName file.xzdcbj.com.cn
+  User xzdc
+  Port 57982
+
+Host server.info
+  HostName info.xzdcbj.com.cn
+  User info
+
+Host server.file
+  HostName file.xzdcbj.com.cn
+  User file
+
+Host server.armor
+  HostName armor.synebula.com
+
+Host ems.hc
+  Port 57991
+  User root
+
+Host ems.cx
+  Port 57996
+
+Host ems.ph
+  Port 57996
+
+Host ems.yt
+  Port 57996
+  User xzdc
+
+Host ems.*
+  HostName file.xzdcbj.com.cn
+  User ems
+
+Host *
+  Port 22
+  User alex
+  IdentityFile ~/.ssh/id_rsa
+  
--- a/profiles/apollo/home/ssh/default.nix
+++ b/profiles/apollo/home/ssh/default.nix
@@ -4,6 +4,6 @@
  };

  home.file.".ssh/config" = {
-    source = config.home-libs.mkOutOfStoreSymlink "profiles/apollo/hm/ssh/config";
+    source = config.home-libs.mkOutOfStoreSymlink "profiles/apollo/home/ssh/config";
  };
 }
--- a/profiles/apollo/network.nix
+++ b/profiles/apollo/network.nix
@@ -1,58 +0,0 @@
-{ config, pkgs, hostname, ... }: {
-  networking = {
-    hostId = "6fa8b74d";
-    hostName = "${hostname}";
-
-    # wireless.enable = false; # Enables wireless support via wpa_supplicant.
-
-    # Configure network proxy if necessary
-    # proxy.default = "http://user:password@proxy:port/";
-    # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-    networkmanager = {
-      enable = true;
-    };
-
-    enableIPv6 = true;
-
-    # bridges = {
-    #   br0 = { interfaces = [ "eno1" ]; };
-    # };
-
-    # Set up bridge network
-    interfaces = {
-      eno1 = {
-        useDHCP = false;
-        ipv4.addresses = [
-          {
-            address = "10.7.43.10";
-            prefixLength = 24;
-          }
-        ];
-        wakeOnLan = {
-          enable = true;
-          policy = [
-            "magic"
-          ];
-        };
-      };
-
-      # br0 = {
-      #   useDHCP = false;
-      #   ipv4.addresses = [
-      #     {
-      #       address = "10.7.43.10";
-      #       prefixLength = 24;
-      #     }
-      #   ];
-      # };
-    };
-
-    defaultGateway = {
-      address = "10.7.43.30";
-      interface = "eno1";
-      # interface = "br0";
-    };
-    nameservers = [ "10.7.43.1" ];
-  };
-}
--- a/profiles/apollo/nixos/default.nix
+++ b/profiles/apollo/nixos/default.nix
@@ -0,0 +1,43 @@
+{ self, pkgs, username, version, lib, config, ... }: {
+  imports = [
+    ./mount.nix
+    ./network.nix
+    ./hardware-configuration.nix
+
+    "${self}/modules/nixos/core"
+    "${self}/modules/nixos/fonts"
+    "${self}/modules/nixos/audio.nix"
+    "${self}/modules/nixos/samba.nix"
+    "${self}/modules/nixos/virtualize/appimage.nix"
+    "${self}/modules/nixos/virtualize/docker.nix"
+    "${self}/modules/nixos/gnome.nix"
+  ];
+
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiIntel
+      intel-media-driver
+    ];
+  };
+
+  services = {
+    gnome.gnome-keyring.enable = true;
+    nix-fhs.gui.enable = true;
+    flatpak.enable = true;
+    apcupsd = {
+      enable = true;
+    };
+  };
+
+  security.pam.services.swaylock = { };
+
+  programs.zsh = {
+    enable = true;
+  };
+
+  users.users."${username}".shell = pkgs.zsh;
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = version;
+}
--- a/profiles/apollo/nixos/hardware-configuration.nix
+++ b/profiles/apollo/nixos/hardware-configuration.nix
--- a/profiles/apollo/nixos/mount.nix
+++ b/profiles/apollo/nixos/mount.nix
--- a/profiles/apollo/nixos/network.nix
+++ b/profiles/apollo/nixos/network.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, hostname, ... }: {
+  networking = {
+    hostId = "6fa8b74d";
+    hostName = "${hostname}";
+
+    networkmanager = {
+      enable = true;
+      ensureProfiles.profiles = {
+        "eno1" = {
+          connection = {
+            id = "eno1";
+            type = "ethernet"; # 有线连接
+            autoconnect = true; # 自动连接
+          };
+          ipv4 = {
+            method = "manual"; # 设置为手动配置 IPv4
+            addresses = "10.7.43.10/24,10.7.43.30";
+            # 如果需要，可以添加 DNS 服务器
+            # dns = [ "10.7.43.1" "8.8.8.8" ];
+          };
+          ipv6 = {
+            method = "auto"; # 设置为自动配置 IPv6 (动态)
+          };
+          ethernet = {
+            wake-on-lan=64;
+          };
+        };
+      };
+    };
+
+    interfaces = {
+      eno1 = {
+        wakeOnLan = {
+          enable = true;
+          policy = [
+            "magic"
+          ];
+        };
+      };
+    };
+  };
+}
--- a/profiles/gaea/configuration.nix
+++ b/profiles/gaea/configuration.nix
@@ -1,52 +0,0 @@
-args@{ self, pkgs, home-manager, username, sysversion, ... }: {
-  # You can import other NixOS modules here
-  imports = [
-    # If you want to use modules your own flake exports (from modules/nixos):
-    # outputs.nixosModules.example
-
-    # Or modules from other flakes (such as nixos-hardware):
-    # inputs.hardware.nixosModules.common-cpu-amd
-    # inputs.hardware.nixosModules.common-ssd
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./users
-
-    # Import your generated (nixos-generate-config) hardware configuration
-    ./mount.nix
-    ./network.nix
-    ./hardware-configuration.nix
-
-    "${self}/modules/nixos/core"
-    "${self}/modules/nixos/fonts"
-    "${self}/modules/nixos/user.nix"
-    "${self}/modules/nixos/audio.nix"
-    "${self}/modules/nixos/nvidia.nix"
-    "${self}/modules/nixos/samba.nix"
-    "${self}/modules/nixos/zfs.nix"
-    "${self}/modules/nixos/sysatomic.nix"
-
-    "${self}/modules/nixos/virtualize/libvirtd"
-    "${self}/modules/nixos/virtualize/docker.nix"
-
-    home-manager.nixosModules.home-manager
-    {
-      # home-manager.useGlobalPkgs = true;
-      # home-manager.useUserPackages = true;
-      home-manager = {
-        extraSpecialArgs = {
-          inherit (args) self inputs outputs libs hostname username useremail sysversion;
-        };
-        users."${username}" = { ... }: {
-          imports = [
-            ./hm
-            "${self}/home/desktop.nix"
-            "${self}/modules/home/develop.nix"
-          ];
-        };
-      };
-    }
-  ];
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = sysversion;
-}
--- a/profiles/gaea/default.nix
+++ b/profiles/gaea/default.nix
@@ -1,15 +1,29 @@
-args@{ libs, inputs, ... }:
+args@{ libs, inputs, nixos, ... }:
 let
-  # 这里可以选择使用稳定版或不稳定版的nixpkgs
-  # nixpkgs = inputs.nixpkgs;
-  nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
-  home-manager = inputs.home-manager-unstable;
-  sysversion = "25.05";
-  sysArgs = args // { inherit home-manager sysversion; };
+  inherit (nixos.unstable) nixpkgs home-manager version;
+  specialArgs = args // { inherit home-manager version; };
+  configuration = conf-args@{ self, home-manager, username, ... }: {
+    imports = [
+      ./nixos
+
+      home-manager.nixosModules.home-manager
+      {
+        # home-manager.useGlobalPkgs = true;
+        # home-manager.useUserPackages = true;
+        home-manager = {
+          extraSpecialArgs = {
+            inherit (conf-args) self inputs outputs libs sourcepath hostname username useremail version;
+          };
+          users."${username}" = ./home;
+        };
+      }
+    ];
+
+  };
 in
-# 使用libs.mkNixosSystem创建nixosSystem
-libs.mkNixosSystem {
-  inherit nixpkgs;
-  args = sysArgs;
-  path = ./.;
+nixpkgs.lib.nixosSystem {
+  inherit specialArgs;
+  modules = [
+    configuration
+  ];
 }
--- a/profiles/gaea/hm/default.nix
+++ b/profiles/gaea/hm/default.nix
@@ -1,6 +0,0 @@
-{ ... }: {
-  imports = [
-    ./ssh.nix
-    ./hyprland.nix
-  ];
-}
--- a/profiles/gaea/hm/ssh.nix
+++ b/profiles/gaea/hm/ssh.nix
@@ -1,61 +0,0 @@
-{ config, ... }:
-{
-  programs.ssh = {
-    enable = true;
-
-    # 全局 SSH 配置
-    extraConfig = ''
-      Host apollo
-        HostName 10.7.43.10
-
-      Host zion
-        HostName 10.7.43.1
-        User root
-
-      Host themis
-        HostName 10.7.43.30
-
-      Host armor
-        HostName armor.synebula.com
-
-      Host server.company
-        HostName file.xzdcbj.com.cn
-        User xzdc
-        Port 57982
-
-      Host server.info
-        HostName info.xzdcbj.com.cn
-        User info
-
-      Host server.file
-        HostName file.xzdcbj.com.cn
-        User file
-
-      Host server.armor
-        HostName armor.synebula.com
-
-      Host ems.hc
-        Port 57991
-        User root
-
-      Host ems.cx
-        Port 57996
-
-      Host ems.ph
-        Port 57996
-
-      Host ems.yt
-        Port 57996
-        User xzdc
-
-      Host ems.*
-        HostName file.xzdcbj.com.cn
-        User ems
-
-      Host *
-        Port 22
-        User alex
-        IdentityFile ~/.ssh/id_rsa
-    '';
-  };
-}
--- a/profiles/gaea/home/default.nix
+++ b/profiles/gaea/home/default.nix
@@ -0,0 +1,12 @@
+{ self, pkgs, ... }: {
+  imports = [
+    ./ssh
+    "${self}/home/desktop.nix"
+    "${self}/modules/home/develop.nix"
+  ];
+
+  home.packages = with pkgs; [
+    nextcloud-client
+    kodi
+  ];
+}
--- a/profiles/gaea/home/hyprland.nix
+++ b/profiles/gaea/home/hyprland.nix
@@ -5,11 +5,8 @@
    sessionVariables = {
      # for hyprland with nvidia gpu, ref https://wiki.hyprland.org/Nvidia/
      # 启用注释部分会导致NVIDIA下无法启动hyprland
-      LIBVA_DRIVER_NAME = "nvidia";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-
-      # WLR_RENDERER = "vulkan";
-      # GBM_BACKEND = "nvidia-drm";
+      WLR_DRM_DEVICES = "/dev/dri/card1";
+      AQ_DRM_DEVICES = "/dev/dri/card1";
    };
  };
 }
--- a/profiles/gaea/home/ssh/config
+++ b/profiles/gaea/home/ssh/config
@@ -0,0 +1,64 @@
+
+Host *
+  ForwardAgent no
+  AddKeysToAgent no
+  Compression no
+  ServerAliveInterval 0
+  ServerAliveCountMax 3
+  HashKnownHosts no
+  UserKnownHostsFile ~/.ssh/known_hosts
+  ControlMaster no
+  ControlPath ~/.ssh/master-%r@%n:%p
+  ControlPersist no
+
+Host apollo
+  HostName 10.7.43.10
+
+Host zion
+  HostName 10.7.43.1
+  User root
+
+Host themis
+  HostName 10.7.43.30
+
+Host armor
+  HostName armor.synebula.com
+
+Host server.company
+  HostName file.xzdcbj.com.cn
+  User xzdc
+  Port 57982
+
+Host server.info
+  HostName info.xzdcbj.com.cn
+  User info
+
+Host server.file
+  HostName file.xzdcbj.com.cn
+  User file
+
+Host server.armor
+  HostName armor.synebula.com
+
+Host ems.hc
+  Port 57991
+  User root
+
+Host ems.cx
+  Port 57996
+
+Host ems.ph
+  Port 57996
+
+Host ems.yt
+  Port 57996
+  User xzdc
+
+Host ems.*
+  HostName file.xzdcbj.com.cn
+  User ems
+
+Host *
+  Port 22
+  User alex
+  IdentityFile ~/.ssh/id_rsa
--- a/profiles/gaea/home/ssh/default.nix
+++ b/profiles/gaea/home/ssh/default.nix
@@ -0,0 +1,9 @@
+{ config, flakesPath, ... }: {
+  programs.ssh = {
+    enable = true;
+  };
+
+  home.file.".ssh/config" = {
+    source = config.home-libs.mkOutOfStoreSymlink "profiles/gaea/home/ssh/config";
+  };
+}
--- a/profiles/gaea/nixos/default.nix
+++ b/profiles/gaea/nixos/default.nix
@@ -0,0 +1,21 @@
+{ self, pkgs, version, ... }: {
+  imports = [
+    ./mount.nix
+    ./network.nix
+    ./hardware-configuration.nix
+
+    "${self}/modules/nixos/core"
+    "${self}/modules/nixos/fonts"
+    "${self}/modules/nixos/audio.nix"
+    "${self}/modules/nixos/nvidia.nix"
+    "${self}/modules/nixos/samba.nix"
+    "${self}/modules/nixos/zfs.nix"
+    "${self}/modules/nixos/sysatomic.nix"
+
+    "${self}/modules/nixos/virtualize/libvirtd"
+    "${self}/modules/nixos/virtualize/docker.nix"
+  ];
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = version;
+}
--- a/profiles/gaea/nixos/hardware-configuration.nix
+++ b/profiles/gaea/nixos/hardware-configuration.nix
--- a/profiles/gaea/nixos/mount.nix
+++ b/profiles/gaea/nixos/mount.nix
--- a/profiles/gaea/nixos/network.nix
+++ b/profiles/gaea/nixos/network.nix
--- a/profiles/luna/configuration.nix
+++ b/profiles/luna/configuration.nix
@@ -1,42 +0,0 @@
-args@{ self, home-manager, username, sysversion, ... }: {
-
-  # You can import other NixOS modules here
-  imports = [
-    # If you want to use modules your own flake exports (from modules/nixos):
-    # outputs.nixosModules.example
-
-    # Or modules from other flakes (such as nixos-hardware):
-    # inputs.hardware.nixosModules.common-cpu-amd
-    # inputs.hardware.nixosModules.common-ssd
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./users.nix
-
-    # Import your generated (nixos-generate-config) hardware configuration
-    ./network.nix
-    ./hardware-configuration.nix
-
-    "${self}/modules/nixos/core"
-    "${self}/modules/nixos/user.nix"
-    "${self}/modules/nixos/sysatomic.nix"
-
-    home-manager.nixosModules.home-manager
-    {
-      # home-manager.useGlobalPkgs = true;
-      # home-manager.useUserPackages = true;
-      home-manager = {
-        extraSpecialArgs = {
-          inherit (args) self inputs outputs libs hostname username useremail sysversion;
-        };
-        users."${username}" = { ... }: {
-          imports = [
-            "${self}/home/desktop.nix"
-          ];
-        };
-      };
-    }
-  ];
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = sysversion;
-}
--- a/profiles/luna/default.nix
+++ b/profiles/luna/default.nix
@@ -1,15 +1,54 @@
-args@{ libs, inputs, ... }:
+args@{ libs, inputs, nixos, ... }:
 let
-  # 这里可以选择使用稳定版或不稳定版的nixpkgs
-  # nixpkgs = inputs.nixpkgs;
-  nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
-  home-manager = inputs.home-manager-unstable;
-  sysversion = "25.05";
-  sysArgs = args // { inherit home-manager sysversion; };
+  # 使用pkgs.unstable中的nixpkgs和home-manager
+  inherit (nixos.unstable) nixpkgs home-manager version;
+  specialArgs = args // { inherit home-manager version; };
+  
+  configuration = conf-args@{ self, home-manager, username, version, ... }: {
+    # You can import other NixOS modules here
+    imports = [
+      # If you want to use modules your own flake exports (from modules/nixos):
+      # outputs.nixosModules.example
+
+      # Or modules from other flakes (such as nixos-hardware):
+      # inputs.hardware.nixosModules.common-cpu-amd
+      # inputs.hardware.nixosModules.common-ssd
+
+      # You can also split up your configuration and import pieces of it here:
+      # ./users.nix
+
+      # Import your generated (nixos-generate-config) hardware configuration
+      ./network.nix
+      ./hardware-configuration.nix
+
+      "${self}/modules/nixos/core"
+      "${self}/modules/nixos/sysatomic.nix"
+
+      home-manager.nixosModules.home-manager
+      {
+        # home-manager.useGlobalPkgs = true;
+        # home-manager.useUserPackages = true;
+        home-manager = {
+          extraSpecialArgs = {
+            inherit (conf-args) self inputs outputs libs sourcepath hostname username useremail version;
+          };
+          users."${username}" = { ... }: {
+            imports = [
+              "${self}/home/desktop.nix"
+            ];
+          };
+        };
+      }
+    ];
+
+    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+    system.stateVersion = version;
+  };
+
 in
-# 使用libs.mkNixosSystem创建nixosSystem
-libs.mkNixosSystem {
-  inherit nixpkgs;
-  args = sysArgs;
-  path = ./.;
+nixpkgs.lib.nixosSystem {
+  inherit specialArgs;
+  modules = [
+    configuration
+  ];
 }
Author	SHA1	Message	Date
alex	7caf8a0a66	更新到25.11	2025-08-18 12:03:21 +08:00
alex	70c052c850	增加sqlite和jq	2025-05-29 18:44:22 +08:00
alex	ce7331fb35	增加 1. apc ups 服务 2. flatpak desktop目录	2025-05-28 14:30:28 +08:00
alex	b1540dfb96	修改mimeapps.list的配置方式	2025-05-19 10:41:29 +08:00
alex	91b8e65a79	1 封装nix-fhs使用nix-ld 2 修改生成hylrland配置文件的方式 3 启用flatpak	2025-05-19 10:20:28 +08:00
alex	05c8ab6c82	调整项目结构和readme	2025-05-09 14:40:19 +08:00
alex	79d3ca7ec4	更新gnome/docker配置	2025-05-07 15:20:28 +08:00
alex	457028533e	更新hyprland配置	2025-05-07 15:16:40 +08:00
alex	c133e5637f	简化stable/unstable切换的方式；增加兼容性代码，根据版本引用	2025-05-05 18:59:34 +08:00
alex	e6891f9f8e	单独定义nix-ld; 增加smartmontools; 增添docker配置; 修改hyprland样式	2025-05-05 12:17:26 +08:00
alex	d605c0f637	配置nix-ld可以运行fhs应用; 移除nix idea软件包，使用下载的binary	2025-05-02 00:18:47 +08:00