Merge 871440fb7e into 3d3cd87978

docs/release-notes/rl-0.8.md

@@ -362,8 +362,13 @@
 
 [rrvsh](https://github.com/rrvsh):
 
+[uv.nvim]: https://github.com/benomahony/uv.nvim
+
 - Add custom snippet support to `vim.snippets.luasnip`
 - Fix namespace of python-lsp-server by changing it to python3Packages
+- Add [uv.nvim] for integration with the uv Python package manager,
+  allowing automatic activation of virtual environments and
+  running code directly from Neovim. Available at `vim.languages.python.uv`.
 
 [Noah765](https://github.com/Noah765):
 

modules/plugins/languages/python.nix

@@ -11,6 +11,7 @@
   inherit (lib.lists) isList;
   inherit (lib.types) enum either listOf package str bool;
   inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 
   cfg = config.vim.languages.python;
 
@@ -225,6 +226,11 @@ in {
         '';
       };
     };
+
+    uv = {
+      enable = mkEnableOption "the uv.nvim plugin";
+      setupOpts = mkPluginSetupOption "uv.nvim." {};
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -261,5 +267,16 @@ in {
       vim.debugger.nvim-dap.enable = true;
       vim.debugger.nvim-dap.sources.python-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
     })
+
+    (mkIf cfg.uv.enable {
+      vim.lazy.plugins."uv.nvim" = {
+        package = "uv.nvim";
+        setupModule = "uv";
+        inherit (cfg.uv) setupOpts;
+        # Plugin should be loaded whenever we enter a buffer
+        # so it can load the uv virtual environment.
+        event = ["BufEnter"];
+      };
+    })
   ]);
 }

npins/sources.json

@@ -2565,6 +2565,19 @@
       "url": "https://github.com/mbbill/undotree/archive/0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f.tar.gz",
       "hash": "0kvv65dq3nlnmhl4xpjxkd0918p5blfzqfbfyq9jlnw0qb9qfqqi"
     },
+    "uv.nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "benomahony",
+        "repo": "uv.nvim"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "642e45d392a65fe15dbebd63444e45e21a38f883",
+      "url": "https://github.com/benomahony/uv.nvim/archive/642e45d392a65fe15dbebd63444e45e21a38f883.tar.gz",
+      "hash": "1l681q5d3c8hqr1vvb4rxs6y5a1fs3m3cx3v0n6lvmlcdbdn4mjb"
+    },
     "vim-dirtytalk": {
       "type": "Git",
       "repository": {