alexion/dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(dotfiles): derive names from Nix paths

Browse Source
This commit is contained in:
alexion
2026-09-27 09:36:09 -04:00
parent a854f40077
commit b8fe48ed4b
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dotfiles/guests.nix
View File

@@ -275,7 +275,7 @@ let
}; };
}; };
names = map (path: util.removeNixSuffix (builtins.baseNameOf path)) files; names = map util.removeNixSuffix files;
in in
{ {
imports = files ++ map mkGuest names; imports = files ++ map mkGuest names;

4
src/dotfiles/registry.nix
View File

@@ -6,9 +6,7 @@
}: }:
let let
definitions = lib.listToAttrs ( definitions = lib.listToAttrs (
map (path: lib.nameValuePair (registryName (builtins.baseNameOf path)) (mkRegistry path)) ( map (path: lib.nameValuePair (registryName path) (mkRegistry path)) (util.collectNixFiles root)
util.collectNixFiles root
)
); );
registryName = util.removeNixSuffix; registryName = util.removeNixSuffix;

2
src/dotfiles/util.nix
View File

@@ -20,7 +20,7 @@ in
{ {
inherit collectNixFiles; inherit collectNixFiles;
removeNixSuffix = fileName: lib.removeSuffix ".nix" fileName; removeNixSuffix = path: lib.removeSuffix ".nix" (builtins.baseNameOf path);
bridgeName = id: "br-vlan${toString id}"; bridgeName = id: "br-vlan${toString id}";

4
src/skills/style/nix/rules/general.md
View File

@@ -15,8 +15,8 @@ Repository Nix code uses one implementation.
### Rule ### Rule
Use `util.removeNixSuffix` to remove a `.nix` suffix from a file name. Use `util.removeNixSuffix` to remove a `.nix` suffix from a path.
Do not call `lib.removeSuffix ".nix"` outside the utility definition. Do not call `builtins.baseNameOf` or `lib.removeSuffix ".nix"` outside the utility definition.
### Rationale ### Rationale