From 8e2cd7575f4294ff08b1a3ec99c1016cebc22a85 Mon Sep 17 00:00:00 2001
From: greg-compass <gregory.hellings@compass.com>
Date: Mon, 12 Sep 2022 10:05:07 -0500
Subject: [PATCH] Darwin updates

Add Python modules that are needed for work and other things
Move import of Bash into Xonsh to the head in order to avoid issues with
being overwritten by Bash defaults
---
 home/xonsh.nix                     |  6 +++---
 hosts/work/default.nix             | 11 +++++++++++
 modules-all/automatic/programs.nix |  9 +++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/home/xonsh.nix b/home/xonsh.nix
index 4e7e963..9d9f9cd 100644
--- a/home/xonsh.nix
+++ b/home/xonsh.nix
@@ -47,6 +47,9 @@
 		};
 
 		configHeader = ''
+if  '__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ''${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE:
+    source-bash /etc/bashrc
+
 # set -e == $RAISE_SUBPROC_ERROR = True
 # set -x == trace on; $XONSH_TRACE_SUBPROC = True
 # $? == _.rtn
@@ -126,9 +129,6 @@ import builtins
 builtins.true = True
 builtins.false = False
 builtins.null = None
-
-if  '__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ''${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE:
-    source-bash /etc/bashrc
 '';
 	};
 }
diff --git a/hosts/work/default.nix b/hosts/work/default.nix
index a67ca90..a6e6219 100644
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -1,4 +1,15 @@
 { pkgs, ... }:
 
 {
+	#greg.pypackages = with pkgs; [
+	#	datadog-api-client
+	#	datadog
+	#	dateutil
+	#	ipython
+	#	pyyaml
+	#	responses
+	#	ruamel-yaml
+	#	typing-extensions
+	#	virtualenv
+	#];
 }
diff --git a/modules-all/automatic/programs.nix b/modules-all/automatic/programs.nix
index f2f273a..55763ae 100644
--- a/modules-all/automatic/programs.nix
+++ b/modules-all/automatic/programs.nix
@@ -2,7 +2,16 @@
 
 let
 	myPackages = pypackages: with pypackages; [
+		pkgs.datadog-api-client
 		pkgs.xonsh-direnv
+		datadog
+		dateutil
+		ipython
+		pyyaml
+		responses
+		ruamel-yaml
+		typing-extensions
+		virtualenv
 	];
 
 	myPython = pkgs.python3.withPackages myPackages;