Merge remote-tracking branch 'origin/main' into compass

overlays/default.nix

@@ -3,7 +3,6 @@ final: prev:
 let
 	myPackages = pypackages: with pypackages; [
 		black
-		copier
 		dateutil
 		flake8
 		ipython
@@ -48,27 +47,27 @@ in rec {
 				    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 {};
-			xonsh-vox = cp ./xonsh-vox.nix {};
 		})
 	];
 
+	aacs = prev.callPackage ./aacs.nix {};
 	brew = prev.callPackage ./homebrew.nix {};
-
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	hms = prev.callPackage ./hms.nix {
 		pkgs = final.pkgs;
 	};
 	inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
+	jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
+	libbluray = prev.libbluray.override {
+		withAACS = true;
+		withBDplus = true;
+	};
 	setup-ssh = prev.callPackage ./setup-ssh.nix {
 		pkgs = final.pkgs;
 	};
+	template = prev.callPackage ./template.nix { };
 
-	xonsh = (prev.callPackage ./xonsh.nix {
-		#inherit (final) lib coreutils python3Packages git;
-	}).overridePythonAttrs (old: rec{
+	xonsh = prev.xonsh.overridePythonAttrs (old: rec{
 		python3 = final.gregpy;
 		propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
 			xonsh-apipenv
@@ -77,9 +76,9 @@ in rec {
 		];
 	});
 
-	bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
-	gnucash = macOver ./mac/gnucash.nix "gnucash";
-	handbrake = macOver ./mac/handbrake.nix "handbrake";
-	onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
-	vlc = macOver ./mac/vlc.nix "vlc";
+	#bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
+	#gnucash = macOver ./mac/gnucash.nix "gnucash";
+	#handbrake = macOver ./mac/handbrake.nix "handbrake";
+	#onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
+	#vlc = macOver ./mac/vlc.nix "vlc";
 }