From db86c80a9931074c574c88a0a7ea5339c06b34f5 Mon Sep 17 00:00:00 2001 From: Tom van der Lee Date: Mon, 21 Sep 2026 12:27:01 +0200 Subject: Fix Nix evaluation deprecation warnings Replace deprecated pkgs.stdenv.isDarwin/isLinux with pkgs.stdenv.hostPlatform.isDarwin/.isLinux, and explicitly pin programs.neovim.withRuby/withPython3 = true so the legacy default doesn't silently change if home.stateVersion is ever bumped. Pure deprecation fixes, no behavior change. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01BBSd4VBfoKHjE1HR3P8kmn --- modules/home/dotfiles.nix | 4 ++-- modules/home/editor.nix | 4 ++++ .../fix-deprecation-warnings/.openspec.yaml | 3 +++ .../changes/fix-deprecation-warnings/proposal.md | 22 ++++++++++++++++++++++ openspec/changes/fix-deprecation-warnings/tasks.md | 13 +++++++++++++ users/tom.nix | 2 +- 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 openspec/changes/fix-deprecation-warnings/.openspec.yaml create mode 100644 openspec/changes/fix-deprecation-warnings/proposal.md create mode 100644 openspec/changes/fix-deprecation-warnings/tasks.md diff --git a/modules/home/dotfiles.nix b/modules/home/dotfiles.nix index 21afb5e..c45c996 100644 --- a/modules/home/dotfiles.nix +++ b/modules/home/dotfiles.nix @@ -7,8 +7,8 @@ let # platform. Kept minimal and overridable via excludePackages rather than # a full per-platform mapping - see design.md for alternatives considered. platformDefaultExcludes = - lib.optionals (!pkgs.stdenv.isDarwin) [ "iterm2" ] - ++ lib.optionals (!pkgs.stdenv.isLinux) [ "herbstluftwm" "xorg" ]; + lib.optionals (!pkgs.stdenv.hostPlatform.isDarwin) [ "iterm2" ] + ++ lib.optionals (!pkgs.stdenv.hostPlatform.isLinux) [ "herbstluftwm" "xorg" ]; excludePackages = platformDefaultExcludes ++ cfg.excludePackages; in diff --git a/modules/home/editor.nix b/modules/home/editor.nix index 413ca8f..792d878 100644 --- a/modules/home/editor.nix +++ b/modules/home/editor.nix @@ -9,6 +9,10 @@ # in separately. Without this, home-manager's own generated init.lua # permanently conflicts with that stow package and it gets skipped. sideloadInitLua = true; + # Pin the legacy (stateVersion < 26.05) provider defaults explicitly so + # this doesn't silently change if stateVersion is ever bumped. + withRuby = true; + withPython3 = true; }; # tree-sitter (parser compilation) and a C compiler for natively-built diff --git a/openspec/changes/fix-deprecation-warnings/.openspec.yaml b/openspec/changes/fix-deprecation-warnings/.openspec.yaml new file mode 100644 index 0000000..54f2ff0 --- /dev/null +++ b/openspec/changes/fix-deprecation-warnings/.openspec.yaml @@ -0,0 +1,3 @@ +schema: spec-driven +created: 2026-09-21 +skip_specs: true diff --git a/openspec/changes/fix-deprecation-warnings/proposal.md b/openspec/changes/fix-deprecation-warnings/proposal.md new file mode 100644 index 0000000..0f1edb5 --- /dev/null +++ b/openspec/changes/fix-deprecation-warnings/proposal.md @@ -0,0 +1,22 @@ +## Why + +`nixos-rebuild`/`home-manager switch` on a real host now emits four evaluation warnings: `stdenv.isDarwin`/`stdenv.isLinux` are deprecated in favor of `stdenv.hostPlatform.isDarwin`/`.isLinux`, and `programs.neovim.withRuby`/`withPython3` warn that their default is changing and asks for an explicit value while `home.stateVersion` stays below "26.05". Left unset, these warnings will keep appearing on every activation, and the neovim providers' actual default would change out from under this flake the moment `stateVersion` is ever bumped, with no record of that being an intentional choice. + +## What Changes + +- Replace every `pkgs.stdenv.isDarwin`/`pkgs.stdenv.isLinux` usage with `pkgs.stdenv.hostPlatform.isDarwin`/`.isLinux` (`users/tom.nix`, `modules/home/dotfiles.nix`). Pure rename with identical semantics — no behavior change. +- Explicitly set `programs.neovim.withRuby = true;` and `programs.neovim.withPython3 = true;` in `modules/home/editor.nix`, pinning today's legacy-default behavior on purpose rather than leaving it implicit and version-dependent. No behavior change. + +## Capabilities + +### New Capabilities +(none) + +### Modified Capabilities +(none — every change here preserves current externally observable behavior exactly; only the deprecated attribute names and an implicit default become explicit. `.openspec.yaml` sets `skip_specs: true` accordingly.) + +## Impact + +- Affected code: `users/tom.nix`, `modules/home/dotfiles.nix`, `modules/home/editor.nix`. +- Affects every `homeConfigurations`/`nixosConfigurations` output built from the shared home profile, on both NixOS and Darwin. +- Out of scope: the "Git tree is dirty" notice in the pasted warnings is expected uncommitted-changes noise from evaluating a local checkout, not a deprecation — not addressed here. Also out of scope: bumping `home.stateVersion` itself, which would pull in a much broader set of home-manager default changes beyond these two neovim options. diff --git a/openspec/changes/fix-deprecation-warnings/tasks.md b/openspec/changes/fix-deprecation-warnings/tasks.md new file mode 100644 index 0000000..0ffedfb --- /dev/null +++ b/openspec/changes/fix-deprecation-warnings/tasks.md @@ -0,0 +1,13 @@ +## 1. Replace deprecated `stdenv.isDarwin`/`isLinux` + +- [x] 1.1 In `users/tom.nix`, replace `pkgs.stdenv.isDarwin` with `pkgs.stdenv.hostPlatform.isDarwin` in the `home.homeDirectory` conditional — verify by reading the file back and confirming the Darwin/Linux home path logic is otherwise unchanged +- [x] 1.2 In `modules/home/dotfiles.nix`, replace `pkgs.stdenv.isDarwin`/`pkgs.stdenv.isLinux` with `pkgs.stdenv.hostPlatform.isDarwin`/`.isLinux` in `platformDefaultExcludes` — verify by reading the file back and confirming the excluded-package lists (`iterm2` on non-Darwin; `herbstluftwm`/`xorg` on non-Linux) are unchanged +- [x] 1.3 Verify via `grep -rn "stdenv.isDarwin\|stdenv.isLinux" --include="*.nix" .` that no remaining usage exists outside `hosts/template/` (if any) (verified: zero matches anywhere in the repo, including `hosts/template/`) + +## 2. Pin Neovim provider defaults explicitly + +- [x] 2.1 In `modules/home/editor.nix`, add `withRuby = true;` and `withPython3 = true;` to the `programs.neovim` block — verify by reading the file back + +## 3. Validate + +- [x] 3.1 Run `nix flake check` (or `nixos-rebuild build`/`home-manager build`, wherever Nix is available) and confirm the four deprecation warnings no longer appear and all outputs still evaluate cleanly (blocked — Nix is not installed on this machine; run this once Nix is available, e.g. on the real host where the original warnings were observed — this is the real acceptance gate, not the individual checkboxes above). Reviewed manually instead: all three edited files were read back and are syntactically well-formed; `pkgs.stdenv.hostPlatform.isDarwin`/`.isLinux` is a straight rename of the same attribute path nixpkgs' `stdenv` exposes, and `withRuby`/`withPython3 = true;` matches the exact value the warning said was already in effect, so no other behavior should change diff --git a/users/tom.nix b/users/tom.nix index 08b30c3..cbbaff0 100644 --- a/users/tom.nix +++ b/users/tom.nix @@ -3,7 +3,7 @@ imports = [ ../modules/home ]; home.username = "tom"; - home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/tom" else "/home/tom"; + home.homeDirectory = if pkgs.stdenv.hostPlatform.isDarwin then "/Users/tom" else "/home/tom"; # Set once at first install/activation; never bump retroactively. home.stateVersion = "24.05"; -- cgit v1.3