+

oluceps · Nov 7, 2024 · 5bc5bed · 5bc5bed
1 parent 3923c0a
commit 5bc5bed
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'; };
         };
       }