diff --git a/nvim/fnl/plugins/kanagawa.fnl b/nvim/fnl/plugins/kanagawa.fnl new file mode 100644 index 0000000..5474e7f --- /dev/null +++ b/nvim/fnl/plugins/kanagawa.fnl @@ -0,0 +1,7 @@ +{ + 1 "rebelot/kanagawa.nvim" + :lazy false + :priority 1000 + :config (fn [] (vim.cmd "colorscheme kanagawa")) +} + diff --git a/nvim/fnl/plugins/lualine.fnl b/nvim/fnl/plugins/lualine.fnl new file mode 100644 index 0000000..67179d7 --- /dev/null +++ b/nvim/fnl/plugins/lualine.fnl @@ -0,0 +1,11 @@ +{ + 1 "nvim-lualine/lualine.nvim" + :dependencies [ + "nvim-tree/nvim-web-devicons" + ] + :config (fn [] + (local lualine (require "lualine")) + (lualine.setup) + ) +} + diff --git a/nvim/init.lua b/nvim/init.lua index 7464891..ea35a58 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,13 +1,15 @@ +-- New bytecode cache +vim.loader.enable() + -- Setup global config require("global") --- Setup Neovide config -- Only run this if inside Neovide if vim.g.neovide then require("neovide") end --- Bootstrap package manager +-- Bootstrap Lazy do local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -23,6 +25,27 @@ do vim.opt.rtp:prepend(lazypath) end +-- Bootstrap Fennel +do + local hotpotpath = vim.fn.stdpath("data") .. "/lazy/hotpot.nvim" + if not vim.loop.fs_stat(hotpotpath) then + vim.notify("Bootstrapping hotpot.nvim...", vim.log.levels.INFO) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "--single-branch", + -- You may with to pin a known version tag with `--branch vX.Y.Z` + "https://github.com/rktjmp/hotpot.nvim.git", + hotpotpath, + }) + end + vim.opt.rtp:prepend(hotpotpath) +end + +-- Load Fennel +require("hotpot") + -- Load lazy local lazy_ok, lazy = pcall(require, "lazy") if lazy_ok then diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 935c87a..5eed075 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -9,6 +9,7 @@ "diffview.nvim": { "branch": "main", "commit": "db97e667e03294bfa9f15e544e78f3082247bf79" }, "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, "haskell-tools.nvim": { "branch": "1.x.x", "commit": "2c3cbdf386ecb03210b56962db96e601705c5118" }, + "hotpot.nvim": { "branch": "master", "commit": "cfe493572fd80678855c3fd3c4cba9f2fec840de" }, "kanagawa.nvim": { "branch": "master", "commit": "1749cea392acb7d1548a946fcee1e6f1304cd3cb" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 3a52a96..4bb3c08 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -1,26 +1,13 @@ return { + -- Fennel + {"rktjmp/hotpot.nvim"}, + -- Editor theme - { - "rebelot/kanagawa.nvim", - lazy = false, - priority = 1000, - config = function() - vim.cmd("colorscheme kanagawa") - end, - }, + require("plugins.kanagawa"), -- Status line - { - "nvim-lualine/lualine.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - config = function() - local lualine = require("lualine") - lualine.setup() - end, - }, + require("plugins.lualine"), -- File tree { @@ -103,7 +90,7 @@ return { sync_install = false, ensure_installed = { -- nvim - "vim", "vimdoc", "lua", + "vim", "vimdoc", "lua", "fennel", -- misc "comment", "dockerfile", "json", "yaml", "toml", "regex", -- git