From 2dff1f5da75bf192454e6d32dc1f6c4cbceb9ce6 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Wed, 4 Jan 2023 00:48:44 -0800
Subject: [PATCH] fix nixos-rebuild & home-manager errors

---
 flake.nix | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index c381157..400ea9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,13 +71,15 @@
         };
       };
     };
-    pkgs = import nixpkgs {
-      overlays = [nur.overlay (utils.lib.genPkgOverlay neovim "neovim")];
-    };
+    pkgsForSystem = system:
+      import nixpkgs {
+        overlays = [nur.overlay (utils.lib.genPkgOverlay neovim "neovim")];
+        inherit system;
+      };
   in {
     nixosConfigurations = {
       skynet = nixpkgs.lib.nixosSystem {
-        inherit pkgs;
+        pkgs = pkgsForSystem "x86_64-linux";
         system = "x86_64-linux";
         modules =
           modules.nixos.common
@@ -93,7 +95,7 @@
       };
 
       wsl = nixpkgs.lib.nixosSystem {
-        inherit pkgs;
+        pkgs = pkgsForSystem "x86_64-linux";
         system = "x86_64-linux";
         modules = [
           nixos-wsl.nixosModules.wsl
@@ -105,15 +107,24 @@
     };
 
     homeConfigurations.relms = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-
-      modules = modules.home.common ++ modules.home.dev ++ modules.home.gui;
+      pkgs = pkgsForSystem "x86_64-linux";
+      modules =
+        modules.home.common
+        ++ modules.home.dev
+        ++ modules.home.gui
+        ++ [
+          {
+            home = {
+              homeDirectory = "/home/relms";
+              username = "relms";
+            };
+          }
+        ];
     };
 
     nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
-      inherit pkgs;
+      pkgs = pkgsForSystem "aarch64-linux";
       system = "aarch64-linux";
-
       modules = [./devices/pixel/base.nix];
     };