From bb9e508da23a2c6cec9127ea43b1c446f65696c2 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Wed, 8 Jan 2025 13:28:28 +0100
Subject: [PATCH] blink: move package into module

---
 flake/packages.nix                                      | 7 -------
 modules/wrapper/build/config.nix                        | 3 +--
 {flake => modules/wrapper/build}/packages/blink-cmp.nix | 0
 3 files changed, 1 insertion(+), 9 deletions(-)
 rename {flake => modules/wrapper/build}/packages/blink-cmp.nix (100%)

diff --git a/flake/packages.nix b/flake/packages.nix
index 39d75ca1..cf1f81ac 100644
--- a/flake/packages.nix
+++ b/flake/packages.nix
@@ -6,7 +6,6 @@
     ...
   }: let
     docs = import ../docs {inherit pkgs inputs lib;};
-    pluginVersion = src: src.shortRev or src.shortDirtyRev or "dirty";
   in {
     packages = {
       inherit (docs.manual) htmlOpenTool;
@@ -67,12 +66,6 @@
             Volumes = {"/home/neovim/demo" = {};};
           };
         };
-
-      # Plugins that need compiling
-      blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
-        src = inputs.plugin-blink-cmp;
-        version = pluginVersion inputs.plugin-blink-cmp;
-      };
     };
   };
 }
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 9a91f2a5..3b90c740 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -50,9 +50,8 @@
       pname = "flutter-tools";
       patches = [./patches/flutter-tools.patch];
     };
-    blink-cmp = pkgs.callPackage ../../../flake/packages/blink-cmp.nix {
+    blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
       src = inputs.plugin-blink-cmp;
-      # TODO: extract into helper func
       version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
     };
   };
diff --git a/flake/packages/blink-cmp.nix b/modules/wrapper/build/packages/blink-cmp.nix
similarity index 100%
rename from flake/packages/blink-cmp.nix
rename to modules/wrapper/build/packages/blink-cmp.nix