plugins: migrate defaultPackage -> package

Migrate all users of `mkVimPlugin` and `mkNeovimPlugin` to use the new
`package` argument instead of the old `defaultPackage` argument.
This commit is contained in:
Matt Sturgeon 2024-09-02 14:05:11 +01:00
parent 285f6cbd7b
commit 1fd4b6c739
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
148 changed files with 126 additions and 277 deletions

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "ayu";
isColorscheme = true;
originalName = "neovim-ayu";
defaultPackage = pkgs.vimPlugins.neovim-ayu;
package = "neovim-ayu";
# The colorscheme option is set by the `setup` function.
colorscheme = null;
callSetup = false;

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -13,7 +12,7 @@ in
lib.nixvim.neovim-plugin.mkNeovimPlugin {
inherit name luaName originalName;
setup = ".with_config";
defaultPackage = pkgs.vimPlugins.base16-nvim;
package = "base16-nvim";
isColorscheme = true;
maintainers = with lib.maintainers; [

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ in
lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "catppuccin";
isColorscheme = true;
defaultPackage = pkgs.vimPlugins.catppuccin-nvim;
package = "catppuccin-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "cyberdream";
isColorscheme = true;
originalName = "cyberdream.nvim";
defaultPackage = pkgs.vimPlugins.cyberdream-nvim;
package = "cyberdream-nvim";
maintainers = [ lib.nixvim.maintainers.AndresBermeoMarinelli ];

View file

@ -1,14 +1,9 @@
{
lib,
pkgs,
...
}:
{ lib, ... }:
lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "dracula-nvim";
originalName = "dracula.nvim ";
luaName = "dracula";
colorscheme = "dracula";
defaultPackage = pkgs.vimPlugins.dracula-nvim;
isColorscheme = true;
maintainers = [ lib.nixvim.maintainers.refaelsh ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -17,7 +16,6 @@ in
lib.nixvim.vim-plugin.mkVimPlugin {
name = "everforest";
isColorscheme = true;
defaultPackage = pkgs.vimPlugins.everforest;
globalPrefix = "everforest_";
maintainers = [ lib.nixvim.maintainers.sheemap ];

View file

@ -1,13 +1,12 @@
{
lib,
pkgs,
...
}:
lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "gruvbox";
isColorscheme = true;
originalName = "gruvbox.nvim";
defaultPackage = pkgs.vimPlugins.gruvbox-nvim;
package = "gruvbox-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -11,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "kanagawa";
isColorscheme = true;
originalName = "kanagawa.nvim";
defaultPackage = pkgs.vimPlugins.kanagawa-nvim;
package = "kanagawa-nvim";
description = ''
You can select the theme in two ways:

View file

@ -1,13 +1,12 @@
{
lib,
pkgs,
...
}:
lib.nixvim.vim-plugin.mkVimPlugin {
name = "melange";
isColorscheme = true;
originalName = "melange-nvim";
defaultPackage = pkgs.vimPlugins.melange-nvim;
package = "melange-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "modus";
luaName = "modus-themes";
originalName = "modus-themes.nvim";
defaultPackage = pkgs.vimPlugins.modus-themes-nvim;
package = "modus-themes-nvim";
isColorscheme = true;
maintainers = [ lib.nixvim.maintainers.nwjsmith ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -11,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "nightfox";
isColorscheme = true;
originalName = "nightfox.nvim";
defaultPackage = pkgs.vimPlugins.nightfox-nvim;
package = "nightfox-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.vim-plugin.mkVimPlugin {
name = "nord";
isColorscheme = true;
originalName = "nord.nvim";
defaultPackage = pkgs.vimPlugins.nord-nvim;
package = "nord-nvim";
globalPrefix = "nord_";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,13 +1,12 @@
{
lib,
pkgs,
...
}:
lib.nixvim.vim-plugin.mkVimPlugin {
name = "one";
isColorscheme = true;
originalName = "vim-one";
defaultPackage = pkgs.vimPlugins.vim-one;
package = "vim-one";
globalPrefix = "one_";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,13 +1,12 @@
{
lib,
pkgs,
...
}:
lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "onedark";
isColorscheme = true;
originalName = "onedark.nvim";
defaultPackage = pkgs.vimPlugins.onedark-nvim;
package = "onedark-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,13 +1,12 @@
{
lib,
pkgs,
...
}:
lib.nixvim.vim-plugin.mkVimPlugin {
name = "oxocarbon";
isColorscheme = true;
originalName = "oxocarbon.nvim";
defaultPackage = pkgs.vimPlugins.oxocarbon-nvim;
package = "oxocarbon-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -10,7 +10,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "palette";
isColorscheme = true;
originalName = "palette.nvim";
defaultPackage = pkgs.vimPlugins.palette-nvim;
package = "palette-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "poimandres";
isColorscheme = true;
originalName = "poimandres.nvim";
defaultPackage = pkgs.vimPlugins.poimandres-nvim;
package = "poimandres-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -9,7 +8,6 @@ in
lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "rose-pine";
isColorscheme = true;
defaultPackage = pkgs.vimPlugins.rose-pine;
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "tokyonight";
isColorscheme = true;
originalName = "tokyonight.nvim";
defaultPackage = pkgs.vimPlugins.tokyonight-nvim;
package = "tokyonight-nvim";
maintainers = [ lib.maintainers.GaetanLepage ];

View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
...
}:
let
@ -10,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "vscode";
isColorscheme = true;
originalName = "vscode-nvim";
defaultPackage = pkgs.vimPlugins.vscode-nvim;
package = "vscode-nvim";
colorscheme = null; # Color scheme is set by `require.("vscode").load()`
callSetup = false;