From 5455aacdedfb2829f000b2f120a6d5194d1227f8 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Sun, 22 Jan 2023 10:18:07 +0100 Subject: feat: big change on the structure of the plugins, move several things to config dir --- lua/alpha/plugins/colorscheme.lua | 10 --- lua/alpha/plugins/comment.lua | 5 -- lua/alpha/plugins/completition.lua | 18 ----- lua/alpha/plugins/dap.lua | 31 ------- lua/alpha/plugins/database.lua | 12 --- lua/alpha/plugins/dressing.lua | 160 ------------------------------------- lua/alpha/plugins/easy-align.lua | 4 - lua/alpha/plugins/fugitive.lua | 10 --- lua/alpha/plugins/gitsigns.lua | 21 ----- lua/alpha/plugins/harpoon.lua | 11 --- lua/alpha/plugins/icon-picker.lua | 9 --- lua/alpha/plugins/init.lua | 28 ------- lua/alpha/plugins/laravel.lua | 15 ---- lua/alpha/plugins/lsp.lua | 28 ------- lua/alpha/plugins/lualine.lua | 47 ----------- lua/alpha/plugins/mind.lua | 16 ---- lua/alpha/plugins/neotest.lua | 64 --------------- lua/alpha/plugins/notify.lua | 8 -- lua/alpha/plugins/refactoring.lua | 14 ---- lua/alpha/plugins/rest.lua | 42 ---------- lua/alpha/plugins/snippets.lua | 137 ------------------------------- lua/alpha/plugins/telescope.lua | 16 ---- lua/alpha/plugins/test.lua | 49 ------------ lua/alpha/plugins/transparent.lua | 20 ----- lua/alpha/plugins/treesitter.lua | 71 ---------------- lua/alpha/plugins/trouble.lua | 6 -- lua/alpha/plugins/worktree.lua | 11 --- 27 files changed, 863 deletions(-) delete mode 100644 lua/alpha/plugins/colorscheme.lua delete mode 100644 lua/alpha/plugins/comment.lua delete mode 100644 lua/alpha/plugins/completition.lua delete mode 100644 lua/alpha/plugins/dap.lua delete mode 100644 lua/alpha/plugins/database.lua delete mode 100644 lua/alpha/plugins/dressing.lua delete mode 100644 lua/alpha/plugins/easy-align.lua delete mode 100644 lua/alpha/plugins/fugitive.lua delete mode 100644 lua/alpha/plugins/gitsigns.lua delete mode 100644 lua/alpha/plugins/harpoon.lua delete mode 100644 lua/alpha/plugins/icon-picker.lua delete mode 100644 lua/alpha/plugins/init.lua delete mode 100644 lua/alpha/plugins/laravel.lua delete mode 100644 lua/alpha/plugins/lsp.lua delete mode 100644 lua/alpha/plugins/lualine.lua delete mode 100644 lua/alpha/plugins/mind.lua delete mode 100644 lua/alpha/plugins/neotest.lua delete mode 100644 lua/alpha/plugins/notify.lua delete mode 100644 lua/alpha/plugins/refactoring.lua delete mode 100644 lua/alpha/plugins/rest.lua delete mode 100644 lua/alpha/plugins/snippets.lua delete mode 100644 lua/alpha/plugins/telescope.lua delete mode 100644 lua/alpha/plugins/test.lua delete mode 100644 lua/alpha/plugins/transparent.lua delete mode 100644 lua/alpha/plugins/treesitter.lua delete mode 100644 lua/alpha/plugins/trouble.lua delete mode 100644 lua/alpha/plugins/worktree.lua (limited to 'lua/alpha/plugins') diff --git a/lua/alpha/plugins/colorscheme.lua b/lua/alpha/plugins/colorscheme.lua deleted file mode 100644 index 9f0528e..0000000 --- a/lua/alpha/plugins/colorscheme.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "folke/tokyonight.nvim", - priority=1000, - config = function() - require("tokyonight").setup({ - style = "night" - }) - vim.cmd.colorscheme("tokyonight") - end -} diff --git a/lua/alpha/plugins/comment.lua b/lua/alpha/plugins/comment.lua deleted file mode 100644 index fd55eff..0000000 --- a/lua/alpha/plugins/comment.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "numToStr/Comment.nvim", - keys = { { "gcc" }, { "gbc" }, { "gc", mode = "v" }, { "gb", mode = "v" } }, - config = true -} diff --git a/lua/alpha/plugins/completition.lua b/lua/alpha/plugins/completition.lua deleted file mode 100644 index cf1a37d..0000000 --- a/lua/alpha/plugins/completition.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-git", - "saadparwaiz1/cmp_luasnip", - "onsails/lspkind-nvim", - { "L3MON4D3/LuaSnip", version = "v1.*" }, - "windwp/nvim-autopairs", - }, - config = function () - require("alpha.completition") - end -} diff --git a/lua/alpha/plugins/dap.lua b/lua/alpha/plugins/dap.lua deleted file mode 100644 index f8a7b17..0000000 --- a/lua/alpha/plugins/dap.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - "mfussenegger/nvim-dap", - dependencies = { - "theHamsta/nvim-dap-virtual-text", - "rcarriga/nvim-dap-ui", - "leoluz/nvim-dap-go", - "mxsdev/nvim-dap-vscode-js", - "anuvyklack/hydra.nvim", - "nvim-telescope/telescope-dap.nvim", - "rcarriga/cmp-dap", - }, - keys = { { "d" } }, - config = function() - require("alpha.dap") - local ok_telescope, telescope = pcall(require, "telescope") - if ok_telescope then - telescope.load_extension("dap") - end - - local ok_cmp, cmp = pcall(require, "cmp") - if ok_cmp then - cmp.setup.filetype({ "dap-repl", "dapui_watches" }, { - sources = cmp.config.sources({ - { name = "dap" }, - }, { - { name = "buffer" }, - }), - }) - end - end -} diff --git a/lua/alpha/plugins/database.lua b/lua/alpha/plugins/database.lua deleted file mode 100644 index fceb506..0000000 --- a/lua/alpha/plugins/database.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "kristijanhusak/vim-dadbod-ui", - dependencies = { - "tpope/vim-dadbod", - "kristijanhusak/vim-dadbod-completion", - "tpope/vim-dotenv", - }, - keys = {{"db", ':tab DBUI'}}, - init = function () - require("alpha.database") - end -} diff --git a/lua/alpha/plugins/dressing.lua b/lua/alpha/plugins/dressing.lua deleted file mode 100644 index d7de41b..0000000 --- a/lua/alpha/plugins/dressing.lua +++ /dev/null @@ -1,160 +0,0 @@ -return { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = { - input = { - -- Set to false to disable the vim.ui.input implementation - enabled = true, - - -- Default prompt string - default_prompt = "Input:", - - -- Can be 'left', 'right', or 'center' - prompt_align = "left", - - -- When true, will close the modal - insert_only = true, - - -- When true, input will start in insert mode. - start_in_insert = true, - - -- These are passed to nvim_open_win - anchor = "SW", - border = "rounded", - -- 'editor' and 'win' will default to being centered - relative = "cursor", - - -- These can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - prefer_width = 40, - width = nil, - -- min_width and max_width can be a list of mixed types. - -- min_width = {20, 0.2} means "the greater of 20 columns or 20% of total" - max_width = { 140, 0.9 }, - min_width = { 20, 0.2 }, - win_options = { - -- Window transparency (0-100) - winblend = 10, - -- Disable line wrapping - wrap = false, - }, - - -- Set to `false` to disable - mappings = { - n = { - [""] = "Close", - [""] = "Confirm", - }, - i = { - [""] = "Close", - [""] = "Confirm", - [""] = "HistoryPrev", - [""] = "HistoryNext", - }, - }, - - override = function(conf) - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - return conf - end, - - -- see :help dressing_get_config - get_config = nil, - }, - select = { - -- Set to false to disable the vim.ui.select implementation - enabled = true, - - -- Priority list of preferred vim.select implementations - backend = { "telescope", "fzf_lua", "fzf", "builtin", "nui" }, - - -- Trim trailing `:` from prompt - trim_prompt = true, - - -- Options for telescope selector - -- These are passed into the telescope picker directly. Can be used like: - -- telescope = require('telescope.themes').get_ivy({...}) - telescope = nil, - - -- Options for fzf selector - fzf = { - window = { - width = 0.5, - height = 0.4, - }, - }, - - -- Options for fzf_lua selector - fzf_lua = { - winopts = { - width = 0.5, - height = 0.4, - }, - }, - - -- Options for nui Menu - nui = { - position = "50%", - size = nil, - relative = "editor", - border = { - style = "rounded", - }, - buf_options = { - swapfile = false, - filetype = "DressingSelect", - }, - win_options = { - winblend = 10, - }, - max_width = 80, - max_height = 40, - min_width = 40, - min_height = 10, - }, - - -- Options for built-in selector - builtin = { - -- These are passed to nvim_open_win - anchor = "NW", - border = "rounded", - -- 'editor' and 'win' will default to being centered - relative = "editor", - - win_options = { - -- Window transparency (0-100) - winblend = 10, - }, - - -- These can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- the min_ and max_ options can be a list of mixed types. - -- max_width = {140, 0.8} means "the lesser of 140 columns or 80% of total" - width = nil, - max_width = { 140, 0.8 }, - min_width = { 40, 0.2 }, - height = nil, - max_height = 0.9, - min_height = { 10, 0.2 }, - - -- Set to `false` to disable - mappings = { - [""] = "Close", - [""] = "Close", - [""] = "Confirm", - }, - - override = function(conf) - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - return conf - end, - }, - - -- Used to override format_item. See :help dressing-format - format_item_override = {}, - - -- see :help dressing_get_config - get_config = nil, - }, - }, -} diff --git a/lua/alpha/plugins/easy-align.lua b/lua/alpha/plugins/easy-align.lua deleted file mode 100644 index 5f62713..0000000 --- a/lua/alpha/plugins/easy-align.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "junegunn/vim-easy-align", - keys = { { "ga", "(EasyAlign)", mode = { "n", "v" } } }, -} diff --git a/lua/alpha/plugins/fugitive.lua b/lua/alpha/plugins/fugitive.lua deleted file mode 100644 index ccce9b5..0000000 --- a/lua/alpha/plugins/fugitive.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "tpope/vim-fugitive", - keys = { - { "ga", ":Git fetch --all -p" }, - { "gl", ":Git pull" }, - { "gdh", ":diffget //2" }, - { "gdl", ":diffget //3" }, - }, - cmd = { "G", "Git" }, -} diff --git a/lua/alpha/plugins/gitsigns.lua b/lua/alpha/plugins/gitsigns.lua deleted file mode 100644 index 524da78..0000000 --- a/lua/alpha/plugins/gitsigns.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - "lewis6991/gitsigns.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - }, - config = function() - local gitsigns = require("gitsigns") - gitsigns.setup({ - trouble = false, - on_attach = function(bufnr) - vim.keymap.set('n', 'hs', gitsigns.stage_hunk, { buffer = bufnr }) - vim.keymap.set('n', 'hu', gitsigns.undo_stage_hunk, { buffer = bufnr }) - vim.keymap.set('n', 'hr', gitsigns.reset_hunk, { buffer = bufnr }) - vim.keymap.set('n', 'hp', gitsigns.preview_hunk, { buffer = bufnr }) - vim.keymap.set('n', 'hj', gitsigns.next_hunk, { buffer = bufnr }) - vim.keymap.set('n', 'hk', gitsigns.prev_hunk, { buffer = bufnr }) - end, - max_file_length = 10000, - }) - end -} diff --git a/lua/alpha/plugins/harpoon.lua b/lua/alpha/plugins/harpoon.lua deleted file mode 100644 index b410c8e..0000000 --- a/lua/alpha/plugins/harpoon.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "ThePrimeagen/harpoon", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-lua/popup.nvim", - }, - keys = require('alpha.harpoon').keymaps, - config = function () - require("alpha.harpoon").setup() - end -} diff --git a/lua/alpha/plugins/icon-picker.lua b/lua/alpha/plugins/icon-picker.lua deleted file mode 100644 index 55183db..0000000 --- a/lua/alpha/plugins/icon-picker.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "ziontee113/icon-picker.nvim", - keys = { - { "i", "IconPickerNormal nerd_font", mode = "n" }, - { "y", "IconPickerYank nerd_font", mode = "n" }, - { "", "IconPickerInsert nerd_font", mode = "i" }, - }, - opts = { disable_legacy_commands = true } -} diff --git a/lua/alpha/plugins/init.lua b/lua/alpha/plugins/init.lua deleted file mode 100644 index b126f85..0000000 --- a/lua/alpha/plugins/init.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - "jwalton512/vim-blade", - { "junegunn/fzf.vim" }, - { - "junegunn/fzf", - build = function() - vim.fn["fzf#install"]() - end, - }, - { - "windwp/nvim-projectconfig", - config = function() - require("nvim-projectconfig").setup() - end, - }, - { - "tpope/vim-dispatch", - cmd = {"Make", "Dispatch"} - }, - "Raimondi/delimitMate", - "lukas-reineke/indent-blankline.nvim", - "tpope/vim-surround", - "tpope/vim-repeat", - "tpope/vim-rhubarb", - "tpope/vim-dotenv", - "tpope/vim-eunuch", - "adalessa/composer.nvim", -} diff --git a/lua/alpha/plugins/laravel.lua b/lua/alpha/plugins/laravel.lua deleted file mode 100644 index 60f8ad2..0000000 --- a/lua/alpha/plugins/laravel.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "adalessa/laravel.nvim", - dependencies = { - "rcarriga/nvim-notify", - "nvim-telescope/telescope.nvim", - }, - cmd = {"Sail", "Artisan", "Composer"}, - keys = { - {"pa", ":Artisan"}, - }, - config = function() - require("laravel").setup() - require("telescope").load_extension("laravel") - end -} diff --git a/lua/alpha/plugins/lsp.lua b/lua/alpha/plugins/lsp.lua deleted file mode 100644 index 8d5c36a..0000000 --- a/lua/alpha/plugins/lsp.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - "neovim/nvim-lspconfig", - dependencies = { - "hrsh7th/cmp-nvim-lsp-signature-help", - { - "jose-elias-alvarez/null-ls.nvim", - dependencies = { - "adalessa/php-code-actions.nvim", - } - }, - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", - { - "j-hui/fidget.nvim", - opts = { - sources = { - ["null-ls"] = { - ignore = true - } - } - }, - }, - }, - config = function () - require("alpha.lsp") - end -} diff --git a/lua/alpha/plugins/lualine.lua b/lua/alpha/plugins/lualine.lua deleted file mode 100644 index f63efa0..0000000 --- a/lua/alpha/plugins/lualine.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = function() - require("lualine").setup( - { - options = { - theme = vim.g.alpha_lualine_color, - icons_enabled = true, - globalstatus = true, - }, - extensions = { "quickfix", "fugitive" }, - sections = { - lualine_a = { { "mode", upper = true } }, - lualine_b = { { "branch", icon = "" }, "db_ui#statusline" }, - lualine_c = { { "filename", file_status = true, path = 1 } }, - lualine_x = { - "diagnostics", "diff", - { - require("lazy.status").updates, - cond = require("lazy.status").has_updates, - color = { fg = "ff9e64" }, - } - }, - lualine_y = { "filetype" }, - lualine_z = { "location" }, - }, - winbar = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = {}, - lualine_z = {}, - }, - inactive_winbar = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = {}, - lualine_z = {}, - }, - } - ) - end, -} diff --git a/lua/alpha/plugins/mind.lua b/lua/alpha/plugins/mind.lua deleted file mode 100644 index 70c0e23..0000000 --- a/lua/alpha/plugins/mind.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "phaazon/mind.nvim", - branch = "v2.2", - dependencies = { "nvim-lua/plenary.nvim" }, - cmd = { "MindOpenMain", "MindOpenProject" }, - config = function() - local dirs = {} - if vim.fn.isdirectory("/mnt/nas/alpha/mind/data") == 1 then - dirs = { - state_path = "/mnt/nas/alpha/mind/mind.json", - data_dir = "/mnt/nas/alpha/mind/data", - } - end - require('mind').setup({ persistence = dirs }) - end -} diff --git a/lua/alpha/plugins/neotest.lua b/lua/alpha/plugins/neotest.lua deleted file mode 100644 index 5a332be..0000000 --- a/lua/alpha/plugins/neotest.lua +++ /dev/null @@ -1,64 +0,0 @@ -return { - "nvim-neotest/neotest", - enabled = false, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - "antoinemadec/FixCursorHold.nvim", - "nvim-neotest/neotest-go", - "rouge8/neotest-rust", - "nvim-neotest/neotest-plenary", - "nvim-neotest/neotest-vim-test", - "anuvyklack/hydra.nvim", - }, - config = function() - local neotest = require("neotest") - neotest.setup({ - adapters = { - require("neotest-go"), - require("neotest-rust"), - require("neotest-plenary"), - require("neotest-vim-test")({ - ignore_file_types = { "go", "lua", "rust", "php" }, - }), - -- require("laravel.neotest"), - }, - }) - - local hydra = require("hydra") - - local hint = [[ - NeoTest - _n_: Near test _f_: Current file _l_: Last Test _m_: Run Marked _s_: Toggle Summary ^ - ^ ^ __ - ]] - - hydra({ - name = "neotest", - hint = hint, - mode = "n", - config = { - color = "teal", - invoke_on_body = true, - hint = { - border = "rounded", - position = "bottom", - }, - }, - body = "", - heads = { - { "n", neotest.run.run }, - { - "f", - function() - neotest.run.run(vim.fn.expand("%")) - end, - }, - { "l", neotest.run.run_last }, - { "m", neotest.summary.run_marked }, - { "s", neotest.summary.toggle }, - { "", nil, { exit = true } }, - }, - }) - end -} diff --git a/lua/alpha/plugins/notify.lua b/lua/alpha/plugins/notify.lua deleted file mode 100644 index 4b2a82c..0000000 --- a/lua/alpha/plugins/notify.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "rcarriga/nvim-notify", - config = function() - local notify = require("notify") - notify.setup({ background_colour = "#000000" }) - vim.notify = notify.notify - end -} diff --git a/lua/alpha/plugins/refactoring.lua b/lua/alpha/plugins/refactoring.lua deleted file mode 100644 index 349cc63..0000000 --- a/lua/alpha/plugins/refactoring.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "ThePrimeagen/refactoring.nvim", - dependencies = { - { "nvim-lua/plenary.nvim" }, - { "nvim-treesitter/nvim-treesitter" }, - }, - keys = { { "rr", function() - require("telescope").extensions.refactoring.refactors() - end, mode = { "n", "v" } } }, - config = function() - require("refactoring").setup({}) - require("telescope").load_extension("refactoring") - end -} diff --git a/lua/alpha/plugins/rest.lua b/lua/alpha/plugins/rest.lua deleted file mode 100644 index 7b60a9d..0000000 --- a/lua/alpha/plugins/rest.lua +++ /dev/null @@ -1,42 +0,0 @@ -return { - "NTBBloodbath/rest.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - ft = "http", - config = function() - local rest_nvim = require("rest-nvim") - - rest_nvim.setup({ - -- Open request results in a horizontal split - result_split_horizontal = false, - -- Skip SSL verification, useful for unknown certificates - skip_ssl_verification = false, - -- Highlight request on run - highlight = { - enabled = true, - timeout = 150, - }, - result = { - -- toggle showing URL, HTTP info, headers at top the of result window - show_url = true, - show_http_info = true, - show_headers = true, - }, - -- Jump to request line on run - jump_to_request = false, - env_file = ".env", - custom_dynamic_variables = {}, - yank_dry_run = true, - }) - - vim.api.nvim_create_autocmd("FileType", { - pattern = "http", - callback = function() - local buff = tonumber(vim.fn.expand(""), 10) - vim.keymap.set("n", "rn", rest_nvim.run, { noremap = true, buffer = buff }) - vim.keymap.set("n", "rl", rest_nvim.last, { noremap = true, buffer = buff }) - vim.keymap.set("n", "rp", function() rest_nvim.run(true) end, { noremap = true, buffer = buff }) - end - }) - - end -} diff --git a/lua/alpha/plugins/snippets.lua b/lua/alpha/plugins/snippets.lua deleted file mode 100644 index cba0dd1..0000000 --- a/lua/alpha/plugins/snippets.lua +++ /dev/null @@ -1,137 +0,0 @@ -local config = function() - if vim.g.snippets ~= "luasnip" then - return - end - - local ls = require("luasnip") - local types = require("luasnip.util.types") - - ls.config.set_config({ - -- This tells LuaSnip to remember to keep around the last snippet. - -- You can jump back into even if you move outside of the selection - history = true, - - -- This one is cool cause if you have dynamic snippets, it updatesas you type! - updateevents = "TextChanged,TextChangedI", - - -- Autosnippets: - enable_autosnippets = true, - - ext_opts = { - [types.choiceNode] = { - active = { - virt_text = { { "<- Choice", "Error" } }, - }, - }, - }, - }) - - -- create snippet - -- s(context, nodes, condition, ...) - local snippet = ls.s - - -- TODO: Write about this. - -- Useful for dynamic nodes and choice nodes - -- local snippet_from_nodes = ls.sn - - -- This is the simplest node. - -- Creates a new text node. Places cursor after node by default. - -- t { "this will be inserted" } - -- - -- Multiple lines are by passing a table of strings. - -- t { "line 1", "line 2" } - local t = ls.text_node - - -- Insert Node - -- Creates a location for the cursor to jump to. - -- Possible options to jump to are 1 - N - -- If you use 0, that's the final place to jump to. - -- - -- To create placeholder text, pass it as the second argument - -- i(2, "this is placeholder text") - local i = ls.insert_node - - -- Function Node - -- Takes a function that returns text - -- local f = ls.function_node - - -- This a choice snippet. You can move through with (in my config) - -- c(1, { t {"hello"}, t {"world"}, }), - -- - -- The first argument is the jump position - -- The second argument is a table of possible nodes. - -- Note, one thing that's nice is you don't have to include - -- the jump position for nodes that normally require one (can be nil) - -- local c = ls.choice_node - - -- local d = ls.dynamic_node - - -- TODO: Document what I've learned about lambda - -- local l = require("luasnip.extras").lambda - - -- local events = require("luasnip.util.events") - - local shortcut = function(val) - if type(val) == "string" then - return { t({ val }), i(0) } - end - - if type(val) == "table" then - for k, v in ipairs(val) do - if type(v) == "string" then - val[k] = t({ v }) - end - end - end - - return val - end - - local make = function(tbl) - local result = {} - for k, v in pairs(tbl) do - table.insert(result, (snippet({ trig = k, desc = v.desc }, shortcut(v)))) - end - - return result - end - - ls.cleanup() - for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/alpha/snips/ft/*.lua", true)) do - local ft = vim.fn.fnamemodify(ft_path, ":t:r") - ls.add_snippets(ft, make(loadfile(ft_path)())) - end - - -- is my expansion key - -- this will expand the current item or jump to the next item within the snippet. - vim.keymap.set({ "i", "s" }, "", function() - if ls.expand_or_jumpable() then - ls.expand_or_jump() - end - end, { silent = true }) - - -- is my jump backwards key. - -- this always moves to the previous item within the snippet - vim.keymap.set({ "i", "s" }, "", function() - if ls.jumpable(-1) then - ls.jump(-1) - end - end, { silent = true }) - - -- is selecting within a list of options. - -- This is useful for choice nodes (introduced in the forthcoming episode 2) - vim.keymap.set("i", "", function() - if ls.choice_active() then - ls.change_choice(1) - end - end) - -end -return { - "L3MON4D3/LuaSnip", - version = "v1.*", - config = function() - config() - vim.keymap.set("n", "s", config) - end -} diff --git a/lua/alpha/plugins/telescope.lua b/lua/alpha/plugins/telescope.lua deleted file mode 100644 index 52d7b8b..0000000 --- a/lua/alpha/plugins/telescope.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - dependencies = { - { "nvim-lua/plenary.nvim" }, - { "nvim-lua/popup.nvim" }, - { "nvim-telescope/telescope-fzy-native.nvim" }, - { "kyazdani42/nvim-web-devicons" }, - { "nvim-telescope/telescope-file-browser.nvim" }, - { "nvim-telescope/telescope-ui-select.nvim" }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - }, - config = function () - require("alpha.telescope.setup") - require("alpha.telescope.mappings") - end -} diff --git a/lua/alpha/plugins/test.lua b/lua/alpha/plugins/test.lua deleted file mode 100644 index 7fcabc9..0000000 --- a/lua/alpha/plugins/test.lua +++ /dev/null @@ -1,49 +0,0 @@ -return { - "vim-test/vim-test", - keys = {{"t"}}, - dependencies = { - "anuvyklack/hydra.nvim", - }, - config = function() - local hydra = require("hydra") - - vim.g["test#preserve_screen"] = 1 - - vim.cmd([[ - let test#php#pest#executable = './vendor/bin/sail test' - let test#strategy = 'neovim' - let test#neovim#term_position = 'vert' - let g:test#preserve_screen = 1 -]] ) - - local hint = [[ - Vim Tests - _n_: Near test _f_: Current file _s_: Test Suit ^ - _l_: Test Last _g_: Visit - ^ ^ __ ^ -]] - - hydra({ - name = "vimtest", - hint = hint, - mode = "n", - config = { - color = "teal", - invoke_on_body = true, - hint = { - border = "rounded", - position = "bottom", - } - }, - body = "t", - heads = { - { "n", ":TestNearest" }, - { "f", ":TestFile" }, - { "s", ":TestSuit" }, - { "l", ":TestLast" }, - { "g", ":TestVisit" }, - { '', nil, { exit = true } } - } - }) - end -} diff --git a/lua/alpha/plugins/transparent.lua b/lua/alpha/plugins/transparent.lua deleted file mode 100644 index fa0b480..0000000 --- a/lua/alpha/plugins/transparent.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "xiyaowong/nvim-transparent", - config = function() - require("transparent").setup({ - enable = true, -- boolean: enable transparent - extra_groups = { -- table/string: additional groups that should be cleared - -- In particular, when you set it to 'all', that means all available groups - - -- example of akinsho/nvim-bufferline.lua - "BufferLineTabClose", - "BufferlineBufferSelected", - "BufferLineFill", - "BufferLineBackground", - "BufferLineSeparator", - "BufferLineIndicatorSelected", - }, - exclude = {}, -- table: groups you don't want to clear - }) - end -} diff --git a/lua/alpha/plugins/treesitter.lua b/lua/alpha/plugins/treesitter.lua deleted file mode 100644 index 49a1d16..0000000 --- a/lua/alpha/plugins/treesitter.lua +++ /dev/null @@ -1,71 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - dependencies = { - "nvim-treesitter/playground", - "nvim-treesitter/nvim-treesitter-refactor", - "nvim-treesitter/nvim-treesitter-textobjects", - }, - config = function() - require "nvim-treesitter.configs".setup { - ensure_installed = { "php", "phpdoc", "vim", "go", "gomod", "css", "html", "javascript", "lua", "typescript", "yaml" }, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, - indent = { - enable = true, - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "gnn", - node_incremental = "grn", - scope_incremental = "grc", - node_decremental = "grm", - }, - }, - refactor = { - highlight_definitions = { enable = true }, - smart_rename = { - enable = true, - keymaps = { - smart_rename = "trr", - }, - }, - }, - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@conditional.outer", - ["ic"] = "@conditional.inner", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - } - } - }, - playground = { - enable = true, - disable = {}, - updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code - persist_queries = false, -- Whether the query persists across vim sessions - keybindings = { - toggle_query_editor = 'o', - toggle_hl_groups = 'i', - toggle_injected_languages = 't', - toggle_anonymous_nodes = 'a', - toggle_language_display = 'I', - focus_language = 'f', - unfocus_language = 'F', - update = 'R', - goto_node = '', - show_help = '?', - }, - } - } - end -} diff --git a/lua/alpha/plugins/trouble.lua b/lua/alpha/plugins/trouble.lua deleted file mode 100644 index 2a08443..0000000 --- a/lua/alpha/plugins/trouble.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "folke/trouble.nvim", - dependencies = "kyazdani42/nvim-web-devicons", - keys = { { "oo", "TroubleToggle" } }, - config = true, -} diff --git a/lua/alpha/plugins/worktree.lua b/lua/alpha/plugins/worktree.lua deleted file mode 100644 index bd7c923..0000000 --- a/lua/alpha/plugins/worktree.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "ThePrimeagen/git-worktree.nvim", - keys = { - { "gt", function() require("telescope").extensions.git_worktree.git_worktrees() end }, - { "gn", function() require("telescope").extensions.git_worktree.create_git_worktree() end }, - }, - config = function() - require("git-worktree").setup({}) - require("telescope").load_extension("git_worktree") - end, -} -- cgit v1.2.3