summaryrefslogtreecommitdiff
path: root/dot_config/nvim/lua/plugins
diff options
context:
space:
mode:
authorChloƩ Vulquin <code@toast.bunkerlabs.net>2024-07-24 19:19:26 +0200
committerChloƩ Vulquin <code@toast.bunkerlabs.net>2024-07-24 19:19:26 +0200
commit01586921b3d5f2ac1ccf8196d3ad9b4b3ddd31f3 (patch)
treed740ac5e8943e48ee4132efc4633051d6cdf1d48 /dot_config/nvim/lua/plugins
parentnvim: ignore lazy-lock.json (diff)
nvim: rewrite config in fennel
One file isn't done, and there's also the question of ftplugin and co. One step at a time though, eh?
Diffstat (limited to '')
-rw-r--r--dot_config/nvim/lua/plugins/bindings/init.lua12
-rw-r--r--dot_config/nvim/lua/plugins/flash.lua69
-rw-r--r--dot_config/nvim/lua/plugins/init.lua45
-rw-r--r--dot_config/nvim/lua/plugins/langs.lua52
-rw-r--r--dot_config/nvim/lua/plugins/lsp/attach.lua1
-rw-r--r--dot_config/nvim/lua/plugins/lsp/capabilities.lua1
-rw-r--r--dot_config/nvim/lua/plugins/lsp/init.lua87
-rw-r--r--dot_config/nvim/lua/plugins/mini/init.lua41
-rw-r--r--dot_config/nvim/lua/plugins/mini/starter.lua22
-rw-r--r--dot_config/nvim/lua/plugins/neo-tree.lua26
-rw-r--r--dot_config/nvim/lua/plugins/os/init.lua4
-rw-r--r--dot_config/nvim/lua/plugins/os/linux.lua1
-rw-r--r--dot_config/nvim/lua/plugins/os/osx.lua1
-rw-r--r--dot_config/nvim/lua/plugins/surround.lua10
-rw-r--r--dot_config/nvim/lua/plugins/telescope.lua45
15 files changed, 105 insertions, 312 deletions
diff --git a/dot_config/nvim/lua/plugins/bindings/init.lua b/dot_config/nvim/lua/plugins/bindings/init.lua
index 56694b0..e4dea1b 100644
--- a/dot_config/nvim/lua/plugins/bindings/init.lua
+++ b/dot_config/nvim/lua/plugins/bindings/init.lua
@@ -1,10 +1,2 @@
-return {
- {
- 'folke/which-key.nvim',
- lazy = true,
- opts = {},
- },
- {
- 'tpope/vim-rsi'
- },
-}
+-- [nfnl] Compiled from fnl/plugins/bindings/init.fnl by https://github.com/Olical/nfnl, do not edit.
+return {{"folke/which-key.nvim", lazy = true, opts = {}}, {"tpope/vim-rsi"}}
diff --git a/dot_config/nvim/lua/plugins/flash.lua b/dot_config/nvim/lua/plugins/flash.lua
index 6791a0a..ad4203e 100644
--- a/dot_config/nvim/lua/plugins/flash.lua
+++ b/dot_config/nvim/lua/plugins/flash.lua
@@ -1,52 +1,17 @@
-return {
- 'folke/flash.nvim',
- opts = {
- -- disable flash search by default
- modes = {
- search = { enabled = false }
- },
- },
- event = "VeryLazy",
- keys = {
- {
- 's';
- mode = { 'n', 'x', 'o' },
- function()
- require 'flash'.jump()
- end,
- desc = 'Flash',
- },
- {
- 'S';
- mode = { 'n', 'x', 'o' },
- function()
- require 'flash'.treesitter()
- end,
- desc = 'Flash Treesitter',
- },
- {
- 'r';
- mode = 'o',
- function()
- require 'flash'.remote()
- end,
- desc = 'Remote Flash',
- },
- {
- 'R';
- mode = { 'o', 'x' },
- function()
- require 'flash'.treesitter_search()
- end,
- desc = 'Flash Treesitter Search',
- },
- {
- '<c-s>',
- mode = 'c',
- function()
- require 'flash'.toggle()
- end,
- desc = 'Toggle Flash Search',
- },
- },
-}
+-- [nfnl] Compiled from fnl/plugins/flash.fnl by https://github.com/Olical/nfnl, do not edit.
+local function _1_()
+ return (require("flash")).jump()
+end
+local function _2_()
+ return (require("flash")).treesitter()
+end
+local function _3_()
+ return (require("flash")).remote()
+end
+local function _4_()
+ return (require("flash")).treesitter_search()
+end
+local function _5_()
+ return (require("flash")).toggle()
+end
+return {{"folke/flash.nvim", event = "VeryLazy", keys = {{"s", _1_, desc = "Flash", mode = {"n", "x", "o"}}, {"S", _2_, desc = "Flash Treesitter", mode = {"n", "x", "o"}}, {"r", _3_, desc = "Remote Flash", mode = "o"}, {"R", _4_, desc = "Flash Treesitter Search", mode = {"o", "x"}}, {"<c-s>", _5_, desc = "Toggle Flash Search", mode = "c"}}, opts = {modes = {search = {enabled = false}}}}}
diff --git a/dot_config/nvim/lua/plugins/init.lua b/dot_config/nvim/lua/plugins/init.lua
index 0e2aec1..15a7d95 100644
--- a/dot_config/nvim/lua/plugins/init.lua
+++ b/dot_config/nvim/lua/plugins/init.lua
@@ -1,36 +1,9 @@
-local conjureft = {
- 'clojure',
- 'fennel',
- 'hy',
- 'janet',
- 'julia',
- 'lisp',
- 'racket',
- 'scheme'
-}
-
--- simple stuff that doesn't need any handling
--- and doesn't fit in elsewhere
-return {
- { 'folke/lazy.nvim', version = false },
- { "Olical/nfnl", ft = "fennel" },
- { 'stevearc/dressing.nvim', opts = {}},
- {
- 'Olical/conjure',
- config = function(_, opts)
- for k, v in pairs(opts) do
- vim.g['conjure#' .. k] = v
- end
- end,
- opts = {
- ['mapping#prefix'] = '<localleader>e',
- ['extract#tree_sitter#enabled'] = true,
- -- disabling lua, python, rust
- filetypes = conjureft,
- ['filetype#fennel'] = 'conjure.client.fennel.stdio',
- ['filetype#janet'] = 'conjure.client.janet.stdio',
- },
- ft = conjureft,
- },
- { 'tpope/vim-repeat' },
-}
+-- [nfnl] Compiled from fnl/plugins/init.fnl by https://github.com/Olical/nfnl, do not edit.
+local conjureft = {"clojure", "fennel", "hy", "janet", "julia", "lisp", "racket", "scheme"}
+local function _1_(_, opts)
+ for k, v in pairs(opts) do
+ vim.g[("conjure#" .. k)] = v
+ end
+ return nil
+end
+return {{"folke/lazy.nvim", version = false}, {"Olical/nfnl", ft = "fennel"}, {"stevearc/dressing.nvim", opts = {}}, {"Olical/conjure", config = _1_, ft = conjureft, opts = {["mapping#prefix"] = "<localleader>e", ["extract#tree_sitter#enabled"] = true, filetypes = conjureft, ["filetype#fennel"] = "conjure.client.fennel.stdio", ["filetype#janet"] = "conjure.client.janet.stdio"}}, {"tpope/vim-repeat"}}
diff --git a/dot_config/nvim/lua/plugins/langs.lua b/dot_config/nvim/lua/plugins/langs.lua
index fd08024..0e49dc6 100644
--- a/dot_config/nvim/lua/plugins/langs.lua
+++ b/dot_config/nvim/lua/plugins/langs.lua
@@ -1,50 +1,2 @@
--- language support
-return {
- -- treesitter
- {
- 'nvim-treesitter/nvim-treesitter',
- version = false,
- build = ':TSUpdate',
- dependencies = {
- 'nvim-treesitter/nvim-treesitter-textobjects',
- },
- main = 'nvim-treesitter.configs',
- opts = {
- ensure_installed = 'all',
- ignore_install = { 'norg' },
- sync_intall = true,
- highlight = {
- enable = true,
- disable = {
- 'markdown',
- },
- additional_vim_regex_highlighting = {
- 'markdown',
- },
- },
- },
- },
-
- -- non-treesitter languages
- {
- 'janet-lang/janet.vim',
- ft = 'janet',
- },
- {
- 'preservim/vim-markdown',
- version = false,
- dependencies = {'godlygeek/tabular'},
- ft = 'markdown',
- },
-
- -- helpers for lisps
- {
- 'gpanders/nvim-parinfer',
- ft = {
- 'clojure',
- 'fennel',
- 'janet',
- 'scm',
- },
- },
-}
+-- [nfnl] Compiled from fnl/plugins/langs.fnl by https://github.com/Olical/nfnl, do not edit.
+return {{"nvim-treesitter/nvim-treesitter", build = ":TSUpdate", dependnecies = {"nvim-treesitter/nvim-treesitter-textobjects"}, main = "nvim-treesitter.configs", opts = {ensure_installed = "all", ignore_install = {"norg"}, sync_install = "true", highlight = {enable = true, disable = {"markdown"}, additional_vim_regex_highlighting = {"markdown"}}}, version = false}, {"janet-lang/janet.vim", ft = "janet"}, {"preservim/vim-markdown", dependencies = {"godlygeek/tabular"}, ft = "markdown", version = false}, {"gpanders/nvim-parinfer", ft = {"clojure", "fennel", "janet", "scm"}}}
diff --git a/dot_config/nvim/lua/plugins/lsp/attach.lua b/dot_config/nvim/lua/plugins/lsp/attach.lua
index e81b154..f81303d 100644
--- a/dot_config/nvim/lua/plugins/lsp/attach.lua
+++ b/dot_config/nvim/lua/plugins/lsp/attach.lua
@@ -1,3 +1,4 @@
+-- TODO: INITIAL PORT
local function helper(opts, ...)
for _, spec in ipairs({...}) do
for _, v in ipairs(spec) do
diff --git a/dot_config/nvim/lua/plugins/lsp/capabilities.lua b/dot_config/nvim/lua/plugins/lsp/capabilities.lua
index 15e53c4..27ef5b2 100644
--- a/dot_config/nvim/lua/plugins/lsp/capabilities.lua
+++ b/dot_config/nvim/lua/plugins/lsp/capabilities.lua
@@ -1 +1,2 @@
+-- [nfnl] Compiled from fnl/plugins/lsp/capabilities.fnl by https://github.com/Olical/nfnl, do not edit.
return nil
diff --git a/dot_config/nvim/lua/plugins/lsp/init.lua b/dot_config/nvim/lua/plugins/lsp/init.lua
index 4c81c54..ce704ec 100644
--- a/dot_config/nvim/lua/plugins/lsp/init.lua
+++ b/dot_config/nvim/lua/plugins/lsp/init.lua
@@ -1,54 +1,35 @@
--- lsp options + runtime bindings
--- technically I could do some tree transforms, but that's a pain and I haven't done fennel stuff yet
--- + I'm not sure how feasible fennel stuff is in bootstrap-phase
--- anyway this is here to be in front of everything, so you can edit the settings you actually care about
-local gopts = function(plist)
- return {
- clangd = {},
- clojure_lsp = {
- root_dir = plist('project.clj', 'deps.edn', 'bb.edn', 'build.boot', 'shadow-cljs.edn', '.git'),
- },
- denols = {
- autostart = false,
- root_dir = plist('deno.json', 'deno.jsonc'),
- },
- gopls = {},
- ltex = {},
- lua_ls = {},
- texlab = {filetypes = {'tex', 'plaintex', 'bib', 'latex'}},
- tsserver = {
- autostart = false,
- root_dir = plist('tsconfig.json', 'package.json'),
- },
- zls = {},
- }
+-- [nfnl] Compiled from fnl/plugins/lsp/init.fnl by https://github.com/Olical/nfnl, do not edit.
+local function gopts(plist)
+ return {clangd = {}, clojure_lsp = {root_dir = plist("project.clj", "deps.edn", "bb.edn", "build.boot", "shadow-cljs.edn", ".git")}, denols = {root_dir = plist("deno.json", "deno.jsonc"), autostart = false}, gopls = {}, ltex = {}, lua_ls = {}, texlab = {filetypes = {"tex", "plaintex", "bib", "latex"}}, tsserver = {root_dir = plist("tsconfig.json", "package.json"), autostart = false}, zls = {}}
end
-
-local attach = require 'plugins.lsp.attach'
-local caps = require 'plugins.lsp.capabilities'
-
-return {
- {
- 'neovim/nvim-lspconfig',
- config = function(_, opts)
- for k, v in pairs(opts) do
- v.on_attach = v.on_attach or attach
- if type(caps) == 'table' then
- v.capabilities = v.capabilities or caps
- end
- local s = require 'lspconfig'[k]
- local c = v.cmd or s.document_config.default_config.cmd
- if vim.fn.executable(c[1]) ~= 0 then
- s.setup(v)
- end
- end
- end,
- opts = function()
- local plist = function(...)
- local p = require 'lspconfig.util'.root_pattern(...)
- return function(f) return p(f) end
- end
- return gopts(plist)
- end
- },
-}
+local attach = require("plugins.lsp.attach")
+local caps = require("plugins.lsp.capabilities")
+local function _1_(_, opts)
+ for k, v in pairs(opts) do
+ v.on_attach = (attach or v.on_attach)
+ if ("table" == type(caps)) then
+ v.capabilities = (v.capabilities or caps)
+ else
+ end
+ local s = (require("lspconfig"))[k]
+ local c = (v.cmd or s.document_config.default_config.cmd)
+ if (0 ~= vim.fn.executable(c[1])) then
+ s.setup(v)
+ else
+ end
+ end
+ return nil
+end
+local function _4_()
+ local plist
+ local function _5_(...)
+ local p = (require("lspconfig.util")).root_pattern(...)
+ local function _6_(_241)
+ return p(_241)
+ end
+ return _6_
+ end
+ plist = _5_
+ return gopts(plist)
+end
+return {{"neovim/nvim-lspconfig", config = _1_, opts = _4_}}
diff --git a/dot_config/nvim/lua/plugins/mini/init.lua b/dot_config/nvim/lua/plugins/mini/init.lua
index 2b61811..d45951e 100644
--- a/dot_config/nvim/lua/plugins/mini/init.lua
+++ b/dot_config/nvim/lua/plugins/mini/init.lua
@@ -1,30 +1,11 @@
-return {
- {
- 'echasnovski/mini.nvim',
- version = false, -- beta
- config = function(_, opts)
- for k, v in pairs(opts) do
- require ("mini." .. k).setup(v)
- end
- end,
- opts = function()
- return {
- ai = {},
- align = {},
- basics = {},
- bracketed = {
- indent = { options = { change_type = 'diff' } },
- },
- comment = {},
- completion = {},
- cursorword = {},
- indentscope = {},
- move = {},
- splitjoin = {},
- -- starter = require 'plugins.mini.starter',
- statusline = {},
- tabline = {},
- trailspace = {},
- }
- end },
-}
+-- [nfnl] Compiled from fnl/plugins/mini/init.fnl by https://github.com/Olical/nfnl, do not edit.
+local function _1_(_, opts)
+ for k, v in pairs(opts) do
+ do end (require(("mini." .. k))).setup(v)
+ end
+ return nil
+end
+local function _2_()
+ return {ai = {}, align = {}, basics = {}, bracketed = {indent = {options = {change_type = "diff"}}}, comment = {}, completion = {}, cursorword = {}, indentscope = {}, move = {}, splitjoin = {}, statusline = {}, tabline = {}, trailspace = {}}
+end
+return {{"echasnovski/mini.nvim", config = _1_, opts = _2_, version = false}}
diff --git a/dot_config/nvim/lua/plugins/mini/starter.lua b/dot_config/nvim/lua/plugins/mini/starter.lua
index 539aa11..4174894 100644
--- a/dot_config/nvim/lua/plugins/mini/starter.lua
+++ b/dot_config/nvim/lua/plugins/mini/starter.lua
@@ -1,19 +1,7 @@
-local starter = require 'mini.starter'
-
-local telescope = {
- {action = 'Telescope commands', name = 'Commands'},
- {action = 'Telescope find_files', name = 'Files'},
- {action = 'Telescope help_tags', name = 'Help tags'},
- {action = 'Telescope live_grep', name = 'Live grep'},
- {action = 'Telescope oldfiles', name = 'Old files'},
-}
+-- [nfnl] Compiled from fnl/plugins/mini/starter.fnl by https://github.com/Olical/nfnl, do not edit.
+local starter = require("mini.starter")
+local telescope = {{action = "Telescope commands", name = "Commands"}, {action = "Telescope find_files", name = "Files"}, {action = "Telescope help_tags", name = "Help tags"}, {action = "Telescope live_grep", name = "Live grep"}, {action = "Telescope oldfiles", name = "Old files"}}
for _, v in ipairs(telescope) do
- v.section = 'Telescope'
+ v.section = "Telescope"
end
-
-return {
- items = {
- telescope,
- starter.sections.builtin_actions(),
- },
-}
+return {items = {telescope, starter.sections.builtin_actions()}}
diff --git a/dot_config/nvim/lua/plugins/neo-tree.lua b/dot_config/nvim/lua/plugins/neo-tree.lua
index 5194d99..e97bfe0 100644
--- a/dot_config/nvim/lua/plugins/neo-tree.lua
+++ b/dot_config/nvim/lua/plugins/neo-tree.lua
@@ -1,21 +1,5 @@
-return {
- {
- 'nvim-neo-tree/neo-tree.nvim',
- cmd = 'Neotree',
- dependencies = {
- 'nvim-lua/plenary.nvim',
- 'MunifTanjim/nui.nvim',
- },
- keys = {
- {
- '<leader>n',
- function()
- require 'neo-tree.command'.execute { toggle = true }
- end,
- desc = 'Neotree',
- },
- },
- opts = {
- },
- },
-}
+-- [nfnl] Compiled from fnl/plugins/neo-tree.fnl by https://github.com/Olical/nfnl, do not edit.
+local function _1_()
+ return (require("neo-tree.command")).execute({toggle = true})
+end
+return {{"nvim-neo-tree/neo-tree.nvim", cmd = "Neotree", dependencies = {"nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim"}, keys = {{"<leader>n", _1_, desc = "Neotree"}}, opts = {}}}
diff --git a/dot_config/nvim/lua/plugins/os/init.lua b/dot_config/nvim/lua/plugins/os/init.lua
index bc0a44e..c9b9cab 100644
--- a/dot_config/nvim/lua/plugins/os/init.lua
+++ b/dot_config/nvim/lua/plugins/os/init.lua
@@ -1,2 +1,2 @@
-local os = jit.os:lower()
-return require('plugins.os.' .. os)
+-- [nfnl] Compiled from fnl/plugins/os/init.fnl by https://github.com/Olical/nfnl, do not edit.
+return require(("plugins.os." .. (jit.os):lower()))
diff --git a/dot_config/nvim/lua/plugins/os/linux.lua b/dot_config/nvim/lua/plugins/os/linux.lua
index a564707..161b61c 100644
--- a/dot_config/nvim/lua/plugins/os/linux.lua
+++ b/dot_config/nvim/lua/plugins/os/linux.lua
@@ -1 +1,2 @@
+-- [nfnl] Compiled from fnl/plugins/os/linux.fnl by https://github.com/Olical/nfnl, do not edit.
return {}
diff --git a/dot_config/nvim/lua/plugins/os/osx.lua b/dot_config/nvim/lua/plugins/os/osx.lua
index a564707..8982211 100644
--- a/dot_config/nvim/lua/plugins/os/osx.lua
+++ b/dot_config/nvim/lua/plugins/os/osx.lua
@@ -1 +1,2 @@
+-- [nfnl] Compiled from fnl/plugins/os/osx.fnl by https://github.com/Olical/nfnl, do not edit.
return {}
diff --git a/dot_config/nvim/lua/plugins/surround.lua b/dot_config/nvim/lua/plugins/surround.lua
index a1c5b52..fc8fec7 100644
--- a/dot_config/nvim/lua/plugins/surround.lua
+++ b/dot_config/nvim/lua/plugins/surround.lua
@@ -1,8 +1,2 @@
-return {
- "kylechui/nvim-surround",
- version = "*", -- Use for stability; omit to use `main` branch for the latest features
- event = "VeryLazy",
- config = function()
- require("nvim-surround").setup {}
- end
-}
+-- [nfnl] Compiled from fnl/plugins/surround.fnl by https://github.com/Olical/nfnl, do not edit.
+return {{"kylechui/nvim-surround", event = "VeryLazy", opts = {}, version = "*"}}
diff --git a/dot_config/nvim/lua/plugins/telescope.lua b/dot_config/nvim/lua/plugins/telescope.lua
index bc760de..683bdd7 100644
--- a/dot_config/nvim/lua/plugins/telescope.lua
+++ b/dot_config/nvim/lua/plugins/telescope.lua
@@ -1,34 +1,13 @@
-local function gen(key, fn, desc)
- return {'<leader>f' .. key,
- function()
- require 'telescope.builtin'[fn]()
- end,
- desc = desc}
+-- [nfnl] Compiled from fnl/plugins/telescope.fnl by https://github.com/Olical/nfnl, do not edit.
+local function gen(key, fun, desc)
+ local function _1_()
+ return (require("telescope.builtin"))[fun]()
+ end
+ return {("<leader>f" .. key), _1_, desc = desc}
end
-
-return {
- {
- 'nvim-telescope/telescope.nvim',
- dependencies = {
- 'nvim-lua/plenary.nvim',
- {
- 'nvim-telescope/telescope-fzf-native.nvim',
- build = 'make',
- },
- },
- config = function(_, opts)
- local ts = require 'telescope'
- ts.setup(opts)
- ts.load_extension 'fzf'
- end,
- cmd = 'Telescope',
- keys = {
- gen('f', 'find_files', 'Find File'),
- gen('g', 'live_grep', 'Live Grep'),
- gen('b', 'buffers', 'Find Buffer'),
- gen('h', 'help_tags', 'Find Help'),
- gen('c', 'commands', 'Find Command'),
- gen('t', 'treesitter', 'Find Treesitter'),
- },
- },
-}
+local function _2_(_, opts)
+ local ts = require("telescope")
+ ts.setup(opts)
+ return ts.load_extension("fzf")
+end
+return {{"nvim-telescope/telescope.nvim", cmd = "Telescope", config = _2_, dependencies = {"nvim-lua/plenary.nvim", {"nvim-telescope/telescope-fzf-native.nvim", build = "make"}}, keys = {gen("f", "find_files", "Find File"), gen("g", "live_grep", "Live Grep"), gen("b", "buffers", "Find Buffer"), gen("h", "help_tags", "Find Help"), gen("c", "commands", "Find Command"), gen("t", "treesitter", "Find Treesitter")}}}