3 files changed, 7 insertions, 2 deletions
diff --git a/hosts/default.nix b/hosts/default.nix
index 604a9bf..fc28902 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -27,12 +27,13 @@ in
 
     himeji = nixosSystem {
       specialArgs = {
-        inherit secrets;
+        inherit inputs outputs secrets;
       };
 
       modules = [
         ./himeji
         inputs.disko.nixosModules.disko
+        inputs.nix-index-database.nixosModules.nix-index
       ];
     };
   };
diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 46eac87..ea9fe7c 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -1,9 +1,12 @@
 { secrets, pkgs, ... }:
 {
   imports = [
+    ../../modules/nix
+    ../../disks/himeji.nix
     ./hardware-configuration.nix
     ../../modules/networking/vpn/tailscale.nix
-    ../../disks/himeji.nix
+    ../../modules/options.nix
+    ./options.nix
   ];
 
   boot.tmp.cleanOnBoot = true;
diff --git a/hosts/himeji/options.nix b/hosts/himeji/options.nix
new file mode 100644
index 0000000..d8e2298
--- /dev/null
+++ b/hosts/himeji/options.nix
@@ -0,0 +1 @@
+{ config.modules.nix.extend = false; }