Upgrade to 25.11 (#25)

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/25
Co-authored-by: Léana 江 <leana.jiang+git@icloud.com>
Co-committed-by: Léana 江 <leana.jiang+git@icloud.com>

nix/homeModules/common/fcitx5/default.nix

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

nix/homeModules/common/git.nix

@@ -1,28 +1,19 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 {
   # 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.mkDefault true;
 
   # 懶惰鬼賴皮
   programs.lazygit =
     let
-      patdiffCfg = config.programs.git.patdiff;
+      patdiffCfg = config.programs.patdiff;
     in
     lib.mkIf patdiffCfg.enable {
       settings = {
@@ -32,7 +23,7 @@
 
   # git itself
   programs.git = {
-    extraConfig = {
+    settings = {
       init.defaultBranch = "trunk"; # I like trees
       push.autoSetupRemote = true;
       pull.ff = "only";
@@ -60,9 +51,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;