about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2024-03-11 17:26:22 -0700
committerFranck Cuny <franck@fcuny.net>2024-03-11 17:26:22 -0700
commit1248d431ff09c15df666b381059efb8884718a9b (patch)
tree7959ce50cd52a99998430b13d0e47feff9630789
parentreorganize common files for hosts (diff)
downloadworld-1248d431ff09c15df666b381059efb8884718a9b.tar.gz
switch to absolute path
-rw-r--r--nix/flake/hosts.nix10
-rw-r--r--nix/hosts/common/homebrew.nix (renamed from hosts/common/homebrew.nix)0
-rw-r--r--nix/hosts/common/macos.nix (renamed from hosts/common/macos.nix)0
-rw-r--r--nix/hosts/common/nix.nix (renamed from hosts/common/nix.nix)0
-rw-r--r--nix/hosts/mba/default.nix (renamed from hosts/work/default.nix)4
-rw-r--r--nix/hosts/work/default.nix (renamed from hosts/mba/default.nix)4
6 files changed, 9 insertions, 9 deletions
diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix
index a6390e5..36821b6 100644
--- a/nix/flake/hosts.nix
+++ b/nix/flake/hosts.nix
@@ -17,9 +17,9 @@ let
             };
           };
         }
-        ../../hosts/common/homebrew.nix
-        ../../hosts/common/macos.nix
-        ../../hosts/common/nix.nix
+        "${self}/nix/hosts/common/homebrew.nix"
+        "${self}/nix/hosts/common/macos.nix"
+        "${self}/nix/hosts/common/nix.nix"
         path
         {
           nixpkgs.overlays = [
@@ -35,8 +35,8 @@ in
   flake = mkMerge [
     {
       darwinConfigurations = {
-        mba-fcuny = mkDarwinConfig "aarch64-darwin" ../../hosts/mba;
-        HQ-C02FK3Q7MD6T = mkDarwinConfig "x86_64-darwin" ../../hosts/work;
+        mba-fcuny = mkDarwinConfig "aarch64-darwin" "${self}/nix/hosts/mba";
+        HQ-C02FK3Q7MD6T = mkDarwinConfig "x86_64-darwin" "${self}/nix/hosts/work";
       };
     }
   ];
diff --git a/hosts/common/homebrew.nix b/nix/hosts/common/homebrew.nix
index b358695..b358695 100644
--- a/hosts/common/homebrew.nix
+++ b/nix/hosts/common/homebrew.nix
diff --git a/hosts/common/macos.nix b/nix/hosts/common/macos.nix
index edc57a0..edc57a0 100644
--- a/hosts/common/macos.nix
+++ b/nix/hosts/common/macos.nix
diff --git a/hosts/common/nix.nix b/nix/hosts/common/nix.nix
index c828a16..c828a16 100644
--- a/hosts/common/nix.nix
+++ b/nix/hosts/common/nix.nix
diff --git a/hosts/work/default.nix b/nix/hosts/mba/default.nix
index 3db1e6f..d583df6 100644
--- a/hosts/work/default.nix
+++ b/nix/hosts/mba/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ self, ... }:
 {
   services.nix-daemon.enable = true;
 
@@ -9,5 +9,5 @@
   # Touch ID for sudo auth
   security.pam.enableSudoTouchIdAuth = true;
 
-  home-manager.users.fcuny = import ../../nix/profiles/home-manager/work.nix;
+  home-manager.users.fcuny = import "${self}/nix/profiles/home-manager/personal.nix";
 }
diff --git a/hosts/mba/default.nix b/nix/hosts/work/default.nix
index 5908a53..24cb95e 100644
--- a/hosts/mba/default.nix
+++ b/nix/hosts/work/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ self, ... }:
 {
   services.nix-daemon.enable = true;
 
@@ -9,5 +9,5 @@
   # Touch ID for sudo auth
   security.pam.enableSudoTouchIdAuth = true;
 
-  home-manager.users.fcuny = import ../../nix/profiles/home-manager/personal.nix;
+  home-manager.users.fcuny = import "${self}/nix/profiles/home-manager/work.nix";
 }