From 5bc5bedb58b6bd4a2c1bb330c841665277cd5890 Mon Sep 17 00:00:00 2001
From: oluceps <secinia@outlook.com>
Date: Fri, 8 Nov 2024 03:58:19 +0800
Subject: [PATCH] +

---
 hosts/abhoth/default.nix | 2 +-
 hosts/azasos/default.nix | 2 +-
 hosts/colour/default.nix | 2 +-
 hosts/eihort/default.nix | 2 +-
 hosts/hastur/default.nix | 2 +-
 hosts/kaambl/default.nix | 2 +-
 hosts/lib.nix            | 4 ++++
 hosts/nodens/default.nix | 2 +-
 hosts/yidhra/default.nix | 2 +-
 9 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hosts/abhoth/default.nix b/hosts/abhoth/default.nix
index cd76946f..a8b9885b 100644
--- a/hosts/abhoth/default.nix
+++ b/hosts/abhoth/default.nix
@@ -21,7 +21,7 @@ withSystem "x86_64-linux" (
         allowUnfree = true;
         allowUnsupportedSystem = true;
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; });
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/azasos/default.nix b/hosts/azasos/default.nix
index 78cdf5a1..89dc0a36 100644
--- a/hosts/azasos/default.nix
+++ b/hosts/azasos/default.nix
@@ -22,7 +22,7 @@ withSystem "x86_64-linux" (
         allowUnfree = true;
         allowUnsupportedSystem = true;
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/colour/default.nix b/hosts/colour/default.nix
index 4fecad50..f803c05e 100644
--- a/hosts/colour/default.nix
+++ b/hosts/colour/default.nix
@@ -21,7 +21,7 @@ withSystem "x86_64-linux" (
         allowUnfree = true;
         allowUnsupportedSystem = true;
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/eihort/default.nix b/hosts/eihort/default.nix
index 49fd7622..604e58aa 100644
--- a/hosts/eihort/default.nix
+++ b/hosts/eihort/default.nix
@@ -18,7 +18,7 @@ withSystem "x86_64-linux" (
     pkgs = import inputs.nixpkgs {
       inherit system;
       config = { };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/hastur/default.nix b/hosts/hastur/default.nix
index 9638c8cd..db1abeb3 100644
--- a/hosts/hastur/default.nix
+++ b/hosts/hastur/default.nix
@@ -30,7 +30,7 @@ withSystem "x86_64-linux" (
           "olm-3.2.16"
         ];
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/kaambl/default.nix b/hosts/kaambl/default.nix
index 359a999b..9e12aaa1 100644
--- a/hosts/kaambl/default.nix
+++ b/hosts/kaambl/default.nix
@@ -21,7 +21,7 @@ withSystem "x86_64-linux" (
         allowUnfree = true;
         allowUnsupportedSystem = true;
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/lib.nix b/hosts/lib.nix
index 7946a3f7..d42b9ee0 100644
--- a/hosts/lib.nix
+++ b/hosts/lib.nix
@@ -36,6 +36,10 @@ in
 
   genOverlays = map (i: inputs.${i}.overlays.default);
 
+  hostOverlays =
+    { inputs', inputs }:
+    (import ../overlays.nix { inherit inputs' inputs; }) ++ [ inputs.self.overlays.default ];
+
   iage = type: import ../age { inherit type; };
 
   sharedModules =
diff --git a/hosts/nodens/default.nix b/hosts/nodens/default.nix
index 5e4774c8..ad5d12f0 100644
--- a/hosts/nodens/default.nix
+++ b/hosts/nodens/default.nix
@@ -28,7 +28,7 @@ withSystem "x86_64-linux" (
             "factorio-headless"
           ];
       };
-      overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+      overlays = lib.hostOverlays { inherit inputs inputs'; };
     };
     specialArgs = {
       inherit
diff --git a/hosts/yidhra/default.nix b/hosts/yidhra/default.nix
index c3142090..d41c2bc6 100644
--- a/hosts/yidhra/default.nix
+++ b/hosts/yidhra/default.nix
@@ -35,7 +35,7 @@ withSystem "x86_64-linux" (
             # contentAddressedByDefault = true;
             allowUnfree = true;
           };
-          overlays = (import "${self}/overlays.nix" { inherit inputs' inputs; }) ++ [ self.overlays.default ];
+          overlays = lib.hostOverlays { inherit inputs inputs'; };
         };
       }