From b8fe48ed4b9ce63d5818c9370f73fc549c60a319 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Sun, 27 Sep 2026 09:36:09 -0400
Subject: [PATCH] refactor(dotfiles): derive names from Nix paths

---
 src/dotfiles/guests.nix               | 2 +-
 src/dotfiles/registry.nix             | 4 +---
 src/dotfiles/util.nix                 | 2 +-
 src/skills/style/nix/rules/general.md | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/dotfiles/guests.nix b/src/dotfiles/guests.nix
index 74cc2ef..e0e5deb 100644
--- a/src/dotfiles/guests.nix
+++ b/src/dotfiles/guests.nix
@@ -275,7 +275,7 @@ let
       };
     };
 
-  names = map (path: util.removeNixSuffix (builtins.baseNameOf path)) files;
+  names = map util.removeNixSuffix files;
 in
 {
   imports = files ++ map mkGuest names;
diff --git a/src/dotfiles/registry.nix b/src/dotfiles/registry.nix
index f2955c3..1f12b27 100644
--- a/src/dotfiles/registry.nix
+++ b/src/dotfiles/registry.nix
@@ -6,9 +6,7 @@
 }:
 let
   definitions = lib.listToAttrs (
-    map (path: lib.nameValuePair (registryName (builtins.baseNameOf path)) (mkRegistry path)) (
-      util.collectNixFiles root
-    )
+    map (path: lib.nameValuePair (registryName path) (mkRegistry path)) (util.collectNixFiles root)
   );
 
   registryName = util.removeNixSuffix;
diff --git a/src/dotfiles/util.nix b/src/dotfiles/util.nix
index faeceb7..56c5e99 100644
--- a/src/dotfiles/util.nix
+++ b/src/dotfiles/util.nix
@@ -20,7 +20,7 @@ in
 {
   inherit collectNixFiles;
 
-  removeNixSuffix = fileName: lib.removeSuffix ".nix" fileName;
+  removeNixSuffix = path: lib.removeSuffix ".nix" (builtins.baseNameOf path);
 
   bridgeName = id: "br-vlan${toString id}";
 
diff --git a/src/skills/style/nix/rules/general.md b/src/skills/style/nix/rules/general.md
index a0b5024..98d33a6 100644
--- a/src/skills/style/nix/rules/general.md
+++ b/src/skills/style/nix/rules/general.md
@@ -15,8 +15,8 @@ Repository Nix code uses one implementation.
 
 ### Rule
 
-Use `util.removeNixSuffix` to remove a `.nix` suffix from a file name.
-Do not call `lib.removeSuffix ".nix"` outside the utility definition.
+Use `util.removeNixSuffix` to remove a `.nix` suffix from a path.
+Do not call `builtins.baseNameOf` or `lib.removeSuffix ".nix"` outside the utility definition.
 
 ### Rationale