mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-11-03 20:22:21 +00:00 
			
		
		
		
	Merge 871440fb7e into 9aa9088564
		
	This commit is contained in:
		
				commit
				
					
						53f142d40b
					
				
			
		
					 3 changed files with 35 additions and 0 deletions
				
			
		| 
						 | 
					@ -356,8 +356,13 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[rrvsh](https://github.com/rrvsh):
 | 
					[rrvsh](https://github.com/rrvsh):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[uv.nvim]: https://github.com/benomahony/uv.nvim
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Add custom snippet support to `vim.snippets.luasnip`
 | 
					- Add custom snippet support to `vim.snippets.luasnip`
 | 
				
			||||||
- Fix namespace of python-lsp-server by changing it to python3Packages
 | 
					- 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):
 | 
					[Noah765](https://github.com/Noah765):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,7 @@
 | 
				
			||||||
  inherit (lib.lists) isList;
 | 
					  inherit (lib.lists) isList;
 | 
				
			||||||
  inherit (lib.types) enum either listOf package str bool;
 | 
					  inherit (lib.types) enum either listOf package str bool;
 | 
				
			||||||
  inherit (lib.nvim.lua) expToLua;
 | 
					  inherit (lib.nvim.lua) expToLua;
 | 
				
			||||||
 | 
					  inherit (lib.nvim.types) mkPluginSetupOption;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cfg = config.vim.languages.python;
 | 
					  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 [
 | 
					  config = mkIf cfg.enable (mkMerge [
 | 
				
			||||||
| 
						 | 
					@ -261,5 +267,16 @@ in {
 | 
				
			||||||
      vim.debugger.nvim-dap.enable = true;
 | 
					      vim.debugger.nvim-dap.enable = true;
 | 
				
			||||||
      vim.debugger.nvim-dap.sources.python-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
 | 
					      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"];
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
  ]);
 | 
					  ]);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2452,6 +2452,19 @@
 | 
				
			||||||
      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
 | 
					      "url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
 | 
				
			||||||
      "hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
 | 
					      "hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "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": {
 | 
					    "vim-dirtytalk": {
 | 
				
			||||||
      "type": "Git",
 | 
					      "type": "Git",
 | 
				
			||||||
      "repository": {
 | 
					      "repository": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue