From 206f84c4da1158c1b6dc6a3e4af926b066d8ae0e Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 16 Sep 2022 11:04:22 -0500
Subject: [PATCH] Move most of Python to home-manager

---
 home/home.nix                      | 20 ++++++++++++++++++++
 modules-all/automatic/programs.nix | 10 +---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 2486da8..35732fc 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -4,6 +4,24 @@ let
 	guiImports = if gui then
 		[ ./gui ] else [];
 
+	myPackages = pypackages: with pypackages; [
+		pkgs.datadog-api-client
+		pkgs.xonsh-direnv
+		black
+		datadog
+		dateutil
+		flake8
+		ipython
+		pyyaml
+		responses
+		ruamel-yaml
+		tox
+		typing-extensions
+		virtualenv
+	];
+
+	myPython = pkgs.python3.withPackages myPackages;
+
 in {
 	imports = [
 		./modules
@@ -27,7 +45,9 @@ in {
 		git
 		gnupatch
 		hms
+		htop
 		libtheora
+		myPython
 		nano
 		tmux
 		transcrypt
diff --git a/modules-all/automatic/programs.nix b/modules-all/automatic/programs.nix
index efca97f..7207086 100644
--- a/modules-all/automatic/programs.nix
+++ b/modules-all/automatic/programs.nix
@@ -2,15 +2,7 @@
 
 let
 	myPackages = pypackages: with pypackages; [
-		pkgs.datadog-api-client
 		pkgs.xonsh-direnv
-		datadog
-		dateutil
-		ipython
-		pyyaml
-		responses
-		ruamel-yaml
-		typing-extensions
 		virtualenv
 	];
 
@@ -29,10 +21,10 @@ in {
 		home-manager
 		htop
 		myPython
+		nano
 		pwgen
 		transcrypt
 		unzip
-		vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
 		wget
 	];
 }