From 5e3f4fd77d02239754b0c80eed90de9a01affa14 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 3 Dec 2022 15:00:43 -0500
Subject: [PATCH] belongs here more

---
 home/default.nix       | 88 ++++++++++++++++++++++++++++--------------
 nix-darwin/default.nix | 14 +------
 nixos/default.nix      | 14 +------
 3 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 64491cc..2baede9 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,34 +1,64 @@
-{ self, inputs, ... }:
+{ self, inputs, config, ... }:
 {
-  flake.homeModules = {
-    common = {
-      home.stateVersion = "22.11";
-      imports = [
-        ./tmux.nix
-        ./neovim.nix
-        ./emacs.nix
-        ./starship.nix
-        ./terminal.nix
-        ./direnv.nix
-      ];
-    };
-    common-linux = {
-      imports = [
-        self.homeModules.common
-        ./vscode-server.nix
-      ];
-      programs.bash.enable = true;
-    };
-    common-darwin = {
-      imports = [
-        self.homeModules.common
-      ];
+  flake = {
+    homeModules = {
+      common = {
+        home.stateVersion = "22.11";
+        imports = [
+          ./tmux.nix
+          ./neovim.nix
+          ./emacs.nix
+          ./starship.nix
+          ./terminal.nix
+          ./direnv.nix
+        ];
+      };
+      common-linux = {
+        imports = [
+          self.homeModules.common
+          ./vscode-server.nix
+        ];
+        programs.bash.enable = true;
+      };
+      common-darwin = {
+        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"
+        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"
+        ];
+      };
+    };
+    nixosModules.home-manager = {
+      imports = [
+        inputs.home-manager.nixosModules.home-manager
+        ({
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            system = "x86_64-linux";
+            flake = { inherit config; };
+          };
+        })
+      ];
+    };
+    darwinModules.home-manager = {
+      imports = [
+        inputs.home-manager.darwinModules.home-manager
+        ({
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = {
+            inherit inputs;
+            system = "aarch64-darwin";
+            flake = { inherit config; };
+          };
+        })
       ];
     };
   };
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index eaf1b35..a1804e8 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -4,18 +4,6 @@
   flake = {
     darwinModules = {
       common = self.nixosModules.common;
-      home.imports = [
-        inputs.home-manager.darwinModules.home-manager
-        ({
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = {
-            inherit inputs;
-            system = "aarch64-darwin";
-            flake = { inherit config; };
-          };
-        })
-      ];
       myself = {
         home-manager.users.${config.people.myself} = { pkgs, ... }: {
           imports = [
@@ -27,7 +15,7 @@
       };
       default.imports = [
         self.darwinModules.common
-        self.darwinModules.home
+        self.darwinModules.home-manager
         self.darwinModules.myself
       ];
     };
diff --git a/nixos/default.nix b/nixos/default.nix
index f249724..db2474a 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -7,18 +7,6 @@
       common.imports = [
         ./caches
       ];
-      home.imports = [
-        inputs.home-manager.nixosModules.home-manager
-        ({
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = {
-            inherit inputs;
-            system = "x86_64-linux";
-            flake = { inherit config; };
-          };
-        })
-      ];
       other-people = {
         # Temporarily sharing with Uday.
         users.users.uday.isNormalUser = true;
@@ -40,7 +28,7 @@
       };
       default.imports = [
         self.nixosModules.common
-        self.nixosModules.home
+        self.nixosModules.home-manager
         self.nixosModules.myself
         ./self-ide.nix
         ./takemessh