From a16009918eee9c2378c25937ee96ea5709935fdf Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 29 Jul 2023 23:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9B=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E5=8C=85=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/packages/default.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index 92c33e34..15db8d5e 100644
--- a/modules/packages/default.nix
+++ b/modules/packages/default.nix
@@ -38,13 +38,13 @@ inputs:
 					# basic tools
 					beep dos2unix gnugrep pv tmux screen parallel tldr
 					# lsxx
-					pciutils usbutils lshw wayland-utils clinfo glxinfo vulkan-tools util-linux lsof
+					pciutils usbutils lshw util-linux lsof
 					# top
-					iotop iftop htop
+					iotop iftop htop btop
 					# editor
 					vim nano bat
 					# downloader
-					wget aria2 curl yt-dlp nur-xddxdd.baidupcs-go wgetpaste
+					wget aria2 curl
 					# file manager
 					tree git autojump exa trash-cli lsd zellij broot file xdg-ninja mlocate
 					# compress
@@ -58,18 +58,12 @@ inputs:
 					# networking
 					ipset iptables iproute2 dig nettools traceroute tcping-go whois tcpdump nmap
 					# nix tools
-					nix-output-monitor nix-template appimage-run nil nixd nix-alien
+					nix-output-monitor
 					# development
 					gcc go rustc clang-tools clang valgrind yarn
 					# office
 					todo-txt-cli pandoc pdfchain
 				];
-				_pythonPackages = [(pythonPackages: with pythonPackages;
-				[
-					phonopy inquirerpy requests tensorflow keras python-telegram-bot
-					fastapi pypdf2 pandas openai matplotlib scipy plotly gunicorn scikit-learn redis jinja2
-				])];
-				_prebuildPackages = [ httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran ];
 			};
 			programs =
 			{
@@ -115,6 +109,9 @@ inputs:
 					[
 						# system management
 						gparted snapper-gui libsForQt5.qtstyleplugin-kvantum wl-clipboard-x11 kio-fuse wl-mirror
+						wayland-utils clinfo glxinfo vulkan-tools
+						# nix tools
+						nix-template appimage-run nil nixd nix-alien
 						# instant messager
 						element-desktop tdesktop discord qq nur-xddxdd.wechat-uos # jail
 						inputs.config.nur.repos.linyinfeng.wemeet # native # nur-xddxdd.wine-wechat thunder
@@ -126,7 +123,7 @@ inputs:
 						# password and key management
 						bitwarden yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui
 						# download
-						qbittorrent
+						qbittorrent yt-dlp nur-xddxdd.baidupcs-go wgetpaste
 						# office
 						crow-translate libreoffice-qt zotero texlive.combined.scheme-full gnuplot poppler_utils
 						# development
@@ -177,7 +174,12 @@ inputs:
 							}
 						)
 					] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
-					_pythonPackages = [(pythonPackages: with pythonPackages; [ tqdm ])];
+					_pythonPackages = [(pythonPackages: with pythonPackages;
+					[
+						phonopy inquirerpy requests tensorflow keras python-telegram-bot tqdm
+						fastapi pypdf2 pandas openai matplotlib scipy plotly gunicorn scikit-learn redis jinja2
+					])];
+					_prebuildPackages = [ httplib magic-enum xtensor boost cereal cxxopts ftxui yaml-cpp gfortran ];
 				};
 				programs =
 				{