Fix recursion and coiper builds

home/home.nix

@@ -35,6 +35,7 @@
 	home.stateVersion = "23.05";
 	home.packages = with pkgs; [
 		bitwarden-cli
+		copier
 		diffutils
 		findutils
 		gh
@@ -53,5 +54,5 @@
 		tree
 		unzip
 		wget
-	] ++ (if (pkgs.copier.version == "9.1.0") then [ pkgs.copier ] else []);
+	];
 }

modules/default.nix

@@ -1,13 +1,10 @@
 { pkgs, lib, ... }:
 
 let
-	inherit (lib.strings) hasSuffix;
-	system = pkgs.system;
-	inherit (pkgs.stdenv) isDarwin isLinux;
 in {
 	imports = [
-	]
+		./linux
-	++ (if (isLinux) then [./linux] else []);
+	];
 
 	# Enable flakes
 	nix = {

overlays/default.nix

@@ -26,6 +26,8 @@ let
 
 	buildFirefoxXpiAddon = final.nur.repos.rycee.lib.buildFirefoxXpiAddon;
 
+	is2405 = prev.lib.versionAtLeast prev.lib.version "24.05";
+
 in rec {
 	gregpy = myPython;
 
@@ -44,8 +46,8 @@ in rec {
 	aacs = prev.callPackage ./aacs.nix {};
 	brew = prev.callPackage ./homebrew.nix {};
 	configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
-	copier = prev.copier.overridePythonAttrs (old: {
+	copier = (if is2405 then prev.copier.overridePythonAttrs (old: {
-		version = "9.1.1";
+		version = "9.1.0";
 		src = final.fetchFromGitHub {
 			owner = "copier-org";
 			repo = "copier";
@@ -53,7 +55,7 @@ in rec {
 			hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA=";
 			postFetch = "rm $out/tests/demo/doc/ma*ana.txt";
 		};
-	});
+	}) else prev.copier);
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	hms = prev.callPackage ./hms {
 		pkgs = final.pkgs;