From 0d15d7179e6d26971eef83e5bb78cb9df1bc3ab5 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Sun, 10 Nov 2024 16:07:33 -0500
Subject: [PATCH] nixpkgs/staging-next to get neovide working again

---
 nix/home-manager/flake.lock | 54 +++++++++++++------------------------
 nix/home-manager/flake.nix  |  8 +++---
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index 7a18b66..111ae13 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -23,11 +23,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1730788380,
-        "narHash": "sha256-jzniRMqEjqYC7yyx0nIiiEnQ4xlZQMnA7R6mvyYZER8=",
+        "lastModified": 1731220256,
+        "narHash": "sha256-7BWlJbGZ6rXtKOfgZYDQerygXco1YyYzXciuLN0UPP4=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "280efe0e9b7b824518091a5aff76065785f81649",
+        "rev": "61c51d848301cefc1535856f9e68ad6e01a5c970",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730633670,
-        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
+        "lastModified": 1731235328,
+        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
+        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
         "type": "github"
       },
       "original": {
@@ -144,22 +144,6 @@
         "type": "github"
       }
     },
-    "miseNixPkgs": {
-      "locked": {
-        "lastModified": 1729718832,
-        "narHash": "sha256-2eVW2pvSSQuQw6AjgFhYCzneXDPme8KJE82DxUUmbKo=",
-        "owner": "konradmalik",
-        "repo": "nixpkgs",
-        "rev": "5332c996ac4538b1c22935629a5641ff9b1cade7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "konradmalik",
-        "ref": "mise",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nix-flake-tests": {
       "locked": {
         "lastModified": 1677844186,
@@ -204,11 +188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730604744,
-        "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
+        "lastModified": 1731209121,
+        "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
+        "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
         "type": "github"
       },
       "original": {
@@ -262,11 +246,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1730643939,
-        "narHash": "sha256-WeLdOsqeCp+njIhqqxysfudQumcfAqBzbBLzjOjkWIA=",
+        "lastModified": 1731248492,
+        "narHash": "sha256-msGgH4xdvCBj48MFDlBLqZQVw6jbZUjRo0pXce+EvuM=",
         "owner": "NixNeovim",
         "repo": "NixNeovimPlugins",
-        "rev": "8fc69a29d16d6145c71f2358c78d2a7ef050a941",
+        "rev": "3a9451b520b2702fab908207961812780fc49495",
         "type": "github"
       },
       "original": {
@@ -292,15 +276,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1730812445,
-        "narHash": "sha256-Ze+W/wtEMeI8w9WazlGvOiwg9P7+PyzZk3IapbDIBGs=",
+        "lastModified": 1731261838,
+        "narHash": "sha256-J6t1AxapM1ukQtC+6EJoDJGp+RUlAI7mlLZhhrKZXeA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "263dc0c329c55980df9de0cfae9510b21ac4b942",
+        "rev": "aa759748dbbe04d93f1b8f1b1c525d4c42a772ca",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "staging-next",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -385,7 +370,6 @@
         "fenix": "fenix",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "miseNixPkgs": "miseNixPkgs",
         "nix-index-database": "nix-index-database",
         "nixneovim": "nixneovim",
         "nixneovimplugins": "nixneovimplugins",
@@ -397,11 +381,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1730749868,
-        "narHash": "sha256-b8UMpLh61z6T4J1NObustAuFGoJiAKBTaPTrEf3Amts=",
+        "lastModified": 1731056261,
+        "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "b51f9bc736dc0472481a47d7c05de2901323e543",
+        "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b",
         "type": "github"
       },
       "original": {
diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix
index 99a7682..4026e45 100644
--- a/nix/home-manager/flake.nix
+++ b/nix/home-manager/flake.nix
@@ -8,8 +8,8 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs = {url = "github:nixos/nixpkgs";};
-    miseNixPkgs = {url = "github:konradmalik/nixpkgs/mise";};
+    nixpkgs = {url = "github:nixos/nixpkgs/staging-next";};
+    # neovidenixpkgs = {url = "github:nixos/nixpkgs/staging-next";};
     flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -67,7 +67,7 @@
     zjstatus,
     fenix,
     wezterm,
-    miseNixPkgs,
+    # neovidenixpkgs,
     ...
   }: let
     supportedSystems = ["aarch64-darwin" "x86_64-linux"];
@@ -88,7 +88,7 @@
                 then inputs.wezterm.packages.${prev.system}.default
                 else prev.wezterm;
             })
-            (_final: prev: {inherit (miseNixPkgs.legacyPackages.${prev.system}) mise;})
+            # (_final: prev: {inherit (neovidenixpkgs.legacyPackages.${prev.system}) neovide;})
             nixneovimplugins.overlays.default
             fenix.overlays.default
           ];