mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
misc: fix python environment options
This commit is contained in:
parent
a1f8b437b3
commit
d52f656a8b
3 changed files with 18 additions and 31 deletions
|
@ -39,13 +39,6 @@ in {
|
|||
description = "Extra packages to be made available to neovim";
|
||||
};
|
||||
|
||||
python = {
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.python3;
|
||||
description = "";
|
||||
};
|
||||
|
||||
extraPythonPackages = mkOption {
|
||||
type = with types; functionTo (listOf package);
|
||||
default = p: [];
|
||||
|
@ -55,7 +48,6 @@ in {
|
|||
p: [ p.numpy ]
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
extraConfigLua = mkOption {
|
||||
type = types.lines;
|
||||
|
|
|
@ -2,14 +2,11 @@
|
|||
plain = {};
|
||||
|
||||
python-packages = {
|
||||
python = {
|
||||
package = pkgs.python3;
|
||||
extraPythonPackages = p:
|
||||
with p; [
|
||||
numpy
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
simple-plugin = {
|
||||
extraPlugins = [pkgs.vimPlugins.vim-surround];
|
||||
|
|
|
@ -100,16 +100,14 @@ in {
|
|||
config.extraPlugins;
|
||||
|
||||
neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({
|
||||
inherit (config) viAlias vimAlias;
|
||||
inherit
|
||||
(config)
|
||||
extraPythonPackages
|
||||
viAlias
|
||||
vimAlias
|
||||
;
|
||||
# inherit customRC;
|
||||
plugins = normalizedPlugins;
|
||||
|
||||
# Python 3 environment
|
||||
python3Env = let
|
||||
python = config.python.package;
|
||||
inherit (config.python) extraPythonPackages;
|
||||
in
|
||||
python.withPackages extraPythonPackages;
|
||||
}
|
||||
# Necessary to make sure the runtime path is set properly in NixOS 22.05,
|
||||
# or more generally before the commit:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue