lua-only no fennel

.gitignore

@@ -1,3 +1,2 @@
-lua/
+fnl/
-lua_bak/
 lazy-lock.json

init.lua

@@ -1,35 +1,2 @@
-
+require("plugins")
--- needed to fix deprecation warning
+require("options")
-vim.tbl_islist = vim.islist
-
--- bootstrap tangerine and hibiscus in order to have fennel support
-local function bootstrap(url, ref)
-	local name = url:gsub(".*/", "")
-	local path
-
-	path = vim.fn.stdpath("data") .. "/lazy/" .. name
-	vim.opt.rtp:prepend(path)
-
-	if vim.fn.isdirectory(path) == 0 then
-		print(name .. ": installing in data dir...")
-
-		vim.fn.system {"git", "clone", url, path}
-		if ref then
-			vim.fn.system {"git", "-C", path, "checkout", ref}
-		end
-
-		vim.cmd "redraw"
-		print(name .. ": finished installing")
-	end
-end
-
-bootstrap("https://github.com/udayvir-singh/tangerine.nvim")
-bootstrap("https://github.com/udayvir-singh/hibiscus.nvim")
-
-
-require "tangerine".setup {
-	compiler = {
-		verbose = false,
-			hooks = { "onsave", "oninit" }
-  	}
-}

lua/options/colors.lua

@@ -0,0 +1,7 @@
+-- :fennel:1721474653
+local espresso = require("catppuccin")
+local color_overrides = {macchiato = {rosewater = "#F5B8AB", flamingo = "#F29D9D", pink = "#AD6FF7", mauve = "#FF8F40", red = "#E66767", maroon = "#EB788B", peach = "#FAB770", yellow = "#FACA64", green = "#70CF67", teal = "#4CD4BD", sky = "#61BDFF", sapphire = "#4BA8FA", blue = "#00BFFF", lavender = "#00BBCC", text = "#C1C9E6", subtext1 = "#A3AAC2", subtext0 = "#8E94AB", overlay2 = "#7D8296", overlay1 = "#676B80", overlay0 = "#464957", surface2 = "#3A3D4A", surface1 = "#2F313D", surface0 = "#1D1E29", base = "#0b0b0b", mantle = "#11111a", crust = "#191926"}}
+local integrations = {cmp = true, gitsigns = true, treesitter = true, telescope = {enabled = true, style = "nvchad"}, mini = {enabled = true}}
+espresso.setup({flavour = "macchiato", color_overrides = color_overrides, integrations = integrations})
+do end (vim.opt)["background"] = "dark"
+return vim.cmd("colorscheme catppuccin")

lua/options/init.lua

@@ -0,0 +1,8 @@
+-- :fennel:1721140474
+local dir = "options."
+local function modul(name)
+  return (dir .. name)
+end
+require(modul("colors"))
+require(modul("keybind"))
+return require(modul("opts"))

lua/options/keybind.lua

