From 8472de8993ec181837bfaf068263610ded34e0b0 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 3 Dec 2022 14:02:54 -0500
Subject: [PATCH] No need for initExtra

---
 home/default.nix       |  6 ++++++
 nix-darwin/default.nix | 12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 0be1555..64491cc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -23,7 +23,13 @@
       imports = [
         self.homeModules.common
       ];
+
       programs.zsh.enable = true;
+      # To put nix and home-manager-installed packages in PATH.
+      home.sessionPath = [
+        "/etc/profiles/per-user/$USER/bin"
+        "/run/current-system/sw/bin"
+      ];
     };
   };
 }
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index 74d7741..6b7134b 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -15,11 +15,10 @@
           };
         })
       ];
-      default.imports =
-        [
-          self.darwinModules.common
-        ] ++
-        self.darwinModules.home.imports;
+      default.imports = [
+        self.darwinModules.common
+        self.darwinModules.home
+      ];
     };
     lib-darwin.mkMacosSystem = userName: inputs.darwin.lib.darwinSystem rec {
       system = "aarch64-darwin";
@@ -40,9 +39,6 @@
                 userEmail = "srid@srid.ca";
               })
             ];
-            programs.zsh.initExtra = ''
-              export PATH=/etc/profiles/per-user/${userName}/bin:/run/current-system/sw/bin/:$PATH
-            '';
           };
         }
       ];