diff options
Diffstat (limited to 'lua/plugins')
| -rw-r--r-- | lua/plugins/animation.lua | 11 | ||||
| -rw-r--r-- | lua/plugins/colorscheme.lua | 19 | ||||
| -rw-r--r-- | lua/plugins/completition.lua | 14 | ||||
| -rw-r--r-- | lua/plugins/image.lua | 12 | ||||
| -rw-r--r-- | lua/plugins/laravel.lua | 11 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 2 | ||||
| -rw-r--r-- | lua/plugins/lualine.lua | 7 | ||||
| -rw-r--r-- | lua/plugins/neodev.lua | 4 | ||||
| -rw-r--r-- | lua/plugins/neorg.lua | 21 | ||||
| -rw-r--r-- | lua/plugins/noice.lua | 90 | ||||
| -rw-r--r-- | lua/plugins/orgmode.lua | 7 | ||||
| -rw-r--r-- | lua/plugins/phpactor.lua | 47 | ||||
| -rw-r--r-- | lua/plugins/smooth-cursor.lua | 4 | ||||
| -rw-r--r-- | lua/plugins/test.lua | 2 | ||||
| -rw-r--r-- | lua/plugins/transparent.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/treesitter.lua | 21 | ||||
| -rw-r--r-- | lua/plugins/trouble.lua | 1 | ||||
| -rw-r--r-- | lua/plugins/twilight.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/vimwiki.lua | 1 |
19 files changed, 252 insertions, 32 deletions
diff --git a/lua/plugins/animation.lua b/lua/plugins/animation.lua new file mode 100644 index 0000000..26cf364 --- /dev/null +++ b/lua/plugins/animation.lua @@ -0,0 +1,11 @@ +return { + "anuvyklack/animation.nvim", + dependencies = { + "anuvyklack/middleclass", + }, + keys = { + {"<leader>aa", function () + require("alpha.animations").redraw_buffer() + end} + }, +} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index a073169..bb80061 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,9 +1,18 @@ +-- return { +-- "wuelnerdotexe/vim-enfocado", +-- lazy = false, +-- priority = 1000, +-- config = function() +-- vim.cmd.colorscheme "enfocado" +-- end, +-- } return { - "catppuccin/nvim", - name = "catppuccin", - lazy = false, - priority = 1000, + "projekt0n/github-nvim-theme", + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins config = function() - vim.cmd.colorscheme "catppuccin-mocha" + require("github-theme").setup {} + + vim.cmd.colorscheme "github_dark_tritanopia" end, } diff --git a/lua/plugins/completition.lua b/lua/plugins/completition.lua index 41abc02..795b016 100644 --- a/lua/plugins/completition.lua +++ b/lua/plugins/completition.lua @@ -11,7 +11,19 @@ return { "onsails/lspkind-nvim", { "L3MON4D3/LuaSnip", version = "v1.*" }, "windwp/nvim-autopairs", - "hrsh7th/cmp-nvim-lsp-signature-help", + { + "zbirenbaum/copilot-cmp", + dependencies = { + "zbirenbaum/copilot.lua", + cmd = { "Copilot" }, + event = { "VeryLazy" }, + opts = { + suggestion = { enabled = false }, + panel = { enabled = false }, + }, + }, + config = true, + }, }, event = "VeryLazy", config = function() diff --git a/lua/plugins/image.lua b/lua/plugins/image.lua new file mode 100644 index 0000000..c8e231f --- /dev/null +++ b/lua/plugins/image.lua @@ -0,0 +1,12 @@ +return { + "samodostal/image.nvim", + dependencies = { + "m00qek/baleia.nvim", + }, + opts = { + render = { + foreground_color = true, + background_color = true, + } + }, +} diff --git a/lua/plugins/laravel.lua b/lua/plugins/laravel.lua index 3f689f6..0252bc0 100644 --- a/lua/plugins/laravel.lua +++ b/lua/plugins/laravel.lua @@ -3,15 +3,16 @@ return { dependencies = { "rcarriga/nvim-notify", "nvim-telescope/telescope.nvim", + "MunifTanjim/nui.nvim", }, - cmd = { "Sail", "Artisan", "Composer", "Npm", "Laravel" }, + cmd = { "Sail", "Artisan", "Composer", "Npm", "Laravel", "LaravelInfo" }, keys = { { "<leader>la", ":Laravel artisan<cr>", desc = "Laravel Application Commands" }, { "<leader>lr", ":Laravel routes<cr>", desc = "Laravel Application Routes" }, { "<leader>lt", function() - require("laravel").app.sendToTinker() + require("laravel.tinker").send_to_tinker() end, mode = "v", desc = "Laravel Application Routes", @@ -19,7 +20,11 @@ return { }, config = function() vim.g.laravel_log_level = "debug" - require("laravel").setup() + require("laravel").setup({ + route_info = { + position = "top", + } + }) require("telescope").load_extension "laravel" end, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 6bf565e..0458b7f 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -19,6 +19,7 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", { "lvimuser/lsp-inlayhints.nvim", + enabled = false, config = function() require("lsp-inlayhints").setup() vim.api.nvim_create_augroup("LspAttach_inlayhints", {}) @@ -38,6 +39,7 @@ return { }, { "j-hui/fidget.nvim", + enabled = false, opts = { window = { blend = 0, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 2a21c19..6594567 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -4,7 +4,7 @@ return { config = function() require("lualine").setup { options = { - theme = "catppuccin", + theme = "auto", icons_enabled = true, globalstatus = true, }, @@ -17,6 +17,11 @@ return { "diagnostics", "diff", { + require("noice").api.statusline.mode.get, + cond = require("noice").api.statusline.mode.has, + color = { fg = "#ff9e64" }, + }, + { require("lazy.status").updates, cond = require("lazy.status").has_updates, color = { fg = "ff9e64" }, diff --git a/lua/plugins/neodev.lua b/lua/plugins/neodev.lua new file mode 100644 index 0000000..1bb0cd1 --- /dev/null +++ b/lua/plugins/neodev.lua @@ -0,0 +1,4 @@ +return { + "folke/neodev.nvim", + opts = {} +} diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua new file mode 100644 index 0000000..9273453 --- /dev/null +++ b/lua/plugins/neorg.lua @@ -0,0 +1,21 @@ +return { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + require("neorg").setup { + load = { + ["core.defaults"] = {}, -- Loads default behaviour + ["core.concealer"] = {}, -- Adds pretty icons to your documents + ["core.dirman"] = { -- Manages Neorg workspaces + config = { + workspaces = { + notes = "~/notes", + }, + default_workspace = "notes", + }, + }, + }, + } + end, +} diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua new file mode 100644 index 0000000..bf7537b --- /dev/null +++ b/lua/plugins/noice.lua @@ -0,0 +1,90 @@ +return { + "folke/noice.nvim", + dependencies = { + "MunifTanjim/nui.nvim", + }, + opts = { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + -- command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + -- inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = true, -- add a border to hover docs and signature help + }, + cmdline = { + view = "cmdline", + }, + messages = { + enable = true, + }, + routes = { + { + view = "split", + filter = { + cmdline = "G", + }, + opts = { + enter = true, + render = "plain", + format = { "{message}" }, + replace = true, + close = { + events = { "BufLeave" }, + keys = { "q" }, + }, + }, + }, + { + view = "split", + filter = { + cmdline = "Notifications", + }, + opts = { + enter = true, + render = "plain", + format = { "{message}" }, + replace = true, + close = { + events = { "BufLeave" }, + keys = { "q" }, + }, + }, + }, + { + view = "mini", + filter = { + cmdline = "w", + }, + }, + { + view = "mini", + filter = { + find = "Config Change Detected. Reloading...", + }, + }, + { + view = "mini", + filter = { + event = "msg_show", + find = "lines yanked", + }, + }, + { + view = "mini", + filter = { + event = "msg_show", + find = "more lines", + }, + }, + }, + }, +} diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua index 1db1581..e9f8667 100644 --- a/lua/plugins/orgmode.lua +++ b/lua/plugins/orgmode.lua @@ -1,15 +1,16 @@ return { "nvim-orgmode/orgmode", + enabled = false, keys = { { "<Leader>oa" }, { "<Leader>oc" }, }, - ft = {"org"}, + ft = { "org" }, config = function() require("orgmode").setup_ts_grammar() require("orgmode").setup { - org_agenda_files = {'~/my-orgs/**/*'}, - org_default_notes_file = '~/my-orgs/refile.org', + org_agenda_files = { "~/my-orgs/**/*" }, + org_default_notes_file = "~/my-orgs/refile.org", } require("cmp").setup { sources = { { name = "orgmode" } } } end, diff --git a/lua/plugins/phpactor.lua b/lua/plugins/phpactor.lua index 8dec3ec..1a13597 100644 --- a/lua/plugins/phpactor.lua +++ b/lua/plugins/phpactor.lua @@ -1,15 +1,58 @@ +local phpactor = function () + vim.ui.select({ + "class_inflect", + "context_menu", + "expand_class", + "generate_accessor", + "change_visibility", + "copy_class", + "import_class", + "import_missing_classes", + "move_class", + "navigate", + "new_class", + "transform", + "update", + "config", + "status", + "cache_clear", + }, { + prompt = "Phpactor Action", + }, function(choice) + if choice == nil or choice == "" then + return + end + + -- TODO: add option for new class in same directory + if choice == "new_class" then + return vim.ui.input({ + prompt = "New Class", + }, function(value) + if value == nil then + return + end + -- TODO: check filename generation to validate the path + require("phpactor").rpc("new_class", { text_value = vim.fn.getcwd() .. '/' .. value .. ".php" }) + end) + end + + require("phpactor").rpc(choice, {}) + end) +end + return { "adalessa/phpactor.nvim", cmd = { "PhpActor" }, keys = { - { "<leader>pa", ":PhpActor context_menu<cr>", desc = "PhpActor context menu" }, + { "<leader>pa", phpactor, desc = "PhpActor options" }, + { "<leader>pc", ":PhpActor context_menu<cr>", desc = "PhpActor context menu" }, }, dependencies = { "nvim-lua/plenary.nvim", }, opts = { install = { - bin = vim.fn.stdpath "data" .. "/mason/bin/phpactor", + bin = vim.fn.stdpath("data") .. '/mason/bin/phpactor' }, lspconfig = { enabled = false, diff --git a/lua/plugins/smooth-cursor.lua b/lua/plugins/smooth-cursor.lua index 58efc73..71fe431 100644 --- a/lua/plugins/smooth-cursor.lua +++ b/lua/plugins/smooth-cursor.lua @@ -1,7 +1,7 @@ return { "gen740/SmoothCursor.nvim", config = function() - require("smoothcursor").setup { cursor = "" } + require("smoothcursor").setup { cursor = "" } vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#8a9baa" }) @@ -12,7 +12,7 @@ return { local current_mode = vim.fn.mode() if current_mode == "n" then vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#8a9baa" }) - vim.fn.sign_define("smoothcursor", { text = "" }) + vim.fn.sign_define("smoothcursor", { text = "" }) elseif current_mode == "v" then vim.api.nvim_set_hl(0, "SmoothCursor", { fg = "#bf616a" }) vim.fn.sign_define("smoothcursor", { text = "" }) diff --git a/lua/plugins/test.lua b/lua/plugins/test.lua index e2cfb59..a9d7baa 100644 --- a/lua/plugins/test.lua +++ b/lua/plugins/test.lua @@ -12,7 +12,7 @@ return { let test#strategy = 'harpoon' let test#neovim#term_position = 'vert' let g:test#preserve_screen = 0 - let g:test#harpoon_term = 3 + let g:test#harpoon_term = 1 let g:test#harpoon#gototerminal= 0 ]] diff --git a/lua/plugins/transparent.lua b/lua/plugins/transparent.lua index 6a74786..e8a6939 100644 --- a/lua/plugins/transparent.lua +++ b/lua/plugins/transparent.lua @@ -1,8 +1,5 @@ return { "xiyaowong/nvim-transparent", - event = "VeryLazy", - init = function () - vim.g.transparent_enabled = true - end, + lazy = false, config = true, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index a9818b4..2bead91 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,7 +3,7 @@ return { build = ":TSUpdate", dependencies = { "nvim-treesitter/playground", - "nvim-treesitter/nvim-treesitter-refactor", + { "nvim-treesitter/nvim-treesitter-refactor", enabled = false }, "nvim-treesitter/nvim-treesitter-textobjects", }, config = function() @@ -28,6 +28,7 @@ return { "sql", "svelte", "typescript", + "regex", "vim", "yaml", }, @@ -47,15 +48,15 @@ return { node_decremental = "grm", }, }, - refactor = { - highlight_definitions = { enable = true }, - smart_rename = { - enable = false, - keymaps = { - smart_rename = "trr", - }, - }, - }, + -- refactor = { + -- highlight_definitions = { enable = true }, + -- smart_rename = { + -- enable = false, + -- keymaps = { + -- smart_rename = "trr", + -- }, + -- }, + -- }, textobjects = { select = { enable = true, diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index 81dcff9..3f884fe 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -1,5 +1,6 @@ return { "folke/trouble.nvim", + enabled = false, dependencies = "kyazdani42/nvim-web-devicons", keys = { { "<leader><leader>t", "<cmd>TroubleToggle<cr>", desc = "Trouble toggle" } }, config = true, 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, +} diff --git a/lua/plugins/vimwiki.lua b/lua/plugins/vimwiki.lua index 581cd33..b07e090 100644 --- a/lua/plugins/vimwiki.lua +++ b/lua/plugins/vimwiki.lua @@ -1,6 +1,7 @@ return { "vimwiki/vimwiki", cmd = { "VimwikiIndex" }, + enabled = false, init = function() vim.g.vimwiki_list = {{ path = "/mnt/nas/alpha/wiki", |