From 0dcfba8f9ce660ad159ee683c5b73bb8e83a269d Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Wed, 5 Apr 2023 22:52:29 -0500 Subject: [PATCH] Add formatter and format files with Stylua --- config/nvim/.stylua.toml | 6 ++++++ config/nvim/init.lua | 6 +++--- config/nvim/lazy-lock.json | 1 + config/nvim/lua/.luarc.json | 15 +++++++++++++++ config/nvim/lua/config/keymaps.lua | 2 +- config/nvim/lua/config/plugins/formatter.lua | 15 +++++++++++++++ .../nvim/lua/config/plugins/lspconfig/emmet.lua | 2 +- config/nvim/lua/config/plugins/lspconfig/lua.lua | 6 +++--- config/nvim/lua/config/plugins/neo-tree.lua | 2 +- config/nvim/lua/config/plugins/nvim-cmp.lua | 2 +- config/nvim/lua/plugins/formatter.lua | 5 +++++ config/nvim/lua/plugins/lspconfig.lua | 2 +- config/nvim/lua/plugins/lualine.lua | 2 +- config/nvim/lua/plugins/neo-tree.lua | 4 ++-- config/nvim/lua/plugins/nvim-cmp.lua | 2 +- config/nvim/lua/plugins/telescope.lua | 2 +- config/nvim/lua/plugins/tree-sitter.lua | 9 ++++++--- config/nvim/lua/plugins/which-key.lua | 2 +- 18 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 config/nvim/.stylua.toml create mode 100644 config/nvim/lua/.luarc.json create mode 100644 config/nvim/lua/config/plugins/formatter.lua create mode 100644 config/nvim/lua/plugins/formatter.lua diff --git a/config/nvim/.stylua.toml b/config/nvim/.stylua.toml new file mode 100644 index 0000000..a817a40 --- /dev/null +++ b/config/nvim/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 80 +indent_type = "Spaces" +indent_width = 2 + +[sort_requires] +enabled = true diff --git a/config/nvim/init.lua b/config/nvim/init.lua index fb38ba0..bee89dc 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,3 +1,3 @@ -require "config.keymaps" -require "config.lazy" -require "config.options" +require("config.keymaps") +require("config.lazy") +require("config.options") diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 49e69f6..e5a7978 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -4,6 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, + "formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" }, "gruvbox.nvim": { "branch": "main", "commit": "1a8ba635e511148801b55a1128aef933c296a301" }, "kanagawa.nvim": { "branch": "master", "commit": "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, diff --git a/config/nvim/lua/.luarc.json b/config/nvim/lua/.luarc.json new file mode 100644 index 0000000..df3bed7 --- /dev/null +++ b/config/nvim/lua/.luarc.json @@ -0,0 +1,15 @@ +{ + "workspace.library": [ + "/Users/danbarber/.config/nvim", + "/Users/danbarber/.local/share/nvim/lazy/lazy.nvim", + "/Users/danbarber/.local/share/nvim/lazy/nvim-lspconfig", + "/Users/danbarber/.local/share/nvim/lazy/nordic.nvim", + "/Users/danbarber/.local/share/nvim/lazy/plenary.nvim", + "/Users/danbarber/.local/share/nvim/lazy/telescope.nvim", + "/Users/danbarber/.local/share/nvim/lazy/tokyonight.nvim", + "/Users/danbarber/.local/share/nvim/lazy/which-key.nvim", + "/Applications/VimR.app/Contents/Resources/NvimView_NvimView.bundle/Contents/Resources/runtime", + "/Users/danbarber/.local/state/nvim/lazy/readme", + "${3rd}/luassert/library" + ] +} \ No newline at end of file diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua index 052a4f0..6547770 100644 --- a/config/nvim/lua/config/keymaps.lua +++ b/config/nvim/lua/config/keymaps.lua @@ -1,7 +1,7 @@ local keymap = vim.keymap.set -- Space as leader -vim.g.mapleader = ' ' +vim.g.mapleader = " " -- Better pane navigation keymap("n", "", "h") diff --git a/config/nvim/lua/config/plugins/formatter.lua b/config/nvim/lua/config/plugins/formatter.lua new file mode 100644 index 0000000..b0ce003 --- /dev/null +++ b/config/nvim/lua/config/plugins/formatter.lua @@ -0,0 +1,15 @@ +return function() + require("formatter").setup({ + logging = true, + log_level = vim.log.levels.WARN, + filetype = { + lua = { + require("formatter.filetypes.lua").stylua, + }, + + ["*"] = { + require("formatter.filetypes.any").remove_trailing_whitespace, + }, + }, + }) +end diff --git a/config/nvim/lua/config/plugins/lspconfig/emmet.lua b/config/nvim/lua/config/plugins/lspconfig/emmet.lua index 6cd32a4..dd640d6 100644 --- a/config/nvim/lua/config/plugins/lspconfig/emmet.lua +++ b/config/nvim/lua/config/plugins/lspconfig/emmet.lua @@ -1 +1 @@ -require('lspconfig').emmet_ls.setup({}) +require("lspconfig").emmet_ls.setup({}) diff --git a/config/nvim/lua/config/plugins/lspconfig/lua.lua b/config/nvim/lua/config/plugins/lspconfig/lua.lua index 294c39b..0ffbf71 100644 --- a/config/nvim/lua/config/plugins/lspconfig/lua.lua +++ b/config/nvim/lua/config/plugins/lspconfig/lua.lua @@ -1,11 +1,11 @@ -require("lspconfig").lua_ls.setup { +require("lspconfig").lua_ls.setup({ settings = { Lua = { runtime = { version = "LuaJIT", }, diagnostics = { - globals = {"vim"}, + globals = { "vim" }, }, workspace = { library = vim.api.nvim_get_runtime_file("", true), @@ -15,4 +15,4 @@ require("lspconfig").lua_ls.setup { }, }, }, -} +}) diff --git a/config/nvim/lua/config/plugins/neo-tree.lua b/config/nvim/lua/config/plugins/neo-tree.lua index 1652f74..8b7b9e2 100644 --- a/config/nvim/lua/config/plugins/neo-tree.lua +++ b/config/nvim/lua/config/plugins/neo-tree.lua @@ -3,6 +3,6 @@ return function() vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) require("neo-tree").setup({ - hijack_netrw_behavior = "open_default" + hijack_netrw_behavior = "open_default", }) end diff --git a/config/nvim/lua/config/plugins/nvim-cmp.lua b/config/nvim/lua/config/plugins/nvim-cmp.lua index 6d1efb6..41bbca9 100644 --- a/config/nvim/lua/config/plugins/nvim-cmp.lua +++ b/config/nvim/lua/config/plugins/nvim-cmp.lua @@ -23,6 +23,6 @@ return function() { name = "vsnip" }, }, { { name = "buffer" }, - }) + }), }) end diff --git a/config/nvim/lua/plugins/formatter.lua b/config/nvim/lua/plugins/formatter.lua new file mode 100644 index 0000000..47acbdd --- /dev/null +++ b/config/nvim/lua/plugins/formatter.lua @@ -0,0 +1,5 @@ +return { + "mhartington/formatter.nvim", + + config = require("config.plugins.formatter"), +} diff --git a/config/nvim/lua/plugins/lspconfig.lua b/config/nvim/lua/plugins/lspconfig.lua index fd0ff72..75899da 100644 --- a/config/nvim/lua/plugins/lspconfig.lua +++ b/config/nvim/lua/plugins/lspconfig.lua @@ -3,5 +3,5 @@ return { config = function() require("config.plugins.lspconfig") - end + end, } diff --git a/config/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua index ef7c3a3..fb96354 100644 --- a/config/nvim/lua/plugins/lualine.lua +++ b/config/nvim/lua/plugins/lualine.lua @@ -5,5 +5,5 @@ return { "nvim-tree/nvim-web-devicons", }, - config = require("config.plugins.lualine") + config = require("config.plugins.lualine"), } diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua index bbdf888..8000f45 100644 --- a/config/nvim/lua/plugins/neo-tree.lua +++ b/config/nvim/lua/plugins/neo-tree.lua @@ -1,11 +1,11 @@ return { "nvim-neo-tree/neo-tree.nvim", - dependencies = { + dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim", }, - config = require("config.plugins.neo-tree") + config = require("config.plugins.neo-tree"), } diff --git a/config/nvim/lua/plugins/nvim-cmp.lua b/config/nvim/lua/plugins/nvim-cmp.lua index 56151d1..ba436ce 100644 --- a/config/nvim/lua/plugins/nvim-cmp.lua +++ b/config/nvim/lua/plugins/nvim-cmp.lua @@ -1,5 +1,5 @@ return { "hrsh7th/nvim-cmp", - config = require("config.plugins.nvim-cmp") + config = require("config.plugins.nvim-cmp"), } diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua index 0047910..458e0c2 100644 --- a/config/nvim/lua/plugins/telescope.lua +++ b/config/nvim/lua/plugins/telescope.lua @@ -1,5 +1,5 @@ return { "nvim-telescope/telescope.nvim", - dependencies = { "nvim-lua/plenary.nvim" } + dependencies = { "nvim-lua/plenary.nvim" }, } diff --git a/config/nvim/lua/plugins/tree-sitter.lua b/config/nvim/lua/plugins/tree-sitter.lua index fbffef3..5008398 100644 --- a/config/nvim/lua/plugins/tree-sitter.lua +++ b/config/nvim/lua/plugins/tree-sitter.lua @@ -11,7 +11,8 @@ return { "nvim-treesitter/nvim-treesitter-textobjects", init = function() -- PERF: no need to load the plugin, if we only need its queries for mini.ai - local plugin = require("lazy.core.config").spec.plugins["nvim-treesitter"] + local plugin = + require("lazy.core.config").spec.plugins["nvim-treesitter"] local opts = require("lazy.core.plugin").values(plugin, "opts", false) local enabled = false if opts.textobjects then @@ -23,13 +24,15 @@ return { end end if not enabled then - require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects") + require("lazy.core.loader").disable_rtp_plugin( + "nvim-treesitter-textobjects" + ) end end, }, }, ---@type TSConfig - opts = require("config.plugins.tree-sitter") + opts = require("config.plugins.tree-sitter"), }, } diff --git a/config/nvim/lua/plugins/which-key.lua b/config/nvim/lua/plugins/which-key.lua index 6f47e34..095cca7 100644 --- a/config/nvim/lua/plugins/which-key.lua +++ b/config/nvim/lua/plugins/which-key.lua @@ -1,5 +1,5 @@ return { "folke/which-key.nvim", - config = require("config.plugins.which-key") + config = require("config.plugins.which-key"), }