From 027ddb052ce06905524ea3856c804673c86db77c Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 5 May 2024 06:27:22 -0400
Subject: [PATCH] Infini-DL360: move storage option to global/options

---
 hosts/Infini-DL360/default.nix | 4 ----
 modules/global/options.nix     | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hosts/Infini-DL360/default.nix b/hosts/Infini-DL360/default.nix
index d514520..fa836af 100644
--- a/hosts/Infini-DL360/default.nix
+++ b/hosts/Infini-DL360/default.nix
@@ -2,10 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./disks.nix
-    ({ options, lib, ... }: {
-      options.storage = lib.our.mkOpt lib.types.attrs { };
-      environment.persistence."/storage" = lib.mkAliasDefinitions options.storage;
-    })
   ];
 
   networking.hostId = "8fa7a57c";
diff --git a/modules/global/options.nix b/modules/global/options.nix
index c6d1a06..cac12bf 100644
--- a/modules/global/options.nix
+++ b/modules/global/options.nix
@@ -21,6 +21,7 @@ in
     env = mkAliasOpt;
 
     persist = mkAliasOpt;
+    storage = mkAliasOpt;
 
     info = {
       monitors = mkOpt int 1;
@@ -60,5 +61,6 @@ in
     environment.variables = mkAliasDefinitions options.env;
 
     environment.persistence."/persist" = mkAliasDefinitions options.persist;
+    environment.persistence."/storage" = lib.mkAliasDefinitions options.storage;
   };
 }