chore: update flake.lock; prepare for 25.11 migration

modules/cli/vcs/git.nix

@@ -18,20 +18,22 @@ lib.my.makeHomeProgramConfig {
   extraConfig = {
     my.hm = {
       programs.git = {
-        userName = "${userfullname}";
-        userEmail = "${useremail}";
-        signing = {
-          format = "ssh";
-          signByDefault = true;
-          key = "/home/${username}/.ssh/id_ed25519";
-        };
-        extraConfig = {
-          push.autoSetupRemote = true;
+        settings = {
           gpg.ssh.allowedSignersFile =
             (pkgs.writeText "allowed_signers" ''
               imxyy1soope1@gmail.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix
               imxyy@imxyy.top ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix
             '').outPath;
+          push.autoSetupRemote = true;
+          user = {
+            name = userfullname;
+            email = useremail;
+          };
+        };
+        signing = {
+          format = "ssh";
+          signByDefault = true;
+          key = "/home/${username}/.ssh/id_ed25519";
         };
       };
       programs.lazygit = {
@@ -39,4 +41,4 @@ lib.my.makeHomeProgramConfig {
       };
     };
   };
-}
+}

modules/desktop/style/default.nix

@@ -91,7 +91,7 @@ lib.my.makeSwitch {
           darker = pkgs.libsForQt5.qt5ct + /share/qt5ct/colors/darker.conf;
         };
         "qt6ct/qt6ct.conf".source = pkgs.replaceVars ./qtct/qt6ct.conf {
-          darker = pkgs.qt6ct + /share/qt6ct/colors/darker.conf;
+          darker = pkgs.qt6Packages.qt6ct + /share/qt6ct/colors/darker.conf;
         };
       };
     };

modules/desktop/wine.nix

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
   ];
   config' = {
     my.hm.home.packages = with pkgs; [
-      wineWayland
+      wine-wayland
       proton-ge-custom
       bottles
     ];

modules/desktop/wm/niri/config.nix

@@ -286,9 +286,11 @@
           "Mod+Shift+Minus".action.set-window-height = "-10%";
           "Mod+Shift+Equal".action.set-window-height = "+10%";
 
-          "Ctrl+Alt+A".action = screenshot;
+          "Ctrl+Alt+A".action.screenshot = [ ];
+          # "Ctrl+Alt+A".action = screenshot;
           "Print".action.screenshot-screen = [ ];
-          "Alt+Print".action = screenshot-window;
+          "Alt+Print".action.screenshot-window = [ ];
+          # "Alt+Print".action = screenshot-window;
 
           "Mod+Shift+E".action = quit;
 

modules/fonts.nix

@@ -17,7 +17,7 @@ lib.my.makeSwitch {
       packages = with pkgs; [
         noto-fonts
         noto-fonts-cjk-sans
-        noto-fonts-emoji
+        noto-fonts-color-emoji
 
         jetbrains-mono
 

modules/i18n/fcitx5.nix

@@ -17,7 +17,8 @@ lib.my.makeSwitch {
       type = "fcitx5";
       fcitx5 = {
         addons = with pkgs; [
-          fcitx5-chinese-addons # fcitx5-mozc
+          qt6Packages.fcitx5-chinese-addons
+          # fcitx5-mozc
           fcitx5-lightly
         ];
         waylandFrontend = true;