diff options
Diffstat (limited to 'nvim')
-rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 60 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/efmls-configs/linters/markdownlint.lua | 18 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/efmls-configs.lua | 29 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/notify.lua | 2 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/treesitter.lua | 5 |
5 files changed, 55 insertions, 59 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 700d5ca..de20bc6 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" }, "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, - "SchemaStore.nvim": { "branch": "main", "commit": "b56b6ac795d988fa3522b279674990120e76b231" }, - "cellular-automaton.nvim": { "branch": "main", "commit": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f" }, + "SchemaStore.nvim": { "branch": "main", "commit": "d2a3d1da007549c921f7b0e22521d1c20d09c8a7" }, + "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-commit": { "branch": "main", "commit": "5f7d19957012ba114da59f06c7e6a3adafb1751d" }, @@ -16,53 +16,53 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "dressing.nvim": { "branch": "master", "commit": "ee571505f3566f84fd252e76c4ce6df6eaf2fb94" }, - "efmls-configs-nvim": { "branch": "main", "commit": "3c274bb64290a5c65987c29e8eb6d4df368a8d20" }, - "git-conflict.nvim": { "branch": "main", "commit": "f83d81e706d7ebfb914457ea72eee159e0e16fae" }, + "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, + "efmls-configs-nvim": { "branch": "main", "commit": "265037d589bde340227c60d2ceaaf552a2d83d85" }, + "git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" }, "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, - "gruvbox.nvim": { "branch": "main", "commit": "6d409ee8af4e84d2327b4b5856f843b97a85a567" }, + "gruvbox.nvim": { "branch": "main", "commit": "fc2b7df3d8384e1ba32d0c5d515931f5ea366eb1" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, "mason-update-all": { "branch": "main", "commit": "007a4085fe5e830b9139313652e1553bf1a9b857" }, - "mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" }, - "neodev.nvim": { "branch": "main", "commit": "c05273b0833021fee8069ea4258fc5ea327596ac" }, - "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, - "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, + "neodev.nvim": { "branch": "main", "commit": "e9dd1535759794635a951644c183beb327879407" }, + "noice.nvim": { "branch": "main", "commit": "791c7adda821fd03529f995df2ee284ad591dabd" }, + "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "897c433ff2fbcf6f71a57bf18460d810e173d1e0" }, - "nvim-dap-go": { "branch": "main", "commit": "9c0eb2b3c8ca63b54009a42a915be657fe7a8734" }, + "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" }, + "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-repl-highlights": { "branch": "master", "commit": "97a2b322c05cf945c5aabaad5e599a20b25e77d9" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, - "nvim-lspconfig": { "branch": "master", "commit": "93c6826b16217eaef568ca5c224ea5d0c12bbb82" }, + "nvim-jdtls": { "branch": "master", "commit": "3ca419c52a7c20a2565237db2c110ed68fc7e6f1" }, + "nvim-lspconfig": { "branch": "master", "commit": "4266f9bb36b4fb09edd19b67d95043cf7ff88ddf" }, "nvim-neoclip.lua": { "branch": "main", "commit": "4e406ae0f759262518731538f2585abb9d269bac" }, - "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" }, "nvim-texlabconfig": { "branch": "master", "commit": "b817297fd07bd6c127df56d01f439f2f838c49ed" }, - "nvim-treesitter": { "branch": "master", "commit": "2ee71c1a2fa74c10692be10ae420ff0c3a02eb3c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "14856c9ee6eb0ede0ae9b43782c9be5e7bd946e6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "56272167a6dead91c47c02dbdbfe1ae5643c59f5" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, + "nvim-treesitter": { "branch": "master", "commit": "fc93fa5c07df7cd578a3ea82d7c075c0460a6884" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" }, "nvim-ts-hint-textobject": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, "peek.nvim": { "branch": "master", "commit": "67752e7581f88da6899838985a05705b008e4185" }, - "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" }, - "refactoring.nvim": { "branch": "master", "commit": "b1cc851bcb4e3c624abbe2a725237eef6bea765c" }, + "refactoring.nvim": { "branch": "master", "commit": "be6505be8bdd306646bb81399312c02927a60a51" }, "rust-tools.nvim": { "branch": "patched", "commit": "4338a9b08faa8da8b5aad095a035ceff31301e3f" }, - "statuscol.nvim": { "branch": "main", "commit": "9f1ff2dcf614544c5022e876d83b4894c1944e87" }, - "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, + "statuscol.nvim": { "branch": "main", "commit": "0944234914438695050eec6f83b4669864680c1a" }, + "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" }, "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, + "telescope.nvim": { "branch": "master", "commit": "40c8d2fc2b729dd442eda093cf8c9496d6e23732" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, + "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, "vim-hjson": { "branch": "master", "commit": "adc104d4a4041a482e1af1914895a119e343c7e1" }, - "virt-column.nvim": { "branch": "master", "commit": "1917bfb519729dea7b4f5d13aa9c810c9579b0ea" } + "virt-column.nvim": { "branch": "master", "commit": "5fc72873dc3175eddbdbbedea8071919c99ad755" } }
\ No newline at end of file diff --git a/nvim/.config/nvim/lua/efmls-configs/linters/markdownlint.lua b/nvim/.config/nvim/lua/efmls-configs/linters/markdownlint.lua deleted file mode 100644 index 2d553d1..0000000 --- a/nvim/.config/nvim/lua/efmls-configs/linters/markdownlint.lua +++ /dev/null @@ -1,18 +0,0 @@ --- Metadata --- languages: python,go,php,html --- url: https://djlint.com/ - -local fs = require("efmls-configs.fs") - -local linter = "markdownlint" -local bin = fs.executable(linter) -local args = ("--stdin --config %s/markdownlint/markdownlint.yaml"):format(vim.env.XDG_CONFIG_HOME) -local command = string.format("%s %s", bin, args) - -return { - prefix = linter, - lintCommand = command, - lintFormats = { "%f:%l %m", "%f:%l:%c %m", "%f: %l: %m" }, - lintStdin = true, - lintIgnoreExitCode = true, -} diff --git a/nvim/.config/nvim/lua/plugins/efmls-configs.lua b/nvim/.config/nvim/lua/plugins/efmls-configs.lua index 1a2c6ce..fa35d77 100644 --- a/nvim/.config/nvim/lua/plugins/efmls-configs.lua +++ b/nvim/.config/nvim/lua/plugins/efmls-configs.lua @@ -14,7 +14,7 @@ function M:config(opts) opts.settings = vim.tbl_extend("force", opts.settings or {}, { languages = { css = { - require("efmls-configs.formatters.prettier"), + require("efmls-configs.formatters.stylelint"), }, django = { require("efmls-configs.linters.djlint"), @@ -24,9 +24,6 @@ function M:config(opts) require("efmls-configs.linters.djlint"), require("efmls-configs.formatters.djlint"), }, - javascript = { - require("efmls-configs.formatters.prettier"), - }, ["jinja.html"] = { require("efmls-configs.linters.djlint"), require("efmls-configs.formatters.djlint"), @@ -35,18 +32,32 @@ function M:config(opts) require("efmls-configs.formatters.stylua"), }, markdown = { - require("efmls-configs.linters.markdownlint"), - require("efmls-configs.formatters.prettier"), - require("efmls-configs.formatters.cbfmt"), + (function() + local markdownlint = require("efmls-configs.linters.markdownlint") + markdownlint.lintCommand = ("%s --config %s/markdownlint/markdownlint.yaml"):format( + markdownlint.lintCommand, + vim.env.XDG_CONFIG_HOME + ) + return markdownlint + end)(), + (function() + local cbfmt = require("efmls-configs.formatters.cbfmt") + cbfmt.formatCommand = ("%s --config %s/cbfmt/cbfmt.toml"):format( + cbfmt.formatCommand, + vim.env.XDG_CONFIG_HOME + ) + return cbfmt + end)(), + require("efmls-configs.formatters.mdformat"), }, python = { require("efmls-configs.formatters.black"), }, sass = { - require("efmls-configs.formatters.prettier"), + require("efmls-configs.formatters.stylelint"), }, scss = { - require("efmls-configs.formatters.prettier"), + require("efmls-configs.formatters.stylelint"), }, sh = { require("efmls-configs.formatters.shfmt"), diff --git a/nvim/.config/nvim/lua/plugins/notify.lua b/nvim/.config/nvim/lua/plugins/notify.lua index d45c3e8..8c02f28 100644 --- a/nvim/.config/nvim/lua/plugins/notify.lua +++ b/nvim/.config/nvim/lua/plugins/notify.lua @@ -10,7 +10,7 @@ local M = { max_width = function() return math.floor(vim.o.columns * 0.75) end, - render = "compact", + render = "wrapped-compact", }, } diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua index 9efcd48..841a808 100644 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -5,8 +5,11 @@ local M = { event = "BufReadPost", dependencies = { "nvim-treesitter/nvim-treesitter-textobjects", - "JoosepAlviste/nvim-ts-context-commentstring", "mfussenegger/nvim-ts-hint-textobject", + { + "JoosepAlviste/nvim-ts-context-commentstring", + config = true, + }, }, main = "nvim-treesitter.configs", opts = { |