From 7e27762b60cebe86be1135680f2b5f3e193c398c Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Fri, 29 Sep 2023 09:56:22 +0200
Subject: merge diverged changes

---
 modules/image/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/image')

diff --git a/modules/image/default.nix b/modules/image/default.nix
index f98afd9..d1d8543 100644
--- a/modules/image/default.nix
+++ b/modules/image/default.nix
@@ -1,13 +1,13 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   config = {
     networking = {
-      domain = "vapor.systems";
-      hostName = "image";
+      domain = lib.mkDefault "vapor.systems";
+      hostName = lib.mkDefault "image";
     };
 
-    system.build.image = import <nixpkgs/nixos/lib/make-disk-image.nix> {
+    system.build.image = import (modulesPath + "/../lib/make-disk-image.nix") {
       name = "vapor-systems-image";
       format = "raw";
       diskSize = "auto";
-- 
cgit v1.2.3