From e195cbc5919b2ea2eebe4518c8905801280e0d39 Mon Sep 17 00:00:00 2001
From: Origami404 <Origami404g@gmail.com>
Date: Mon, 19 Jan 2026 13:10:34 +0800
Subject: [PATCH] =?UTF-8?q?[hypnos]=20=E9=87=8D=E6=9E=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84,=20=E5=A2=9E=E5=8A=A0=20flake=20=E7=BC=96?=
 =?UTF-8?q?=E5=86=99=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/hosts/hypnos.nix            | 39 ++++++++++++++++++++++++++++++--
 home/modules/darwin-packages.nix | 23 -------------------
 hosts/eris/configuration.nix     |  1 -
 3 files changed, 37 insertions(+), 26 deletions(-)
 delete mode 100644 home/modules/darwin-packages.nix

diff --git a/home/hosts/hypnos.nix b/home/hosts/hypnos.nix
index 50f21a7..b511a77 100644
--- a/home/hosts/hypnos.nix
+++ b/home/hosts/hypnos.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   home.homeDirectory = "/Users/origami";
@@ -8,7 +13,6 @@
     ../modules/shell.nix
     ../modules/shell-develop.nix
     ../modules/zsh.nix
-    ../modules/darwin-packages.nix
     ../modules/llm.nix
   ];
 
@@ -17,4 +21,35 @@
   };
   # 外壳同款配色
   programs.zsh.initContent = "zstyle ':prompt:grml:*:items:user' pre '%F{#82C8E5}'";
+
+  # 包
+  home.packages = (
+    with pkgs;
+    [
+      # 标准 GNU 工具
+      autoconf
+      coreutils
+      gawk
+      gnused
+      gnutar
+      gnugrep
+      gnumake
+      pkgconf
+      unar
+
+      # 命令行小工具
+      helix
+      uv
+      typst
+      pandoc
+
+      # NixOS
+      nix-output-monitor
+      nixd
+      nixfmt
+      nixpkgs-fmt
+      nix-index
+      nix-tree
+    ]
+  );
 }
diff --git a/home/modules/darwin-packages.nix b/home/modules/darwin-packages.nix
deleted file mode 100644
index 362039d..0000000
--- a/home/modules/darwin-packages.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages =
-    (with pkgs; [
-      autoconf
-      coreutils
-      gawk
-      gnused
-      gnutar
-      gnugrep
-      gnumake
-      pkgconf
-      unar
-
-      codex
-
-      helix
-      uv
-      typst
-      pandoc
-    ])
-    ;
-}
diff --git a/hosts/eris/configuration.nix b/hosts/eris/configuration.nix
index e9d1105..e69d5dc 100644
--- a/hosts/eris/configuration.nix
+++ b/hosts/eris/configuration.nix
@@ -76,7 +76,6 @@
     home-manager
     nix-output-monitor
     nixd
-    nixpkgs-fmt
     nix-index
     nix-tree