Reduce Arch package surface

7 files changed, 31 insertions, 37 deletions

diff --git a/dot_config/nvim/lua/plugins/treesitter.lua b/dot_config/nvim/lua/plugins/treesitter.lua
index 4f3ad31..0cba10f 100644
--- a/dot_config/nvim/lua/plugins/treesitter.lua
+++ b/dot_config/nvim/lua/plugins/treesitter.lua
@@ -1,5 +1,15 @@
 require("treewalker").setup({})
 
+-- nvim-treesitter's main branch shells out to tree-sitter, whose Rust cc crate
+-- respects CC. On the Arch host, Home Manager sets this to a Nix compiler
+-- wrapper so parser builds keep working without global base-devel.
+if
+  (vim.env.CC == nil or vim.env.CC == "")
+  and vim.env.NVIM_TREESITTER_CC ~= nil
+then
+  vim.env.CC = vim.env.NVIM_TREESITTER_CC
+end
+
 vim.keymap.set(
   { "n", "v" },
   "<a-k>",
diff --git a/dot_config/pacman/makepkg.conf b/dot_config/pacman/makepkg.conf
deleted file mode 100644
index 7233660..0000000
--- a/dot_config/pacman/makepkg.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CFLAGS="-march=native -Ofast -pipe -fomit-frame-pointer"
-RUSTFLAGS="-C opt-level=2 -C target-cpu=native"
-MAKEFLAGS="-j4"
-BUILDDIR=/tmp/makepkg
-COMPRESSGZ=(pigz -c -f -n)
-COMPRESSBZ2=(pbzip2 -c -f)
-COMPRESSXZ=(xz -c -z - --threads=0)
-COMPRESSZST=(zstd -c -z -q - --threads=0)
-PKGEXT='.pkg.tar.zst'
diff --git a/dot_config/paru/paru.conf b/dot_config/paru/paru.conf
deleted file mode 100644
index 6a3632c..0000000
--- a/dot_config/paru/paru.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# /etc/paru.conf
-# ~/.config/paru/paru.conf
-#
-# See the paru.conf(5) manpage for options
-
-#
-# GENERAL OPTIONS
-#
-[options]
-PgpFetch
-Devel
-Provides
-DevelSuffixes = -git -cvs -svn -bzr -darcs -always
-# BottomUp
-RemoveMake
-SudoLoop
-#UseAsk
-CombinedUpgrade
-BatchInstall
-# UpgradeMenu
-NewsOnUpgrade
-CleanAfter
-SaveChanges
-NoWarn = sommerfeld-*
diff --git a/dot_config/systemd/user/pass-secret-service.service b/dot_config/systemd/user/pass-secret-service.service
new file mode 100644
index 0000000..d7dc564
--- /dev/null
+++ b/dot_config/systemd/user/pass-secret-service.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Expose the libsecret D-Bus API with pass as backend
+Documentation=https://github.com/grimsteel/pass-secret-service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.secrets
+ExecStart=%h/.nix-profile/bin/pass-secret-service
+
+[Install]
+WantedBy=default.target
+Alias=dbus-org.freedesktop.secrets.service
diff --git a/dot_config/waybar/executable_update-status.sh b/dot_config/waybar/executable_update-status.sh
index cbd899e..a300245 100755
--- a/dot_config/waybar/executable_update-status.sh
+++ b/dot_config/waybar/executable_update-status.sh
@@ -3,7 +3,7 @@
 # upgraded recently. Source of truth is /var/log/pacman.log — the last
 # "[PACMAN] starting full system upgrade" entry. No daemon, no -Sy
 # polling, no opinion about *which* updates are pending; this only
-# tracks whether you've run `paru -Syu` (or equivalent) lately.
+# tracks whether you've run `pacman -Syu` lately.
 #
 # States, by hours since last full upgrade:
 #   < 24h         empty (hidden via :empty rule in style.css)
diff --git a/dot_config/zsh/dot_zprofile b/dot_config/zsh/dot_zprofile
index b95079b..20852db 100644
--- a/dot_config/zsh/dot_zprofile
+++ b/dot_config/zsh/dot_zprofile
@@ -29,6 +29,12 @@ export XDG_CACHE_HOME="$HOME/.cache"
 # even if /etc/profile.d snippets try to prepend duplicates.
 [[ -r /etc/profile ]] && emulate sh -c 'source /etc/profile'
 
+# Home Manager writes host-specific session variables here. Keep this after
+# /etc/profile so Nix/HM values can provide user-level tool wiring without
+# being clobbered by distro profile snippets.
+[[ -r "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]] &&
+	emulate sh -c ". \"$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh\""
+
 # ── Locale ────────────────────────────────────────────────────────────────────
 export LANG=en_US.UTF-8
 
diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
index c697594..d78c9e5 100644
--- a/dot_config/zsh/dot_zshrc
+++ b/dot_config/zsh/dot_zshrc
@@ -46,7 +46,7 @@ fpath=($XDG_DATA_HOME/zsh/completion $fpath)
 # Pull in completions from both nix-installed packages AND the system
 # package manager (pacman on Arch host, apt on Ubuntu VM). nix zsh's
 # default fpath only includes its own nix-store dirs, so without these
-# entries we miss completions for pacman, paru, systemctl, flatpak,
+# entries we miss completions for pacman, systemctl, flatpak,
 # docker, kubectl, etc. on the host, and apt/snap on the VM.
 for _d in "$HOME/.nix-profile/share/zsh/site-functions" \
 	"$HOME/.nix-profile/share/zsh/vendor-completions" \
@@ -77,7 +77,7 @@ zstyle ':completion:*' completer _expand_alias _complete _ignored _match _approx
 zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}  # colorize file completions like ls
 zstyle ':completion:*' use-cache on                            # cache completions (speeds up pip, dpkg, etc.)
 zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh"
-zstyle ':completion:*' rehash true                             # rebuild PATH hash on every completion (catches paru, cargo, pip, manual installs)
+zstyle ':completion:*' rehash true                             # rebuild PATH hash on every completion (catches cargo, pip, manual installs)
 zstyle ':completion:*:match:*' original only                   # only show original when pattern-matching
 zstyle ':completion:*:functions' ignored-patterns '_*'         # hide internal completion functions
 zstyle ':completion:*:*:kill:*' menu yes select                # interactive menu for kill completion