From 44fab7a24d80912779968d5667d8961f63797111 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Sat, 19 Sep 2026 16:35:08 -0400
Subject: [PATCH] refactor(dotfiles): namespace shared flake utilities

---
 src/dotfiles/guests.nix  | 2 +-
 src/dotfiles/modules.nix | 2 +-
 src/dotfiles/util.nix    | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/dotfiles/guests.nix b/src/dotfiles/guests.nix
index 4085661..a8e6998 100644
--- 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
   );
diff --git a/src/dotfiles/modules.nix b/src/dotfiles/modules.nix
index 9dead8f..0e062de 100644
--- a/src/dotfiles/modules.nix
+++ b/src/dotfiles/modules.nix
@@ -3,5 +3,5 @@
   util,
 }:
 {
-  imports = util.collectNixFiles root;
+  imports = util.flake.collectNixFiles root;
 }
diff --git a/src/dotfiles/util.nix b/src/dotfiles/util.nix
index 614ca48..6fad941 100644
--- 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 =