From 6da298fdbaa57d7f79090c9793a3bcb191129ea4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 16 Nov 2024 17:36:16 -0600
Subject: [PATCH] vimPlugins.orgmode: migrate to buildNeovimPlugin

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  |  4 ++--
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9c2898b48d532..e7933144cf7ea 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -10398,18 +10398,6 @@ final: prev:
     meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
   };
 
-  orgmode = buildVimPlugin {
-    pname = "orgmode";
-    version = "2025-01-06";
-    src = fetchFromGitHub {
-      owner = "nvim-orgmode";
-      repo = "orgmode";
-      rev = "738de3980f7ff3f5cc63634432ce3307424aea4d";
-      sha256 = "1jc1wn5bnlimwz7pcw7i6s63r95y1fdlm9qadyis8ab0jy4367hc";
-    };
-    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
-  };
-
   other-nvim = buildVimPlugin {
     pname = "other.nvim";
     version = "2024-11-30";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 47053c2da49a9..6f57ca0cdd839 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2575,8 +2575,8 @@ in
     ];
   };
 
-  orgmode = super.orgmode.overrideAttrs {
-    dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];
+  orgmode = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.orgmode;
   };
 
   otter-nvim = super.otter-nvim.overrideAttrs {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 7186d90b20f7c..74c101e7b319d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -861,7 +861,6 @@ https://github.com/tyru/open-browser-github.vim/,,
 https://github.com/tyru/open-browser.vim/,,
 https://github.com/Almo7aya/openingh.nvim/,,
 https://github.com/salkin-mada/openscad.nvim/,HEAD,
-https://github.com/nvim-orgmode/orgmode/,,
 https://github.com/rgroli/other.nvim/,HEAD,
 https://github.com/jmbuhr/otter.nvim/,,
 https://github.com/hedyhli/outline.nvim/,HEAD,