Move more host tooling to Nix

4 files changed, 34 insertions, 17 deletions

diff --git a/nix/common.nix b/nix/common.nix
index 9c9e093..50d7f60 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -54,7 +54,9 @@
     glow
 
     # Git stack
-    git
+    # Includes git-send-email: nixpkgs wraps it with the SMTP/SASL Perl deps
+    # it needs, so we don't carry distro Perl modules just for email support.
+    (git.override { sendEmailSupport = true; })
     gh
     delta
     mergiraf
@@ -66,6 +68,15 @@
     yq-go
 
     # System
+    dash
+    # Prefer Rust uutils for the unprefixed replacements that pass repo-local
+    # usage checks. Keep GNU tar on the system PATH for now; uutils-tar still
+    # rejects common GNU tar invocations like `tar -czf`.
+    uutils-coreutils-noprefix
+    uutils-diffutils
+    uutils-findutils
+    uutils-procps
+    uutils-sed
     htop
     fastfetch
     hyperfine
diff --git a/nix/flake.lock b/nix/flake.lock
index 25482b2..cdbca21 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -30,16 +30,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1779726825,
-        "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
+        "lastModified": 1780370888,
+        "narHash": "sha256-PRJj9RKTEf/sITycujP1c/BrvLJKMYXzcpwTsXNulXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
+        "rev": "a7a415883195ffbd4dabec8f098f201e6eaaadf8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -69,11 +69,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1780096845,
-        "narHash": "sha256-O3vJgv3HJtizMyjT9PLEL90iqXwRyKaFz0QcaABRQFQ=",
+        "lastModified": 1780345905,
+        "narHash": "sha256-4ERFyKR3O2HUfv3oRuUChoGnSdcdppFpCqrHticKi6A=",
         "owner": "agavra",
         "repo": "tuicr",
-        "rev": "9abc01e8ad13ca9e1beb45d469572bdb0334892e",
+        "rev": "1f585175b59c20c2bfaa8a73ca572218ccfd93ff",
         "type": "github"
       },
       "original": {
diff --git a/nix/flake.nix b/nix/flake.nix
index d82d9a4..f452228 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -4,12 +4,11 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
-      # Pin to the release branch matching nixpkgs lib.version (the
-      # `nixos-unstable` snapshot we follow here reports 26.05). Without
-      # this, HM master races ahead one cycle and emits the
-      # "mismatched versions" warning at every activation. Bump the
-      # branch name in lockstep when nixpkgs lib.version rolls over.
-      url = "github:nix-community/home-manager/release-26.05";
+      # Track the Home Manager branch whose release.json matches nixpkgs'
+      # lib.version. nixos-unstable currently reports 26.11pre-git, while
+      # home-manager's latest release branch is still 26.05, so master is the
+      # matching input until release-26.11 exists.
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # tuicr: TUI git-change reviewer. Upstream flake exposes
diff --git a/nix/host.nix b/nix/host.nix
index 0565f1b..dff9aef 100644
--- a/nix/host.nix
+++ b/nix/host.nix
@@ -117,6 +117,13 @@ in
     lshw
     yt-dlp
     streamlink
+    xdg-utils     # xdg-open, used by yazi/linkhandler/OPENER
+
+    # ── File sync ───────────────────────────────────────────────────────────────
+    # Package-only migration from pacman. The boot-time system service is the
+    # repo-owned syncthing@sommerfeld.service tracked in systemd-units/system.txt
+    # and backed by etc/systemd/system/syncthing@.service.
+    syncthing
 
     # chezmoi & paru — both are pure user CLIs. `paru` wraps pacman+makepkg
     # but doesn't link them; it just shells out. bootstrap.sh installs a