From 6dda873a26e3ebd65d49d80c2431cd4e2d14355d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20=F0=9F=9A=B6?= Date: Fri, 22 Dec 2023 15:38:21 +1100 Subject: [PATCH] Update lazyvim --- .stylua.toml | 5 +-- lazyvim/lazy-lock.json | 57 --------------------------------- lazyvim/lua/config/lazy.lua | 3 +- lazyvim/lua/plugins/example.lua | 7 ++-- lazyvim/lua/plugins/text.lua | 42 ------------------------ 5 files changed, 6 insertions(+), 108 deletions(-) delete mode 100644 lazyvim/lazy-lock.json delete mode 100644 lazyvim/lua/plugins/text.lua diff --git a/.stylua.toml b/.stylua.toml index 6601564..0f90030 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,6 +1,3 @@ -column_width = 120 -line_endings = "Unix" indent_type = "Spaces" indent_width = 2 -quote_style = "AutoPreferSingle" -no_call_parentheses = false +column_width = 120 diff --git a/lazyvim/lazy-lock.json b/lazyvim/lazy-lock.json deleted file mode 100644 index f9a527d..0000000 --- a/lazyvim/lazy-lock.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "d69d55afd42566eddf77893564bf21faecd4854a" }, - "LuaSnip": { "branch": "master", "commit": "51ebb4b6637290e1b8e0fb0d6f38b605d3c24940" }, - "SchemaStore.nvim": { "branch": "main", "commit": "2d0b27ad28443cb700835b0d6a404ffe7f29c731" }, - "bufferline.nvim": { "branch": "main", "commit": "02d795081e6a24ec1fd506c513491543793d0780" }, - "catppuccin": { "branch": "main", "commit": "a54a3247dbd2ea2f846cf9f68aedb4b49c61e269" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "dressing.nvim": { "branch": "master", "commit": "f16d7586fcdd8b2e3850d0abb7e46f944125cc25" }, - "flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" }, - "friendly-snippets": { "branch": "main", "commit": "0dd6114bea08276d9111d58c5dce5e256bbc8921" }, - "gitsigns.nvim": { "branch": "main", "commit": "f868d82a36f7f7f5e110eb0a9659993984f59875" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, - "lazy.nvim": { "branch": "main", "commit": "9223c1aa200a8c329053f9e2ca0980ead56059d6" }, - "leap.nvim": { "branch": "main", "commit": "14b5a65190fe69388a8f59c695ed3394a10d6af8" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f0ce33f4794a2364eb08d09d09380e8b04ec5e6a" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "c836e511e796d2b6a25ad9f164f5b25d8b9ff705" }, - "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, - "mini.ai": { "branch": "main", "commit": "44d7df1340b16b16b27b67fba07028cb57f45408" }, - "mini.bufremove": { "branch": "main", "commit": "14805473144fffbd019d07e51bed2d176e065ee9" }, - "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, - "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, - "mini.pairs": { "branch": "main", "commit": "963b800d0524eadd297199207011b98684205ada" }, - "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "8c89efb93b8383666a6f989762c2f610f5f2c930" }, - "neoconf.nvim": { "branch": "main", "commit": "17aaf0462f7cd6b2c70c9a32988126bec71a2504" }, - "neodev.nvim": { "branch": "main", "commit": "13872b2e3bfe4e7c76a0fd6010bbb466f3a84f91" }, - "noice.nvim": { "branch": "main", "commit": "7e358170cea2314d9768b3f63616e8fad186195e" }, - "nui.nvim": { "branch": "main", "commit": "2b2732528e4a79eb8542568bd51d25f710395bd6" }, - "null-ls.nvim": { "branch": "main", "commit": "c89333e034a8daba654ebfcf9a4ec9f87765f01e" }, - "nvim-cmp": { "branch": "main", "commit": "fc0f694af1a742ada77e5b1c91ff405c746f4a26" }, - "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, - "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-lspconfig": { "branch": "master", "commit": "90f5b0c2d7c5d3deb76b5deb0ecc379023c4f299" }, - "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" }, - "nvim-notify": { "branch": "master", "commit": "f3024b912073774111202f5fa6518b0cd2a74432" }, - "nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" }, - "nvim-treesitter": { "branch": "master", "commit": "6847ce4f8c93a0c8fd5a3d4df08975ab185187eb" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "23e883b99228f8d438254e5ef8c897e5e60e75d1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, - "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, - "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, - "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, - "telescope.nvim": { "branch": "master", "commit": "6d3fbffe426794296a77bb0b37b6ae0f4f14f807" }, - "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, - "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" }, - "trouble.nvim": { "branch": "main", "commit": "324c977cfeacb8498ca9ba1c74cc35bd18858a8d" }, - "typescript.nvim": { "branch": "main", "commit": "f66d4472606cb24615dfb7dbc6557e779d177624" }, - "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, - "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, - "vim-startuptime": { "branch": "master", "commit": "b5c144367fad9846bd288be6c3933f6c7ddd69ef" }, - "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" } -} \ No newline at end of file diff --git a/lazyvim/lua/config/lazy.lua b/lazyvim/lua/config/lazy.lua index 5b5302d..9724ab5 100644 --- a/lazyvim/lua/config/lazy.lua +++ b/lazyvim/lua/config/lazy.lua @@ -2,7 +2,8 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then -- bootstrap lazy.nvim -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", + lazypath }) end vim.opt.rtp:prepend(vim.env.LAZY or lazypath) diff --git a/lazyvim/lua/plugins/example.lua b/lazyvim/lua/plugins/example.lua index 5d2c1f8..f84ebdc 100644 --- a/lazyvim/lua/plugins/example.lua +++ b/lazyvim/lua/plugins/example.lua @@ -2,7 +2,7 @@ -- stylua: ignore if true then return {} end --- every spec file under config.plugins will be loaded automatically by lazy.nvim +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim -- -- In your plugin files, you can: -- * add extra plugins @@ -44,8 +44,7 @@ return { dependencies = { "hrsh7th/cmp-emoji" }, ---@param opts cmp.ConfigSchema opts = function(_, opts) - local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } })) + table.insert(opts.sources, { name = "emoji" }) end, }, @@ -196,7 +195,7 @@ return { -- use mini.starter instead of alpha { import = "lazyvim.plugins.extras.ui.mini-starter" }, - -- add jsonls and schemastore ans setup treesitter for json, json5 and jsonc + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc { import = "lazyvim.plugins.extras.lang.json" }, -- add any tools you want to have installed below diff --git a/lazyvim/lua/plugins/text.lua b/lazyvim/lua/plugins/text.lua deleted file mode 100644 index 4c6cc93..0000000 --- a/lazyvim/lua/plugins/text.lua +++ /dev/null @@ -1,42 +0,0 @@ -local words = {} -for word in io.open(vim.fn.stdpath("config") .. "/spell/en.utf-8.add", "r"):lines() do - table.insert(words, word) -end - -return { - -- remove markdown from treesitter - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - local ignore_install = { "markdown", "markdown_inline" } - if type(opts.ignore_install) == "table" then - vim.list_extend(ignore_install, opts.ignore_install) - end - opts.ignore_install = ignore_install - return opts - end, - }, - - -- ltex installation - { - "neovim/nvim-lspconfig", - opts = { - -- make sure mason installs the server - servers = { - ltex = { - settings = { - ltex = { - additionalRules = { - motherTongue = "fa", - enablePickyRules = "true" - }, - dictionary = { - ["en-US"] = words, - }, - }, - } - } - } - } - } -}