diff --git a/Justfile b/Justfile
index 2696c757..3c0318de 100644
--- a/Justfile
+++ b/Justfile
@@ -9,7 +9,7 @@ os host action:
         nixos-rebuild {{ action }} \
                 -I nixpkgs=${nixpkgs} \
                 -I nixos-config=./nix/configurations/{{ host }}.nix \
-                --fast \
+                --no-reexec \
                 --file ./default.nix \
                 --attr "nixosConfigurations.{{ host }}"
 
diff --git a/nix/configurations/hetzner_benchmark/home/programs.nix b/nix/configurations/hetzner_benchmark/home/programs.nix
index edd900cd..be1cbfc1 100644
--- 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
diff --git a/nix/configurations/hydrogen/home/programs.nix b/nix/configurations/hydrogen/home/programs.nix
index 67651b85..df6c010b 100644
--- 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
diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index ab470dbd..9332268b 100644
--- 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
diff --git a/nix/configurations/vanadium/home/gtk.nix b/nix/configurations/vanadium/home/gtk.nix
new file mode 100644
index 00000000..f059868e
--- /dev/null
+++ 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";
+  };
+}
diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix
index 7fc0c785..23eea664 100644
--- 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 = {
diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix
index a05cb216..a2b44af7 100644
--- 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
@@ -110,6 +110,7 @@
     pkgs.signal-desktop
     pkgs.tuba # mastodon GUI client
     pkgs.emoji-picker-rs
+    pkgs.telegram-desktop # for archlinux china
 
     # wm utilities
     pkgs.xbrightness
@@ -122,6 +123,8 @@
     # audio utilities
     pkgs.helvum
     pkgs.pavucontrol
+    pkgs.pulseaudio # pactl value control
+    pkgs.pantheon.elementary-sound-theme
   ];
 
   programs = {
@@ -161,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;
diff --git a/nix/configurations/vanadium/nixos/battery.nix b/nix/configurations/vanadium/nixos/battery.nix
index 95eda6f8..8ac3479a 100644
--- 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";
   };
 }
diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix
index 836883ad..b9b1f6b4 100644
--- 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
+      '';
     };
   };
 
diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix
index f7ee7a78..8414c6e9 100644
--- 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=";
-    };
 }
diff --git a/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-chttrans.patch b/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-chttrans.patch
index f18c0d76..ea5ce501 100644
--- 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)
-
diff --git a/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-fullwidth.patch b/nix/configurations/vanadium/patches/fcitx5-chinese-addons/disable-fullwidth.patch
index 16626dc4..b079fafe 100644
--- 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)
-
diff --git a/nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch b/nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
index 4ad25570..fa526161 100644
--- 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)
-
diff --git a/nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch b/nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
index 37afa2fd..41df9ece 100644
--- 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)
-
diff --git a/nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch b/nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch
index 8b49d39e..7de1dedd 100644
--- 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()
  
diff --git a/nix/homeModules/common/fcitx5/default.nix b/nix/homeModules/common/fcitx5/default.nix
index 4e1cc178..40fadff1 100644
--- a/nix/homeModules/common/fcitx5/default.nix
+++ b/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
     ];
   };
diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix
index c3a19f91..99aef957 100644
--- a/nix/homeModules/common/git.nix
+++ b/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;
diff --git a/nix/homeModules/common/zen-browser.nix b/nix/homeModules/common/zen-browser.nix
index bfc4470b..993b1175 100644
--- a/nix/homeModules/common/zen-browser.nix
+++ b/nix/homeModules/common/zen-browser.nix
@@ -50,7 +50,7 @@ in
     # https://searchfox.org/mozilla-central/source/browser/components/enterprisepolicies/Policies.sys.mjs
     # Some policies can be rewritten to profiles configuration
     #
-    # TODO: try out the "locked" semantic from zen
+    # "locked" semantic from zen (doesn't seem to be doing anything, attempted for zen-twilight 1.18t)
     # https://github.com/0xc000022070/zen-browser-flake/tree/main#preferences
     #
     # To check which option is mapped to which about:config
diff --git a/nix/networks/list.nix b/nix/networks/list.nix
index 3dca7a25..75127935 100644
--- a/nix/networks/list.nix
+++ b/nix/networks/list.nix
@@ -93,6 +93,10 @@ in
     ssid = "NTUH_guest";
     randomizeMac = true;
   }
+  {
+    ssid = "i_Tzuchi_WiFi";
+    randomizeMac = true;
+  }
 
   { ssid = "_SNCF_WIFI_INOUI"; }
   { ssid = "_WIFI_LYRIA"; }
diff --git a/nix/overlays/agenix.nix b/nix/overlays/agenix.nix
index 33db93ab..262d465a 100644
--- a/nix/overlays/agenix.nix
+++ b/nix/overlays/agenix.nix
@@ -3,5 +3,5 @@ let
 in
 final: _: {
   # Use flake so the package inputs is pinned
-  agenix = sources.agenix.asFlake.packages.${final.system}.default;
+  agenix = sources.agenix.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
 }
diff --git a/nix/overlays/disko.nix b/nix/overlays/disko.nix
index cb013aad..c0243b78 100644
--- a/nix/overlays/disko.nix
+++ b/nix/overlays/disko.nix
@@ -2,5 +2,5 @@ let
   sources = import ../../npins;
 in
 final: _: {
-  disko = sources.disko.asFlake.packages.${final.system}.default;
+  disko = sources.disko.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
 }
