From 505fffa82419e85f2a8db8c1b64f8d47fe4723d0 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Mon, 23 Sep 2024 05:37:24 -0700
Subject: himeji: move options to top-level module

---
 hosts/himeji/default.nix | 18 ++++++++++++++++--
 hosts/himeji/options.nix | 14 --------------
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 hosts/himeji/options.nix

diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 9d3045d..ef52532 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -4,8 +4,22 @@
     ./hardware-configuration.nix
     ../../modules/options
     ../../modules/server
-    ./options.nix
   ];
 
-  system.stateVersion = "24.05";
+  config = {
+    modules = {
+      nix.extend = false;
+
+      containers = {
+        engine = "podman";
+
+        extraOptions = [
+          "--restart=on-failure"
+          "--pull=newer"
+        ];
+      };
+    };
+
+    system.stateVersion = "24.05";
+  };
 }
diff --git a/hosts/himeji/options.nix b/hosts/himeji/options.nix
deleted file mode 100644
index 6d21e7b..0000000
--- a/hosts/himeji/options.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config.modules = {
-    nix.extend = false;
-
-    containers = {
-      engine = "podman";
-
-      extraOptions = [
-        "--restart=on-failure"
-        "--pull=newer"
-      ];
-    };
-  };
-}
-- 
cgit v1.2.3