From 5f4edfeb2a98b72f6f5d9998af0f933bfd1a0eef Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Thu, 28 Oct 2021 09:46:12 +0200
Subject: [PATCH] Move gitpkgs into pkg overrides.

---
 pkgs/nixpkgs.nix       |  1 +
 pkgsets/emacs.nix      |  1 -
 pkgsets/mail_utils.nix |  4 +---
 pkgsets/python3.nix    | 19 +++++++++++++------
 services/desktop.nix   |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/nixpkgs.nix b/pkgs/nixpkgs.nix
index 82a0048..25f335a 100644
--- a/pkgs/nixpkgs.nix
+++ b/pkgs/nixpkgs.nix
@@ -12,6 +12,7 @@ in {
       theme_sddm_midnight = callPackage ./sddm_midnight { };
       xdiskusage = callPackage ./xdiskusage { };
       django3 = pkgs.python3Packages.callPackage ./django3 { };
+      gitpkgs = import /nixpkgs {};
     };
   };
 }
diff --git a/pkgsets/emacs.nix b/pkgsets/emacs.nix
index a7a21a8..dcbe93a 100644
--- a/pkgsets/emacs.nix
+++ b/pkgsets/emacs.nix
@@ -3,7 +3,6 @@
 with lib;
 
 let
-  gitpkgs = import /nixpkgs {};
   fn = import (toString ../fn.nix) { inherit lib; };
   modefiles = fn.lst { p = (toString ./emacs); b = true; };
 in rec {
diff --git a/pkgsets/mail_utils.nix b/pkgsets/mail_utils.nix
index f3c4f42..e7b1dfb 100644
--- a/pkgsets/mail_utils.nix
+++ b/pkgsets/mail_utils.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
-let
-  gitpkgs = import /nixpkgs {};
-in {
+{
   config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
     fetchmail
     isync
diff --git a/pkgsets/python3.nix b/pkgsets/python3.nix
index ba555f4..f6169c0 100644
--- a/pkgsets/python3.nix
+++ b/pkgsets/python3.nix
@@ -4,10 +4,10 @@ with lib;
 
 let
   fn = import ../fn.nix { inherit lib; };
-  gitpkgs = import /nixpkgs {};
+  # ocv3 = pkgs.python38Packages.opencv3.override { enableGtk2 = true; enableFfmpeg = true; enableGStreamer = true; };
 in {
-  config.machine.pkgsets.python3.pkgwrap = (pkgs.python38Full.withPackages (ps: with ps; (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
-  config.machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [
+  config.machine.pkgsets.python3.pkgwrap = (pkgs.gitpkgs.python38.withPackages (ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
+  config.machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [
     GitPython
     bpython
     configparser
@@ -15,16 +15,21 @@ in {
     epc
     flake8
     genanki
+    matplotlib ipywidgets
+    python-docx
     mypy
     numpy
-    opencv3
+    mysqlclient
+    pandas
+    # ocv3 scipy scikitimage (imutils.override { opencv3 = ocv3; })
     paho-mqtt
     pep8
     pillow
     pip
     plotly
     pyflakes
-    pygame pygame_sdl2
+    pypdf2
+    # pygame pygame_sdl2
     pylama
     pylint toml
     pyopengl
@@ -34,10 +39,12 @@ in {
     schedule
     scipy
     selenium
+    setuptools
     telegram
     tkinter
     toolz
+    tifffile
     virtualenv
-    xdot
+    # xdot
   ];
 }
diff --git a/services/desktop.nix b/services/desktop.nix
index b461b5b..cdd7b45 100644
--- a/services/desktop.nix
+++ b/services/desktop.nix
@@ -52,5 +52,5 @@ in mkIf (elem "desktop" cfg.services) {
       horizontalScrolling = true;
     };
   };
-  machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [ py3status pytz tzlocal ];
+  machine.pkgsets.python3.pkgs = with pkgs.gitpkgs.python38Packages; [ py3status pytz tzlocal ];
 }