From 497f030efb8cb02a9511a129289911bce576a467 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 12:54:14 -0600 Subject: [PATCH] vimPlugins: consolidate non generated plugins We dont want to keep polluting the plugins folder. Moving to a folder for non-generated plugins that only exist in overrides to be part of the package set. --- .../LanguageClient-neovim/default.nix | 0 .../avante-nvim/default.nix | 0 .../{ => non-generated}/blink-cmp/default.nix | 0 .../codesnap-nvim/default.nix | 0 .../{ => non-generated}/cord-nvim/default.nix | 0 .../moveline-nvim/Cargo.lock | 0 .../moveline-nvim/default.nix | 0 .../nvim-spectre/default.nix | 0 .../{ => non-generated}/sg-nvim/default.nix | 0 .../{ => non-generated}/sniprun/default.nix | 0 .../sniprun/fix-paths.patch | 0 .../{ => non-generated}/vim-clap/Cargo.lock | 0 .../{ => non-generated}/vim-clap/default.nix | 0 .../vim-markdown-composer/default.nix | 0 .../editors/vim/plugins/overrides.nix | 22 +++++++++---------- 15 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/LanguageClient-neovim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/avante-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/blink-cmp/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/codesnap-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/cord-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/moveline-nvim/Cargo.lock (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/moveline-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/nvim-spectre/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sg-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sniprun/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sniprun/fix-paths.patch (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-clap/Cargo.lock (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-clap/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-markdown-composer/default.nix (100%) diff --git a/pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/avante-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/blink-cmp/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix diff --git a/pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/cord-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/Cargo.lock similarity index 100% rename from pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock rename to pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/Cargo.lock diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/nvim-spectre/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/sg-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/sniprun/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch similarity index 100% rename from pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch rename to pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock rename to pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-clap/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix diff --git a/pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 738d66459bdd..a166c7e2cecb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -173,7 +173,7 @@ in ]; }; - avante-nvim = callPackage ./avante-nvim { }; + avante-nvim = callPackage ./non-generated/avante-nvim { }; aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ @@ -244,7 +244,7 @@ in meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; - blink-cmp = callPackage ./blink-cmp { }; + blink-cmp = callPackage ./non-generated/blink-cmp { }; bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; @@ -654,7 +654,7 @@ in nvimRequireCheck = "codeium"; }; - codesnap-nvim = callPackage ./codesnap-nvim { }; + codesnap-nvim = callPackage ./non-generated/codesnap-nvim { }; codewindow-nvim = super.codewindow-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; @@ -764,7 +764,7 @@ in nvimRequireCheck = "coq"; }; - cord-nvim = callPackage ./cord-nvim { }; + cord-nvim = callPackage ./non-generated/cord-nvim { }; cornelis = super.cornelis.overrideAttrs { dependencies = [ self.vim-textobj-user ]; @@ -1272,7 +1272,7 @@ in nvimRequireCheck = "kulala"; }; - LanguageClient-neovim = callPackage ./LanguageClient-neovim { }; + LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { }; LazyVim = super.LazyVim.overrideAttrs { # Any other dependency is optional @@ -1599,7 +1599,7 @@ in ]; }; - moveline-nvim = callPackage ./moveline-nvim { }; + moveline-nvim = callPackage ./non-generated/moveline-nvim { }; multicursors-nvim = super.multicursors-nvim.overrideAttrs { dependencies = with self; [ @@ -2181,7 +2181,7 @@ in nvimSkipModule = "snippets.utils.cmp"; }; - nvim-spectre = callPackage ./nvim-spectre { }; + nvim-spectre = callPackage ./non-generated/nvim-spectre { }; nvim-surround = super.nvim-surround.overrideAttrs { # Optional treesitter integration @@ -2554,7 +2554,7 @@ in dependencies = [ self.nui-nvim ]; }; - sg-nvim = callPackage ./sg-nvim { }; + sg-nvim = callPackage ./non-generated/sg-nvim { }; skim = buildVimPlugin { pname = "skim"; @@ -2613,7 +2613,7 @@ in ]; }; - sniprun = callPackage ./sniprun { }; + sniprun = callPackage ./non-generated/sniprun { }; # The GitHub repository returns 404, which breaks the update script Spacegray-vim = buildVimPlugin { @@ -3152,7 +3152,7 @@ in passthru.python3Dependencies = ps: with ps; [ beancount ]; }; - vim-clap = callPackage ./vim-clap { }; + vim-clap = callPackage ./non-generated/vim-clap { }; vim-codefmt = super.vim-codefmt.overrideAttrs { dependencies = [ self.vim-maktaba ]; @@ -3285,7 +3285,7 @@ in ''; }; - vim-markdown-composer = callPackage ./vim-markdown-composer { }; + vim-markdown-composer = callPackage ./non-generated/vim-markdown-composer { }; vim-matchup = super.vim-matchup.overrideAttrs { # Optional treesitter integration