From 7e4f8a2a560120d5a21c218d0e80ea18d9397a5e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Dec 2024 20:18:07 +0100
Subject: [PATCH] plugins/friendly-snippets: switch to mkVimPlugin

---
 flake-modules/dev/list-plugins.py             |  1 -
 plugins/by-name/friendly-snippets/default.nix | 26 +++----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/flake-modules/dev/list-plugins.py b/flake-modules/dev/list-plugins.py
index 09d2c59b..7acbcdef 100755
--- a/flake-modules/dev/list-plugins.py
+++ b/flake-modules/dev/list-plugins.py
@@ -70,7 +70,6 @@ KNOWN_PATHS: dict[
     "plugins/by-name/coq-thirdparty/default.nix": (State.OLD, Kind.NEOVIM, False),
     "plugins/by-name/dap/default.nix": (State.OLD, Kind.NEOVIM, False),
     "plugins/by-name/floaterm/default.nix": (State.OLD, Kind.VIM, False),
-    "plugins/by-name/friendly-snippets/default.nix": (State.OLD, Kind.VIM, False),
     "plugins/by-name/gitgutter/default.nix": (State.OLD, Kind.VIM, False),
     "plugins/by-name/gitmessenger/default.nix": (State.OLD, Kind.VIM, False),
     "plugins/by-name/intellitab/default.nix": (
diff --git a/plugins/by-name/friendly-snippets/default.nix b/plugins/by-name/friendly-snippets/default.nix
index 444e1c96..d4f8b4de 100644
--- a/plugins/by-name/friendly-snippets/default.nix
+++ b/plugins/by-name/friendly-snippets/default.nix
@@ -1,31 +1,13 @@
 {
   lib,
-  helpers,
-  config,
-  pkgs,
   ...
 }:
-with lib;
-let
-  cfg = config.plugins.friendly-snippets;
-in
-{
-  meta.maintainers = [ maintainers.GaetanLepage ];
+lib.nixvim.vim-plugin.mkVimPlugin {
+  name = "friendly-snippets";
 
-  options.plugins.friendly-snippets = {
-    enable = mkEnableOption "friendly-snippets";
-
-    package = lib.mkPackageOption pkgs "friendly-snippets" {
-      default = [
-        "vimPlugins"
-        "friendly-snippets"
-      ];
-    };
-  };
-
-  config = mkIf cfg.enable {
-    extraPlugins = [ cfg.package ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 
+  extraConfig = {
     # Simply add an element to the `fromVscode` list to trigger the import of friendly-snippets
     plugins.luasnip.fromVscode = [ { } ];
   };