refactor(dotfiles): namespace shared flake utilities

2026-09-19 16:35:08 -04:00
parent 91ffef19ea
commit 44fab7a24d
3 changed files with 5 additions and 4 deletions
--- a/src/dotfiles/guests.nix
+++ b/src/dotfiles/guests.nix
@@ -275,7 +275,7 @@ let
      };
    };

-  files = util.collectNixFiles root;
+  files = util.flake.collectNixFiles root;
  guestFiles = lib.filterAttrs (file: type: type == "regular" && lib.hasSuffix ".nix" file) (
    builtins.readDir root
  );
--- a/src/dotfiles/modules.nix
+++ b/src/dotfiles/modules.nix
@@ -3,5 +3,5 @@
  util,
 }:
 {
-  imports = util.collectNixFiles root;
+  imports = util.flake.collectNixFiles root;
 }
--- a/src/dotfiles/util.nix
+++ b/src/dotfiles/util.nix
@@ -1,6 +1,7 @@
 { flakeUtil, lib }:
-flakeUtil
-// {
+{
+  flake = flakeUtil;
+
  bridgeName = id: "br-vlan${toString id}";

  deriveMac =