rearranged fennel and lua code

Former-commit-id: a5f5aa6e19e52b3734a395369a9b40b9833aa27a

4 files changed, 19 insertions, 39 deletions

diff --git a/pkgs/custom-neovim/config/fnl/init.fnl b/pkgs/custom-neovim/config/fnl/init.fnl
new file mode 100644
index 0000000..f62b370
--- /dev/null
+++ b/pkgs/custom-neovim/config/fnl/init.fnl
@@ -0,0 +1 @@
+(vim.cmd.colorscheme evening)
diff --git a/pkgs/custom-neovim/config/init.fnl b/pkgs/custom-neovim/config/init.fnl
deleted file mode 100644
index c097c94..0000000
--- a/pkgs/custom-neovim/config/init.fnl
+++ /dev/null
@@ -1,7 +0,0 @@
-;; Import Hibiscus Macros
-(import-macros {
-	: set!
-	: set+
-	: exec!} :hibiscus.vim)
-
-(exec! [colorscheme rose-pine-main])
diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index a69b7ef..a857272 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -1,9 +1,12 @@
-require 'tangerine'.setup {
-  vimrc = "./init.fnl",
-  source = "./fnl",
-  target = "./lua",
-  compiler = {
-    verbose = false,
-    hooks = { "oninit" }
-  },
-}
+fennel = require "fennel"
+configdir = debug.getinfo(1).source:sub(2, string.len('/init.lua'))
+
+do
+  local fnldir = (configdir .. "/fnl")
+  for _, dir in ipairs({"/?.fnl", "/?/init.fnl"}) do
+    fennel["path"] = (fnldir .. dir .. ";" .. fennel.path)
+    fennel["macro-path"] = (fnldir .. dir .. ";" .. fennel["macro-path"])
+  end
+end
+
+fennel.install()
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