modules/top-level: move out of wrappers/modules

This commit is contained in:
Matt Sturgeon 2024-07-05 14:25:21 +01:00
parent b59fa976d0
commit 2deb61f6a5
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
10 changed files with 34 additions and 16 deletions

View file

@ -0,0 +1,165 @@
{
pkgs,
config,
lib,
helpers,
...
}:
with lib;
{
options = {
viAlias = mkOption {
type = types.bool;
default = false;
description = ''
Symlink `vi` to `nvim` binary.
'';
};
vimAlias = mkOption {
type = types.bool;
default = false;
description = ''
Symlink `vim` to `nvim` binary.
'';
};
withRuby = mkOption {
type = types.bool;
default = true;
description = "Enable Ruby provider.";
};
withNodeJs = mkOption {
type = types.bool;
default = false;
description = "Enable Node provider.";
};
package = mkOption {
type = types.package;
default = pkgs.neovim-unwrapped;
description = "Neovim to use for NixVim.";
};
wrapRc = mkOption {
type = types.bool;
description = "Should the config be included in the wrapper script.";
default = false;
};
finalPackage = mkOption {
type = types.package;
description = "Wrapped Neovim.";
readOnly = true;
};
initPath = mkOption {
type = types.str;
description = "The path to the `init.lua` file.";
readOnly = true;
visible = false;
};
initContent = mkOption {
type = types.str;
description = "The content of the `init.lua` file.";
readOnly = true;
visible = false;
};
printInitPackage = mkOption {
type = types.package;
description = "A tool to show the content of the generated `init.lua` file.";
readOnly = true;
visible = false;
};
};
config =
let
defaultPlugin = {
plugin = null;
config = "";
optional = false;
};
normalizedPlugins = map (
x: defaultPlugin // (if x ? plugin then x else { plugin = x; })
) config.extraPlugins;
neovimConfig = pkgs.neovimUtils.makeNeovimConfig (
{
inherit (config)
extraPython3Packages
viAlias
vimAlias
withRuby
withNodeJs
;
# inherit customRC;
plugins = normalizedPlugins;
}
# Necessary to make sure the runtime path is set properly in NixOS 22.05,
# or more generally before the commit:
# cda1f8ae468 - neovim: pass packpath via the wrapper
// optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
configure.packages = {
nixvim = {
start = map (x: x.plugin) normalizedPlugins;
opt = [ ];
};
};
}
);
customRC =
let
hasContent = str: (builtins.match "[[:space:]]*" str) == null;
in
(optionalString (hasContent neovimConfig.neovimRcContent) ''
vim.cmd([[
${neovimConfig.neovimRcContent}
]])
'')
+ config.content;
init = helpers.writeLua "init.lua" customRC;
extraWrapperArgs = builtins.concatStringsSep " " (
(optional (config.extraPackages != [ ]) ''--prefix PATH : "${makeBinPath config.extraPackages}"'')
++ (optional config.wrapRc ''--add-flags -u --add-flags "${init}"'')
);
wrappedNeovim = pkgs.wrapNeovimUnstable config.package (
neovimConfig
// {
wrapperArgs = lib.escapeShellArgs neovimConfig.wrapperArgs + " " + extraWrapperArgs;
wrapRc = false;
}
);
in
{
type = lib.mkForce "lua";
finalPackage = wrappedNeovim;
initContent = readFile init;
initPath = "${init}";
printInitPackage = pkgs.writeShellApplication {
name = "nixvim-print-init";
runtimeInputs = [ pkgs.bat ];
text = ''
bat --language=lua "${init}"
'';
};
extraConfigLuaPre = lib.optionalString config.wrapRc ''
-- Ignore the user lua configuration
vim.opt.runtimepath:remove(vim.fn.stdpath('config')) -- ~/.config/nvim
vim.opt.runtimepath:remove(vim.fn.stdpath('config') .. "/after") -- ~/.config/nvim/after
vim.opt.runtimepath:remove(vim.fn.stdpath('data') .. "/site") -- ~/.local/share/nvim/site
'';
extraPlugins = if config.wrapRc then [ config.filesPlugin ] else [ ];
};
}