@@ -0,0 +1,26 @@
+-- :fennel:1721767243
+vim.g["mapleader"] = " "
+vim.keymap.set({"n"}, "<leader>tw", "<cmd>lua MiniTrailspace.trim()<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>fb", "<cmd>Telescope buffers<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>ff", "<cmd>Telescope find_files<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>fs", "<cmd>Telescope current_buffer_fuzzy_find<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>gs", "<cmd>Telescope git_status<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>fg", "<cmd>Telescope live_grep<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>fh", "<cmd>Telescope help_tags<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>fk", "<cmd>Telescope keymaps<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<leader>tt", "<cmd>terminal<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<C-Space>", "<cmd>bprev<CR>", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "w", "<Plug>CamelCaseMotion_w", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "b", "<Plug>CamelCaseMotion_b", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "e", "<Plug>CamelCaseMotion_e", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "ge", "<Plug>CamelCaseMotion_ge", {noremap = true, silent = true})
+vim.keymap.set({"v"}, "J", ":m '>+1<CR>gv=gv", {noremap = true, silent = true})
+vim.keymap.set({"v"}, "K", ":m '<-2<CR>gv=gv", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "J", "mzJ`z", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<C-d>", "<C-d>zz", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "<C-u>", "<C-u>zz", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "n", "nzzzv", {noremap = true, silent = true})
+vim.keymap.set({"n"}, "N", "Nzzzv", {noremap = true, silent = true})
+vim.keymap.set({"n", "v", "x"}, "<leader>y", "\"+y", {noremap = true, silent = true})
+vim.keymap.set({"n", "v", "x"}, "<leader>Y", "\"+yy", {noremap = true, silent = true})
+return vim.keymap.set({"n", "v", "x"}, "<leader>p", "\"+p", {noremap = true, silent = true})

lua/options/opts.lua

@@ -0,0 +1,43 @@
+-- :fennel:1722704128
+vim.opt["number"] = true
+vim.opt["relativenumber"] = true
+vim.opt["undofile"] = true
+vim.opt["backup"] = false
+vim.opt["autowrite"] = true
+vim.opt["ignorecase"] = true
+vim.opt["list"] = true
+vim.opt["smartindent"] = false
+vim.opt["splitright"] = true
+vim.opt["splitkeep"] = "screen"
+vim.opt["startofline"] = false
+vim.opt["swapfile"] = false
+vim.opt["termguicolors"] = true
+vim.opt["wrap"] = false
+vim.opt["backupcopy"] = "yes"
+vim.opt["smarttab"] = false
+vim.opt["tabstop"] = 4
+vim.opt["softtabstop"] = 4
+vim.opt["shiftwidth"] = 4
+vim.opt["expandtab"] = false
+vim.opt["compatible"] = false
+vim.opt["showmatch"] = true
+vim.opt["hlsearch"] = true
+vim.opt["incsearch"] = true
+vim.opt["autoindent"] = true
+vim.opt["wildmode"] = "longest,list"
+vim.opt["inccommand"] = "split"
+vim.opt["mouse"] = "v"
+vim.opt["mouse"] = "a"
+vim.opt["ttyfast"] = true
+vim.opt["cursorline"] = true
+vim.opt["splitbelow"] = true
+vim.opt["signcolumn"] = "yes:1"
+vim.opt["showmode"] = false
+vim.opt["cmdheight"] = 0
+vim.cmd("syntax match keyword \"\\<lambda\\>\" conceal cchar=\206\187")
+do end (vim.opt)["conceallevel"] = 1
+local default_plugins = {["2html_plugin"] = "getscript", getscriptPlugin = "gzip", logipat = "netrw", netrwPlugin = "netrwSettings", netrwFileHandlers = "matchit", tar = "tarPlugin", rrhelper = "spellfile_plugin", vimball = "vimballPlugin", zip = "zipPlugin", tutor = "rplugin", syntax = "synmenu", optwin = "compiler", bugreport = "ftplugin"}
+for _, plug in ipairs(default_plugins) do
+  vim.g[("loaded" .. plug)] = 1
+end
+return nil

lua/plugins/colorizer.lua

@@ -0,0 +1,4 @@
+-- :fennel:1721474653
+vim.opt["termguicolors"] = true
+local colorizer = require("nvim-highlight-colors")
+return colorizer.setup()

lua/plugins/devicons.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721474653
+local plug = require("nvim-web-devicons")
+return plug.setup({"strict", true, "default", true, "color_icons", true, "override", {"zsh", {"icon", "", "color", "#428850", "cterm_color", "65", "name", "zsh"}}, "override_by_filename", {".gitignore", {"icon", "", "color", "#f1502f", "name", "gitignore"}}, "override_by_extension", {"log", {"icon", "", "color", "#81e043", "name", "Log"}}})

lua/plugins/gitsigns.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721566506
+local gitsigns = require("gitsigns")
+return gitsigns.setup({signs = {add = {text = "\226\150\141"}, change = {text = "\226\150\141"}, delete = {text = "\226\150\141"}, topdelete = {text = "\226\150\141"}, changedelete = {text = "\226\150\141"}, untracked = {text = "\226\150\141"}}, signcolumn = true, watch_gitdir = {follow_files = true}, attach_to_untracked = true, current_line_blame_opts = {virt_text = true, virt_text_pos = "eol", delay = 1000, ignore_whitespace = false}, current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>", sign_priority = 6, update_debounce = 100, status_formatter = nil, max_file_length = 40000, preview_config = {border = "single", style = "minimal", relative = "cursor", row = 0, col = 1}, current_line_blame = false, linehl = false, numhl = false, word_diff = false})

lua/plugins/harpoon.lua

@@ -0,0 +1,35 @@
+-- :fennel:1721425793
+local harpoon = require("harpoon")
+harpoon.setup()
+local function _1_()
+  return (harpoon.list):append()
+end
+vim.keymap.set({"n"}, "<leader>ha", _1_, {noremap = true, silent = true})
+local function _2_()
+  return harpoon.ui.toggle_quick_menu(harpoon.list())
+end
+vim.keymap.set({"n"}, "<C-e>", _2_, {noremap = true, silent = true})
+local function _3_()
+  return (harpoon.list):select(1)
+end
+vim.keymap.set({"n"}, "<C-h>", _3_, {noremap = true, silent = true})
+local function _4_()
+  return (harpoon.list):select(2)
+end
+vim.keymap.set({"n"}, "<C-t>", _4_, {noremap = true, silent = true})
+local function _5_()
+  return (harpoon.list):select(3)
+end
+vim.keymap.set({"n"}, "<C-n>", _5_, {noremap = true, silent = true})
+local function _6_()
+  return (harpoon.list):select(4)
+end
+vim.keymap.set({"n"}, "<C-s>", _6_, {noremap = true, silent = true})
+local function _7_()
+  return (harpoon.list):prev()
+end
+vim.keymap.set({"n"}, "<C-S-P>", _7_, {noremap = true, silent = true})
+local function _8_()
+  return (harpoon.list):next()
+end
+return vim.keymap.set({"n"}, "<C-S-N>", _8_, {noremap = true, silent = true})

lua/plugins/hlchunk.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721474653
+local hlchunk = require("hlchunk")
+return hlchunk.setup({indent = {enable = true, chars = {".", ".", ".", "."}, style = {["#888888"] = "#666666", ["#444444"] = "#333333", ["#333333"] = "#333333"}}, blank = {enable = false}, chunk = {enable = false}, line_num = {style = "#ADBC9F", enable = false}})

lua/plugins/incline.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721474653
+local incline = require("incline")
+return incline.setup({highlight = {groups = {InclineNormal = {default = true, group = "lualine_a_normal"}, InclineNormalNC = {default = true, group = "Comment"}}}, window = {margin = {vertical = 0, horizontal = 1}}})

lua/plugins/init.lua

@@ -0,0 +1,17 @@
+-- :fennel:1721499601
+local dir = "plugins."
+local function modul(name)
+  return (dir .. name)
+end
+require(modul("lazy"))
+require(modul("devicons"))
+require(modul("gitsigns"))
+require(modul("harpoon"))
+require(modul("lsp-zero"))
+require(modul("lualine"))
+require(modul("mini"))
+require(modul("telescope"))
+require(modul("treesitter"))
+require(modul("wilder"))
+require(modul("incline"))
+return require(modul("colorizer"))

lua/plugins/lazy.lua

@@ -0,0 +1,11 @@
+-- :fennel:1722759221
+local lazypath = (vim.fn.stdpath("data") .. "/lazy/lazy.nvim")
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({"git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath})
+else
+end
+do end (vim.opt.rtp):prepend(lazypath)
+local lazy = require("lazy")
+local plug = 1
+local plugins = {"ThePrimeagen/vim-be-good", "udayvir-singh/tangerine.nvim", "udayvir-singh/hibiscus.nvim", "lambdalisue/nerdfont.vim", {[plug] = "catppuccin/nvim", name = "catppuccin", priority = 1000}, "gelguy/wilder.nvim", "bkad/camelcasemotion", "lewis6991/gitsigns.nvim", {[plug] = "b0o/incline.nvim", event = {"BufReadPre"}}, "echasnovski/mini.nvim", "brenoprata10/nvim-highlight-colors", {[plug] = "svampkorg/moody.nvim", event = {"ModeChanged", "BufWinEnter", "WinEnter"}, opts = {}}, {[plug] = "nvim-telescope/telescope-fzf-native.nvim", build = "make"}, {[plug] = "nvim-telescope/telescope.nvim", tag = "0.1.8", dependencies = {"nvim-lua/plenary.nvim"}}, {[plug] = "OXY2DEV/markview.nvim", dependencies = {"nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons"}}, {[plug] = "ThePrimeagen/harpoon", branch = "harpoon2", dependencies = {"nvim-lua/plenary.nvim"}}, {[plug] = "nvim-lualine/lualine.nvim", dependencies = {"nvim-tree/nvim-web-devicons"}}, {[plug] = "nvim-treesitter/nvim-treesitter", build = ":TSUpdate"}, {[plug] = "VonHeikemen/lsp-zero.nvim", branch = "v3.x", dependencies = {"neovim/nvim-lspconfig", "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", "hrsh7th/nvim-cmp", "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip"}}, {[plug] = "m4xshen/hardtime.nvim", dependencies = {"MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim"}}}
+return lazy.setup(plugins)

lua/plugins/lsp-zero.lua

@@ -0,0 +1,36 @@
+-- :fennel:1721498140
+local lsp = require("lsp-zero")
+lsp.preset()
+local lspconfig = require("lspconfig")
+lspconfig.lua_ls.setup(lsp.nvim_lua_ls())
+local mason = require("mason")
+mason.setup()
+local mason_lspc = require("mason-lspconfig")
+mason_lspc.setup({["ensure-installed"] = {"fennel-ls", "lua-language-server", "python-lsp-server"}, automatic_installation = true})
+local cmp = require("cmp")
+local cmp_action = lsp.cmp_action()
+local function _1_(_, bufnr)
+  do local _ = lsp.default_keymaps end
+  return {buffer = bufnr}
+end
+lsp.on_attach(_1_)
+lspconfig.pylsp.setup({setings = {pylsp = {plugins = {pycodestyle = {ignore = {"W391", "E303", "E226"}, maxLineLength = 120}}}}})
+lsp.setup()
+lspconfig.racket_langserver.setup({})
+local function _2_(fallback)
+  if cmp.visible() then
+    cmp.select_next_item()
+  else
+    fallback()
+  end
+  return {"i", "s"}
+end
+local function _4_(fallback)
+  if cmp.visible() then
+    cmp.select_prev_item()
+  else
+    fallback()
+  end
+  return {"i", "s"}
+end
+return cmp.setup({mapping = {["<CR>"] = cmp.mapping.confirm({select = true}), ["<Tab>"] = cmp.mapping(_2_), ["<S-Tab>"] = cmp.mapping(_4_), ["<C-Space>"] = cmp.mapping.complete, ["<C-f>"] = cmp_action.luasnip_jump_forward, ["<C-b>"] = cmp_action.luasnip_jump_backward}})

lua/plugins/lualine.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721474653
+local lualine = require("lualine")
+return lualine.setup({options = {section_separators = {left = "\238\130\188", right = "\238\130\186"}, component_separators = {left = "\238\130\189", right = "\238\130\187"}}})

lua/plugins/mini.lua

@@ -0,0 +1,11 @@
+-- :fennel:1721140474
+local cursorword = require("mini.cursorword")
+cursorword.setup()
+local trailspace = require("mini.trailspace")
+trailspace.setup()
+local pairs = require("mini.pairs")
+pairs.setup()
+local clue = require("mini.clue")
+clue.setup()
+local surround = require("mini.surround")
+return surround.setup()

lua/plugins/oil.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721140474
+local oil = require("oil")
+return oil.setup()

lua/plugins/telescope.lua

@@ -0,0 +1,4 @@
+-- :fennel:1721500726
+local telescope = require("telescope")
+telescope.setup({extansions = {fzf = {fuzzy = true, override_generic_sorter = true, override_file_sorter = true, case_mode = "smart_case"}}})
+return telescope.load_extension("fzf")

lua/plugins/treesitter.lua

@@ -0,0 +1,4 @@
+-- :fennel:1721474653
+local configs = require("nvim-treesitter.configs")
+configs.setup({ensure_installed = {"c", "lua", "vim", "vimdoc", "query", "haskell", "go", "bash", "python", "fennel", "hyprlang"}, auto_install = true, highlight = {enable = true}, sync_install = false})
+return vim.filetype.add({pattern = {[".*/hypr/.*%.conf"] = "hyprlang"}})

lua/plugins/wilder.lua

@@ -0,0 +1 @@
+-- :fennel:1721497941

lua/tangerine_vimrc.lua

@@ -0,0 +1,3 @@
+-- :fennel:1721567155
+require("plugins")
+return require("options")