diff options
| -rw-r--r-- | meta/base.txt | 15 | ||||
| -rw-r--r-- | nix/common.nix | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/meta/base.txt b/meta/base.txt index f17a0f0..6ea9439 100644 --- a/meta/base.txt +++ b/meta/base.txt @@ -1,11 +1,12 @@ # --- 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. +# rsync, mergiraf, delta, tree-sitter, neovim, zellij, gh, pass + pass-otp, +# openssh, git, gnupg, wget, zsh + plugins + zsh-completions, basedpyright, +# rust-analyzer, etc.) is provisioned via Home-Manager from nix/common.nix +# and lives under ~/.nix-profile/bin (first in PATH). Anything pacman drops +# that's still needed (curl, git, openssh, gnupg) comes back transitively +# via base/base-devel/desktop deps. acpid arch-audit base @@ -13,7 +14,6 @@ base-devel bash-completion chezmoi cpupower -curl dashbinsh duf fwupd @@ -33,7 +33,6 @@ overdue pacman-cleanup-hook pacman-contrib paru -pass-otp pbzip2 pigz pkgstats @@ -48,10 +47,8 @@ systemd-resolvconf tlp torsocks unzip -wget wireguard-tools yazi -zsh-completions zram-generator # --- bluetooth --- diff --git a/nix/common.nix b/nix/common.nix index 7adb8fb..66cd6ac 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -75,9 +75,10 @@ in man-db man-pages - # Secrets + # Secrets — `pass-otp` is wired as an extension so `pass otp ...` + # works against the same store. `pass` from pacman is removed. gnupg - pass + (pass.withExtensions (exts: [ exts.pass-otp ])) # C/C++ source tooling (no compiler driver in PATH) clang-tools @@ -144,6 +145,7 @@ in # shared zshrc; nix-profile path is preferred, system path is the # fallback for un-bootstrapped states). zsh + zsh-completions zsh-syntax-highlighting zsh-autosuggestions zsh-history-substring-search |