gitignored result

Former-commit-id: e8190c9ca78f9565671352f9d66512f67971c95e

4 files changed, 23 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 9b42106..d53e06f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .direnv/
+result
diff --git a/pkgs/custom-neovim/config/init.fnl b/pkgs/custom-neovim/config/init.fnl
index c097c94..f9a303f 100644
--- a/pkgs/custom-neovim/config/init.fnl
+++ b/pkgs/custom-neovim/config/init.fnl
@@ -1,7 +1 @@
-;; Import Hibiscus Macros
-(import-macros {
-	: set!
-	: set+
-	: exec!} :hibiscus.vim)
-
-(exec! [colorscheme rose-pine-main])
+(vim.cmd.colorscheme oxocarbon)
diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index a69b7ef..3c9d9fb 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -1,9 +1,14 @@
-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()
+
+-- vim.cmd.colorscheme("oxocarbon")
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index a6e5b62..aa7d7d2 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.
@@ -55,7 +33,7 @@ inputs.mnw.lib.wrap pkgs {
     opt = [];
   };
 
-  luaFiles = [./config/init.lua];
+  luaFiles = [./config];
 
   extraBinPath = with pkgs; [
     # LSP Servers
@@ -70,4 +48,9 @@ inputs.mnw.lib.wrap pkgs {
     # Extra Tools
     ripgrep
   ];
+
+  extraLuaPackages = lua:
+    with lua; [
+      fennel # allow config in fennel
+    ];
 }