From fe4730b82c9633850672d24d32a4d94a05c3fabe Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Thu, 23 May 2024 12:45:16 -0500
Subject: [PATCH] use pixi as package instead of overlay

---
 flake.lock                   | 20 +++++++++++++++++---
 flake.nix                    |  1 -
 modules/languages/python.nix |  2 ++
 overlays/default.nix         |  1 -
 todo.md                      |  2 ++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 245f01f..865e734 100644
--- a/flake.lock
+++ b/flake.lock
@@ -625,11 +625,25 @@
         "type": "github"
       }
     },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1716330097,
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pixi": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_8",
         "pixi-source": "pixi-source"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 8f81e5d..bcc92c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,6 @@
     f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
 
     pixi.url = "github:daylinmorgan/pixi-flake";
-    pixi.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   nixConfig = {
diff --git a/modules/languages/python.nix b/modules/languages/python.nix
index 7f0ab9b..9b1e429 100644
--- a/modules/languages/python.nix
+++ b/modules/languages/python.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   config,
   lib,
   pkgs,
@@ -13,6 +14,7 @@ in
     environment.systemPackages =
       let
         python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
+        pixi = inputs.pixi.packages.${pkgs.system}.default;
       in
       with pkgs;
       [
diff --git a/overlays/default.nix b/overlays/default.nix
index f2fc7ce..f3ee3a4 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -11,7 +11,6 @@ let
 in
 {
   nixpkgs.overlays = defaultOverlays ++ [
-    inputs.pixi.overlays.default
     (final: _prev: {
       stable = import inputs.stable {
         system = final.system;
diff --git a/todo.md b/todo.md
index 98e7881..9fa1cc2 100644
--- a/todo.md
+++ b/todo.md
@@ -10,4 +10,6 @@
 
 - [ ] make desktop application file for win10 vm
 
+- [ ] find out why pixi on GHA is different from local (possibly from the fetch git step?)
+
 <!-- generated with <3 by daylinmorgan/todo -->