From a548667d9284037213d3ec9b601b10c4930438de Mon Sep 17 00:00:00 2001 From: dish Date: Sun, 5 Apr 2026 21:35:30 -0400 Subject: [PATCH] [flake] move data to a separate output Still available under `lib.data` for the time being since i dont wanna break stuff --- data/default.nix | 7 +++++++ {lib/data => data}/hosts.toml | 0 {lib/data => data}/services.toml | 0 flake.nix | 1 + lib/data/default.nix | 6 ------ lib/default.nix | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 data/default.nix rename {lib/data => data}/hosts.toml (100%) rename {lib/data => data}/services.toml (100%) delete mode 100644 lib/data/default.nix diff --git a/data/default.nix b/data/default.nix new file mode 100644 index 00000000..45918ea5 --- /dev/null +++ b/data/default.nix @@ -0,0 +1,7 @@ +{ + flake.data = { + hosts = fromTOML (builtins.readFile ./hosts.toml); + services = fromTOML (builtins.readFile ./services.toml); + tsNet = "coelacanth-dragon.ts.net"; + }; +} diff --git a/lib/data/hosts.toml b/data/hosts.toml similarity index 100% rename from lib/data/hosts.toml rename to data/hosts.toml diff --git a/lib/data/services.toml b/data/services.toml similarity index 100% rename from lib/data/services.toml rename to data/services.toml diff --git a/flake.nix b/flake.nix index 1779459f..a365a543 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ ./templates ./hosts ./neovim + ./data ]; # # Flake attributes diff --git a/lib/data/default.nix b/lib/data/default.nix deleted file mode 100644 index 1df4ad6a..00000000 --- a/lib/data/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - hosts = fromTOML (builtins.readFile ./hosts.toml); - services = fromTOML (builtins.readFile ./services.toml); - mail = fromTOML (builtins.readFile ./mail.toml); - tsNet = "coelacanth-dragon.ts.net"; -} diff --git a/lib/default.nix b/lib/default.nix index f66f1f70..52f08308 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,6 +1,6 @@ -{ lib, ... }: +{ lib, self, ... }: let - data = import ./data; + inherit (self) data; strings = import ./strings.nix { inherit lib; }; in { -- 2.51.2