refactor(lib): Upstream `lib` to vhack.eu

This allows to share it with the server config.

4 files changed, 29 insertions, 3 deletions

diff --git a/flake.lock b/flake.lock
index d81a2dc4..bac9eb78 100644
--- a/flake.lock
+++ b/flake.lock
@@ -362,6 +362,22 @@
         "type": "github"
       }
     },
+    "library": {
+      "locked": {
+        "lastModified": 1734626644,
+        "narHash": "sha256-p/RVC4Rp5AGN3qwlVoQJHkbEkvcilSr2lWfRgnlRXlQ=",
+        "ref": "prime",
+        "rev": "1021c1ffe1dd8dd75380dac618b93ff2cefd81f4",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.vhack.eu/vhack.eu/nix-library"
+      },
+      "original": {
+        "ref": "prime",
+        "type": "git",
+        "url": "https://git.vhack.eu/vhack.eu/nix-library"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -733,6 +749,7 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
+        "library": "library",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
         "nixVim": "nixVim",
diff --git a/flake.nix b/flake.nix
index 80f8bc35..b748e0aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,10 @@
     nixpkgs-tfc.url = "github:soispha/nixpkgs/add-termfilechooser";
     nixpkgs-onlykey.url = "github:soispha/nixpkgs/fix-onlykey-agent";
 
+    library = {
+      url = "git+https://git.vhack.eu/vhack.eu/nix-library?ref=prime";
+    };
+
     # inputs for following
     nix-darwin = {
       url = "github:lnl7/nix-darwin";
@@ -192,6 +196,7 @@
       };
     };
     lanzaboote = {
+      # TODO: Subscribe to their update feed. <2024-12-18>
       url = "github:nix-community/lanzaboote/v0.4.1";
       inputs = {
         nixpkgs.follows = "nixpkgs-stable";
@@ -262,6 +267,7 @@
     nixpkgs-stable,
     nixpkgs-tfc,
     nixpkgs-onlykey,
+    library,
     # modules
     home-manager,
     nixos-generators,
@@ -285,7 +291,7 @@
     system = "x86_64-linux";
     sysLib = shell_library.lib.${system};
 
-    nixLib = import ./lib {};
+    inherit (library) nixLib;
 
     pkgsStable = nixpkgs-stable.legacyPackages.${system};
     pkgs = nixpkgs.legacyPackages.${system};
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