chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 01:29:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
陈浩南
2025-11-14 10:28:34 +08:00
parent 002ca9e400
commit 316aaa270c
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/packages/desktop.nix
View File

@@ -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

2
modules/services/slurm.nix
View File

@@ -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

2
modules/system/font.nix
View File

@@ -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
];

5
modules/system/gui.nix
View File

@@ -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; };