diff --git a/.config/nvim/ftplugin/bash.lua b/.config/nvim/ftplugin/bash.lua new file mode 100644 index 00000000..1531a875 --- /dev/null +++ b/.config/nvim/ftplugin/bash.lua @@ -0,0 +1,5 @@ +vim.keymap.set("n", "f", function() + local saved = vim.fn.winsaveview() + vim.cmd([[silent exec "%!shfmt"]]) + vim.fn.winrestview(saved) +end, { desc = "ft(bash): Format with shfmt" }) diff --git a/.config/nvim/ftplugin/lua.lua b/.config/nvim/ftplugin/lua.lua new file mode 100644 index 00000000..02b68775 --- /dev/null +++ b/.config/nvim/ftplugin/lua.lua @@ -0,0 +1,6 @@ + + vim.keymap.set("n", "f", function() + local saved = vim.fn.winsaveview() + vim.cmd([[silent exec "!stylua %"]]) + vim.fn.winrestview(saved) + end, { desc = "ft(lua): Format with stylua" }) diff --git a/.config/nvim/ftplugin/typst.lua b/.config/nvim/ftplugin/typst.lua index 58ea4b91..929f7c77 100644 --- a/.config/nvim/ftplugin/typst.lua +++ b/.config/nvim/ftplugin/typst.lua @@ -1,3 +1,9 @@ vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 vim.bo.textwidth = 100 + +vim.keymap.set("n", "f", function() + local saved = vim.fn.winsaveview() + vim.cmd([[silent exec "%!typstyle -c 100"]]) + vim.fn.winrestview(saved) +end, { desc = "ft(typst): Format with typstyle" }) diff --git a/.config/nvim/plugin/lsp.lua b/.config/nvim/plugin/lsp.lua index 6ab4295d..c8fa1488 100644 --- a/.config/nvim/plugin/lsp.lua +++ b/.config/nvim/plugin/lsp.lua @@ -28,35 +28,11 @@ local servers = { -- golangci_lint_ls = {}, fish_lsp = {}, + bashls = {}, - bashls = { -- Bash - on_attach = function(_, bufno) - map("n", "f", function() - local saved = vim.fn.winsaveview() - vim.cmd([[silent exec "%!shfmt"]]) - vim.fn.winrestview(saved) - end, { buffer = bufno }) - end, - }, - - tinymist = { - on_attach = function(_, bufno) - map("n", "f", function() - local saved = vim.fn.winsaveview() - vim.cmd([[silent exec "%!typstyle -c 100"]]) - vim.fn.winrestview(saved) - end, { buffer = bufno }) - end, - }, + tinymist = {}, lua_ls = { -- Lua - on_attach = function(_, bufno) - map("n", "f", function() - local saved = vim.fn.winsaveview() - vim.cmd([[silent exec "!stylua %"]]) - vim.fn.winrestview(saved) - end, { buffer = bufno }) - end, settings = { Lua = { workspace = {