treewide: remove file-wide with lib; in nixos/modules/programs

This commit is contained in:
Acid Bong 2024-04-17 14:37:58 +03:00
parent 861f29655c
commit 49f6869f71
No known key found for this signature in database
118 changed files with 1053 additions and 1269 deletions

View file

@ -1,14 +1,12 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.neovim;
in
{
options.programs.neovim = {
enable = mkOption {
type = types.bool;
enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = ''
@ -21,8 +19,8 @@ in
'';
};
defaultEditor = mkOption {
type = types.bool;
defaultEditor = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
When enabled, installs neovim and configures neovim to be the default editor
@ -30,44 +28,44 @@ in
'';
};
viAlias = mkOption {
type = types.bool;
viAlias = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Symlink {command}`vi` to {command}`nvim` binary.
'';
};
vimAlias = mkOption {
type = types.bool;
vimAlias = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Symlink {command}`vim` to {command}`nvim` binary.
'';
};
withRuby = mkOption {
type = types.bool;
withRuby = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable Ruby provider.";
};
withPython3 = mkOption {
type = types.bool;
withPython3 = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable Python 3 provider.";
};
withNodeJs = mkOption {
type = types.bool;
withNodeJs = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable Node provider.";
};
configure = mkOption {
type = types.attrs;
configure = lib.mkOption {
type = lib.types.attrs;
default = { };
example = literalExpression ''
example = lib.literalExpression ''
{
customRC = '''
" here your custom configuration goes!
@ -86,31 +84,31 @@ in
'';
};
package = mkPackageOption pkgs "neovim-unwrapped" { };
package = lib.mkPackageOption pkgs "neovim-unwrapped" { };
finalPackage = mkOption {
type = types.package;
finalPackage = lib.mkOption {
type = lib.types.package;
visible = false;
readOnly = true;
description = "Resulting customized neovim package.";
};
runtime = mkOption {
runtime = lib.mkOption {
default = { };
example = literalExpression ''
example = lib.literalExpression ''
{ "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; }
'';
description = ''
Set of files that have to be linked in {file}`runtime`.
'';
type = with types; attrsOf (submodule (
type = with lib.types; attrsOf (submodule (
{ name, config, ... }:
{
options = {
enable = mkOption {
type = types.bool;
enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether this runtime directory should be generated. This
@ -118,49 +116,49 @@ in
'';
};
target = mkOption {
type = types.str;
target = lib.mkOption {
type = lib.types.str;
description = ''
Name of symlink. Defaults to the attribute
name.
'';
};
text = mkOption {
text = lib.mkOption {
default = null;
type = types.nullOr types.lines;
type = lib.types.nullOr lib.types.lines;
description = "Text of the file.";
};
source = mkOption {
source = lib.mkOption {
default = null;
type = types.nullOr types.path;
type = lib.types.nullOr lib.types.path;
description = "Path of the source file.";
};
};
config.target = mkDefault name;
config.target = lib.mkDefault name;
}
));
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
environment.systemPackages = [
cfg.finalPackage
];
environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
environment.etc = listToAttrs (attrValues (mapAttrs
environment.etc = builtins.listToAttrs (builtins.attrValues (builtins.mapAttrs
(name: value: {
name = "xdg/nvim/${name}";
value = removeAttrs
value = builtins.removeAttrs
(value // {
target = "xdg/nvim/${value.target}";
})
(optionals (isNull value.source) [ "source" ]);
(lib.optionals (builtins.isNull value.source) [ "source" ]);
})
cfg.runtime));