From 715f84ee83409197da40a69cfc8e910af95bbb46 Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Sun, 29 Jun 2025 17:08:41 +0800
Subject: [PATCH] feat(nvf): update nvf to use rrvsh fork with uv enabled

---
 flake.lock                                            | 11 ++++++-----
 flake.nix                                             |  2 +-
 .../x86_64-linux/rafiq/cli/editor/_nvf/languages.nix  |  2 ++
 homes/x86_64-linux/rafiq/cli/editor/default.nix       | 10 ----------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8fbe0e0..0e4b783 100644
--- a/flake.lock
+++ b/flake.lock
@@ -836,15 +836,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1750842150,
-        "narHash": "sha256-slD1Nzr7SStRhQgC1WmrIsgrgwgRyag2MAxCSrjrxKg=",
-        "owner": "notashelf",
+        "lastModified": 1751187535,
+        "narHash": "sha256-AMNouwcg9qSG/DI0JXoxZdjtcxfSErVaIsdQn4Q893k=",
+        "owner": "rrvsh",
         "repo": "nvf",
-        "rev": "f9ee813a230e1c0ba0e1a13e1747fd1b996f08dc",
+        "rev": "871440fb7e5dc9d4abf59a8577bbbf7bba63bff7",
         "type": "github"
       },
       "original": {
-        "owner": "notashelf",
+        "owner": "rrvsh",
+        "ref": "uv-nvim",
         "repo": "nvf",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index ad93ba5..b339143 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
     nvf.inputs.nil.follows = "nil";
     nvf.inputs.nixpkgs.follows = "nixpkgs";
     nvf.inputs.systems.follows = "systems";
-    nvf.url = "github:notashelf/nvf";
+    nvf.url = "github:rrvsh/nvf/uv-nvim";
     python-flexseal.inputs.flake-utils.follows = "flake-utils";
     python-flexseal.inputs.nixpkgs.follows = "nixpkgs";
     python-flexseal.url = "github:Janrupf/python-flexseal";
diff --git a/homes/x86_64-linux/rafiq/cli/editor/_nvf/languages.nix b/homes/x86_64-linux/rafiq/cli/editor/_nvf/languages.nix
index cc3dd8c..1eb16fb 100644
--- a/homes/x86_64-linux/rafiq/cli/editor/_nvf/languages.nix
+++ b/homes/x86_64-linux/rafiq/cli/editor/_nvf/languages.nix
@@ -23,6 +23,8 @@
     enable = true;
     format.type = "ruff";
     lsp.server = "pyright";
+    uv.enable = true;
+    uv.setupOpts.picker_integration = true;
   };
   rust.enable = true;
   rust.crates.enable = true;
diff --git a/homes/x86_64-linux/rafiq/cli/editor/default.nix b/homes/x86_64-linux/rafiq/cli/editor/default.nix
index 4f4c5ee..c03651f 100644
--- a/homes/x86_64-linux/rafiq/cli/editor/default.nix
+++ b/homes/x86_64-linux/rafiq/cli/editor/default.nix
@@ -7,16 +7,6 @@ in
   persistDirs = singleton ".local/share/nvf";
   programs.nvf.enable = true;
   programs.nvf.settings.vim = {
-    lazy.plugins = {
-      "uv.nvim" = {
-        # TODO: upstream this
-        package = pkgs.vimPlugins.uv-nvim;
-        setupModule = "uv";
-        setupOpts.picker_integration = true;
-        event = [ "BufEnter" ];
-        after = "print('uv.nvim loaded')";
-      };
-    };
     hideSearchHighlight = true;
     syntaxHighlighting = true;
     telescope.enable = true;