From 5529501df9e4f40542657c8cc9fc3b57e3a5dd65 Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <mohammadrafiq567@gmail.com>
Date: Fri, 4 Apr 2025 19:29:23 +0800
Subject: [PATCH] refactor: switch nvf input back to upstream

---
 flake.lock | 47 +++++++++++++++++++++++------------------------
 flake.nix  |  3 +--
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 489cbc6..791f5fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -267,11 +267,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743360001,
-        "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=",
+        "lastModified": 1743717835,
+        "narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d",
+        "rev": "66a6ec65f84255b3defb67ff45af86c844dd451b",
         "type": "github"
       },
       "original": {
@@ -394,11 +394,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743167577,
-        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
+        "lastModified": 1743420942,
+        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
+        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
         "type": "github"
       },
       "original": {
@@ -409,11 +409,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743095683,
-        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
+        "lastModified": 1743583204,
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
         "type": "github"
       },
       "original": {
@@ -477,16 +477,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1743568014,
-        "narHash": "sha256-yGegHHE/dIhFFgDIwSVM8LsgWuNaL5lxKaWQyPF2LJs=",
-        "owner": "rrvsh",
+        "lastModified": 1743765431,
+        "narHash": "sha256-qNx2j05x97FuDnGEtj6UW3vWN1t7TaDY0n0NKyDtQuU=",
+        "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "f6511e77c41bb9c0818b06e458c5f6a25ce7b3e2",
+        "rev": "68346ebedea3f33ca93cf9b77ca69562660faf2d",
         "type": "github"
       },
       "original": {
-        "owner": "rrvsh",
-        "ref": "fix/pylsp-pkgs",
+        "owner": "NotAShelf",
         "repo": "nvf",
         "type": "github"
       }
@@ -538,11 +537,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743305778,
-        "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=",
+        "lastModified": 1743756170,
+        "narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8e873886bbfc32163fe027b8676c75637b7da114",
+        "rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
         "type": "github"
       },
       "original": {
@@ -561,11 +560,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743308176,
-        "narHash": "sha256-xiHVIJsxj3tknObHzfKsWHQ0N38zyFsb8edB3oXDOxg=",
+        "lastModified": 1743595372,
+        "narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "567e5b6ee6d7433261f16b400e424a6bd5c8c8b3",
+        "rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
         "type": "github"
       },
       "original": {
@@ -604,11 +603,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1743347063,
-        "narHash": "sha256-2wCoQhyHo3lIRkm/Y4d2ViknCQHhoS2qGvjm//Noo90=",
+        "lastModified": 1743733287,
+        "narHash": "sha256-Yg2225KQ3hM6VJSPLRz7/+Ci3A9t4c/L5GZDFD/MGRU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "eede71351571c60b87dbf9eefb7ddf2b11fb1354",
+        "rev": "ac8dd8b1a6bc2d367f7ec8e39e0032f03ae9a458",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f9292e7..094f37c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,8 +127,7 @@
         nixpkgs.follows = "nixpkgs";
         systems.follows = "systems";
       };
-      #FIXME: Change back to NotAShelf/nvf once fix is merged
-      url = "github:rrvsh/nvf/fix/pylsp-pkgs";
+      url = "github:NotAShelf/nvf";
     };
     sops-nix = {
       inputs.nixpkgs.follows = "nixpkgs";