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>
2025-12-06 06:39:14 +00:00 · 2025-11-28 04:30:58 +01:00 · 2025-11-28 04:30:58 +01:00 · b50954a4ef
commit b50954a4ef
parent b7b2083c74
27 changed files with 141 additions and 100 deletions
--- a/nix/configurations/hetzner_benchmark/home/programs.nix
+++ b/nix/configurations/hetzner_benchmark/home/programs.nix
@ -25,7 +25,7 @@
    pkgs.hutils

    # pretty tui tools
-    pkgs.du-dust
+    pkgs.dust
    pkgs.tokei
    pkgs.hyperfine
    pkgs.watchexec
--- a/nix/configurations/hydrogen/home/programs.nix
+++ b/nix/configurations/hydrogen/home/programs.nix
@ -27,7 +27,7 @@
    pkgs.nix-which

    # # pretty tui tools
-    # pkgs.du-dust
+    # pkgs.dust
    # pkgs.tokei
    # pkgs.hyperfine
    # pkgs.watchexec
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@ -151,6 +151,7 @@ in
        #
        ./vanadium/home/programs.nix
        ./vanadium/home/misc.nix
+        ./vanadium/home/gtk.nix

        ./vanadium/home/zen-browser.nix
        ./vanadium/home/firefox.nix
