refactor(dotfiles): centralize Nix suffix removal
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
root,
|
||||
specialArgs,
|
||||
repositoryModules,
|
||||
@@ -276,7 +275,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
names = map (path: lib.removeSuffix ".nix" (builtins.baseNameOf path)) files;
|
||||
names = map (path: util.removeNixSuffix (builtins.baseNameOf path)) files;
|
||||
in
|
||||
{
|
||||
imports = files ++ map mkGuest names;
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
)
|
||||
);
|
||||
|
||||
registryName = fileName: lib.removeSuffix ".nix" fileName;
|
||||
registryName = util.removeNixSuffix;
|
||||
|
||||
mkRegistry =
|
||||
path:
|
||||
|
||||
@@ -20,6 +20,8 @@ in
|
||||
{
|
||||
inherit collectNixFiles;
|
||||
|
||||
removeNixSuffix = fileName: lib.removeSuffix ".nix" fileName;
|
||||
|
||||
bridgeName = id: "br-vlan${toString id}";
|
||||
|
||||
deriveMac =
|
||||
|
||||
@@ -10,3 +10,14 @@ Pass `util` to Nix functions that need the helper.
|
||||
|
||||
`util.collectNixFiles` centralizes recursive discovery of Nix files.
|
||||
Repository Nix code uses one implementation.
|
||||
|
||||
## Remove Nix file suffixes with the utility
|
||||
|
||||
### Rule
|
||||
|
||||
Use `util.removeNixSuffix` to remove a `.nix` suffix from a file name.
|
||||
Do not call `lib.removeSuffix ".nix"` outside the utility definition.
|
||||
|
||||
### Rationale
|
||||
|
||||
The utility centralizes Nix file-name normalization.
|
||||
|
||||
Reference in New Issue
Block a user