From a1f1e24d62a0ea5f633324c6362b566abf9ec66c Mon Sep 17 00:00:00 2001 From: triethyl Date: Thu, 3 Jul 2025 10:06:37 -0400 Subject: rearranged fennel and lua code Former-commit-id: a5f5aa6e19e52b3734a395369a9b40b9833aa27a --- pkgs/custom-neovim/config/fnl/init.fnl | 1 + pkgs/custom-neovim/config/init.fnl | 7 ------- pkgs/custom-neovim/config/init.lua | 21 ++++++++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 pkgs/custom-neovim/config/fnl/init.fnl delete mode 100644 pkgs/custom-neovim/config/init.fnl (limited to 'pkgs/custom-neovim/config') 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() -- cgit v1.2.3