From 350641dd14fcb579450965554e2586f0cd19edfd Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 3 Dec 2022 14:53:18 -0500
Subject: [PATCH] expose myuser

---
 nix-darwin/default.nix | 19 ++++++++++---------
 nixos/default.nix      | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index 8a4f968..ff803c1 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -16,9 +16,19 @@
           };
         })
       ];
+      myself = {
+        home-manager.users.${config.people.myself} = { pkgs, ... }: {
+          imports = [
+            self.homeModules.common-darwin
+            ../home/shellcommon.nix
+            ../home/git.nix
+          ];
+        };
+      };
       default.imports = [
         self.darwinModules.common
         self.darwinModules.home
+        self.darwinModules.myself
       ];
     };
     lib-darwin.mkMacosSystem = inputs.darwin.lib.darwinSystem rec {
@@ -30,15 +40,6 @@
       modules = [
         self.darwinModules.default
         ../systems/darwin.nix
-        {
-          home-manager.users.${config.people.myself} = { pkgs, ... }: {
-            imports = [
-              self.homeModules.common-darwin
-              ../home/shellcommon.nix
-              ../home/git.nix
-            ];
-          };
-        }
       ];
     };
   };
diff --git a/nixos/default.nix b/nixos/default.nix
index 5fbf658..0e1079b 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -31,9 +31,19 @@
           };
         }
       ];
+      myself = {
+        home-manager.users.${config.people.myself} = { pkgs, ... }: {
+          imports = [
+            self.homeModules.common-linux
+            ../home/shellcommon.nix
+            ../home/git.nix
+          ];
+        };
+      };
       default.imports = [
         self.nixosModules.common
         self.nixosModules.home
+        self.nixosModules.myself
         ./self-ide.nix
         ./takemessh
         ./current-location.nix
@@ -46,15 +56,6 @@
       specialArgs = { inherit system inputs; };
       modules = [
         self.nixosModules.default
-        {
-          home-manager.users.${config.people.myself} = { pkgs, ... }: {
-            imports = [
-              self.homeModules.common-linux
-              ../home/shellcommon.nix
-              ../home/git.nix
-            ];
-          };
-        }
       ] ++ extraModules;
     };
   };