flake: use self instead of relative path

3 files changed, 22 insertions, 10 deletions

diff --git a/hosts/default.nix b/hosts/default.nix
index 15a94fa..bb94007 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,7 +7,7 @@
   ...
 }:
 let
-  secrets = import ../lib/secrets.nix { inherit self; };
+  secrets = import "${self}/lib/secrets.nix" { inherit self; };
 in
 {
   flake.nixosConfigurations = with lib; {
@@ -19,7 +19,12 @@ in
         })."x86_64-linux";
 
       specialArgs = {
-        inherit inputs outputs secrets;
+        inherit
+          inputs
+          outputs
+          secrets
+          self
+          ;
       };
 
       modules = with inputs; [
@@ -35,7 +40,12 @@ in
 
     himeji = nixosSystem {
       specialArgs = {
-        inherit inputs outputs secrets;
+        inherit
+          inputs
+          outputs
+          secrets
+          self
+          ;
       };
 
       modules = with inputs; [
diff --git a/hosts/himeji/default.nix b/hosts/himeji/default.nix
index 3c3727b..0d5fc9e 100644
--- a/hosts/himeji/default.nix
+++ b/hosts/himeji/default.nix
@@ -1,10 +1,11 @@
+{ self, ... }:
 {
   imports = [
     ./hardware-configuration.nix
-    ../../disks/himeji.nix
-    ../../modules/core
-    ../../modules/options
-    ../../modules/server
+    "${self}/disks/himeji.nix"
+    "${self}/modules/core"
+    "${self}/modules/options"
+    "${self}/modules/server"
   ];
 
   config = {
diff --git a/hosts/kansai/default.nix b/hosts/kansai/default.nix
index 164f0d5..b1863e6 100644
--- a/hosts/kansai/default.nix
+++ b/hosts/kansai/default.nix
@@ -1,9 +1,10 @@
+{ self, ... }:
 {
   imports = [
     ./hardware-configuration.nix
-    ../../modules/core
-    ../../modules/desktop
-    ../../modules/options
+    "${self}/modules/core"
+    "${self}/modules/desktop"
+    "${self}/modules/options"
   ];
 
   networking.hostName = "kansai";