mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-01 11:01:15 +00:00
treewide: clean up references to neovim-flake
This commit is contained in:
parent
227f80ac9d
commit
97a64abeff
8 changed files with 38 additions and 19 deletions
22
flake.nix
22
flake.nix
|
@ -27,19 +27,33 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
homeManagerModules = {
|
homeManagerModules = {
|
||||||
neovim-flake = {
|
neovim-flake =
|
||||||
|
nixpkgs.lib.warn ''
|
||||||
|
homeManagerModules.neovim-flake has been deprecated.
|
||||||
|
Plese use the homeManagereModules.nvf instead
|
||||||
|
''
|
||||||
|
self.homeManagerModules.nvf;
|
||||||
|
|
||||||
|
nvf = {
|
||||||
imports = [(import ./flake/modules/home-manager.nix self.packages inputs)];
|
imports = [(import ./flake/modules/home-manager.nix self.packages inputs)];
|
||||||
};
|
};
|
||||||
|
|
||||||
default = self.homeManagerModules.neovim-flake;
|
default = self.homeManagerModules.nvf;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosModules = {
|
nixosModules = {
|
||||||
neovim-flake = {
|
neovim-flake =
|
||||||
|
nixpkgs.lib.warn ''
|
||||||
|
nixosModules.neovim-flake has been deprecated.
|
||||||
|
Please use the nixosModules.nvf instead
|
||||||
|
''
|
||||||
|
self.nixosModules.neovim-flake;
|
||||||
|
|
||||||
|
nvf = {
|
||||||
imports = [(import ./flake/modules/nixos.nix self.packages inputs)];
|
imports = [(import ./flake/modules/nixos.nix self.packages inputs)];
|
||||||
};
|
};
|
||||||
|
|
||||||
default = self.nixosModules.neovim-flake;
|
default = self.nixosModules.nvf;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
inherit (config.legacyPackages) neovim-nix;
|
inherit (config.legacyPackages) neovim-nix;
|
||||||
in
|
in
|
||||||
dockerTools.buildImage {
|
dockerTools.buildImage {
|
||||||
name = "neovim-flake";
|
name = "nvf";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
|
|
||||||
copyToRoot = buildEnv {
|
copyToRoot = buildEnv {
|
||||||
|
|
|
@ -9,7 +9,7 @@ nixpkgsLib.extend (self: super: {
|
||||||
|
|
||||||
# Makes our custom functions available under `lib.nvim` where stdlib-extended.nix is imported
|
# Makes our custom functions available under `lib.nvim` where stdlib-extended.nix is imported
|
||||||
# with the appropriate arguments. For end-users, a `lib` output will be accessible from the flake.
|
# with the appropriate arguments. For end-users, a `lib` output will be accessible from the flake.
|
||||||
# E.g. for an input called `neovim-flake`, `inputs.neovim-flake.lib.nvim` will return the set
|
# E.g. for an input called `nvf`, `inputs.nvf.lib.nvim` will return the set
|
||||||
# below.
|
# below.
|
||||||
nvim = import ./. {
|
nvim = import ./. {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
|
|
|
@ -16,7 +16,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
options.vim.spellcheck = {
|
options.vim.spellcheck = {
|
||||||
enable = mkEnableOption "neovim's built-in spellchecking";
|
enable = mkEnableOption "Neovim's built-in spellchecking";
|
||||||
languages = mkOption {
|
languages = mkOption {
|
||||||
type = listOf str;
|
type = listOf str;
|
||||||
default = ["en"];
|
default = ["en"];
|
||||||
|
@ -27,7 +27,7 @@ in {
|
||||||
To add your own language files, you may place your `spell`
|
To add your own language files, you may place your `spell`
|
||||||
directory in either `~/.config/nvim` or the
|
directory in either `~/.config/nvim` or the
|
||||||
[additionalRuntimePaths](#opt-vim.additionalRuntimePaths)
|
[additionalRuntimePaths](#opt-vim.additionalRuntimePaths)
|
||||||
directory provided by neovim-flake.
|
directory provided by **nvf**.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ in {
|
||||||
description = ''
|
description = ''
|
||||||
A list of filetypes for which spellchecking will be disabled.
|
A list of filetypes for which spellchecking will be disabled.
|
||||||
|
|
||||||
You may use `echo &filetype` in neovim to find out the
|
You may use `echo &filetype` in Neovim to find out the
|
||||||
filetype for a specific buffer.
|
filetype for a specific buffer.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,10 +7,12 @@ in {
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
(mkRemovedOptionModule ["vim" "presence" "presence-nvim"] ''
|
(mkRemovedOptionModule ["vim" "presence" "presence-nvim"] ''
|
||||||
The option vim.presence.presence-nvim has been deprecated in favor of the new neocord module.
|
The option vim.presence.presence-nvim has been deprecated in favor of the new
|
||||||
Options provided by the plugin remain mostly the same, but manual migration is required.
|
neocord module. Options provided by the plugin remain mostly the same, but manual
|
||||||
|
migration is required.
|
||||||
|
|
||||||
Please see neocord documentation and the neovim-flake options for more info
|
Please see neocord documentation and options page on the **nvf** manual
|
||||||
|
for mor einformation
|
||||||
'')
|
'')
|
||||||
]
|
]
|
||||||
++ (map
|
++ (map
|
||||||
|
|
|
@ -27,7 +27,7 @@ in {
|
||||||
description = ''
|
description = ''
|
||||||
List of treesitter grammars to install.
|
List of treesitter grammars to install.
|
||||||
|
|
||||||
For languages already supported by neovim-flake, you may
|
For languages already supported by nvf, you may
|
||||||
use the {option}`vim.language.<lang>.treesitter` options, which
|
use the {option}`vim.language.<lang>.treesitter` options, which
|
||||||
will automatically add the required grammars to this.
|
will automatically add the required grammars to this.
|
||||||
'';
|
'';
|
||||||
|
@ -39,6 +39,7 @@ in {
|
||||||
description = ''
|
description = ''
|
||||||
Whether to add the default grammars to the list of grammars
|
Whether to add the default grammars to the list of grammars
|
||||||
to install.
|
to install.
|
||||||
|
|
||||||
This option is only relevant if treesitter has been enabled.
|
This option is only relevant if treesitter has been enabled.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,11 +12,14 @@ in {
|
||||||
type = package;
|
type = package;
|
||||||
default = pkgs.neovim-unwrapped;
|
default = pkgs.neovim-unwrapped;
|
||||||
description = ''
|
description = ''
|
||||||
The neovim package to use.
|
The neovim package to use for the wrapper. This
|
||||||
|
corresponds to the package that will be wrapped
|
||||||
|
with your plugins and settings.
|
||||||
|
|
||||||
::: {.warning}
|
::: {.warning}
|
||||||
You will need to use an unwrapped package for this
|
You will need to use an unwrapped package for this
|
||||||
option to work as intended.
|
option to work as intended. Using an already wrapped
|
||||||
|
package here may yield undesirable results.
|
||||||
:::
|
:::
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -74,8 +77,7 @@ in {
|
||||||
set up after builtin plugins.
|
set up after builtin plugins.
|
||||||
|
|
||||||
This option takes a special type that allows you to order
|
This option takes a special type that allows you to order
|
||||||
your custom plugins using neovim-flake's modified DAG
|
your custom plugins using nvf's modified DAG library.
|
||||||
library.
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
|
|
|
@ -102,7 +102,7 @@ in {
|
||||||
|
|
||||||
If this option is passed as a DAG, it will be resolved
|
If this option is passed as a DAG, it will be resolved
|
||||||
according to the DAG resolution rules (e.g. entryBefore
|
according to the DAG resolution rules (e.g. entryBefore
|
||||||
or entryAfter) as per the neovim-flake library.
|
or entryAfter) as per the **nvf** extended library.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
example = literalMD ''
|
example = literalMD ''
|
||||||
|
@ -182,7 +182,7 @@ in {
|
||||||
|
|
||||||
If this option is passed as a DAG, it will be resolved
|
If this option is passed as a DAG, it will be resolved
|
||||||
according to the DAG resolution rules (e.g. entryBefore
|
according to the DAG resolution rules (e.g. entryBefore
|
||||||
or entryAfter) as per the neovim-flake library.
|
or entryAfter) as per the **nvf** extended library.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
example = literalMD ''
|
example = literalMD ''
|
||||||
|
|
Loading…
Reference in a new issue