From 32e5b77be0457806ed0390f632fbcc1d4a018241 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Sat, 16 Nov 2024 23:02:57 +0300 Subject: [PATCH] feat(config): update and add new plugins --- after/queries/html/injections.scm | 36 ------ after/queries/php/indents.scm | 10 -- index.blade.php | 1 + lazy-lock.json | 32 ++--- lua/config/keymaps.lua | 4 +- lua/config/lazy.lua | 4 +- lua/plugins/additional.lua | 8 ++ lua/plugins/disabled.lua | 7 ++ lua/plugins/laravel.lua | 18 +++ lua/plugins/lazy_git.lua | 20 ++++ lua/plugins/mason-nvim-dap.lua | 47 -------- lua/plugins/php-tools.lua | 60 ++++++++++ lua/plugins/php.lua | 187 +++++++++++++++--------------- lua/plugins/treesitter.lua | 50 -------- lua/plugins/twilight.lua | 5 + 15 files changed, 233 insertions(+), 256 deletions(-) delete mode 100644 after/queries/html/injections.scm delete mode 100644 after/queries/php/indents.scm create mode 100644 lua/plugins/additional.lua create mode 100644 lua/plugins/disabled.lua create mode 100644 lua/plugins/laravel.lua create mode 100644 lua/plugins/lazy_git.lua delete mode 100644 lua/plugins/mason-nvim-dap.lua create mode 100644 lua/plugins/php-tools.lua delete mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/twilight.lua diff --git a/after/queries/html/injections.scm b/after/queries/html/injections.scm deleted file mode 100644 index e183fb0..0000000 --- a/after/queries/html/injections.scm +++ /dev/null @@ -1,36 +0,0 @@ -;; extends - -; AlpineJS attributes -(attribute - (attribute_name) @_attr - (#lua-match? @_attr "^x%-%l") - (#not-any-of? @_attr "x-teleport" "x-ref" "x-transition") - (quoted_attribute_value - (attribute_value) @injection.content) - (#set! injection.language "javascript")) - -; Blade escaped JS attributes -; -(element - (_ - (tag_name) @_tag - (#lua-match? @_tag "^x%-%l") - (attribute - (attribute_name) @_attr - (#lua-match? @_attr "^::%l") - (quoted_attribute_value - (attribute_value) @injection.content) - (#set! injection.language "javascript")))) - -; Blade PHP attributes -; -(element - (_ - (tag_name) @_tag - (#lua-match? @_tag "^x%-%l") - (attribute - (attribute_name) @_attr - (#lua-match? @_attr "^:%l") - (quoted_attribute_value - (attribute_value) @injection.content) - (#set! injection.language "php_only")))) diff --git a/after/queries/php/indents.scm b/after/queries/php/indents.scm deleted file mode 100644 index b2044f3..0000000 --- a/after/queries/php/indents.scm +++ /dev/null @@ -1,10 +0,0 @@ -;; extends - -[ - ; prevent double indent for `return new class ...` - (return_statement - (object_creation_expression)) - ; prevent double indent for `return function() { ... }` - (return_statement - (anonymous_function_creation_expression)) -] @indent.dedent diff --git a/index.blade.php b/index.blade.php index cc691b3..cf79bb7 100644 --- a/index.blade.php +++ b/index.blade.php @@ -1,6 +1,7 @@ @extends('layouts/eatvio') @php $curDiaryDate = \Carbon\Carbon::createFromFormat('Y-m-d', $curDiary->date)->format('d-m-Y'); + $cities = ['London', 'Berlin', new Yourk()]; @endphp @section('main_section')
diff --git a/lazy-lock.json b/lazy-lock.json index f743b4d..d97bd3a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,36 +19,34 @@ "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" }, "grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" }, "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "larago.nvim": { "branch": "master", "commit": "8bfaf6c85d6e088bec9c5d8b94c8d5495895b2dc" }, + "laravel.nvim": { "branch": "main", "commit": "2e7c08c0511234d5816166c1204e2240edac99b5" }, "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" }, + "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "cab00668464d2914d0752b86168b4a431cc93eb2" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" }, "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" }, - "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, "namespace.nvim": { "branch": "master", "commit": "b13d5dc1da64ac839552e8f7a4f69b486de252b4" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "4824592317e7f5faf51adb8dfba6567aa8456d61" }, - "none-ls.nvim": { "branch": "main", "commit": "fb7acad9e98ad9c617775451c1aea95157e17942" }, + "noice.nvim": { "branch": "main", "commit": "6e0c8dcc61282782ac7fa4b9b4b0c910fd3f83d9" }, + "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "f134063618a65cad4d7415fddbd96ff7e0c5b4ae" }, - "nvim-dap": { "branch": "master", "commit": "6bf4de67dbe90271608e1c81797e5edc79ec6335" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" }, "nvim-lspconfig": { "branch": "master", "commit": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "06611c75fec573420838369fe76ac5f8bd740240" }, + "nvim-treesitter": { "branch": "master", "commit": "13c7caf8a602488b37cdefe8543c4cfdd5947d9d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, + "phptools.nvim": { "branch": "main", "commit": "b485be1098d3713d165056750ee1c837d5276b30" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" }, "rustaceanvim": { "branch": "master", "commit": "8ece53be36515cb9e76f3d03511643636469502d" }, "snacks.nvim": { "branch": "main", "commit": "f126609b57c0ec07cfd7bcef7085e3905adb4d42" }, @@ -58,12 +56,16 @@ "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "9758827c3b380ba89da4a2212b6255d01afbcf08" }, "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, + "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" }, - "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "da0e75c09c27a82aad078d993bb1b2f4afd43427" }, - "vim-dadbod-ui": { "branch": "master", "commit": "39a5d69ff786ca43ca3785857c38e4e0515c6bf8" }, + "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, + "vim-dadbod-completion": { "branch": "master", "commit": "c3ab458fb7c94c2fc4baae4e2cd5601eec9d27bc" }, + "vim-dadbod-ui": { "branch": "master", "commit": "0f51d8de368c8c6220973e8acd156d17da746f4c" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-gutentags": { "branch": "master", "commit": "aa47c5e29c37c52176c44e61c780032dfacef3dd" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "vim-swap": { "branch": "master", "commit": "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83" }, "vimtex": { "branch": "master", "commit": "6ee92c7ed2cdc876f499bd5561a65d04dee10d1f" }, "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } } diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 932ce8d..f2ceaab 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -44,8 +44,8 @@ bind("n", "zz", ":update") bind("n", ",", ":nohlsearch") -- namespace php -vim.keymap.set("n", "u", "GetClass") -vim.keymap.set("n", "un", "Namespace") +vim.keymap.set("n", "u", "Php class", { desc = "GetClass", silent = true }) +vim.keymap.set("n", "un", "Php namespace", { desc = "Namespace", silent = true }) vim.keymap.set("n", "[", "call append(line('.') - 1, repeat([''], v:count1))") vim.keymap.set("n", "]", "call append(line('.'), repeat([''], v:count1))") diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 81cee44..f551563 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -18,8 +18,8 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.lang.docker" }, { import = "lazyvim.plugins.extras.lang.tex" }, -- { import = "lazyvim.plugins.extras.lang.python" }, - { import = "lazyvim.plugins.extras.coding.copilot" }, - { import = "lazyvim.plugins.extras.dap.core" }, + -- { import = "lazyvim.plugins.extras.coding.copilot" }, + -- { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.lsp.none-ls" }, -- { import = "lazyvim.plugins.extras.lang.go" }, -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, diff --git a/lua/plugins/additional.lua b/lua/plugins/additional.lua new file mode 100644 index 0000000..1fe40e7 --- /dev/null +++ b/lua/plugins/additional.lua @@ -0,0 +1,8 @@ +return { + { + "tpope/vim-surround", + }, + { + "machakann/vim-swap", + }, +} diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua new file mode 100644 index 0000000..f80de28 --- /dev/null +++ b/lua/plugins/disabled.lua @@ -0,0 +1,7 @@ +return { + -- { + -- "echasnovski/mini.pairs", + -- enabled = false, + -- }, + { "folke/flash.nvim", enabled = false }, +} diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua new file mode 100644 index 0000000..f1d8141 --- /dev/null +++ b/lua/plugins/laravel.lua @@ -0,0 +1,18 @@ +return { + "adalessa/laravel.nvim", + dependencies = { + "tpope/vim-dotenv", + "nvim-telescope/telescope.nvim", + "MunifTanjim/nui.nvim", + "kevinhwang91/promise-async", + }, + cmd = { "Laravel" }, + keys = { + -- { "la", ":Laravel artisan" }, + { "lr", ":Laravel routes" }, + { "lm", ":Laravel related" }, + }, + event = { "VeryLazy" }, + opts = {}, + config = true, +} diff --git a/lua/plugins/lazy_git.lua b/lua/plugins/lazy_git.lua new file mode 100644 index 0000000..5c77df0 --- /dev/null +++ b/lua/plugins/lazy_git.lua @@ -0,0 +1,20 @@ +return { + "kdheepak/lazygit.nvim", + lazy = true, + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + -- setting the keybinding for LazyGit with 'keys' is recommended in + -- order to load the plugin when the command is run for the first time + keys = { + { "lg", "LazyGit", desc = "LazyGit" } + } +} diff --git a/lua/plugins/mason-nvim-dap.lua b/lua/plugins/mason-nvim-dap.lua deleted file mode 100644 index 24455d6..0000000 --- a/lua/plugins/mason-nvim-dap.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - "jay-babu/mason-nvim-dap.nvim", - dependencies = "mason.nvim", - cmd = { "DapInstall", "DapUninstall" }, - opts = { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_setup = true, - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = { - function(config) - -- all sources with no handler get passed here - - -- Keep original functionality - require("mason-nvim-dap").default_setup(config) - end, - php = function(config) - config.configurations = { - { - type = "php", - request = "launch", - name = "Listen for Xdebug", - port = 9003, - pathMappings = { - -- For some reason xdebug sometimes fails for me, depending on me - -- using herd or docker. To get it to work, change the order of the mappings. - -- The first mapping should be the one that you are actively using. - -- This only started recently, so I don't know what changed. - ["${workspaceFolder}"] = "${workspaceFolder}", - ["/var/www/html"] = "${workspaceFolder}", - }, - }, - } - require("mason-nvim-dap").default_setup(config) -- don't forget this! - end, - }, - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - "php", - "bash", - -- "python", - }, - }, -} diff --git a/lua/plugins/php-tools.lua b/lua/plugins/php-tools.lua new file mode 100644 index 0000000..223d91e --- /dev/null +++ b/lua/plugins/php-tools.lua @@ -0,0 +1,60 @@ +return { + "ccaglak/phptools.nvim", + keys = { + { "lm", "PhpTools Method" }, + { "lc", "PhpTools Class" }, + { "ls", "PhpTools Scripts" }, + { "ln", "PhpTools Namespace" }, + { "lg", "PhpTools GetSet" }, + { "lf", "PhpTools Create" }, + { "ld", "PhpTools DrupalAutoLoader" }, + { mode = "v", "lr", "PhpTools Refactor" }, + }, + dependencies = { + "ccaglak/namespace.nvim", -- optional - php namespace resolver + "ccaglak/larago.nvim", -- optional -- laravel goto blade/components + -- "ccaglak/snippets.nvim", -- optional -- native snippet expander + }, + config = function() + require("phptools").setup({ + ui = { + enable = true, -- default:true; false only if you have a UI enhancement plugin + fzf = false, -- default:false; requires fzf used only in tests module otherwise there might long list of tests + }, + create = false, -- default:false autorun PhpTools Create when creating a new php file + drupal_autoloader = { -- delete if you dont use it + scan_paths = { "/web/modules/contrib/" }, -- Paths to scan for modules + root_markers = { ".git" }, -- Project root markers + autoload_file = "/vendor/composer/autoload_psr4.php", -- Autoload file path + }, + custom_toggles = { + -- { "foo", "bar", "baz" }, -- Add more custom toggle groups here + }, + }) + + local map = vim.keymap.set + + -- local ide_helper = require("phptools.ide_helper") + -- -- Laravel IDE Helper keymaps + -- map("n", "lha", ide_helper.generate_all, { desc = "Generate all IDE helpers" }) + -- map("n", "lhm", ide_helper.generate_models, { desc = "Generate model helpers" }) + -- map("n", "lhf", ide_helper.generate_facades, { desc = "Generate facade helpers" }) + -- map("n", "lht", ide_helper.generate_meta, { desc = "Generate meta helper" }) + -- map("n", "lhi", ide_helper.install, { desc = "Install IDE Helper package" }) + -- + -- local tests = require("phptools.tests") + -- map("n", "ta", tests.test.all, { desc = "Run all tests" }) + -- map("n", "tf", tests.test.file, { desc = "Run current file tests" }) + -- map("n", "tl", tests.test.line, { desc = "Run test at cursor" }) + -- map("n", "ts", tests.test.filter, { desc = "Search and run test" }) + -- map("n", "tp", tests.test.parallel, { desc = "Run tests in parallel" }) + -- map("n", "tr", tests.test.rerun, { desc = "Rerun last test" }) + -- map("n", "ti", tests.test.selected, { desc = "Run selected test file" }) + -- + -- local fn = require("phptools.fn") + -- map("n", "llf", fn.toggle_function, { desc = "Toggle PHP function style" }) + -- map("n", "lli", fn.toggle_if_ternary, { desc = "Toggle if/ternary" }) + -- map("n", "llm", fn.toggle_if_match, { desc = "Toggle if/match" }) + -- map("n", "llm", fn.toggle_quotes, { desc = "Toggle qoutes" }) + end, +} diff --git a/lua/plugins/php.lua b/lua/plugins/php.lua index 69d6d06..a951ac5 100644 --- a/lua/plugins/php.lua +++ b/lua/plugins/php.lua @@ -1,97 +1,96 @@ return { -- lazy - { - "ccaglak/namespace.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - }, - { - "adalessa/composer.nvim", - lazy = true, - }, + "ccaglak/namespace.nvim", + dependencies = { + "ccaglak/phptools.nvim", -- optional + "ccaglak/larago.nvim", -- optional + }, + { + "adalessa/composer.nvim", + lazy = true, + }, + { + "ludovicchabant/vim-gutentags", + config = function() + vim.g.gutentags_ctags_exclude = { + "*.git", + "*.svg", + "*.hg", + "*/tests/*", + "build", + "dist", + "*sites/*/files/*", + "bin", + "node_modules", + "bower_components", + "cache", + "compiled", + "docs", + "example", + "bundle", + -- "vendor", + "*.md", + "*-lock.json", + "*.lock", + "*bundle*.js", + "*build*.js", + ".*rc*", + "*.json", + "*.min.*", + "*.map", + "*.bak", + "*.zip", + "*.pyc", + "*.class", + "*.sln", + "*.Master", + "*.csproj", + "*.tmp", + "*.csproj.user", + "*.cache", + "*.pdb", + "tags*", + "cscope.*", + -- '*.css', + -- '*.less', + -- '*.scss', + "*.exe", + "*.dll", + "*.mp3", + "*.ogg", + "*.flac", + "*.swp", + "*.swo", + "*.bmp", + "*.gif", + "*.ico", + "*.jpg", + "*.png", + "*.rar", + "*.zip", + "*.tar", + "*.tar.gz", + "*.tar.xz", + "*.tar.bz2", + "*.pdf", + "*.doc", + "*.docx", + "*.ppt", + "*.pptx", + } + + vim.g.gutentags_add_default_project_roots = false + vim.g.gutentags_project_root = { "package.json", ".git" } + vim.g.gutentags_cache_dir = vim.fn.stdpath("data") .. "/ctags" + vim.g.gutentags_generate_on_new = true + vim.g.gutentags_generate_on_missing = true + vim.g.gutentags_generate_on_write = true + vim.g.gutentags_generate_on_empty_buffer = true + vim.g.gutentags_modules = true + vim.cmd([[command! -nargs=0 GutentagsClearCache call system('rm ' . g:gutentags_cache_dir . '/*')]]) + vim.g.gutentags_ctags_extra_args = { "--tag-relative=yes", "--fields=+ailmnS" } + + -- custom + vim.g.gutentags_modules = { "ctags" } + end, }, - -- { - -- "ludovicchabant/vim-gutentags", - -- config = function() - -- vim.g.gutentags_ctags_exclude = { - -- "*.git", - -- "*.svg", - -- "*.hg", - -- "*/tests/*", - -- "build", - -- "dist", - -- "*sites/*/files/*", - -- "bin", - -- "node_modules", - -- "bower_components", - -- "cache", - -- "compiled", - -- "docs", - -- "example", - -- "bundle", - -- "vendor", - -- "*.md", - -- "*-lock.json", - -- "*.lock", - -- "*bundle*.js", - -- "*build*.js", - -- ".*rc*", - -- "*.json", - -- "*.min.*", - -- "*.map", - -- "*.bak", - -- "*.zip", - -- "*.pyc", - -- "*.class", - -- "*.sln", - -- "*.Master", - -- "*.csproj", - -- "*.tmp", - -- "*.csproj.user", - -- "*.cache", - -- "*.pdb", - -- "tags*", - -- "cscope.*", - -- -- '*.css', - -- -- '*.less', - -- -- '*.scss', - -- "*.exe", - -- "*.dll", - -- "*.mp3", - -- "*.ogg", - -- "*.flac", - -- "*.swp", - -- "*.swo", - -- "*.bmp", - -- "*.gif", - -- "*.ico", - -- "*.jpg", - -- "*.png", - -- "*.rar", - -- "*.zip", - -- "*.tar", - -- "*.tar.gz", - -- "*.tar.xz", - -- "*.tar.bz2", - -- "*.pdf", - -- "*.doc", - -- "*.docx", - -- "*.ppt", - -- "*.pptx", - -- } - -- - -- vim.g.gutentags_add_default_project_roots = false - -- vim.g.gutentags_project_root = { "package.json", ".git" } - -- vim.g.gutentags_cache_dir = vim.fn.stdpath("data") .. "/ctags" - -- vim.g.gutentags_generate_on_new = true - -- vim.g.gutentags_generate_on_missing = true - -- vim.g.gutentags_generate_on_write = true - -- vim.g.gutentags_generate_on_empty_buffer = true - -- vim.g.gutentags_modules = true - -- vim.cmd([[command! -nargs=0 GutentagsClearCache call system('rm ' . g:gutentags_cache_dir . '/*')]]) - -- vim.g.gutentags_ctags_extra_args = { "--tag-relative=yes", "--fields=+ailmnS" } - -- - -- -- custom - -- vim.g.gutentags_modules = { "ctags" } - -- end, - -- }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua deleted file mode 100644 index fd39c56..0000000 --- a/lua/plugins/treesitter.lua +++ /dev/null @@ -1,50 +0,0 @@ --- add more treesitter parsers -return { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - dependencies = { - { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = { - custom_calculation = function(_, language_tree) - if vim.bo.filetype == "blade" and language_tree._lang ~= "javascript" and language_tree._lang ~= "php" then - return "{{-- %s --}}" - end - end, - }, - }, - "nvim-treesitter/nvim-treesitter-textobjects", - }, - opts = { - ensure_installed = "all", - -- auto_install = true, - highlight = { - enable = true, - }, - -- Needed because treesitter highlight turns off autoindent for php files - indent = { - enable = true, - }, - }, - config = function(_, opts) - ---@class ParserInfo[] - local parser_config = require("nvim-treesitter.parsers").get_parser_configs() - parser_config.blade = { - install_info = { - url = "https://github.com/EmranMR/tree-sitter-blade", - files = { - "src/parser.c", - -- "src/scanner.cc", - }, - branch = "main", - -- generate_requires_npm = true, - -- requires_generate_from_grammar = true, - }, - filetype = "blade", - } - - require("nvim-treesitter.configs").setup(opts) - end, -} diff --git a/lua/plugins/twilight.lua b/lua/plugins/twilight.lua new file mode 100644 index 0000000..144111f --- /dev/null +++ b/lua/plugins/twilight.lua @@ -0,0 +1,5 @@ +return { + "folke/twilight.nvim", + cmd = { "Twilight" }, + config = true, +}