flake.lock

@@ -625,25 +625,11 @@
         "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_8",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "pixi-source": "pixi-source"
       },
       "locked": {

flake.nix

@@ -35,6 +35,7 @@
     f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
 
     pixi.url = "github:daylinmorgan/pixi-flake";
+    pixi.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   nixConfig = {

modules/languages/python.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   lib,
   pkgs,
@@ -14,7 +13,6 @@ in
     environment.systemPackages =
       let
         python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
-        pixi = inputs.pixi.packages.${pkgs.system}.default;
       in
       with pkgs;
       [

overlays/default.nix

@@ -11,6 +11,7 @@ let
 in
 {
   nixpkgs.overlays = defaultOverlays ++ [
+    inputs.pixi.overlays.default
     (final: _prev: {
       stable = import inputs.stable {
         system = final.system;

pkgs/oizys/oizys-go/cmd/root.go

@@ -38,7 +38,7 @@ var rootCmd = &cobra.Command{
 	Use:   "oizys",
 	Short: "nix begat oizys",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-    oizys.Set(flake, host, cacheName, verbose)
+		oizys.Update(flake, host, cacheName, verbose)
 		oizys.CheckFlake()
 	},
 }

pkgs/oizys/oizys-go/pkg/oizys.go

@@ -52,7 +52,7 @@ func (o *Oizys) Output() string {
 	)
 }
 
-func (o *Oizys) Set (
+func (o *Oizys) Update(
 	flake, host, cache string,
 	verbose bool,
 ) {
@@ -81,9 +81,9 @@ func terminalSize() (int, int) {
 }
 
 type packages struct {
-	desc  string
 	names []string
 	pad   int
+	desc  string
 }
 
 func parsePackages(lines []string, desc string) *packages {
@@ -171,14 +171,12 @@ func (o *Oizys) GitPull() {
 		os.Exit(1)
 	}
 
-  cmdOutput, err = o.git("pull").CombinedOutput()
-	if err != nil {
+	if cmdOutput, err := o.git("pull").CombinedOutput(); err != nil {
 		showFailedOutput(cmdOutput)
 		log.Fatal(err)
 	}
 }
 
-
 func parseDryRun(buf string) (*packages, *packages) {
 	lines := strings.Split(strings.TrimSpace(buf), "\n")
 	var parts [2][]string

todo.md

@@ -10,6 +10,4 @@
 
 - [ ] 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 -->