From 91ffef19ea91fb515a1bede81273aaf9613d0628 Mon Sep 17 00:00:00 2001 From: alexion Date: Sat, 19 Sep 2026 16:33:34 -0400 Subject: [PATCH] refactor(dotfiles): accept shared flake utilities --- src/dotfiles/default.nix | 3 ++- src/dotfiles/util.nix | 5 +---- src/flake/default.nix | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dotfiles/default.nix b/src/dotfiles/default.nix index 5b765e4..dfd5cce 100644 --- a/src/dotfiles/default.nix +++ b/src/dotfiles/default.nix @@ -2,10 +2,11 @@ lib, inputs, self, + flakeUtil, root, }: let - util = import ./util.nix { inherit lib; }; + util = import ./util.nix { inherit flakeUtil lib; }; registry = import ./registry.nix { inherit lib; diff --git a/src/dotfiles/util.nix b/src/dotfiles/util.nix index 4fa3d07..614ca48 100644 --- a/src/dotfiles/util.nix +++ b/src/dotfiles/util.nix @@ -1,7 +1,4 @@ -{ lib }: -let - flakeUtil = import ../flake/util.nix { inherit lib; }; -in +{ flakeUtil, lib }: flakeUtil // { bridgeName = id: "br-vlan${toString id}"; diff --git a/src/flake/default.nix b/src/flake/default.nix index f3bed7b..8ed104b 100644 --- a/src/flake/default.nix +++ b/src/flake/default.nix @@ -14,6 +14,7 @@ let lib self ; + flakeUtil = util; root = root + "/configs/nixos"; }; in