Build home in Linux, too

flake.lock

@@ -171,11 +171,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687163790,
-        "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=",
+        "lastModified": 1687871164,
+        "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337",
+        "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
         "type": "github"
       },
       "original": {
@@ -358,11 +358,11 @@
     },
     "nixunstable": {
       "locked": {
-        "lastModified": 1684749550,
-        "narHash": "sha256-0uqCE8cDYvQ53KbGXKB/kNV9u4fhU9A8j7PjceZ7Gq8=",
-        "owner": "NixOS",
+        "lastModified": 1687898314,
+        "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fc89970a268de31561c98a4b61e40b6f0636d50a",
+        "rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
         "type": "github"
       },
       "original": {

hosts/default.nix

@@ -3,27 +3,48 @@ let
 	wsl = args: (unstable (args // { extraMods = [ inputs.wsl.nixosModules.wsl ]; }));
 	unstable = args: (machine (args // { channel = inputs.nixunstable; }));
 	machine = {
-		system ? "x86_64-linux",
-		name,
 		channel ? inputs.nixstable,
-		extraMods ? []
+		extraMods ? [],
+		gnome ? false,
+		gui ? false,
+		name,
+		system ? "x86_64-linux"
 	}:
 	let
-		nixpkgs = channel;
-	in nixpkgs.lib.nixosSystem {
+		nixpkgs = import channel {
+			inherit system;
+		};
+	in channel.lib.nixosSystem {
 		inherit system;
+		specialArgs = { inherit nixpkgs; };
 		modules = [
-			{ nixpkgs.overlays = overlays; }
+			{
+				nixpkgs.overlays = overlays;
+				home-manager.useGlobalPkgs = true;
+				home-manager.useUserPackages = true;
+				home-manager.users.greg = import ../home/home.nix;
+				home-manager.extraSpecialArgs = {
+					inherit gnome gui inputs overlays;
+					home = "/home/greg";
+				};
+			}
 			inputs.agenix.nixosModules.default
+			inputs.hm.nixosModules.home-manager
 			../modules-all
 			../modules-linux
 			./${name}
 		] ++ extraMods;
-		specialArgs = { inherit nixpkgs; };
 	};
 in {
-	"2maccabees" = unstable { system = "aarch64-linux"; name = "2maccabees"; };
-	jude = unstable { name = "jude"; };
+	"2maccabees" = unstable {
+		system = "aarch64-linux";
+		name = "2maccabees";
+	};
+	jude = unstable {
+		name = "jude";
+		gnome = true;
+		gui = true;
+	};
 	icdm-root = unstable { name = "icdm-root"; };
 	linode = machine { name = "linode"; };
 	linodeeu = machine { name = "linodeeu"; };

modules-linux/gnome.nix

@@ -30,8 +30,8 @@ in with lib; {
 
 			# Enablement for Firefox
 			gnome = {
-				#gnome-browser-connector.enable = true;
-				chrome-gnome-shell.enable = true;
+				gnome-browser-connector.enable = true;
+				#chrome-gnome-shell.enable = true;
 				sushi.enable = true;
 				gnome-online-accounts.enable = true;
 			};

overlays/default.nix

@@ -1,9 +1,7 @@
 final: prev:
 
 let
-	cp = prev.python3.pkgs.callPackage;
-
-	myPackages = pypackages: with pypackages; with pkgs.my-py-addons; [
+	myPackages = pypackages: with pypackages; [
 		black
 		copier
 		dateutil
@@ -53,27 +51,22 @@ in rec {
 
 	## Testing adding python packages in the correct manner
 	pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [
-		(python-final: python-prev: {
-			django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {};
+		(python-final: python-prev: let cp = python-final.callPackage; in {
+			django-rapyd-modernauth = cp ./django-rapyd-modernauth.nix {};
 			xonsh-apipenv = cp ./xonsh-apipenv.nix {};
 			xonsh-direnv = cp ./xonsh-direnv.nix {};
+			copier =  cp ./copier.nix {
+				inherit (python-final)
+				    iteration-utilities
+				    jinja2-ansible-filters
+				    pyyaml-include;
+			};
+			iteration-utilities = cp ./iteration-utilities.nix {};
+			jinja2-ansible-filters = cp ./jinja2-ansible-filters.nix {};
+			pyyaml-include = cp ./pyyaml-include.nix {};
 		})
 	];
 
-	my-py-addons = rec {
-		copier =  cp ./copier.nix {
-			inherit iteration-utilities
-			        jinja2-ansible-filters
-			        pyyaml-include
-			;
-		};
-		iteration-utilities = cp ./iteration-utilities.nix {};
-		jinja2-ansible-filters = cp ./jinja2-ansible-filters.nix {};
-		pydantic = cp ./pydantic.nix {};
-		pyyaml-include = cp ./pyyaml-include.nix {};
-	};
-
-	#fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines;
 	brew = prev.callPackage ./homebrew.nix {};
 
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};