wonderfulfrog/neovim
1
0
Fork 0
Code Pull requests Activity

Compare commits

base: wonderfulfrog:fca3c2d043963382c11f17c8eb0a3b4f8e303db4
Branches Tags
wonderfulfrog:main
..
compare: wonderfulfrog:567e5775131410a36edaf4b49e4e3a2eef680760
Branches Tags
wonderfulfrog:main

No commits in common. "fca3c2d043963382c11f17c8eb0a3b4f8e303db4" and "567e5775131410a36edaf4b49e4e3a2eef680760" have entirely different histories.
fca3c2d043 ... 567e577513

4 changed files with 40 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

60
lazy-lock.json
View file

@ -1,35 +1,35 @@
{ {
"LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"markdown.nvim": { "branch": "main", "commit": "df64d5d5432e13026a79384ec4e2bab185fd4eb5" }, "markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
"mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"neo-tree.nvim": { "branch": "main", "commit": "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde" }, "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" },
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
"nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
} }

19
lua/plugins/formatting.lua
View file

@ -3,7 +3,6 @@ return {
"stevearc/conform.nvim", "stevearc/conform.nvim",
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
blade = { "blade-formatter" },
css = { "prettierd" }, css = { "prettierd" },
scss = { "prettierd" }, scss = { "prettierd" },
html = { "djlint" }, html = { "djlint" },
@ -13,7 +12,7 @@ return {
javascriptreact = { "prettierd" }, javascriptreact = { "prettierd" },
json = { "prettierd" }, json = { "prettierd" },
jsonc = { "prettierd" }, jsonc = { "prettierd" },
php = { "php_cs_fixer", stop_after_first = true }, php = { "php_cs_fixer" },
toml = { "taplo" }, toml = { "taplo" },
typescript = { "prettierd" }, typescript = { "prettierd" },
typescriptreact = { "prettierd" }, typescriptreact = { "prettierd" },
@ -36,9 +35,6 @@ return {
end, end,
}, },
php_cs_fixer = { php_cs_fixer = {
env = {
PHP_CS_FIXER_IGNORE_ENV = "1",
},
args = function() args = function()
local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php" local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php"
return { return {
@ -49,16 +45,6 @@ return {
} }
end, end,
}, },
-- pint = {
-- args = function()
-- local CONFIG_PATH = os.getenv("HOME") .. "/.config/pint/pint.json"
-- return {
-- "--config",
-- CONFIG_PATH,
-- "$FILENAME",
-- }
-- end,
-- },
}, },
}, },
}, },
@ -66,10 +52,7 @@ return {
"WhoIsSethDaniel/mason-tool-installer.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim",
opts = { opts = {
ensure_installed = { ensure_installed = {
"blade-formatter",
"djlint", "djlint",
"eslint",
"phpcs",
"php-cs-fixer", "php-cs-fixer",
"prettierd", "prettierd",
"proselint", "proselint",

16
lua/plugins/lsp.lua
View file

@ -1,23 +1,17 @@
return { return {
-- Locking mason.nvim and mason-lspconfig.nvim to v1
-- See -- see https://github.com/LazyVim/LazyVim/issues/6039
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
version = "^1.0.0",
opts = {}, opts = {},
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
version = "^1.0.0",
dependencies = { "neovim/nvim-lspconfig" },
opts = { opts = {
automatic_enable = false,
ensure_installed = { ensure_installed = {
"cssls", "cssls",
"eslint", "eslint",
"html", "html",
"lua_ls", "lua_ls",
"phpactor", -- php "psalm", -- .php
"taplo", -- .toml "taplo", -- .toml
"ts_ls", "ts_ls",
"twiggy_language_server", -- .twig "twiggy_language_server", -- .twig
@ -29,6 +23,10 @@ return {
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
event = "VeryLazy", event = "VeryLazy",
dependencies = {
"mason.nvim",
"williamboman/mason-lspconfig.nvim",
},
opts = { opts = {
servers = { servers = {
cssls = {}, cssls = {},
@ -40,9 +38,9 @@ return {
}) })
end, end,
}, },
html = {},
lua_ls = {}, lua_ls = {},
phpactor = {}, html = {},
psalm = {},
taplo = {}, taplo = {},
ts_ls = {}, ts_ls = {},
twiggy_language_server = {}, twiggy_language_server = {},

5
lua/plugins/treesitter.lua
View file

@ -4,10 +4,10 @@ return {
version = false, version = false,
build = ":TSUpdate", build = ":TSUpdate",
event = { "VeryLazy" }, event = { "VeryLazy" },
lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
opts = { opts = {
ensure_installed = { ensure_installed = {
"graphql", "graphql",
"html", "html",
"htmldjango", "htmldjango",
"javascript", "javascript",
@ -18,7 +18,6 @@ return {
"markdown", "markdown",
"markdown_inline", "markdown_inline",
"php", "php",
"php_only",
"pug", "pug",
"tsx", "tsx",
"twig", "twig",