diff --git a/nix/overlays/dix.nix b/nix/overlays/dix.nix
index 60717e01..ad644e49 100644
--- a/nix/overlays/dix.nix
+++ b/nix/overlays/dix.nix
@@ -2,5 +2,5 @@ let
   sources = import ../../npins;
 in
 final: _: {
-  dix = sources.dix.asFlake.packages.${final.system}.default;
+  dix = sources.dix.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
 }
diff --git a/nix/overlays/eepy.nix b/nix/overlays/eepy.nix
index 70f4f78a..38bc8053 100644
--- a/nix/overlays/eepy.nix
+++ b/nix/overlays/eepy.nix
@@ -2,5 +2,5 @@ let
   sources = import ../../npins;
 in
 final: _: {
-  eepy = sources.eepy.asFlake.packages.${final.system}.default;
+  eepy = sources.eepy.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
 }
diff --git a/nix/overlays/nil.nix b/nix/overlays/nil.nix
index c409f3c7..9ba6b75b 100644
--- a/nix/overlays/nil.nix
+++ b/nix/overlays/nil.nix
@@ -5,7 +5,7 @@ in
 final: _: {
   nil =
     let
-      pkg = sources.nil.asFlake.packages.${final.system}.default;
+      pkg = sources.nil.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
     in
     pkg.overrideAttrs (oldAttrs: {
       patches = oldAttrs.patches or [ ] ++ [
diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index ee3b06ac..28f696bb 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -3,7 +3,7 @@ let
 in
 # The final nix is lix in this case
 final: prev: {
-  nix-monitored = sources.nix-monitored.asFlake.packages.${final.system}.default.override {
+  nix-monitored = sources.nix-monitored.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override {
     inherit (final) nix;
     withNotify = false; # noisy, spams "command completed" even for nix shells
   };
diff --git a/nix/overlays/nix-tree.nix b/nix/overlays/nix-tree.nix
index 2fcc6cbf..ec23e3c2 100644
--- a/nix/overlays/nix-tree.nix
+++ b/nix/overlays/nix-tree.nix
@@ -4,5 +4,5 @@ let
   sources = import ../../npins;
 in
 final: _: {
-  nix-tree = (import sources.nix-tree).packages.${final.system}.default;
+  nix-tree = (import sources.nix-tree).packages.${final.stdenv.hostPlatform.system}.default;
 }
diff --git a/nix/packages/by-name/easyscan/package.nix b/nix/packages/by-name/easyscan/package.nix
index 258e7fd3..3cd88e89 100644
--- a/nix/packages/by-name/easyscan/package.nix
+++ b/nix/packages/by-name/easyscan/package.nix
@@ -1,7 +1,7 @@
 {
   writeShellApplication,
   sane-backends,
-  poppler_utils,
+  poppler-utils,
   fzf,
   ghostscript,
 }:
@@ -10,7 +10,7 @@ writeShellApplication {
 
   runtimeInputs = [
     sane-backends
-    poppler_utils
+    poppler-utils
     fzf
     ghostscript
   ];
diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix
index 5854849f..0bf791a4 100644
--- a/nix/packages/by-name/ruler/package.nix
+++ b/nix/packages/by-name/ruler/package.nix
@@ -11,8 +11,8 @@ let
     domain = "git.confusedcompiler.org";
     owner = "leana8959";
     repo = "ruler";
-    rev = "adb153af8aab6e0350e396de1f26316d97df3add";
-    hash = "sha256-8+at3h5udcLXqbsaPcQ5HMGZMd6brZ21d/VW3kSyMFw=";
+    rev = "6cdadb92b8cff6d57bc1d15061923bfbf40ede71";
+    hash = "sha256-TwUXpgdmGBUgyxyN/nRReu3VniYdLkAVp1Q72r9ouBI=";
   }) { };
 
   cabalOverrides = o: {
diff --git a/npins/sources.json b/npins/sources.json
index d7c39ceb..31edf218 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -112,11 +112,11 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "release-25.05",
+      "branch": "master",
       "submodules": false,
-      "revision": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
-      "url": "https://github.com/nix-community/home-manager/archive/3b955f5f0a942f9f60cdc9cacb7844335d0f21c3.tar.gz",
-      "hash": "0q3lv288xlzxczh6lc5lcw0zj9qskvjw3pzsrgvdh8rl8ibyq75s"
+      "revision": "295d90e22d557ccc3049dc92460b82f372cd3892",
+      "url": "https://github.com/nix-community/home-manager/archive/295d90e22d557ccc3049dc92460b82f372cd3892.tar.gz",
+      "hash": "1bg6p94gn7rzs43asb1njvhl242kd09ka2dbq3jyzhs140f0i099"
     },
     "infuse": {
       "type": "GitRelease",
@@ -195,14 +195,14 @@
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs"
       },
-      "branch": "nixos-25.05-small",
+      "branch": "nixos-25.11-small",
       "submodules": false,
-      "revision": "cec38dec00df26a901eb8b424d53bbb3bcc72eec",
-      "url": "https://github.com/NixOS/nixpkgs/archive/cec38dec00df26a901eb8b424d53bbb3bcc72eec.tar.gz",
-      "hash": "006pn4a3f4wnr60bbw7cw181p6gzgyyz5lchp3i8q5v7bjjvalmg"
+      "revision": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
+      "url": "https://github.com/nixos/nixpkgs/archive/a320ce8e6e2cc6b4397eef214d202a50a4583829.tar.gz",
+      "hash": "1q779dz718s7k00zmfzksl6j8alpixp4rdazsvsfk7rn7g05sdzb"
     },
     "nur": {
       "type": "Git",