hosts: move hosts to unique modules

1 files changed, 29 insertions, 23 deletions

diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 0d5fc9e..dfdf9f0 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -1,28 +1,34 @@
-{ self, ... }:
 {
-  imports = [
-    ./hardware-configuration.nix
-    "${self}/disks/himeji.nix"
-    "${self}/modules/core"
-    "${self}/modules/options"
-    "${self}/modules/server"
-  ];
-
-  config = {
-    networking.hostName = "himeji";
-    system.stateVersion = "24.05";
-
-    modules = {
-      nix.extend = false;
-
-      containers = {
-        engine = "podman";
+  lib,
+  inputs,
+  kansaiPkgs,
+  defaultModules,
+  self,
+  outputs,
+  secrets,
+  ...
+}:
+{
+  flake.nixosConfigurations.himeji = lib.nixosSystem {
+    pkgs =
+      (kansaiPkgs
+        {
+        }
+      )."x86_64-linux";
 
-        extraOptions = [
-          "--restart=on-failure"
-          "--pull=newer"
-        ];
-      };
+    specialArgs = {
+      inherit
+        inputs
+        outputs
+        secrets
+        self
+        ;
     };
+
+    modules = [
+      ./configuration.nix
+      ./hardware-configuration.nix
+      inputs.disko.nixosModules.disko
+    ] ++ defaultModules;
   };
 }