--- a/nix/configurations/vanadium/home/gtk.nix
+++ b/nix/configurations/vanadium/home/gtk.nix
@ -0,0 +1,38 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    pkgs.pantheon.elementary-sound-theme
+  ];
+
+  # Note: this would automatically recurse into gtk{2,3,4} settings
+  # In version prior to 25.11 it doesn't do this.
+  gtk.enable = true;
+  gtk = {
+    font = {
+      name = "Ubuntu";
+      package = pkgs.ubuntu-classic;
+    };
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.gnome-themes-extra;
+    };
+    theme = {
+      name = "Adwaita";
+      package = pkgs.gnome-themes-extra;
+    };
+
+    # TODO: open an issue, why are the types inconsistent? ew.
+    gtk2.extraConfig = ''
+      gtk-sound-theme-name = "elementary"
+    '';
+    gtk3.extraConfig = {
+      gtk-sound-theme-name = "elementary";
+    };
+    gtk4.extraConfig = {
+      gtk-sound-theme-name = "elementary";
+    };
+  };
+  dconf.settings = {
+    "org/gnome/desktop/sound".theme-name = "elementary";
+  };
+}
--- a/nix/configurations/vanadium/home/misc.nix
+++ b/nix/configurations/vanadium/home/misc.nix
@ -1,7 +1,6 @@
 {
  pkgs,
  lib,
-  nixosConfig ? { },
  ...
 }:
 {
@ -42,12 +41,9 @@
  home.pointerCursor = {
    x11.enable = true;
    gtk.enable = true;
-
-    inherit (nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme)
-      name
-      package
-      size
-      ;
+    name = "Posy_Cursor_Black";
+    package = pkgs.posy-cursors;
+    size = 72;
  };
  xresources.properties."Xft.dpi" = 150;
  i18n.inputMethod = {
--- a/nix/configurations/vanadium/home/programs.nix
+++ b/nix/configurations/vanadium/home/programs.nix
@ -50,7 +50,7 @@
    pkgs.zbar

    # pdf
-    pkgs.poppler_utils # pdfseparate, pdfunite
+    pkgs.poppler-utils # pdfseparate, pdfunite
    pkgs.easyscan

    # fun
@ -62,7 +62,7 @@
    # pkgs.necrolib

    # pretty tui tools
-    pkgs.du-dust
+    pkgs.dust
    pkgs.tokei
    pkgs.hyperfine
    pkgs.watchexec
@ -123,6 +123,8 @@
    # audio utilities
    pkgs.helvum
    pkgs.pavucontrol
+    pkgs.pulseaudio # pactl value control
+    pkgs.pantheon.elementary-sound-theme
  ];

  programs = {
@ -162,7 +164,12 @@
    kitty = {
      enable = true;
      font.size = 12; # sweet spot for framework 13
-      settings.shell = lib.getExe config.programs.fish.package;
+      settings = {
+        shell = lib.getExe config.programs.fish.package;
+        # https://github.com/kovidgoyal/kitty/issues/1866
+        # https://sw.kovidgoyal.net/kitty/conf/#terminal-bell
+        linux_bell_theme = "elementary";
+      };
    };

    chromium.enable = true;
--- a/nix/configurations/vanadium/nixos/battery.nix
+++ b/nix/configurations/vanadium/nixos/battery.nix
@ -1,7 +1,7 @@
 {
-  services.logind = {
+  services.logind.settings = {
    # Note: vanadium's btrfs disk layout has been changed and the swap has been reduced. It will not work with hibernate anymore.
-    lidSwitch = "suspend";
-    lidSwitchDocked = "ignore";
+    Login.HandleLidSwitch = "suspend";
+    Login.HandleLidSwitchDocked = "ignore";
  };
 }
--- a/nix/configurations/vanadium/nixos/gui.nix
+++ b/nix/configurations/vanadium/nixos/gui.nix
@ -15,13 +15,29 @@
    autoRepeatInterval = 40;
  };

+  environment.systemPackages = [
+    pkgs.pantheon.elementary-sound-theme
+  ];
  services.xserver.displayManager.lightdm = {
    enable = true;
    background = "#000000";
-    greeters.gtk.cursorTheme = {
-      name = "Posy_Cursor_Black";
-      package = pkgs.posy-cursors;
-      size = 72;
+    greeters.gtk = {
+      iconTheme = {
+        name = "Adwaita";
+        package = pkgs.gnome-themes-extra;
+      };
+      theme = {
+        name = "Adwaita";
+        package = pkgs.gnome-themes-extra;
+      };
+      cursorTheme = {
+        name = "Posy_Cursor_Black";
+        package = pkgs.posy-cursors;
+        size = 72;
+      };
+      extraConfig = ''
+        gtk-sound-theme-name = elementary
+      '';
    };
  };

--- a/nix/configurations/vanadium/overlay.nix
+++ b/nix/configurations/vanadium/overlay.nix
@ -53,31 +53,19 @@ infuse {
    ./patches/fcitx5/disable-quickphrase.patch
    ./patches/fcitx5/disable-unicode.patch
  ];
-  fcitx5-chinese-addons.__output.cmakeFlags.__append = [
+  qt6Packages.fcitx5-chinese-addons.__output.cmakeFlags.__append = [
    (lib.cmakeFeature "ENABLE_BROWSER" "Off")
-    (lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off")
+    (lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off") # c.f. patch below
    (lib.cmakeFeature "ENABLE_DATA" "Off")
  ];
-  fcitx5-chinese-addons.__output.patches.__append = [
+  qt6Packages.fcitx5-chinese-addons.__output.patches.__append = [
    ./patches/fcitx5-chinese-addons/disable-chttrans.patch
    ./patches/fcitx5-chinese-addons/disable-fullwidth.patch
+    (final.fetchpatch {
+      name = "cloudpinyin-disable-build"; # without this the option would fail
+      url = "https://github.com/fcitx/fcitx5-chinese-addons/commit/92ffd494273a5573347c1fe2667fb8d67a5303db.patch";
+      hash = "sha256-Mo5l8tsn1JQxTFHxOZfQRmbCeWZHLyxfn2Qwv/gQXGA=";
+    })
    # Note: disabling pinyin helper breaks canjie
  ];
-
-  # Security, Xorg vuln
-  # Backport has failed in upstream currently <https://github.com/NixOS/nixpkgs/pull/457804>,
-  # might as well patch it while people are blogging about it <https://github.com/Xe/site/pull/1062>
-  # Upstream talks about it here https://lists.x.org/archives/xorg-announce/2025-October/003635.html
-  xorg.xorgserver.__output.version =
-    oldVersion:
-    let
-      version = "21.1.20";
-    in
-    if oldVersion == version then throw "This patch has been merged upstream" else version;
-  xorg.xorgserver.__output.src =
-    _:
-    final.fetchurl {
-      url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz";
-      sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc=";
-    };
 }
--- a/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-chttrans.patch
+++ b/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-chttrans.patch
@ -1,5 +1,5 @@
 diff --git a/modules/chttrans/CMakeLists.txt b/modules/chttrans/CMakeLists.txt
-index 6c73ea8..8ed5660 100644
+index e2f5f43..61c6590 100644
 --- a/modules/chttrans/CMakeLists.txt
 +++ b/modules/chttrans/CMakeLists.txt
@@ -1,20 +1,20 @@
@ -10,7 +10,7 @@ index 6c73ea8..8ed5660 100644
 -    set(CHTTRANS_SOURCES ${CHTTRANS_SOURCES} chttrans-opencc.cpp)
 -endif()
 -add_fcitx5_addon(chttrans ${CHTTRANS_SOURCES})
-target_link_libraries(chttrans Fcitx5::Core Fcitx5::Config Fcitx5::Module::Notifications Boost::iostreams ${FMT_TARGET})
+-target_link_libraries(chttrans Fcitx5::Core Fcitx5::Config Fcitx5::Module::Notifications)
 -if (ENABLE_OPENCC)
 -    target_link_libraries(chttrans OpenCC::OpenCC)
 -    if (TARGET Boost::json)
@ -25,7 +25,7 @@ index 6c73ea8..8ed5660 100644
 +#     set(CHTTRANS_SOURCES ${CHTTRANS_SOURCES} chttrans-opencc.cpp)
 +# endif()
 +# add_fcitx5_addon(chttrans ${CHTTRANS_SOURCES})
-+# target_link_libraries(chttrans Fcitx5::Core Fcitx5::Config Fcitx5::Module::Notifications Boost::iostreams ${FMT_TARGET})
+# target_link_libraries(chttrans Fcitx5::Core Fcitx5::Config Fcitx5::Module::Notifications)
 +# if (ENABLE_OPENCC)
 +#     target_link_libraries(chttrans OpenCC::OpenCC)
 +#     if (TARGET Boost::json)
@ -42,7 +42,7 @@ index 6c73ea8..8ed5660 100644
 +#         COMPONENT config)
 +# install(FILES gbks2t.tab DESTINATION "${CMAKE_INSTALL_DATADIR}/fcitx5/chttrans" COMPONENT config)
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 994a4d1..9322834 100644
+index 5a8c94c..2feccd0 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
@@ -23,10 +23,10 @@ add_dependencies(testfullwidth fullwidth fullwidth.conf.in-fmt)
@ -50,14 +50,13 @@ index 994a4d1..9322834 100644
 
 add_subdirectory(inputmethod)
 -add_executable(testchttrans testchttrans.cpp)
-target_link_libraries(testchttrans Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM Pthread::Pthread)
+-target_link_libraries(testchttrans Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
 -add_dependencies(testchttrans chttrans chttrans.conf.in-fmt copy-addon copy-testim)
 -add_test(NAME testchttrans COMMAND testchttrans)
 +# add_executable(testchttrans testchttrans.cpp)
-+# target_link_libraries(testchttrans Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM Pthread::Pthread)
+# target_link_libraries(testchttrans Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
 +# add_dependencies(testchttrans chttrans chttrans.conf.in-fmt copy-addon copy-testim)
 +# add_test(NAME testchttrans COMMAND testchttrans)
 
 add_subdirectory(addon)
 add_executable(testpinyin testpinyin.cpp)
-
--- a/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-fullwidth.patch
+++ b/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-fullwidth.patch
@ -22,7 +22,7 @@ index 6e275bd..2dabd86 100644
 +# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fullwidth.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
 +#         COMPONENT config)
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 994a4d1..f354bfd 100644
+index 5a8c94c..0f0b130 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
@@ -17,10 +17,10 @@ target_link_libraries(testpinyinhelper Fcitx5::Core Fcitx5::Module::PinyinHelper
@ -30,14 +30,13 @@ index 994a4d1..f354bfd 100644
 add_test(NAME testpinyinhelper COMMAND testpinyinhelper)
 
 -add_executable(testfullwidth testfullwidth.cpp)
-target_link_libraries(testfullwidth Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM Pthread::Pthread)
+-target_link_libraries(testfullwidth Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
 -add_dependencies(testfullwidth fullwidth fullwidth.conf.in-fmt)
 -add_test(NAME testfullwidth COMMAND testfullwidth)
 +# add_executable(testfullwidth testfullwidth.cpp)
-+# target_link_libraries(testfullwidth Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM Pthread::Pthread)
+# target_link_libraries(testfullwidth Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
 +# add_dependencies(testfullwidth fullwidth fullwidth.conf.in-fmt)
 +# add_test(NAME testfullwidth COMMAND testfullwidth)
 
 add_subdirectory(inputmethod)
 add_executable(testchttrans testchttrans.cpp)
-
--- a/nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
+++ b/nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
@ -1,8 +1,8 @@
 diff --git a/src/modules/clipboard/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt
-index 997c4e3e..4163cada 100644
+index afeaa6d3..ad4e77e0 100644
 --- a/src/modules/clipboard/CMakeLists.txt
 +++ b/src/modules/clipboard/CMakeLists.txt
-@@ -1,21 +1,21 @@
+@@ -1,25 +1,25 @@
 -add_fcitx5_addon(clipboard)
 -
 -target_sources(clipboard PRIVATE clipboard.cpp)
@ -15,7 +15,11 @@ index 997c4e3e..4163cada 100644
 -
 -if (WAYLAND_FOUND)
 -    target_sources(clipboard PRIVATE waylandclipboard.cpp)
-    target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
+-    target_link_libraries(clipboard
+-        Fcitx5::Module::Wayland
+-        Fcitx5::Wayland::WLRDataControl
+-        Fcitx5::Wayland::ExtDataControl
+-        Pthread::Pthread)
 -endif()
 -
 -install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
@ -33,7 +37,11 @@ index 997c4e3e..4163cada 100644
 +#
 +# if (WAYLAND_FOUND)
 +#     target_sources(clipboard PRIVATE waylandclipboard.cpp)
-+#     target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
+#     target_link_libraries(clipboard
+#         Fcitx5::Module::Wayland
+#         Fcitx5::Wayland::WLRDataControl
+#         Fcitx5::Wayland::ExtDataControl
+#         Pthread::Pthread)
 +# endif()
 +#
 +# install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
@ -42,4 +50,3 @@ index 997c4e3e..4163cada 100644
 configure_file(clipboard.conf.in.in clipboard.conf.in @ONLY)
 fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf.in clipboard.conf)
 fcitx5_export_module(Clipboard TARGET clipboard BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS clipboard_public.h INSTALL)
-
--- a/nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
+++ b/nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
@ -25,10 +25,10 @@ index b5bc37ac..04f4da59 100644
 +#         FILES_MATCHING PATTERN "*.mb")
 
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 97eed1f3..53e09977 100644
+index 643d96f4..0916c732 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -147,10 +147,10 @@ if (ENABLE_KEYBOARD)
+@@ -162,10 +162,10 @@ if (ENABLE_KEYBOARD)
     add_test(NAME testspell COMMAND testspell)
 endif()
 
@ -43,4 +43,3 @@ index 97eed1f3..53e09977 100644
 
 if (ENABLE_X11)
 add_executable(testxim testxim.cpp)
-
--- a/nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch
+++ b/nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch
@ -1,13 +1,13 @@
 diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt
-index 73f7e064..afddabee 100644
+index 11512ecf..9efde8ac 100644
 --- a/src/modules/unicode/CMakeLists.txt
 +++ b/src/modules/unicode/CMakeLists.txt
@@ -1,11 +1,11 @@
 -add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
-target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
+-target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard)
 -install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
 +# add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
-+# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
+# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard)
 +# install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
 configure_file(unicode.conf.in.in unicode.conf.in @ONLY)
 fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/unicode.conf.in unicode.conf)
@ -21,10 +21,10 @@ index 73f7e064..afddabee 100644
 +# install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config)
 
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 97eed1f3..ff902c88 100644
+index 643d96f4..d008183a 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -134,10 +134,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt)
+@@ -149,10 +149,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt)
 add_test(NAME testemoji COMMAND testemoji)
 endif()