From 54016a9da20a2399d01523bd931413f243217d8f Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 20 Sep 2026 22:42:06 +0800
Subject: [PATCH] fix: address nixpkgs rename/deprecation warnings

---
 home/base/gui/dev-tools.nix           | 13 +++++-
 home/base/tui/dev-tools.nix           | 62 ++++++++++++++-------------
 hosts/idols-aquamarine/postgresql.nix |  2 +-
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/home/base/gui/dev-tools.nix b/home/base/gui/dev-tools.nix
index dd375da6..012ccb77 100644
--- a/home/base/gui/dev-tools.nix
+++ b/home/base/gui/dev-tools.nix
@@ -1,4 +1,9 @@
-{ pkgs, llm-agents, ... }:
+{
+  pkgs,
+  lib,
+  llm-agents,
+  ...
+}:
 let
   agentPackages = llm-agents.packages.${pkgs.stdenv.hostPlatform.system};
 in
@@ -6,9 +11,13 @@ in
   home.packages =
     with pkgs;
     [
+      qrtool # decode/encode qr code
+    ]
+    # mitmproxy & wireshark don't build on darwin
+    # (removed there, see modules/darwin/broken-packages.nix)
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
       mitmproxy # http/https proxy tool
       wireshark # network analyzer
-      qrtool # decode/encode qr code
     ]
     # AI Agent Tools
     ++ [
diff --git a/home/base/tui/dev-tools.nix b/home/base/tui/dev-tools.nix
index f38d70c4..ab3f6fd3 100644
--- a/home/base/tui/dev-tools.nix
+++ b/home/base/tui/dev-tools.nix
@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   ...
 }:
 {
@@ -14,42 +15,45 @@
   #
   #############################################################
 
-  home.packages = with pkgs; [
-    colmena # nixos's remote deployment tool
+  home.packages =
+    with pkgs;
+    [
+      colmena # nixos's remote deployment tool
 
-    tokei # count lines of code, alternative to cloc
+      tokei # count lines of code, alternative to cloc
 
-    # db related
-    # mycli
-    pgcli
-    mongosh
-    sqlite
+      # db related
+      # mycli
+      pgcli
+      mongosh
+      sqlite
 
-    # embedded development
-    minicom
+      # embedded development
+      minicom
 
-    # ai related
-    python313Packages.huggingface-hub # huggingface-cli
-    yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
+      # ai related
+      python313Packages.huggingface-hub # huggingface-cli
+      yt-dlp # youtube/bilibili/soundcloud/... video/music downloader
 
-    # misc
-    devbox
-    bfg-repo-cleaner # remove large files from git history
-    k6 # load testing tool
+      # misc
+      devbox
+      bfg-repo-cleaner # remove large files from git history
+      k6 # load testing tool
 
-    # solve coding extercises - learn by doing
-    exercism
+      # solve coding extercises - learn by doing
+      exercism
 
-    # Automatically trims your branches whose tracking remote refs are merged or gone
-    # It's really useful when you work on a project for a long time.
-    git-trim
-    gitleaks
-
-    # need to run `conda-install` before using it
-    # need to run `conda-shell` before using command `conda`
-    # conda is not available for MacOS
-    conda
-  ];
+      # Automatically trims your branches whose tracking remote refs are merged or gone
+      # It's really useful when you work on a project for a long time.
+      git-trim
+      gitleaks
+    ]
+    # conda is not available on macOS
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
+      # need to run `conda-install` before using it
+      # need to run `conda-shell` before using command `conda`
+      conda
+    ];
 
   programs = {
     direnv = {
diff --git a/hosts/idols-aquamarine/postgresql.nix b/hosts/idols-aquamarine/postgresql.nix
index 5c864e7d..400e6f9c 100644
--- a/hosts/idols-aquamarine/postgresql.nix
+++ b/hosts/idols-aquamarine/postgresql.nix
@@ -48,7 +48,7 @@ in
       "--allow-group-access"
     ];
 
-    extraPlugins =
+    extensions =
       ps: with ps; [
         # postgis
         # pg_repack