From 316aaa270cfa1c6c276de89146f807df32b40d61 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 14 Nov 2025 10:28:34 +0800
Subject: [PATCH] fix build

---
 modules/packages/desktop.nix | 6 +++---
 modules/services/slurm.nix   | 2 +-
 modules/system/font.nix      | 2 +-
 modules/system/gui.nix       | 5 +++--
 packages/vesta.nix           | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix
index bb89526f..c51da7e8 100644
--- a/modules/packages/desktop.nix
+++ b/modules/packages/desktop.nix
@@ -15,7 +15,7 @@ inputs:
         [
           # system management
           # TODO: module should add yubikey-touch-detector into path
-          gparted wayland-utils clinfo glxinfo vulkan-tools dracut yubikey-touch-detector btrfs-assistant snapper-gui
+          gparted wayland-utils clinfo mesa-demos vulkan-tools dracut yubikey-touch-detector btrfs-assistant snapper-gui
           kdePackages.qtstyleplugin-kvantum cpu-x wl-mirror geekbench xpra
           (
             writeShellScriptBin "xclip"
@@ -36,7 +36,7 @@ inputs:
           adb-sync scrcpy dbeaver-bin cling aircrack-ng kitty
           weston cage openbox krita fprettify # jetbrains.clion 
           # password and key management
-          yubikey-manager bitwarden hashcat yubikey-personalization
+          yubikey-manager bitwarden-desktop hashcat yubikey-personalization
           # download
           qbittorrent
           # editor
@@ -51,7 +51,7 @@ inputs:
           # browser
           google-chrome tor-browser
           # office
-          crow-translate zotero pandoc texliveFull poppler_utils pdftk pdfchain
+          crow-translate zotero pandoc texliveFull poppler-utils pdftk pdfchain
           ydict texstudio panoply pspp libreoffice-qt6-still ocrmypdf typst # paperwork
           # required by ltex-plus.vscode-ltex-plus
           ltex-ls ltex-ls-plus
diff --git a/modules/services/slurm.nix b/modules/services/slurm.nix
index 22c67976..c60ca70d 100644
--- a/modules/services/slurm.nix
+++ b/modules/services/slurm.nix
@@ -65,7 +65,7 @@ inputs:
               {
                 buildInputs = prev.buildInputs or [] ++ additionalInputs;
                 LDFLAGS = prev.LDFLAGS or [] ++ additionalFlags;
-                nativeBuildInputs = prev.nativeBuildInputs ++ [ inputs.pkgs.wrapGAppsHook ];
+                nativeBuildInputs = prev.nativeBuildInputs ++ [ inputs.pkgs.wrapGAppsHook3 ];
                 postInstall =
                 ''
                   pushd contribs/pmi2
diff --git a/modules/system/font.nix b/modules/system/font.nix
index 8d549ccb..5104fb73 100644
--- a/modules/system/font.nix
+++ b/modules/system/font.nix
@@ -9,7 +9,7 @@ inputs:
       [
         noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono hack-font inter
         noto-fonts-color-emoji roboto sarasa-gothic source-han-mono wqy_microhei wqy_zenhei noto-fonts-cjk-sans
-        noto-fonts-emoji corefonts vistafonts vistafonts-chs dejavu_fonts nerd-fonts.fira-code
+        corefonts vista-fonts vista-fonts-chs dejavu_fonts nerd-fonts.fira-code
         # needed by typst may template
         lxgw-wenkai libertinus
       ];
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index 811d26ab..0818ecb6 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -38,7 +38,8 @@ inputs:
       {
         enable = true;
         type = "fcitx5";
-        fcitx5.addons = builtins.map (p: inputs.pkgs."fcitx5-${p}") [ "chinese-addons" "mozc" "material-color" "gtk" ];
+        fcitx5.addons = with inputs.pkgs;
+          [ qt6Packages.fcitx5-chinese-addons fcitx5-mozc fcitx5-material-color fcitx5-gtk ];
       };
       programs.dconf.enable = true;
       nixos.user.sharedModules = [(hmInputs:
@@ -67,7 +68,7 @@ inputs:
       programs.niri.enable = true;
       nixos.user.sharedModules = [(hmInputs:
       {
-        config.programs.dankMaterialShell = { enable = true; enableKeybinds = true; enableSystemd = true; };
+        config.programs.dankMaterialShell = { enable = true; niri.enableKeybinds = true; enableSystemd = true; };
       })];
       # niri module will auto enable this, disable it to avoid conflict with system ssh-agent and kwallet
       services.gnome = { gcr-ssh-agent.enable = false; gnome-keyring.enable = inputs.lib.mkForce false; };
diff --git a/packages/vesta.nix b/packages/vesta.nix
index 03020963..6c6070fc 100644
--- a/packages/vesta.nix
+++ b/packages/vesta.nix
@@ -1,12 +1,12 @@
 {
-  lib, stdenv, fetchurl, autoPatchelfHook, wrapGAppsHook, makeWrapper, src,
+  lib, stdenv, fetchurl, autoPatchelfHook, wrapGAppsHook3, makeWrapper, src,
   glib, gtk2, xorg, libGLU, gtk3, writeShellScript, gsettings-desktop-schemas, xdg-utils, jdk
 }: stdenv.mkDerivation
 {
   pname = "vesta";
   inherit (src) src version;
   nativeBuildInputs =
-    [ autoPatchelfHook wrapGAppsHook makeWrapper glib gtk2 xorg.libXxf86vm libGLU gtk3 xorg.libXtst jdk ];
+    [ autoPatchelfHook wrapGAppsHook3 makeWrapper glib gtk2 xorg.libXxf86vm libGLU gtk3 xorg.libXtst jdk ];
   unpackPhase = "tar -xf $src";
   installPhase =
   ''