aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/nvim
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2023-05-12 14:39:36 -0500
committerToby Vincent <tobyv13@gmail.com>2023-05-12 14:39:36 -0500
commitfcfa2dbbb9083067f5ef280c6460bafd45c50918 (patch)
tree52d080d110457ff07621e55990da5b7ee0add40d /nvim
parent92da6dc0162015eba5b56f6f4a08cbc16c09b1ee (diff)
feat(nvim): setup zola development
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/after/ftplugin/htmldjango.lua3
-rw-r--r--nvim/.config/nvim/lazy-lock.json4
-rw-r--r--nvim/.config/nvim/lua/plugins/core.lua5
-rw-r--r--nvim/.config/nvim/lua/plugins/null-ls.lua4
-rw-r--r--nvim/.config/nvim/lua/tobyvin/lsp/configs.lua1
5 files changed, 15 insertions, 2 deletions
diff --git a/nvim/.config/nvim/after/ftplugin/htmldjango.lua b/nvim/.config/nvim/after/ftplugin/htmldjango.lua
new file mode 100644
index 0000000..9b09cd6
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/htmldjango.lua
@@ -0,0 +1,3 @@
+---@diagnostic disable-next-line: param-type-mismatch
+vim.opt_local.formatoptions:remove("o")
+vim.opt_local.tabstop = 2
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 38fe1f3..9da8ec7 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -2,6 +2,7 @@
"Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
"SchemaStore.nvim": { "branch": "main", "commit": "aac9313a2c78b602f23fa59fc799768b35926e8a" },
+ "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
"cellular-automaton.nvim": { "branch": "main", "commit": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" },
@@ -64,5 +65,6 @@
"telescope.nvim": { "branch": "master", "commit": "713d26b98583b160b50fb827adb751f768238ed3" },
"todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
"tokyonight.nvim": { "branch": "main", "commit": "f2ed28707a0ad49047d9b733395ea205ea09f517" },
- "virt-column.nvim": { "branch": "master", "commit": "93b40ea038f676f5a72d7d1f2336fe7b051fc0ce" }
+ "virt-column.nvim": { "branch": "master", "commit": "93b40ea038f676f5a72d7d1f2336fe7b051fc0ce" },
+ "zola.nvim": { "branch": "main", "commit": "35367507f9efb4b88ce587bb0997762feeb04617" }
} \ No newline at end of file
diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua
index 3c61416..6bef9a8 100644
--- a/nvim/.config/nvim/lua/plugins/core.lua
+++ b/nvim/.config/nvim/lua/plugins/core.lua
@@ -28,6 +28,11 @@ local M = {
config = true,
},
{
+ "yorik1984/zola.nvim",
+ ft = "markdown",
+ dependencies = "Glench/Vim-Jinja2-Syntax",
+ },
+ {
"akinsho/git-conflict.nvim",
event = "BufReadPre",
opts = {
diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua
index b775334..f017c6d 100644
--- a/nvim/.config/nvim/lua/plugins/null-ls.lua
+++ b/nvim/.config/nvim/lua/plugins/null-ls.lua
@@ -18,10 +18,14 @@ function M.config()
null_ls.builtins.code_actions.gitrebase,
null_ls.builtins.code_actions.shellcheck,
null_ls.builtins.diagnostics.markdownlint,
+ null_ls.builtins.diagnostics.djlint,
null_ls.builtins.formatting.prettier.with({
disabled_filetypes = { "json", "jsonc" },
extra_args = { "--prose-wrap=always" },
}),
+ null_ls.builtins.formatting.djlint.with({
+ extra_args = { "--indent=2" },
+ }),
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.shfmt,
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 89b55e8..ef11d76 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -22,7 +22,6 @@ local M = {
tsserver = {},
cssls = {},
cssmodules_ls = {},
- stylelint_lsp = {},
clangd = {},
powershell_es = {},
pylsp = {},