rearranged fennel and lua code

Former-commit-id: a5f5aa6e19e52b3734a395369a9b40b9833aa27a

1 files changed, 6 insertions, 23 deletions

diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index a6e5b62..acf24f1 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -5,34 +5,12 @@
 inputs.mnw.lib.wrap pkgs {
   neovim = pkgs.neovim-unwrapped;
 
-  plugins = with pkgs.vimPlugins; let
-    tangerine-nvim = pkgs.vimUtils.buildVimPlugin {
-      name = "tangerine-nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "udayvir-singh";
-        repo = "tangerine.nvim";
-        tag = "v2.9";
-        hash = "sha256-C4QmsW83SxTn+eIkCMWDnd/Vdc9Mb7yD7a0bYSiIRJI=";
-      };
-    };
-    hibiscus-nvim = pkgs.vimUtils.buildVimPlugin {
-      name = "hibiscus-nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "udayvir-singh";
-        repo = "hibiscus.nvim";
-        tag = "v1.7";
-        hash = "sha256-fjdwT2rdDZ6OF4SByMrcvFNXhF4lhBwzmTLhpwgOQ6o=";
-      };
-    };
-  in {
+  plugins = with pkgs.vimPlugins; {
     dev.config = {
       pure = ./config;
       impure = "/home/culsans/Sync/setup/pkgs/custom-neovim";
     };
     start = [
-      tangerine-nvim # Allow configuration in fennel.
-      hibiscus-nvim # Adds extra fennel macros.
-
       # Core Plugins
       mini-nvim # Ton of small modules.
       nvim-lspconfig # Adds lsp presets.
@@ -57,6 +35,11 @@ inputs.mnw.lib.wrap pkgs {
 
   luaFiles = [./config/init.lua];
 
+  extraLuaPackages = lua:
+    with lua; [
+      fennel
+    ];
+
   extraBinPath = with pkgs; [
     # LSP Servers
     lua-language-server # Lua LS