vanadium: fix build

packages/ruler: update

vanadium/overlays/fcitx5: fix patch

vanadium/overlays/fcitx5-chinese-addons: fix patch

treewide: system -> stdenv.hostPlatform.system

vanadium: fix warnings
This commit is contained in:
Primrose 2025-11-26 08:52:29 +08:00
parent 8f0bc83348
commit bc4490acff
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
22 changed files with 78 additions and 86 deletions

View file

@ -10,7 +10,7 @@ in
{
i18n.inputMethod = {
fcitx5.addons = [
pkgs.fcitx5-chinese-addons
pkgs.qt6Packages.fcitx5-chinese-addons
pkgs.fcitx5-table-extra
];
};

View file

@ -8,21 +8,21 @@
# git plugins
programs.git = {
lfs.enable = true;
patdiff.enable = lib.mkMerge [
# known to fail on aarch64-linux
(lib.mkIf (pkgs.system == "aarch64-linux") (
# TODO: investigate this
lib.warn "patdiff has been forcibly disabled because it has previously failed to build" lib.mkForce
false
))
(lib.mkDefault true)
];
};
programs.patdiff.enable = lib.mkMerge [
# known to fail on aarch64-linux
(lib.mkIf (pkgs.stdenv.hostPlatform.system == "aarch64-linux") (
# TODO: investigate this
lib.warn "patdiff has been forcibly disabled because it has previously failed to build" lib.mkForce
false
))
(lib.mkDefault true)
];
# 懶惰鬼賴皮
programs.lazygit =
let
patdiffCfg = config.programs.git.patdiff;
patdiffCfg = config.programs.patdiff;
in
lib.mkIf patdiffCfg.enable {
settings = {
@ -32,7 +32,7 @@
# git itself
programs.git = {
extraConfig = {
settings = {
init.defaultBranch = "trunk"; # I like trees
push.autoSetupRemote = true;
pull.ff = "only";
@ -60,9 +60,9 @@
};
# identity
programs.git = {
userEmail = "leana.jiang+git@icloud.com";
userName = "Léana ";
programs.git.settings = {
user.email = "leana.jiang+git@icloud.com";
user.name = "Léana ";
signing = {
key = "0x4E887A4CA9714ADA";
signByDefault = lib.mkDefault false;