From 5f361d0172103df5c16baae8427dba78e8b0dfae Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Wed, 20 May 2026 13:56:09 +0100 Subject: feat(pkg): drop leaf tools migrated to Home-Manager The following are now provisioned by Home-Manager via nix/common.nix and live under ~/.nix-profile/bin (which is first in PATH per phase p3): ripgrep, fd, bat, glow, fzf, lsd, jq, yq (yq-go), zoxide, just, sd, choose, dog, curlie, hyperfine, htop, fastfetch, tldr, rsync, mergiraf, git-delta (delta), tree-sitter-cli (tree-sitter), neovim, zellij, github-cli (gh), pass, openssh, git, zsh, zsh-syntax-highlighting, zsh-autosuggestions, zsh-history-substring-search, basedpyright-bin (basedpyright), rust-analyzer Kept: - pass-otp, zsh-completions: no Home-Manager equivalent yet - pcsclite: still needed by Home-Manager gnupg/scdaemon (see nix/host.nix scdaemon.conf) - curl, wget, man-db, man-pages, gnupg: system-fundamental, fine to keep duplicated. git/openssh/gnupg also come back as transitive deps of paru/sudo/etc. even if dropped here. Added hyperfine to nix/common.nix (missed in the p5 batch). Phase 7 of the nix-on-host migration plan. --- meta/base.txt | 46 +++++++++++----------------------------------- nix/common.nix | 1 + 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/meta/base.txt b/meta/base.txt index c00c15c..f17a0f0 100644 --- a/meta/base.txt +++ b/meta/base.txt @@ -1,45 +1,38 @@ # --- core --- +# Note: the leaf-CLI tooling (ripgrep, fd, bat, glow, fzf, lsd, jq, yq-go, +# zoxide, just, sd, choose, dog, curlie, hyperfine, htop, fastfetch, tldr, +# rsync, mergiraf, delta, tree-sitter, neovim, zellij, gh, pass, openssh, +# git, zsh + plugins, basedpyright, rust-analyzer, etc.) is now provisioned +# via Home-Manager from nix/common.nix and lives under ~/.nix-profile/bin. +# Anything pacman drops that's still needed (git, openssh, curl, …) comes +# back transitively through other base/base-devel/desktop deps. acpid arch-audit base base-devel bash-completion -bat chezmoi -choose cpupower -curlie +curl dashbinsh -dog duf -fastfetch -fd fwupd -fzf gdu -git -glow -htop iwd -jq kernel-modules-hook linux-firmware lostfiles -lsd lshw man-db man-pages -neovim nfs-utils nftables nmap ocl-icd -openssh overdue pacman-cleanup-hook pacman-contrib paru -pass pass-otp pbzip2 pigz @@ -48,28 +41,17 @@ procs qrencode rebuild-detector reflector -ripgrep -rsync sbctl -sd smartmontools sudo-rs systemd-resolvconf -tldr tlp torsocks -tree-sitter-cli unzip wget wireguard-tools yazi -zellij -zoxide -zsh -zsh-autosuggestions zsh-completions -zsh-history-substring-search -zsh-syntax-highlighting zram-generator # --- bluetooth --- @@ -89,33 +71,25 @@ nix # --- dev --- android-tools -basedpyright-bin ccache clang cmake -curl difftastic direnv doxygen gdb git-absorb -git-delta -github-cli go -hyperfine jdk21-openjdk -just lld lldb luarocks -mergiraf mold ninja npm perf podman-compose podman-docker -rust-analyzer rustup samply sccache @@ -262,7 +236,9 @@ udisks2 flatpak # Smartcard stack (cartão de cidadão reader + PKCS#11 bridge into flatpak -# browsers). pcscd.socket is enabled by systemd-units/system.txt. +# browsers). pcscd.socket is enabled by systemd-units/system.txt. pcsclite +# itself is also needed by Home-Manager's gnupg/scdaemon (see nix/host.nix's +# scdaemon.conf — points scdaemon at /usr/lib/libpcsclite.so.1). pcsclite ccid diff --git a/nix/common.nix b/nix/common.nix index 9bfe2d6..7adb8fb 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -60,6 +60,7 @@ in # System htop fastfetch + hyperfine # Net curl -- cgit v1.3.1