Mac updates galore

Patch up my new structure to support Macs as well
Add Firefox for Mac overlay
Combine Python version definitions
Toy around with Vim settings

modules-all/automatic/programs.nix

@@ -1,13 +1,6 @@
 { pkgs, ... }:
 
-let
-	myPackages = pypackages: with pypackages; [
-		pkgs.my-py-addons.xonsh-direnv
-		virtualenv
-	];
-
-	myPython = pkgs.python3.withPackages myPackages;
-in {
+{
 	# Base packages that need to be in all my hosts
 	environment.systemPackages = with pkgs; [
 		agenix
@@ -16,11 +9,11 @@ in {
 		diffutils
 		git
 		gnupatch
+		gregpy
 		findutils
 		hms # My own home manager switcher
 		home-manager
 		htop
-		myPython
 		nano
 		pwgen
 		transcrypt