From 7f50f1867c90a5ac846561247e371aeab3e929b3 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 23 Jun 2024 16:15:37 +0200 Subject: [PATCH] remove old nvim config --- nvim-old/.luarc.json | 5 - nvim-old/README.md | 5 - nvim-old/init.lua | 2 - nvim-old/lazy-lock.json | 53 -------- nvim-old/lua/config/commands.lua | 11 -- nvim-old/lua/config/filetype.lua | 48 -------- nvim-old/lua/config/icons.lua | 90 -------------- nvim-old/lua/config/init.lua | 5 - nvim-old/lua/config/mappings.lua | 71 ----------- nvim-old/lua/config/plugins/bufferline.lua | 46 ------- nvim-old/lua/config/plugins/catppuccin.lua | 115 ------------------ nvim-old/lua/config/plugins/cmp.lua | 59 --------- nvim-old/lua/config/plugins/comment.lua | 20 --- nvim-old/lua/config/plugins/conform.lua | 18 --- nvim-old/lua/config/plugins/laravel.lua | 9 -- nvim-old/lua/config/plugins/lsp.lua | 74 ----------- nvim-old/lua/config/plugins/lualine.lua | 93 -------------- nvim-old/lua/config/plugins/neo-tree.lua | 69 ----------- nvim-old/lua/config/plugins/telescope.lua | 50 -------- nvim-old/lua/config/plugins/treesitter.lua | 57 --------- nvim-old/lua/config/plugins/trouble.lua | 10 -- nvim-old/lua/config/plugins/which-key.lua | 10 -- nvim-old/lua/config/settings.lua | 96 --------------- nvim-old/lua/plugins/core/autopairs.lua | 5 - nvim-old/lua/plugins/core/autotag.lua | 24 ---- .../lua/plugins/core/indent-blankline.lua | 28 ----- nvim-old/lua/plugins/core/treesitter.lua | 27 ---- nvim-old/lua/plugins/editor/mini-comment.lua | 5 - nvim-old/lua/plugins/editor/telescope.lua | 38 ------ nvim-old/lua/plugins/ide/cmp.lua | 24 ---- nvim-old/lua/plugins/ide/conform.lua | 38 ------ nvim-old/lua/plugins/ide/copilot.lua | 18 --- nvim-old/lua/plugins/ide/dap.lua | 91 -------------- nvim-old/lua/plugins/ide/glow.lua | 1 - nvim-old/lua/plugins/ide/lsp.lua | 92 -------------- nvim-old/lua/plugins/ide/neodev.lua | 4 - nvim-old/lua/plugins/ide/neotest.lua | 58 --------- nvim-old/lua/plugins/ide/trouble.lua | 8 -- nvim-old/lua/plugins/ide/undotree.lua | 6 - nvim-old/lua/plugins/init.lua | 64 ---------- nvim-old/lua/plugins/lang/go.lua | 15 --- nvim-old/lua/plugins/lang/laravel.lua | 26 ---- nvim-old/lua/plugins/ui/barbar.lua | 34 ------ nvim-old/lua/plugins/ui/bufferline.lua | 6 - nvim-old/lua/plugins/ui/catppuccin.lua | 10 -- nvim-old/lua/plugins/ui/colorscheme.lua | 92 -------------- nvim-old/lua/plugins/ui/dashboard.lua | 40 ------ nvim-old/lua/plugins/ui/dressing.lua | 23 ---- nvim-old/lua/plugins/ui/edgy.lua | 33 ----- nvim-old/lua/plugins/ui/gitsigns.lua | 31 ----- nvim-old/lua/plugins/ui/lualine.lua | 9 -- nvim-old/lua/plugins/ui/neo-tree.lua | 13 -- nvim-old/lua/plugins/ui/which-key.lua | 14 --- nvim-old/lua/utils/lspkind.lua | 21 ---- nvim-old/queries/blade/highlights.scm | 6 - nvim-old/queries/blade/injections.scm | 15 --- nvim-old/queries/php_only/highlights.scm | 23 ---- nvim-old/queries/php_only/indents.scm | 10 -- 58 files changed, 1968 deletions(-) delete mode 100644 nvim-old/.luarc.json delete mode 100644 nvim-old/README.md delete mode 100644 nvim-old/init.lua delete mode 100644 nvim-old/lazy-lock.json delete mode 100644 nvim-old/lua/config/commands.lua delete mode 100644 nvim-old/lua/config/filetype.lua delete mode 100644 nvim-old/lua/config/icons.lua delete mode 100644 nvim-old/lua/config/init.lua delete mode 100644 nvim-old/lua/config/mappings.lua delete mode 100644 nvim-old/lua/config/plugins/bufferline.lua delete mode 100644 nvim-old/lua/config/plugins/catppuccin.lua delete mode 100644 nvim-old/lua/config/plugins/cmp.lua delete mode 100644 nvim-old/lua/config/plugins/comment.lua delete mode 100644 nvim-old/lua/config/plugins/conform.lua delete mode 100644 nvim-old/lua/config/plugins/laravel.lua delete mode 100644 nvim-old/lua/config/plugins/lsp.lua delete mode 100644 nvim-old/lua/config/plugins/lualine.lua delete mode 100644 nvim-old/lua/config/plugins/neo-tree.lua delete mode 100644 nvim-old/lua/config/plugins/telescope.lua delete mode 100644 nvim-old/lua/config/plugins/treesitter.lua delete mode 100644 nvim-old/lua/config/plugins/trouble.lua delete mode 100644 nvim-old/lua/config/plugins/which-key.lua delete mode 100644 nvim-old/lua/config/settings.lua delete mode 100644 nvim-old/lua/plugins/core/autopairs.lua delete mode 100644 nvim-old/lua/plugins/core/autotag.lua delete mode 100644 nvim-old/lua/plugins/core/indent-blankline.lua delete mode 100644 nvim-old/lua/plugins/core/treesitter.lua delete mode 100644 nvim-old/lua/plugins/editor/mini-comment.lua delete mode 100644 nvim-old/lua/plugins/editor/telescope.lua delete mode 100644 nvim-old/lua/plugins/ide/cmp.lua delete mode 100644 nvim-old/lua/plugins/ide/conform.lua delete mode 100644 nvim-old/lua/plugins/ide/copilot.lua delete mode 100644 nvim-old/lua/plugins/ide/dap.lua delete mode 100644 nvim-old/lua/plugins/ide/glow.lua delete mode 100644 nvim-old/lua/plugins/ide/lsp.lua delete mode 100644 nvim-old/lua/plugins/ide/neodev.lua delete mode 100644 nvim-old/lua/plugins/ide/neotest.lua delete mode 100644 nvim-old/lua/plugins/ide/trouble.lua delete mode 100644 nvim-old/lua/plugins/ide/undotree.lua delete mode 100644 nvim-old/lua/plugins/init.lua delete mode 100644 nvim-old/lua/plugins/lang/go.lua delete mode 100644 nvim-old/lua/plugins/lang/laravel.lua delete mode 100644 nvim-old/lua/plugins/ui/barbar.lua delete mode 100644 nvim-old/lua/plugins/ui/bufferline.lua delete mode 100644 nvim-old/lua/plugins/ui/catppuccin.lua delete mode 100644 nvim-old/lua/plugins/ui/colorscheme.lua delete mode 100644 nvim-old/lua/plugins/ui/dashboard.lua delete mode 100644 nvim-old/lua/plugins/ui/dressing.lua delete mode 100644 nvim-old/lua/plugins/ui/edgy.lua delete mode 100644 nvim-old/lua/plugins/ui/gitsigns.lua delete mode 100644 nvim-old/lua/plugins/ui/lualine.lua delete mode 100644 nvim-old/lua/plugins/ui/neo-tree.lua delete mode 100644 nvim-old/lua/plugins/ui/which-key.lua delete mode 100644 nvim-old/lua/utils/lspkind.lua delete mode 100644 nvim-old/queries/blade/highlights.scm delete mode 100644 nvim-old/queries/blade/injections.scm delete mode 100644 nvim-old/queries/php_only/highlights.scm delete mode 100644 nvim-old/queries/php_only/indents.scm diff --git a/nvim-old/.luarc.json b/nvim-old/.luarc.json deleted file mode 100644 index 7768e26..0000000 --- a/nvim-old/.luarc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "diagnostics.disable": [ - "different-requires" - ] -} \ No newline at end of file diff --git a/nvim-old/README.md b/nvim-old/README.md deleted file mode 100644 index d25af65..0000000 --- a/nvim-old/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# vim-config - -Just my vim config. - -Run `:Lazy` to install all plugins. diff --git a/nvim-old/init.lua b/nvim-old/init.lua deleted file mode 100644 index a75bc2d..0000000 --- a/nvim-old/init.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("config") -require("plugins") diff --git a/nvim-old/lazy-lock.json b/nvim-old/lazy-lock.json deleted file mode 100644 index fde0f75..0000000 --- a/nvim-old/lazy-lock.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, - "catppuccin": { "branch": "main", "commit": "02bdd749931a5d739063562e57531c118e081882" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "dashboard": { "branch": "master", "commit": "681300934baf36f6184ca41f0b26aed22056d4ee" }, - "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" }, - "edgy.nvim": { "branch": "main", "commit": "de79b7d92a5979cd71a9a1d8b6282515345e5055" }, - "fd": { "branch": "master", "commit": "11069e284a61afef8becdd4e189977e5621c0cf9" }, - "gitsigns.nvim": { "branch": "main", "commit": "c097cb255096f333e14d341082a84f572b394fa2" }, - "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, - "go.nvim": { "branch": "master", "commit": "39c245285483f7b587d827b3ff3eaa7e9ed00510" }, - "guihua.lua": { "branch": "master", "commit": "3b3126ae87c254f6849e708549ba76c39e3f42f8" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "laravel.nvim": { "branch": "main", "commit": "baafe3c0072ecb7c8f1efc9ed5e3c96ff4fbf056" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, - "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-conform.nvim": { "branch": "main", "commit": "c41b19222db71b016e55c64454b5e03441f56859" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, - "neo-tree.nvim": { "branch": "main", "commit": "c61074acb19102dfc6f21738dcae4d9a494a8959" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neotest": { "branch": "master", "commit": "f03a78cef74db5638e4312e18b767294a90de8da" }, - "neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" }, - "neotest-phpunit": { "branch": "main", "commit": "5799a4ea84450af14461d24edbde43913f9b3008" }, - "none-ls.nvim": { "branch": "main", "commit": "dca7ddec321a102ec9e792b1b29193702aff5fbb" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" }, - "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, - "nvim-treesitter": { "branch": "master", "commit": "b0ac1135fe304edd34e18204304906744db0fe63" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "67ac27f859ee3f7584f3edef81d0942bb61d5344" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, - "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} \ No newline at end of file diff --git a/nvim-old/lua/config/commands.lua b/nvim-old/lua/config/commands.lua deleted file mode 100644 index c1478a0..0000000 --- a/nvim-old/lua/config/commands.lua +++ /dev/null @@ -1,11 +0,0 @@ --- Nice command that creates all directores in the path --- then creates the file and opens it. -local createfile = function(opts) - local dir = vim.fs.dirname(opts.fargs[1]) - vim.cmd(string.format("!mkdir -p %s\n !touch %s", dir, opts.fargs[1])) - vim.cmd.e(opts.fargs) -end - - -vim.api.nvim_create_user_command('CreateFile', createfile, { nargs = 1, complete = "file" }) -vim.cmd("ca cf CreateFile") diff --git a/nvim-old/lua/config/filetype.lua b/nvim-old/lua/config/filetype.lua deleted file mode 100644 index f365e0f..0000000 --- a/nvim-old/lua/config/filetype.lua +++ /dev/null @@ -1,48 +0,0 @@ --- --- Filetype settings --- -local autocmd = vim.api.nvim_create_autocmd -local augroup = vim.api.nvim_create_augroup - - --- Add blade filetype for .blade.php files -vim.filetype.add({ - pattern = { - ['.*%.blade%.php'] = 'blade', - }, -}) - --- Fix autocomment plugins to use line comments for php. -autocmd('Filetype', { - pattern = 'php', - command = 'setlocal commentstring=//\\%s' -}) - - --- --- Indent --- - - -augroup('indent', { clear = true }) - --- Hardtabs for make -autocmd('Filetype', { - group = 'indent', - pattern = { 'make' }, - command = 'setlocal ts=4 sts=0 sw=4 noexpandtab' -}) - --- Softtab (2) for yaml -autocmd('Filetype', { - group = 'indent', - pattern = { 'yaml' }, - command = 'setlocal ts=2 sts=2 sw=2 expandtab' -}) - --- Hardtabs for c/cpp -autocmd('Filetype', { - group = 'indent', - pattern = { 'c', 'cpp' }, - command = 'setlocal ts=8 sts=0 sw=8 noexpandtab' -}) diff --git a/nvim-old/lua/config/icons.lua b/nvim-old/lua/config/icons.lua deleted file mode 100644 index 50326a3..0000000 --- a/nvim-old/lua/config/icons.lua +++ /dev/null @@ -1,90 +0,0 @@ -return { - prompt = '', - current = ' ', - selected = '', - close = '󰅖', - modified = '', - pinned = '', - separator = '│', - tree = { - node = '│', - nodelast = '└', - }, - files = { - text = "", - symlink = "", - }, - folder = { - closed = "", - open = "", - empty = "", - empty_open = "", - symlink = "", - symlink_open = "", - }, - diff = { - added = '', - modified = '', - removed = '', - }, - diff_gutter = { - add = '▍', - change = '▍', - delete = '', - untracked = '+' - }, - gitsigns = { - -- Change type - added = "", - modified = "", - deleted = "", - renamed = "➜", - -- Status type - untracked = "★", - ignored = "◌", - unstaged = "", - staged = "✓", - conflict = "", - }, - diagnostics = { - error = '', - warn = '', - info = '', - hint = '' - }, - test = { - ok = '', - failed = '', - running = '', - skipped = '', - watch = '', - unknown = '', - }, - symbols = { - Text = "", - Method = "", - Function = "󰊕", - Constructor = "", - Field = "", - Variable = "", - Class = "", - Interface = "", - Module = "", - Property = "", - Unit = "󰑭", - Value = "", - Enum = "", - Keyword = "", - Snippet = "󰘦", - Color = "", - File = "󰈙", - Reference = "󰈇", - Folder = "󰉋", - EnumMember = "", - Constant = "", - Struct = "󰙅", - Event = "", - Operator = "󰆕", - TypeParameter = "", - }, -} diff --git a/nvim-old/lua/config/init.lua b/nvim-old/lua/config/init.lua deleted file mode 100644 index d2a4c24..0000000 --- a/nvim-old/lua/config/init.lua +++ /dev/null @@ -1,5 +0,0 @@ --- config -require("config.commands") -require("config.settings") -require("config.mappings") -require("config.filetype") diff --git a/nvim-old/lua/config/mappings.lua b/nvim-old/lua/config/mappings.lua deleted file mode 100644 index 9e7b4f2..0000000 --- a/nvim-old/lua/config/mappings.lua +++ /dev/null @@ -1,71 +0,0 @@ --- --- Keymaps! Alot of stuff "borrowed" from thePrimeagen --- -local map = vim.keymap.set -local cmd = vim.cmd - -vim.g.mapleader = " " - --- Make half page jumps stay in the center of screen -map("n", "", "zz", { silent = true, desc = "jump half a page up" }) -map("n", "", "zz", { silent = true, desc = "jump half a page down" }) -map("n", "", "zz", { silent = true, desc = "jump half a page up" }) -map("n", "", "zz", { silent = true, desc = "jump half a page down" }) --- Make jump to next search item stay in the center of screen. -map("n", "n", "nzzzv", { silent = true, desc = "jump to next search match" }) -map("n", "N", "Nzzzv", { silent = true, desc = "jump to previous search match" }) - --- Ctrl+s saves the current buffer in normal/insert mode. -map({ "n", "i" }, "", cmd.w, { desc = "save current buffer" }) - --- Move text -map("n", "", ":m -2v=", { silent = true, desc = "move current line one line up" }) -map("n", "", ":m +1v=", { silent = true, desc = "move current line one line down" }) -map("v", "", ":m '<-2gv=gv", { silent = true, desc = "move current selection one line up" }) -map("v", "", ":m '>+1gv=gv", { silent = true, desc = "move current selection one line down" }) - --- copy/paste -map("x", "p", [["_dP]], - { silent = true, desc = "Paste over selected text without losing content in \"-register" }) -map({ "n", "v" }, "y", [["+y]], { desc = "Yank to system clipboard register" }) -map({ "n", "v" }, "p", [["+p]], { desc = "Paste from system clipboard register" }) - --- File operations -map("n", "Fc", ":CreateFile ", { silent = true, desc = "Create new file" }) -map("n", "Fx", "!chmod +x %", { silent = true, desc = "Set execute flag on current file" }) - --- buffers -map("n", "bn", cmd.bn, { silent = true, desc = "Move to next buffer" }) -map("n", "bb", cmd.bp, { silent = true, desc = "Move to previous buffer" }) -map("n", "bd", cmd.bd, { silent = true, desc = "Close current buffer" }) -map("n", "bc", "BufferLineCloseOthers", { silent = true, desc = "Close all other buffers" }) -map("n", "bD", "%bd", { silent = true, desc = "Close all buffers" }) - --- Indent -map('n', "", "^=$") -map('x', "", "=", { desc = "auto indent selection" }) -map("i", "", "", { desc = "delete indent" }) - --- fix paste --- map('n', "p", "p=$") - --- Crazy search+replace -map("n", "rw", [[:%s/\<\>//gI]], { - desc = "search+replace word under cursor" -}) - -map({ "x" }, "fhx", [[:s/\(\x\{2\}\)/0x\1, /g]], { desc = "Format hex" }) -map({ "x" }, "fha", [[:s/0x\(\x\{1\}\X\)/0x0\1/g]], { desc = "Format each hex number to be 2 characters long" }) -map({ "x" }, "fhn", [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex with 8 bytes per row" }) --- map({"x"}, "hb", [[:'<,'>s/\(\x\{2\}\)/0x\1, /g]], { desc = "Format a hex string to byte array"}) - --- diagnostics -map("n", "do", vim.diagnostic.open_float, { desc = "Open diagnostics" }) -map("n", "dn", vim.diagnostic.get_next, { desc = "Goto next" }) -map("n", "dp", vim.diagnostic.get_prev, { desc = "Goto previous" }) - --- TMux -map("n", "m", ":terminal tmuxsi", { desc = "Open tmux manager" }) - - -map("n", "Q", "") diff --git a/nvim-old/lua/config/plugins/bufferline.lua b/nvim-old/lua/config/plugins/bufferline.lua deleted file mode 100644 index 0439377..0000000 --- a/nvim-old/lua/config/plugins/bufferline.lua +++ /dev/null @@ -1,46 +0,0 @@ -local icons = require('config.icons') - -return function() - local highlightfunc = require("catppuccin.groups.integrations.bufferline") - return { - highlights = highlightfunc.get(), - options = { - mode = "buffers", - themable = true, - buffer_close_icon = icons.close, - close_icon = icons.close, - modified_icon = icons.modified, - diagnostics = false, - enforce_regular_tabs = true, - indicator = { - icon = "", - }, - close_command = function(bufnum) - vim.cmd("bprev") - vim.api.nvim_buf_delete(bufnum, {}) - end, - hover = { - enabled = true, - delay = 200, - reveal = { 'close' } - }, - offsets = { - { - filetype = "neo-tree", - text = "File Explorer", - text_align = "left" - } - }, - custom_areas = { - left = function() - return { - { - text = "  ", - fg = "#8fff6d", - } - } - end - } - } - } -end diff --git a/nvim-old/lua/config/plugins/catppuccin.lua b/nvim-old/lua/config/plugins/catppuccin.lua deleted file mode 100644 index 6846540..0000000 --- a/nvim-old/lua/config/plugins/catppuccin.lua +++ /dev/null @@ -1,115 +0,0 @@ -return { - flavour = "mocha", - color_overrides = { - mocha = { - base = '#0E1019', - mantle = '#0D0F17', - crust = '#0C0D14', - surface0 = '#131521', - surface1 = '#343959', - surface2 = '#41476F', - overlay0 = '#3F4256', - overlay1 = '#5B5F7C', - overlay2 = '#767BA0', - text = '#eceef4', - } - }, - no_italic = true, - no_bold = true, - highlight_overrides = { - mocha = function(colors) - return { - -- Normal = { fg = colors.text }, - -- NormalNC = { fg = colors.text }, - - -- Floating windows - NormalFloat = { fg = colors.text, bg = colors.mantle }, - FloatTitle = { fg = colors.base, bg = colors.blue }, - FloatBorder = { fg = colors.blue, bg = colors.mantle }, - - -- Window separator - WinSeparator = { fg = colors.surface0 }, - NeoTreeWinSeparator = { link = "WinSeparator" }, - - -- Menus - Pmenu = { fg = colors.text, bg = colors.mantle }, - - -- NoiceMini = { link = "NormalFloat" }, - WhichKeyFloat = { link = "Pmenu" }, - - -- indent lines - IblScope = { fg = colors.overlay1 }, - - -- LSP - -- LspReferenceText = { bg = colors.surface0 }, - -- LspReferenceRead = { link = "LspReferenceText" }, - -- LspReferenceWrite = { link = "LspReferenceText" }, - -- - -- -- telescope - TelescopeNormal = { bg = colors.crust }, - TelescopeBorder = { fg = colors.crust, bg = colors.crust }, - TelescopePromptNormal = { bg = colors.mantle }, - TelescopePromptPrefix = { fg = colors.mauve }, - TelescopePromptBorder = { fg = colors.mantle, bg = colors.mantle }, - TelescopePromptTitle = { fg = colors.crust, bg = colors.blue }, - TelescopePreviewTitle = { fg = colors.crust, bg = colors.mauve }, - TelescopeSelection = { fg = colors.text, bg = colors.surface0 }, - - -- Statusline - StatusLine = { fg = colors.text, bg = colors.mantle }, - StatusLineNormal = { fg = colors.text, bg = colors.mantle }, - StatusLineSeparator = { fg = colors.surface0, bg = colors.mantle }, - StatusLineInsert = { fg = colors.base, bg = colors.blue }, - StatusLineVisual = { fg = colors.base, bg = colors.mauve }, - StatusLineCommand = { fg = colors.base, bg = colors.yellow }, - StatusLineReplace = { fg = colors.base, bg = colors.maroon }, - - -- Syntax - PreProc = { link = "Include" }, - Operator = { fg = colors.rosewater }, - Function = { link = "@text" }, - Delimiter = { link = "@text" }, - Include = { fg = colors.mauve }, - Keyword = { fg = colors.yellow }, - Repeat = { link = "Keyword" }, - Conditional = { link = "Keyword" }, - Type = { fg = colors.blue }, - String = { fg = colors.lavender }, - Exception = { link = "Keyword" }, - ["@constructor"] = { link = "Function" }, - ["@variable"] = { fg = colors.green }, - ["@variable.builtin"] = { link = "@variable" }, - ["@variable.parameter"] = { link = "@parameter" }, - ["@variable.member"] = { link = "@variable" }, - ["@parameter"] = { link = "@variable" }, - ["@keyword.function"] = { link = "Keyword" }, - ["@keyword.return"] = { link = "Keyword" }, - ["@keyword.operator"] = { link = "Keyword" }, - ["@property"] = { link = "@variable" }, - ["@tag"] = { link = "Keyword" }, - ["@tag.delimiter"] = { link = "@text" }, - ["@punctuation"] = { link = "@text" }, - ["@module"] = { link = "@text" }, - ["@punctuation.bracket"] = { link = "@punctuation" }, - ["@lsp.type.property"] = { link = "@variable" }, - - -- PHP specific - ["@class_name.php"] = { link = "@text" }, - ["@extend_name.php"] = { link = "@text" }, - ["@implements_name.php"] = { link = "@text" }, - ["@namespace_name.php"] = { link = "@text" }, - ["@namespace_alias.php"] = { link = "@text" }, - } - end - }, - integrations = { - cmp = true, - treesitter = true, - barbar = true, - neotree = true, - noice = true, - telescope = { - enabled = true, - } - } -} diff --git a/nvim-old/lua/config/plugins/cmp.lua b/nvim-old/lua/config/plugins/cmp.lua deleted file mode 100644 index 7888e8a..0000000 --- a/nvim-old/lua/config/plugins/cmp.lua +++ /dev/null @@ -1,59 +0,0 @@ -return function() - local cmp = require('cmp') - local lspkind = require('utils.lspkind') - local icons = require('config.icons') - - local selectPrev = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }) - local selectNext = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }) - - local borderstyle = { - border = "none", - winhighlight = 'Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None', - } - - return { - preselect = false, - view = { - entries = { name = 'custom', selection_order = 'near_cursor' }, - }, - window = { - documentation = borderstyle, - completion = borderstyle - }, - mapping = { - [""] = selectPrev, - [""] = selectPrev, - [""] = selectNext, - [""] = selectNext, - [""] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), - }, - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - formatting = { - fields = { "abbr", "kind", "menu" }, - format = lspkind.format({ - mode = 'symbol', - preset = 'codicons', - symbol_map = icons.symbols, - maxwidth = 40, - ellipsis_char = "...", - }), - }, - sources = { - { name = "copilot" }, - { name = 'nvim_lsp' }, - { name = 'buffer' }, - { name = 'path' }, - { name = 'luasnip' } - }, - experimental = { - ghost_text = { - hl_group = "NonText", - }, - }, - } -end diff --git a/nvim-old/lua/config/plugins/comment.lua b/nvim-old/lua/config/plugins/comment.lua deleted file mode 100644 index 772b694..0000000 --- a/nvim-old/lua/config/plugins/comment.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - options = { - custom_commentstring = function() return vim.bo.commentstring end - }, - mappings = { - -- Toggle comment (like `gcip` - comment inner paragraph) for both - -- Normal and Visual modes - comment = '/', - - -- Toggle comment on current line - comment_line = '//', - - -- Toggle comment on visual selection - comment_visual = '/', - - -- Define 'comment' textobject (like `dg/` - delete whole comment block) - -- Works also in Visual mode if mapping differs from `comment_visual` - textobject = 'g/', - } -} diff --git a/nvim-old/lua/config/plugins/conform.lua b/nvim-old/lua/config/plugins/conform.lua deleted file mode 100644 index 127500e..0000000 --- a/nvim-old/lua/config/plugins/conform.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - keys = { - { 'ff', "Format", desc = 'Format file' }, - { 'ff', "Format", mode = 'x', desc = 'Format selection' }, - }, - opts = { - format_options = { - async = true, - lsp_fallback = true, - }, - notify_on_error = true, - formatters_by_ft = { - blade = { "blade-formatter" }, - lua = { "stylua" }, - ["_"] = { "prettier" } - } - } -} diff --git a/nvim-old/lua/config/plugins/laravel.lua b/nvim-old/lua/config/plugins/laravel.lua deleted file mode 100644 index 2224177..0000000 --- a/nvim-old/lua/config/plugins/laravel.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - keys = { - ["la"] = { "Laravel artisan", "Run artisan" }, - ["lm"] = { "Laravel make", "Make" }, - ["lr"] = { "Laravel routes", "Search routes" }, - ["lR"] = { "Laravel related", "Related" }, - ["lv"] = { "Laravel view-finder", "View finder" }, - }, -} diff --git a/nvim-old/lua/config/plugins/lsp.lua b/nvim-old/lua/config/plugins/lsp.lua deleted file mode 100644 index 97009e6..0000000 --- a/nvim-old/lua/config/plugins/lsp.lua +++ /dev/null @@ -1,74 +0,0 @@ -return { - mappings = { - ["rs"] = { vim.lsp.buf.rename, { desc = "Rename symbol" } }, - ["ca"] = { vim.lsp.buf.code_action, { desc = "Code action" } }, - ["ff"] = { vim.lsp.buf.format, { desc = "Format file" } }, - K = { vim.lsp.buf.hover, { desc = "Hover" } }, - gd = { vim.lsp.buf.definition, { desc = "Goto definition" } }, - gi = { vim.lsp.buf.implementation, { desc = "Goto implementation" } }, - gr = { vim.lsp.buf.references, { desc = "Goto references" } }, - }, - servers = { - -- PHP - phpactor = { - settings = { - init_options = { - ["language_server_phpstan.enabled"] = true, - ["language_server_psalm.enabled"] = false, - } - } - }, - -- - -- - -- JS,TS,VUE - volar = { - filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' } - }, - -- TailwindCSS - tailwindcss = {}, - -- GO - gopls = { - -- format_on_save = true, - on_save = function() - local params = vim.lsp.util.make_range_params() - params.context = { only = { "source.organizeImports" } } - local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 1000) - for cid, res in pairs(result or {}) do - for _, r in pairs(res.result or {}) do - if r.edit then - local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16" - vim.lsp.util.apply_workspace_edit(r.edit, enc) - end - end - end - vim.lsp.buf.format({ async = false }) - end, - settings = { - gopls = { - analyses = { - unusedvariable = true, - unusedwrite = true, - useany = true - }, - gofumpt = true, - }, - }, - }, - -- Lua - lua_ls = { - settings = { - Lua = { - runtime = { - version = 'LuaJIT' - }, - workspace = { - checkThirdParty = false, - library = { - vim.env.VIMRUNTIME - } - } - }, - }, - }, - }, -} diff --git a/nvim-old/lua/config/plugins/lualine.lua b/nvim-old/lua/config/plugins/lualine.lua deleted file mode 100644 index fe71d83..0000000 --- a/nvim-old/lua/config/plugins/lualine.lua +++ /dev/null @@ -1,93 +0,0 @@ -local icons = require('config.icons') -local separator = { "'" .. icons.separator .. "'", color = 'StatusLineSeparator' } - -return { - options = { - globalstatus = true, - component_separators = '', - section_separators = '', - disabled_filetypes = { - statusline = { - 'dashboard', - } - }, - theme = { - normal = { - a = "StatusLineNormal", - b = "StatusLine", - c = "StatusLine", - x = "StatusLine", - y = "StatusLine", - z = "StatusLine", - }, - command = { - a = "StatusLineCommand", - z = "StatusLine", - }, - insert = { - a = "StatusLineInsert", - z = "StatusLine", - }, - visual = { - a = "StatusLineVisual", - z = "StatusLine", - }, - replace = { - a = "StatusLineReplace", - z = "StatusLine", - } - } - }, - sections = { - lualine_a = { - "mode", - }, - lualine_b = { - separator, - "branch", - separator, - '" " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))', - { - require("lazy.status").updates, - cond = require("lazy.status").has_updates, - color = { fg = "#ff9e64" }, - }, - { - "diagnostics", - symbols = { - error = icons.diagnostics.error .. ' ', - warn = icons.diagnostics.warn .. ' ', - info = icons.diagnostics.info .. ' ', - hint = icons.diagnostics.hint .. ' ', - }, - }, - { - "diff", - symbols = { - added = icons.diff.added .. ' ', - modified = icons.diff.modified .. ' ', - removed = icons.diff.removed .. ' ' - } - }, - separator, - }, - lualine_c = { - 'filename' - }, - lualine_x = { - 'filetype', - 'fileformat', - '(vim.bo.expandtab and "SPC" or "TAB") .. " " .. vim.bo.shiftwidth', - }, - lualine_y = { - separator, - 'location', - 'progress' - }, - lualine_z = {} - }, - extensions = { - 'lazy', - 'neo-tree' - } -} diff --git a/nvim-old/lua/config/plugins/neo-tree.lua b/nvim-old/lua/config/plugins/neo-tree.lua deleted file mode 100644 index 6842b1f..0000000 --- a/nvim-old/lua/config/plugins/neo-tree.lua +++ /dev/null @@ -1,69 +0,0 @@ -local icons = require('config.icons') - -return { - close_if_last_window = false, - hide_root_node = true, - default_component_configs = { - indent = { - indent_size = 2, - padding = 1, - -- indent guides - with_markers = true, - indent_marker = icons.tree.node, - last_indent_marker = icons.tree.nodelast, - }, - icon = { - folder_open = icons.folder.open, - folder_close = icons.folder.close, - folder_empty = icons.folder.empty, - default = icons.files.text, - }, - name = { - use_git_status_colors = false, - }, - git_status = { - symbols = icons.gitsigns - }, - file_size = { - enabled = false, - }, - type = { - enabled = false, - }, - last_modified = { - enabled = false, - }, - created = { - enabled = false, - }, - symlink_target = { - enabled = true, - }, - }, - event_handlers = { - { - event = "neo_tree_buffer_enter", - handler = function() - if vim.bo.filetype == "neo-tree" then - vim.cmd("setlocal statuscolumn=") - end - end, - } - }, - filesystem = { - filtered_items = { - visible = true, -- when true, they will just be displayed differently than normal items - hide_dotfiles = true, - hide_gitignored = true, - hide_hidden = true, -- only works on Windows for hidden files/directories - hide_by_name = { - "node_modules", - "vendor", - }, - }, - follow_current_file = { - enabled = true, - }, - use_libuv_file_watcher = true, - } -} diff --git a/nvim-old/lua/config/plugins/telescope.lua b/nvim-old/lua/config/plugins/telescope.lua deleted file mode 100644 index 61003a8..0000000 --- a/nvim-old/lua/config/plugins/telescope.lua +++ /dev/null @@ -1,50 +0,0 @@ -local icons = require('config.icons') - -return { - key_groups = { - ["s"] = { name = "+search" }, - }, - keys = { - { 'sf', 'Telescope find_files', desc = 'Search files' }, - { 'sa', 'Telescope live_grep', desc = 'Search in files' }, - { 'sg', 'Telescope git_files', desc = 'Search Git files' }, - { 'so', 'Telescope oldfiles', desc = 'Search Old files' }, - { 'sw', 'Telescope grep_string', desc = 'Search for word under cursor' }, - { 'sd', 'Telescope diagnostics', desc = 'Search Diagnostics' }, - { 'sq', 'Telescope quickfix', desc = 'Search Quickfix' }, - { 'sh', 'Telescope help', desc = 'Search Neovim help' }, - -- LSP - { 'sr', 'Telescope lsp_references', desc = 'Search Reference' }, - { 'ss', 'Telescope lsp_document_symbols', desc = 'Search document symbols' }, - { 'sr', 'Telescope lsp_references', desc = 'Search Reference' }, - { 'si', 'Telescope lsp_implementations', desc = 'Search Inplementations' }, - { 'sp', 'Telescope lsp_workspace_symbols', desc = 'Search Workspace symbols' }, - { 'gd', 'Telescope lsp_definitions', desc = 'Goto definition' }, - }, - opts = function() - local actions = require("telescope.actions") - return { - defaults = { - path_display = { truncate = 1 }, - prompt_prefix = ' ', - selection_caret = icons.current .. ' ', - multi_icon = icons.selected .. ' ', - file_ignore_patterns = { - ".git/", - "node_modules/" - }, - mappings = { - i = { - [""] = actions.close - } - } - }, - pickers = { - find_files = { - hidden = true - } - } - } - end, -} - diff --git a/nvim-old/lua/config/plugins/treesitter.lua b/nvim-old/lua/config/plugins/treesitter.lua deleted file mode 100644 index f725696..0000000 --- a/nvim-old/lua/config/plugins/treesitter.lua +++ /dev/null @@ -1,57 +0,0 @@ -return { - -- A list of parser names - ensure_installed = { - "bash", - "c", - "cpp", - "ninja", - "cmake", - "dockerfile", - "make", - "lua", - "vim", - "vimdoc", - "query", - "php", - "phpdoc", - "blade", - "go", - "gomod", - "gosum", - "javascript", - "typescript", - "css", - "scss", - "html", - "vue", - "json", - "jsonc", - "yaml", - "toml", - "xml", - "glsl", - "hlsl", - "markdown" - }, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = true, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = false, - - highlight = { - enable = true, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, - - indent = { - enable = true - } -} diff --git a/nvim-old/lua/config/plugins/trouble.lua b/nvim-old/lua/config/plugins/trouble.lua deleted file mode 100644 index e82b896..0000000 --- a/nvim-old/lua/config/plugins/trouble.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - keys = { - { "xx", function() require("trouble").toggle() end }, - { "xw", function() require("trouble").toggle("workspace_diagnostics") end }, - { "xd", function() require("trouble").toggle("document_diagnostics") end }, - { "xq", function() require("trouble").toggle("quickfix") end }, - { "xl", function() require("trouble").toggle("loclist") end }, - { "gR", function() require("trouble").toggle("lsp_references") end }, - }, -} diff --git a/nvim-old/lua/config/plugins/which-key.lua b/nvim-old/lua/config/plugins/which-key.lua deleted file mode 100644 index a92fd30..0000000 --- a/nvim-old/lua/config/plugins/which-key.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - defaults = { - mode = { "n", "v" }, - ["r"] = { name = "+rename" }, - ["b"] = { name = "+buffers" }, - ["f"] = { name = "+format" }, - ["F"] = { name = "+files" }, - ["d"] = { name = "+diagnostics" } - } -} diff --git a/nvim-old/lua/config/settings.lua b/nvim-old/lua/config/settings.lua deleted file mode 100644 index ce1008f..0000000 --- a/nvim-old/lua/config/settings.lua +++ /dev/null @@ -1,96 +0,0 @@ -local set = vim.opt - - --- --- General Settings --- - -set.termguicolors = true -set.updatetime = 50 -set.showmode = false -- disable mode in the command line, because i use lualine - - --- --- Editor settings --- - - -set.pumheight = 20 -set.laststatus = 3 -set.splitkeep = "screen" -set.scrolloff = 20 - --- mouse and cursor -set.cursorline = true -set.mousemoveevent = true - --- search -set.hlsearch = false -set.incsearch = true -set.ignorecase = true -set.smartcase = true - --- line numbers -set.number = true -set.relativenumber = true -set.numberwidth = 5 - --- sign column to the right. ---set.statuscolumn = '%=%{v:relnum?v:relnum:v:lnum} %s ' - --- sign column to the left -set.statuscolumn = '%s %=%{v:relnum?v:relnum:v:lnum} ' - --- indent -set.expandtab = true -set.tabstop = 4 -set.softtabstop = 4 -set.shiftwidth = 4 -set.autoindent = true -set.smartindent = true - --- Folding ---set.foldenable = true ---set.foldmethod = "expr" ---set.foldexpr = "nvim_treesitter#foldexpr()" - ---vim.api.nvim_create_autocmd('BufReadPost,FileReadPost', { --- pattern = '*', --- cmd = 'normal zR', ---}) --- - --- Completion -set.completeopt = "menuone,longest,preview" - - - --- --- Diagnostics --- - - -local icons = require('config.icons').diagnostics -vim.fn.sign_define('DiagnosticSignError', { text = icons.error, texthl = 'DiagnosticSignError' }) -vim.fn.sign_define('DiagnosticSignWarn', { text = icons.warn, texthl = 'DiagnosticSignWarn' }) -vim.fn.sign_define('DiagnosticSignInfo', { text = icons.info, texthl = 'DiagnosticSignInfo' }) -vim.fn.sign_define('DiagnosticSignHint', { text = icons.hint, texthl = 'DiagnosticSignHint' }) - -vim.diagnostic.config({ - virtual_text = false, - severity_sort = true, - underline = false, - float = { - -- border = 'single', - }, -}) - --- Highlight on yank -vim.api.nvim_create_autocmd('TextYankPost', { - group = vim.api.nvim_create_augroup('highlight_yank', {}), - desc = 'Hightlight selection on yank', - pattern = '*', - callback = function() - vim.highlight.on_yank { higroup = 'IncSearch', timeout = 200 } - end, -}) diff --git a/nvim-old/lua/plugins/core/autopairs.lua b/nvim-old/lua/plugins/core/autopairs.lua deleted file mode 100644 index 5698563..0000000 --- a/nvim-old/lua/plugins/core/autopairs.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - 'windwp/nvim-autopairs', - event = "InsertEnter", - config = true -} diff --git a/nvim-old/lua/plugins/core/autotag.lua b/nvim-old/lua/plugins/core/autotag.lua deleted file mode 100644 index 991c841..0000000 --- a/nvim-old/lua/plugins/core/autotag.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - "windwp/nvim-ts-autotag", - dependencies = { - 'nvim-treesitter/nvim-treesitter' - }, - opts = { - filetypes = { - 'html', - 'javascript', - 'typescript', - 'javascriptreact', - 'typescriptreact', - 'svelte', - 'vue', - 'tsx', - 'jsx', - 'rescript', - 'xml', - 'php', - 'blade', - 'markdown', - } - } -} diff --git a/nvim-old/lua/plugins/core/indent-blankline.lua b/nvim-old/lua/plugins/core/indent-blankline.lua deleted file mode 100644 index fcfffb2..0000000 --- a/nvim-old/lua/plugins/core/indent-blankline.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - opts = { - debounce = 10, - indent = { - char = '▏', - }, - scope = { - enabled = true, - show_start = false, - show_end = false - }, - exclude = { - filetypes = { - 'help', - 'dashboard' - } - } - }, - config = function(_, opts) - require 'ibl'.setup(opts) - - local hooks = require 'ibl.hooks' - hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level) - hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) - end -} diff --git a/nvim-old/lua/plugins/core/treesitter.lua b/nvim-old/lua/plugins/core/treesitter.lua deleted file mode 100644 index f84acf6..0000000 --- a/nvim-old/lua/plugins/core/treesitter.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - 'nvim-treesitter/nvim-treesitter', - build = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', - 'nvim-treesitter/playground' - }, - opts = require('config.plugins.treesitter'), - config = function(_, opts) - local parser_config = require('nvim-treesitter.parsers').get_parser_configs() - - parser_config.blade = { - install_info = { - url = 'https://github.com/EmranMR/tree-sitter-blade', - branch = "main", - files = { 'src/parser.c' }, - generate_requires_npm = true, - requires_generate_from_grammar = true, - }, - filetype = 'blade', - } - - require("nvim-treesitter.configs").setup(opts) - end, -} diff --git a/nvim-old/lua/plugins/editor/mini-comment.lua b/nvim-old/lua/plugins/editor/mini-comment.lua deleted file mode 100644 index 255cddb..0000000 --- a/nvim-old/lua/plugins/editor/mini-comment.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - 'echasnovski/mini.comment', - version = '*', - opts = require('config.plugins.comment') -} diff --git a/nvim-old/lua/plugins/editor/telescope.lua b/nvim-old/lua/plugins/editor/telescope.lua deleted file mode 100644 index fec4f13..0000000 --- a/nvim-old/lua/plugins/editor/telescope.lua +++ /dev/null @@ -1,38 +0,0 @@ -local config = require('config.plugins.telescope') - -return { - 'nvim-telescope/telescope.nvim', - main = 'telescope', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'sharkdp/fd', - { - "folke/which-key.nvim", - optional = true, - opts = { - defaults = config.key_groups or {}, - }, - }, - }, - keys = config.keys or {}, - opts = config.opts or {}, - config = function (_, opts) - local override = { - border = { - prompt = { 1, 1, 1, 1 }, - results = { 1, 1, 1, 1 }, - preview = { 1, 1, 1, 1 }, - }, - -- borderchars = { - -- prompt = { "─", "│", "─", "│", "├", "┤", "┴", "└" }, - -- results = { "─", "│", " ", "│", "┌", "┬", "│", "│" }, - -- preview = { "─", "│", "─", " ", "─", "┐", "┘", "─" }, - -- }, - } - - opts.defaults = vim.tbl_deep_extend("force", opts.defaults, override) - - require('telescope').setup(opts) - end -} diff --git a/nvim-old/lua/plugins/ide/cmp.lua b/nvim-old/lua/plugins/ide/cmp.lua deleted file mode 100644 index a4eefc6..0000000 --- a/nvim-old/lua/plugins/ide/cmp.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - 'hrsh7th/nvim-cmp', - version = false, - event = "InsertEnter", - dependencies = { - 'hrsh7th/cmp-buffer', - 'hrsh7th/cmp-path', - 'hrsh7th/cmp-nvim-lsp', - 'L3MON4D3/LuaSnip', - 'onsails/lspkind-nvim', - }, - opts = require('config.plugins.cmp'), - config = function(_, opts) - local cmp = require('cmp') - - cmp.setup(opts) - - -- insert () on function completion using autopairs - cmp.event:on( - 'confirm_done', - require('nvim-autopairs.completion.cmp').on_confirm_done() - ) - end -} diff --git a/nvim-old/lua/plugins/ide/conform.lua b/nvim-old/lua/plugins/ide/conform.lua deleted file mode 100644 index 92606fe..0000000 --- a/nvim-old/lua/plugins/ide/conform.lua +++ /dev/null @@ -1,38 +0,0 @@ -local config = require('config.plugins.conform') - -return { - 'stevearc/conform.nvim', - dependencies = { - "williamboman/mason.nvim", - "zapling/mason-conform.nvim" - }, - cmd = { "ConformInfo", "Format" }, - keys = config.keys or {}, - opts = config.opts or {}, - config = function (_, opts) - - -- Create command to format a buffer or range. - vim.api.nvim_create_user_command("Format", function(args) - local range = nil - if args.count ~= -1 then - local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1] - range = { - start = { args.line1, 0 }, - ["end"] = { args.line2, end_line:len() }, - } - end - - local opt = opts.format_options - if range ~= nil then - opt = vim.tbl_deep_extend("force", opt, { range = range }) - end - - require("conform").format(opt) - end, { range = true }) - - require('conform').setup(opts) - - -- setup mason-conform to autmagically install formatters. - require('mason-conform').setup() - end -} diff --git a/nvim-old/lua/plugins/ide/copilot.lua b/nvim-old/lua/plugins/ide/copilot.lua deleted file mode 100644 index 2a7dcf9..0000000 --- a/nvim-old/lua/plugins/ide/copilot.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "zbirenbaum/copilot.lua", - cmd = "Copilot", - event = "InsertEnter", - opts = { - suggestion = { - enabled = true, - auto_trigger = true, - keymap = { - accept = "", - }, - }, - panel = { - enabled = true, - auto_refresh = true, - }, - } -} diff --git a/nvim-old/lua/plugins/ide/dap.lua b/nvim-old/lua/plugins/ide/dap.lua deleted file mode 100644 index 0dd14b2..0000000 --- a/nvim-old/lua/plugins/ide/dap.lua +++ /dev/null @@ -1,91 +0,0 @@ -return { - "mfussenegger/nvim-dap", - dependencies = { - { - "folke/which-key.nvim", - -- optional = true, - opts = { - defaults = { - ["D"] = { name = "+debug" }, - }, - }, - }, - { - "rcarriga/nvim-dap-ui", - -- stylua: ignore - keys = { - { "Dr", function() require("dap").continue({ }) end, desc = "Dap Run/Continue" }, - { "Du", function() require("dapui").toggle({ }) end, desc = "Dap UI" }, - { "De", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} }, - }, - opts = {}, - config = function(_, opts) - -- setup dap config by VsCode launch.json file - -- require("dap.ext.vscode").load_launchjs() - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open({}) - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close({}) - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close({}) - end - end, - }, - }, - keys = { - { "Dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" }, - { "Db", function() require'dap'.toggle_breakpoint() end, desc = "Toggle breakpoint" }, - }, - config = function() - vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" }) - - local dap = require "dap" - dap.adapters.delve = { - type = 'server', - port = '${port}', - executable = { - command = 'dlv', - args = {'dap', '-l', '127.0.0.1:${port}'}, - } - } - - dap.configurations.go = { - { - type = "delve", - name = "Debug", - request = "launch", - program = "${file}" - }, - { - type = "delve", - name = "Debug test", -- configuration for debugging test files - request = "launch", - mode = "test", - program = "${file}" - }, - -- works with go.mod packages and sub packages - { - type = "delve", - name = "Debug test (go.mod)", - request = "launch", - mode = "test", - program = "./${relativeFileDirname}" - } - } - -- local Config = require("lazyvim.config") - - - -- for name, sign in pairs(Config.icons.dap) do - -- sign = type(sign) == "table" and sign or { sign } - -- vim.fn.sign_define( - -- "Dap" .. name, - -- { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] } - -- ) - -- end - end, -} diff --git a/nvim-old/lua/plugins/ide/glow.lua b/nvim-old/lua/plugins/ide/glow.lua deleted file mode 100644 index 0e2c41f..0000000 --- a/nvim-old/lua/plugins/ide/glow.lua +++ /dev/null @@ -1 +0,0 @@ -return {"ellisonleao/glow.nvim", config = true, cmd = "Glow"} diff --git a/nvim-old/lua/plugins/ide/lsp.lua b/nvim-old/lua/plugins/ide/lsp.lua deleted file mode 100644 index a83f740..0000000 --- a/nvim-old/lua/plugins/ide/lsp.lua +++ /dev/null @@ -1,92 +0,0 @@ -return { - 'neovim/nvim-lspconfig', - dependencies = { - 'williamboman/mason.nvim', - 'williamboman/mason-lspconfig.nvim', - 'hrsh7th/cmp-nvim-lsp', - { 'folke/neodev.nvim', opts = {} }, - }, - opts = require('config.plugins.lsp'), - config = function(_, opts) - -- Setup Mason to automatically install LSP servers - require('mason').setup() - require('mason-lspconfig').setup({ automatic_installation = true }) - local augroup = vim.api.nvim_create_augroup("Lsp", {}) - local lspconfig = require('lspconfig') - local capabilities = require('cmp_nvim_lsp').default_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = false - - vim.lsp.handlers['textDocument/hover'] = vim.lsp.with( - vim.lsp.handlers.hover, - { border = 'single' } - ) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - focusable = true, - style = "minimal", - border = "single", - }) - - vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = false, - } - ) - - for name, server_opt in pairs(opts.servers) do - local on_attach = function(client, bufnr) - for bind, settings in pairs(opts.mappings) do - vim.keymap.set('n', bind, settings[1], vim.tbl_deep_extend("force", settings[2], { buffer = bufnr })) - end - - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - - -- Add format on save if configured and client supports it. - if server_opt.format_on_save and client.supports_method("textDocument/formatting") then - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format() - end, - }) - end - - if server_opt.on_save then - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = server_opt.on_save, - }) - end - - - if client.supports_method("textDocument/documentHighlight") then - vim.api.nvim_create_autocmd("CursorHold", { - group = augroup, - buffer = bufnr, - callback = function() vim.lsp.buf.document_highlight() end - }) - - vim.api.nvim_create_autocmd("CursorHoldI", { - group = augroup, - buffer = bufnr, - callback = function() vim.lsp.buf.document_highlight() end - }) - - vim.api.nvim_create_autocmd("CursorMoved", { - group = augroup, - buffer = bufnr, - callback = function() vim.lsp.buf.clear_references() end - }) - end - end - - lspconfig[name].setup({ - settings = server_opt.settings or {}, - capabilities = capabilities, - on_attach = on_attach - }) - end - end -} diff --git a/nvim-old/lua/plugins/ide/neodev.lua b/nvim-old/lua/plugins/ide/neodev.lua deleted file mode 100644 index 0db939e..0000000 --- a/nvim-old/lua/plugins/ide/neodev.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "folke/neodev.nvim", - opts = {} -} diff --git a/nvim-old/lua/plugins/ide/neotest.lua b/nvim-old/lua/plugins/ide/neotest.lua deleted file mode 100644 index aec2d8c..0000000 --- a/nvim-old/lua/plugins/ide/neotest.lua +++ /dev/null @@ -1,58 +0,0 @@ -return { - "nvim-neotest/neotest", - dependencies = { - "nvim-neotest/nvim-nio", - "nvim-lua/plenary.nvim", - "antoinemadec/FixCursorHold.nvim", - "nvim-treesitter/nvim-treesitter", - "nvim-neotest/neotest-go", - "olimorris/neotest-phpunit", - { - "folke/which-key.nvim", - optional = true, - opts = { - defaults = { - ["t"] = { name = "+test" }, - }, - }, - }, - }, - keys = { - {"tn", ":lua require('neotest').run.run()", desc = "test nearest", silent = true}, - {"tf", ":lua require('neotest').run.run(vim.fn.expand('%'))", desc = "test file"}, - {"ta", ":lua require('neotest').output_panel.open():lua require('neotest').run.run({suite = true})", desc = "test all"}, - {"ts", ":lua require('neotest').run.stop()", desc = "stop test"}, - {"tq", ":lua require('neotest').output_panel.close()", desc = "close output window"}, - {"te", ":Neotest summary", desc = "Open test explorer"} - }, - opts = function() - local icons = require('config.icons').test - - return { - adapters = { - require("neotest-go")({ - recursive_run = true - }), - require("neotest-phpunit") - }, - icons = { - child_indent = "│", - child_prefix = "├", - collapsed = "─", - expanded = "┐", - failed = icons.failed, - final_child_indent = " ", - final_child_prefix = "└", - non_collapsible = "─", - passed = icons.ok, - running = icons.running, - skipped = icons.skipped, - unknown = icons.unknown, - watching = icons.watch - }, - summery = { - open = "botleft vsplit" - } - } - end -} diff --git a/nvim-old/lua/plugins/ide/trouble.lua b/nvim-old/lua/plugins/ide/trouble.lua deleted file mode 100644 index 5348210..0000000 --- a/nvim-old/lua/plugins/ide/trouble.lua +++ /dev/null @@ -1,8 +0,0 @@ -local conf = require("config.plugins.trouble") or {} - -return { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - keys = conf.keys or {}, - opts = conf.opts or {}, -} diff --git a/nvim-old/lua/plugins/ide/undotree.lua b/nvim-old/lua/plugins/ide/undotree.lua deleted file mode 100644 index 392c881..0000000 --- a/nvim-old/lua/plugins/ide/undotree.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "mbbill/undotree", - keys = { - {"u", ":UndotreeToggle", desc = "Toggle undotree"}, - }, -} diff --git a/nvim-old/lua/plugins/init.lua b/nvim-old/lua/plugins/init.lua deleted file mode 100644 index 5369a58..0000000 --- a/nvim-old/lua/plugins/init.lua +++ /dev/null @@ -1,64 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - -local opts = { - dev = { - path = "~/code/nvim_plugins", - } -} - -require("lazy").setup({ - - -- Core - ----------------------------- - { import = "plugins.core.treesitter" }, - { import = "plugins.core.autopairs" }, - { import = "plugins.core.autotag" }, - { import = "plugins.core.indent-blankline" }, - - -- Editor - ----------------------------- - { import = "plugins.editor.mini-comment" }, - { import = "plugins.editor.telescope" }, - - -- UI - ----------------------------- - { import = "plugins.ui.catppuccin" }, - { import = "plugins.ui.dressing" }, - { import = "plugins.ui.edgy" }, - { import = "plugins.ui.dashboard" }, - { import = "plugins.ui.neo-tree" }, - { import = "plugins.ui.bufferline" }, - { import = "plugins.ui.lualine" }, - { import = "plugins.ui.gitsigns" }, - { import = "plugins.ui.which-key" }, - - -- IDE - ----------------------------- - { import = "plugins.ide.trouble" }, - { import = "plugins.ide.undotree" }, - { import = "plugins.ide.conform" }, - { import = "plugins.ide.cmp" }, - { import = "plugins.ide.lsp" }, - { import = "plugins.ide.dap" }, - { import = "plugins.ide.neotest" }, - { import = "plugins.ide.neodev" }, - { import = "plugins.ide.copilot" }, - { import = "plugins.ide.glow" }, - - -- Language specific - ----------------------------- - { import = "plugins.lang.laravel" }, - { import = "plugins.lang.go" }, - -}, opts) diff --git a/nvim-old/lua/plugins/lang/go.lua b/nvim-old/lua/plugins/lang/go.lua deleted file mode 100644 index 64c940b..0000000 --- a/nvim-old/lua/plugins/lang/go.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "ray-x/go.nvim", - main = "go", - dependencies = { - "ray-x/guihua.lua", - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - }, - config = function(opts) - require('go').setup(opts) - end, - event = { "CmdlineEnter" }, - ft = { "go", 'gomod' }, - build = ':lua require("go.install").update_all_sync()' -} diff --git a/nvim-old/lua/plugins/lang/laravel.lua b/nvim-old/lua/plugins/lang/laravel.lua deleted file mode 100644 index 073cf1c..0000000 --- a/nvim-old/lua/plugins/lang/laravel.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - "adalessa/laravel.nvim", - dependencies = { - "nvim-telescope/telescope.nvim", - "tpope/vim-dotenv", - "MunifTanjim/nui.nvim", - "nvimtools/none-ls.nvim", - }, - ft = "php", - cmd = { "Sail", "Artisan", "Composer", "Npm", "Yarn", "Laravel" }, - config = function(_, _) - local opts = require('config.plugins.laravel') - - local haswk, wk = pcall(require, "which-key") - - if haswk then - wk.register({ l = { name = "laravel" } }, { prefix = "" }) - end - - for key, value in pairs(opts.keys) do - vim.keymap.set("n", key, value[1], { desc = value[2] or '' }) - end - - require('laravel').setup(opts) - end -} diff --git a/nvim-old/lua/plugins/ui/barbar.lua b/nvim-old/lua/plugins/ui/barbar.lua deleted file mode 100644 index a631200..0000000 --- a/nvim-old/lua/plugins/ui/barbar.lua +++ /dev/null @@ -1,34 +0,0 @@ -local icons = require('config.icons') - -return { - 'romgrk/barbar.nvim', - dependencies = { - 'lewis6991/gitsigns.nvim', - 'nvim-tree/nvim-web-devicons', - }, - init = function() vim.g.barbar_auto_setup = false end, - opts = { - animation = false, - auto_hide = 0, - focus_on_close = 'previous', - button = icons.close, - highlight_inactive_file_icons = true, - icons = { - separator = { left = '', right = '' }, - separator_at_end = false, - inactive = { button = '', separator = { left = '', right = '' } }, - modified = { button = icons.gitsigns.modified }, - pinned = { button = icons.pinned, filename = true }, - gitsigns = { - added = { enabled = false }, - changed = { enabled = false }, - deleted = { enabled = false }, - } - }, - maximum_padding = 2, - minimum_padding = 1, - sidebar_filetypes = { - --['neo-tree'] = {event = 'BufWipeout'}, - } - }, -} diff --git a/nvim-old/lua/plugins/ui/bufferline.lua b/nvim-old/lua/plugins/ui/bufferline.lua deleted file mode 100644 index 8b310bf..0000000 --- a/nvim-old/lua/plugins/ui/bufferline.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'akinsho/bufferline.nvim', - version = "*", - dependencies = 'nvim-tree/nvim-web-devicons', - opts = require('config.plugins.bufferline') -} diff --git a/nvim-old/lua/plugins/ui/catppuccin.lua b/nvim-old/lua/plugins/ui/catppuccin.lua deleted file mode 100644 index 260045b..0000000 --- a/nvim-old/lua/plugins/ui/catppuccin.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = require('config.plugins.catppuccin'), - config = function(_, opts) - require("catppuccin").setup(opts) - vim.cmd.colorscheme("catppuccin") - end -} diff --git a/nvim-old/lua/plugins/ui/colorscheme.lua b/nvim-old/lua/plugins/ui/colorscheme.lua deleted file mode 100644 index b8c97d9..0000000 --- a/nvim-old/lua/plugins/ui/colorscheme.lua +++ /dev/null @@ -1,92 +0,0 @@ -return { - "navarasu/onedark.nvim", - lazy = false, - priority = 1000, - opts = { - style = 'deep', - code_style = { - comments = 'none', - keywords = 'none', - functions = 'none', - strings = 'none', - variables = 'none' - }, - -- colors = { - -- fg = '#b3b1b1', - -- bg0 = '#171b26', - -- bg1 = '#30323b', - -- bg2 = '#24262f', - -- bg3 = '#383a43', - -- bg_d = "#1f2129", - -- bg_blue = "#ff00ff", - -- bg_yellow = "#f0d197", - -- red = '#cc4a33', - -- green = '#51cc7f', - -- yellow = '#ccaf33', - -- orange = '#ccab1f', - -- -- blue = '#3390cc', - -- cyan = '#33ccb7', - -- purple = '#9233cc', - -- dark_cyan = "#8abeb7", - -- dark_red = "#cc817f", - -- dark_yellow = "#ffcc99", - -- dark_purple = "#9999cc", - -- }, - -- highlights = { - -- LineNr = { fg = "$light_grey" }, - -- CursorLineNr = { fg = "$blue" }, - -- - -- Pmenu = { bg = "$bg2" }, - -- PmenuSel = { bg = "$bg_d", fg = "$fg" }, - -- FloatBorder = { fg = "$grey", bg = 'None' }, - -- -- Syntax - -- ["@comment"] = { fg = "$red" }, - -- ["@string"] = { fg = "$purple" }, - -- ["@function"] = { fg = "$fg" }, - -- ["@keyword"] = { fg = "$yellow" }, - -- ["@keyword.import"] = { fg = "$yellow" }, - -- ["@keyword.function"] = { fg = "$yellow" }, - -- ["@keyword.conditional"] = { fg = "$yellow" }, - -- ["@keyword.operator"] = { fg = "$yellow" }, - -- ["@keyword.repeat"] = { fg = "$yellow" }, - -- ["@constant"] = { fg = "$green" }, - -- ["@tag"] = { fg = "$yellow" }, - -- ["@tag.delimiter"] = { fg = "$yellow" }, - -- ["@tag.attribute"] = { fg = "$yellow" }, - -- ["@type"] = { fg = "$blue" }, - -- ["@type.qualifier"] = { fg = "$yellow" }, - -- ["@type.definition"] = { fg = "$blue" }, - -- ["@type.builtin"] = { fg = "$blue" }, - -- ["@function.method"] = { fg = "$fg" }, - -- ["@function.call"] = { fg = "$fg" }, - -- ["@function.builtin"] = { fg = "$fg" }, - -- - -- ["@number"] = { fg = "$red" }, - -- ["@variable"] = { fg = "$green" }, - -- ["@variable.member"] = { fg = "$green" }, - -- ["@variable.builtin"] = { fg = "$green" }, - -- ["@variable.parameter"] = { fg = "$fg" }, - -- ["@property"] = { fg = "$orange" }, - -- -- ["@property"] = { fg = "$fg" }, - -- ["@punctuation.delimiter"] = { fg = "$fg" }, - -- ["@punctuation.bracket"] = { fg = "$fg" }, - -- ["@module"] = { fg = "$fg" }, - -- - -- -- php overrides - -- ["@class_name.php"] = { fg = "$fg" }, - -- ["@extend_name.php"] = { fg = "$fg" }, - -- ["@implements_name.php"] = { fg = "$fg" }, - -- ["@namespace_name.php"] = { fg = "$fg" }, - -- ["@namespace_alias.php"] = { fg = "$fg" }, - -- } - }, - config = function(_, opts) - local c = require('onedark') - c.setup(opts) - c.load() - - -- vim.cmd(string.format("highlight GitSignsAdd guifg='%s'", opts.colors.green)) - -- vim.cmd(string.format("highlight GitSignsChange guifg='%s'", opts.colors.yellow)) - -- vim.cmd(string.format("highlight GitSignsDelete guifg='%s'", opts.colors.red)) - end -} diff --git a/nvim-old/lua/plugins/ui/dashboard.lua b/nvim-old/lua/plugins/ui/dashboard.lua deleted file mode 100644 index 4fd9ae2..0000000 --- a/nvim-old/lua/plugins/ui/dashboard.lua +++ /dev/null @@ -1,40 +0,0 @@ -local logo = [[ - ::::::::: :::: ::: ::: ::: - :+: :+: :+:+: :+: :+: :+: - +:+ +:+ :+:+:+ +:+ +:+ +:+ - +#++:++#+ +#+ +:+ +#+ +#++:+ - +#+ +#+ +#+#+# +#+ +#+ - #+# #+# #+#+# #+# #+# - ### ### #### ### ### -]] - -logo = string.rep("\n", 8) .. logo .. "\n\n" - -return { - 'nvimdev/dashboard-nvim', - name = 'dashboard', - dependencies = { - 'nvim-tree/nvim-web-devicons' - }, - event = 'VimEnter', - opts = { - theme = 'doom', - config = { - header = vim.split(logo, "\n"), - - center = { - { action = function() require('telescope.builtin').find_files() end, desc = " Find file", icon = " ", key = "f" }, - { action = "ene | startinsert", desc = " New file", icon = " ", key = "n" }, - { action = function() require('telescope.builtin').oldfiles() end, desc = " Recent files", icon = " ", key = "r" }, - { action = function() require('telescope.builtin').live_grep() end, desc = " Find text", icon = " ", key = "g" }, - { action = "Lazy", desc = " Lazy", icon = "󰒲 ", key = "l" }, - { action = "qa", desc = " Quit", icon = " ", key = "q" } - }, - footer = function() - local stats = require("lazy").stats() - local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) - return { "Loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } - end, - } - } -} diff --git a/nvim-old/lua/plugins/ui/dressing.lua b/nvim-old/lua/plugins/ui/dressing.lua deleted file mode 100644 index 9ee4589..0000000 --- a/nvim-old/lua/plugins/ui/dressing.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - 'stevearc/dressing.nvim', - opts = { - input = { - title_pos = "center", - border = "single", - relative = "win", - }, - select = { - backend = { "telescope", "builtin" }, - telescope = require('telescope.themes').get_dropdown({ - borderchars = { - prompt = { "─", "│", "─", "│", "┌", "┐", "┘", "└" }, - results = { "─", "│", "─", "│", "├", "┤", "┘", "└" }, - }, - max_height = 5 - }), - builtin = { - border = "single", - } - } - }, -} diff --git a/nvim-old/lua/plugins/ui/edgy.lua b/nvim-old/lua/plugins/ui/edgy.lua deleted file mode 100644 index 9f3701e..0000000 --- a/nvim-old/lua/plugins/ui/edgy.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - "folke/edgy.nvim", - event = "VeryLazy", - keys = { - { "ue", function() require("edgy").toggle() end, desc = "Edgy Toggle" }, - -- stylua: ignore - { "uE", function() require("edgy").select() end, desc = "Edgy Select Window" }, - }, - opts = { - left = { - { - title = "Neo-Tree", - ft = "neo-tree", - filter = function(buf) - return vim.b[buf].neo_tree_source == "filesystem" - end, - size = { height = 0.5 }, - }, - { - title = "Test", - ft = "neotest-summary" - }, - "neo-tree", - }, - options = { - left = { size = 40 } - }, - animate = { - enabled = false, - }, - exit_when_last = false - } -} diff --git a/nvim-old/lua/plugins/ui/gitsigns.lua b/nvim-old/lua/plugins/ui/gitsigns.lua deleted file mode 100644 index 77d31e3..0000000 --- a/nvim-old/lua/plugins/ui/gitsigns.lua +++ /dev/null @@ -1,31 +0,0 @@ -local icons = require('config.icons').diff_gutter - -return { - 'lewis6991/gitsigns.nvim', - dependencies = { - { - "folke/which-key.nvim", - optional = true, - opts = { - defaults = { - ["g"] = { name = "+git" }, - }, - }, - }, - }, - lazy = false, - keys = { - { 'gp', 'Gitsigns preview_hunk', desc = 'Git preview diff' }, - { 'gb', 'Gitsigns blame_line', desc = 'Git blame' } - }, - opts = { - signs = { - add = { text = icons.add }, - delete = { text = icons.delete }, - change = { text = icons.change }, - untracked = { text = icons.untracked }, - topdelete = { text = icons.delete }, - changedelete = { text = icons.change }, - }, - }, -} diff --git a/nvim-old/lua/plugins/ui/lualine.lua b/nvim-old/lua/plugins/ui/lualine.lua deleted file mode 100644 index 5ed9c26..0000000 --- a/nvim-old/lua/plugins/ui/lualine.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - 'nvim-lualine/lualine.nvim', - event = "VeryLazy", - dependencies = { - 'arkav/lualine-lsp-progress', - 'nvim-tree/nvim-web-devicons', - }, - opts = require("config.plugins.lualine") -} diff --git a/nvim-old/lua/plugins/ui/neo-tree.lua b/nvim-old/lua/plugins/ui/neo-tree.lua deleted file mode 100644 index e014a32..0000000 --- a/nvim-old/lua/plugins/ui/neo-tree.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - 'nvim-neo-tree/neo-tree.nvim', - cmd = 'Neotree', - keys = { - { 'Fe', ':Neotree reveal toggle', desc = 'Toggle File Explorer'}, - }, - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-tree/nvim-web-devicons", - "nvim-lua/plenary.nvim", - }, - opts = require('config.plugins.neo-tree') -} diff --git a/nvim-old/lua/plugins/ui/which-key.lua b/nvim-old/lua/plugins/ui/which-key.lua deleted file mode 100644 index 3c3cf7b..0000000 --- a/nvim-old/lua/plugins/ui/which-key.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = require('config.plugins.which-key'), - config = function(_, opts) - local wk = require("which-key") - wk.setup(opts) - wk.register(opts.defaults or {}) - end -} diff --git a/nvim-old/lua/utils/lspkind.lua b/nvim-old/lua/utils/lspkind.lua deleted file mode 100644 index aee80bb..0000000 --- a/nvim-old/lua/utils/lspkind.lua +++ /dev/null @@ -1,21 +0,0 @@ - -local M = {} - --- Create format function. -function M.format(config) - return function(entry, vim_item) - -- Devicons for files - if vim.tbl_contains({ 'path' }, entry.source.name) then - local icon, hl_group = require('nvim-web-devicons').get_icon(entry:get_completion_item().label) - if icon then - vim_item.kind = icon - vim_item.kind_hl_group = hl_group - return vim_item - end - end - - return require('lspkind').cmp_format(config)(entry, vim_item) - end -end - -return M diff --git a/nvim-old/queries/blade/highlights.scm b/nvim-old/queries/blade/highlights.scm deleted file mode 100644 index 5c206f5..0000000 --- a/nvim-old/queries/blade/highlights.scm +++ /dev/null @@ -1,6 +0,0 @@ -(comment) @comment -((parameter) @string (#set! "priority" 110)) -((php_only) @include (#set! "priority" 110)) -((bracket_start) @function (#set! "priority" 120)) -((bracket_end) @function (#set! "priority" 120)) -((keyword) @keyword (#set! "priority" 110)) diff --git a/nvim-old/queries/blade/injections.scm b/nvim-old/queries/blade/injections.scm deleted file mode 100644 index b7066e5..0000000 --- a/nvim-old/queries/blade/injections.scm +++ /dev/null @@ -1,15 +0,0 @@ -((text) @injection.content - (#not-has-ancestor? @injection.content "envoy") - (#set! injection.combined) - (#set! injection.language php)) - -; could be bash or zsh -; or whatever tree-sitter grammar you have. -((text) @injection.content - (#has-ancestor? @injection.content "envoy") - (#set! injection.combined) - (#set! injection.language bash)) - - -((php_only) @injection.content (#set! injection.language php)) -((parameter) @injection.content (#set! injection.language php)) diff --git a/nvim-old/queries/php_only/highlights.scm b/nvim-old/queries/php_only/highlights.scm deleted file mode 100644 index c7c4539..0000000 --- a/nvim-old/queries/php_only/highlights.scm +++ /dev/null @@ -1,23 +0,0 @@ -; inherits: php_only - -; php tags should be tagged as preprocessor tokens -(php_tag) @preproc - -; Tag names in class definition as regular text. -(class_declaration [ - name: (name) @class_name - (base_clause (name) @extend_name) - (class_interface_clause (name) @implement_name) -]) - -; tag "use" traits as text -(use_declaration (name) @text) - -; tag namespace classes in "use" as text -(namespace_use_declaration (namespace_use_clause [ - (qualified_name [ - (name) @namespace_name - (namespace_name_as_prefix (namespace_name (name) @namespace_name)) - ]) - (namespace_aliasing_clause (name) @namespace_alias) -])) diff --git a/nvim-old/queries/php_only/indents.scm b/nvim-old/queries/php_only/indents.scm deleted file mode 100644 index eea446d..0000000 --- a/nvim-old/queries/php_only/indents.scm +++ /dev/null @@ -1,10 +0,0 @@ -; extends - -; Fix for phpdoc comments that don't align * properly. -; This is black magic. I came up with it myself but -; i don't know why it works. -(ERROR - "/" - "**" - @indent.align) -