diff --git a/after/plugin/conform.lua b/after/plugin/conform.lua deleted file mode 100644 index 7ee8d81..0000000 --- a/after/plugin/conform.lua +++ /dev/null @@ -1,3 +0,0 @@ -local conform = require("conform") -conform.setup() - diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua deleted file mode 100644 index 64186ee..0000000 --- a/after/plugin/lualine.lua +++ /dev/null @@ -1,3 +0,0 @@ - -require('lualine').setup { -} diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua deleted file mode 100644 index 6925ee6..0000000 --- a/after/plugin/treesitter.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("nvim-treesitter.configs").setup({ -}) diff --git a/lazy-lock.json b/lazy-lock.json index a2eefd4..7247dca 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,24 +12,25 @@ "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" }, "flutter-tools.nvim": { "branch": "main", "commit": "4f18033c3b78aa5450e538d81dfbbb3e67aeadec" }, - "harpoon": { "branch": "harpoon2", "commit": "da326d0438ac68dee9b6b62a734be940a8bd8405" }, + "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.diff": { "branch": "main", "commit": "5600beba78cebd2790d679b531b6543fe2e91b12" }, + "mini.diff": { "branch": "main", "commit": "860d6632806a71030aadc8adf8e37aee2daba09d" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, - "nvim-lspconfig": { "branch": "master", "commit": "9619e53d3f99f0ca4ea3b88f5d97fce703131820" }, + "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" }, - "nvim-treesitter": { "branch": "master", "commit": "11a3584b81c3249d2b6279305aee1c7ad273985a" }, + "nvim-treesitter": { "branch": "master", "commit": "b0ac1135fe304edd34e18204304906744db0fe63" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, - "nvim-web-devicons": { "branch": "master", "commit": "20921d33c605ba24c8d0b76b379a54a9c83ba170" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "telescope.nvim": { "branch": "master", "commit": "d26b666b45e5dde23332e4bde1227677f2d92e31" }, + "tailwind-sorter.nvim": { "branch": "main", "commit": "3bde5890457e6272550c8b853c13bfb57457f47f" }, + "telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, diff --git a/lua/409/lazy.lua b/lua/409/lazy.lua index ca014cf..cf9f060 100644 --- a/lua/409/lazy.lua +++ b/lua/409/lazy.lua @@ -14,7 +14,7 @@ vim.opt.rtp:prepend(lazypath) local lazy = require("lazy") lazy.setup("409.plugins", { - ui = { - border = "single" - } + ui = { + border = "single", + }, }) diff --git a/lua/409/plugins/comments.lua b/lua/409/plugins/comments.lua index e83370b..2b39a54 100644 --- a/lua/409/plugins/comments.lua +++ b/lua/409/plugins/comments.lua @@ -1,66 +1,62 @@ return { - { - "numToStr/Comment.nvim", - event = "VeryLazy", - config = function() - require("Comment").setup() - end - }, - { - "danymat/neogen", - event = "VeryLazy", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - opts = { - enabled = true, - input_after_comment = true, - languages = { - cs = { - template = { - annotation_convention = "xmldoc" - } - } - } - }, - keys = { - { - "nf", - ":Neogen func", - desc = "Document function" - }, - { - "nt", - ":Neogen type", - desc = "Document type" - }, - { - "nc", - ":Neogen class", - desc = "Document class" - }, - { - "", - function() - require("neogen").jump_next() - end, - mode = "i", - desc = "Next documentation field" - }, - { - "", - function() - require("neogen").jump_prev() - end, - mode = "i", - desc = "Previous documentation field" - }, - } - }, - { - "folke/todo-comments.nvim", - event = "VeryLazy", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function () - require("todo-comments").setup() - end - }, + { + "numToStr/Comment.nvim", + event = "VeryLazy", + config = true, + }, + { + "danymat/neogen", + event = "VeryLazy", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + opts = { + enabled = true, + input_after_comment = true, + languages = { + cs = { + template = { + annotation_convention = "xmldoc", + }, + }, + }, + }, + keys = { + { + "nf", + ":Neogen func", + desc = "Document function", + }, + { + "nt", + ":Neogen type", + desc = "Document type", + }, + { + "nc", + ":Neogen class", + desc = "Document class", + }, + { + "", + function() + require("neogen").jump_next() + end, + mode = "i", + desc = "Next documentation field", + }, + { + "", + function() + require("neogen").jump_prev() + end, + mode = "i", + desc = "Previous documentation field", + }, + }, + }, + { + "folke/todo-comments.nvim", + event = "VeryLazy", + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, } diff --git a/lua/409/plugins/formatting.lua b/lua/409/plugins/formatting.lua index 0b61f05..2945cb1 100644 --- a/lua/409/plugins/formatting.lua +++ b/lua/409/plugins/formatting.lua @@ -15,7 +15,7 @@ return { end, config = function(plugin, opts) local conform = require("conform") - conform.setup(opts) + conform.setup(opts) conform.formatters.clang_format = { args = { "--style", "{IndentWidth: 4, UseTab: Always, TabWidth: 4}" }, diff --git a/lua/409/plugins/git.lua b/lua/409/plugins/git.lua index 9d8e333..7a7c2dc 100644 --- a/lua/409/plugins/git.lua +++ b/lua/409/plugins/git.lua @@ -13,8 +13,6 @@ return { { "echasnovski/mini.diff", version = false, - config = function() - require("mini.diff").setup() - end, + config = true }, } diff --git a/lua/409/plugins/statusline.lua b/lua/409/plugins/statusline.lua index 5297ba3..3b398e5 100644 --- a/lua/409/plugins/statusline.lua +++ b/lua/409/plugins/statusline.lua @@ -99,8 +99,6 @@ return { "SmiteshP/nvim-navic", "nvim-tree/nvim-web-devicons", -- optional dependency }, - config = function() - require("barbecue").setup() - end, + config = true }, } diff --git a/lua/409/plugins/util.lua b/lua/409/plugins/util.lua index 474e199..a5c2384 100644 --- a/lua/409/plugins/util.lua +++ b/lua/409/plugins/util.lua @@ -24,8 +24,6 @@ return { { "echasnovski/mini.surround", version = "*", - config = function() - require("mini.surround").setup() - end + config = true }, }