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