From 8a4d6ba1cb7314d8a45a78ba672bd293fd44ecd6 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 27 Jun 2024 00:26:29 +0200
Subject: [PATCH] Add python dependencies

---
 home/programs/terminal/coding/python/default.nix |  1 +
 home/programs/terminal/coding/python/mypy.nix    | 14 ++++++++++++++
 home/programs/terminal/coding/python/poetry.nix  |  5 +++++
 home/programs/terminal/coding/python/python.nix  | 10 +---------
 home/programs/terminal/default.nix               |  1 +
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 home/programs/terminal/coding/python/mypy.nix

diff --git a/home/programs/terminal/coding/python/default.nix b/home/programs/terminal/coding/python/default.nix
index c35e3d0..1bf124b 100644
--- a/home/programs/terminal/coding/python/default.nix
+++ b/home/programs/terminal/coding/python/default.nix
@@ -5,6 +5,7 @@
     ./poetry.nix
     ./rye.nix
     ./pyright.nix
+    ./mypy.nix
     ./ruff.nix
   ];
 }
diff --git a/home/programs/terminal/coding/python/mypy.nix b/home/programs/terminal/coding/python/mypy.nix
new file mode 100644
index 0000000..1d086f5
--- /dev/null
+++ b/home/programs/terminal/coding/python/mypy.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.coding.python;
+in {
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [ python312Packages.mypy ];
+  };
+}
diff --git a/home/programs/terminal/coding/python/poetry.nix b/home/programs/terminal/coding/python/poetry.nix
index c3356fe..3047eeb 100644
--- a/home/programs/terminal/coding/python/poetry.nix
+++ b/home/programs/terminal/coding/python/poetry.nix
@@ -14,6 +14,11 @@ in {
       settings = {
         virtualenvs = {
           in-project = true;
+
+          # use python the version of python that's globally installed on the system
+          # and exists in PATH, instead of the python version poetry was installed
+          # with. Annoyingly, there's no good way to override the python version at
+          # which NixOS will built poetry here, so this is the next best thing.
           prefer-active-python = true;
         };
       };
diff --git a/home/programs/terminal/coding/python/python.nix b/home/programs/terminal/coding/python/python.nix
index 703b945..f4628e2 100644
--- a/home/programs/terminal/coding/python/python.nix
+++ b/home/programs/terminal/coding/python/python.nix
@@ -9,14 +9,6 @@
   cfg = osConfig.myOptions.home-manager.programs.coding.python;
 in {
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      python38
-      python39
-      python310
-      python311
-      python312
-      python313
-    ];
+    home.packages = with pkgs; [ python312 ];
   };
 }
-
diff --git a/home/programs/terminal/default.nix b/home/programs/terminal/default.nix
index b142bdf..8d41a45 100644
--- a/home/programs/terminal/default.nix
+++ b/home/programs/terminal/default.nix
@@ -5,5 +5,6 @@ _: {
     ./editors
     ./file-managers
     ./emulators
+    ./coding
   ];
 }