From 0ac11166a8fb22d1ce4de111f46e8a3ba1de7663 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Fri, 20 Dec 2024 17:50:16 +0100
Subject: refactor(lib): Upstream `lib` to vhack.eu

This allows to share it with the server config.
---
 flake/default.nix                     | 5 +++--
 flake/nixosConfigurations/default.nix | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'flake')

diff --git a/flake/default.nix b/flake/default.nix
index 16ae52c6..2c8d6f6b 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -41,6 +41,7 @@
       # my things
       shell_library
       sysLib
+      nixLib
       templates
       # modules
       home-manager
@@ -61,7 +62,7 @@
   };
 
   tests = import ../tests {
-    inherit pkgs nixpkgs_as_input myPkgs sysLib;
+    inherit pkgs nixpkgs_as_input myPkgs sysLib nixLib;
     inherit (pkgs) lib;
     extraModules = {
       termfilechooser = "${nixpkgs_open_prs.nixpkgs-tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix";
@@ -80,7 +81,7 @@
 in {
   inherit nixosConfigurations;
   checks."${system}" =
-    nixLib.maybeMerge {
+    nixLib.warnMerge {
       inherit
         (self.packages."${system}")
         nvim
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index d51e57a5..7d98f868 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -8,6 +8,7 @@
   # my things
   shell_library,
   sysLib,
+  nixLib,
   templates,
   # modules
   home-manager,
@@ -47,6 +48,7 @@
       myPkgs
       shell_library
       sysLib
+      nixLib
       # extra information
       system
       # modules
-- 
cgit 1.4.1