diff --git a/lazy-lock.json b/lazy-lock.json index e363b1c..ff4c31f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,68 +1,66 @@ { - "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, - "asyncrun.vim": { "branch": "master", "commit": "42385d54b8546c163b946fd50eed2103ef7993c9" }, + "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" }, "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" }, - "cellular-automaton.nvim": { "branch": "main", "commit": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f" }, + "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cloak.nvim": { "branch": "main", "commit": "ff5e746e787de14675396beb642bf5010b8bc96d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "copilot.vim": { "branch": "release", "commit": "172955782814a49fbebca2d1a2ccce2059103329" }, - "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, - "focus.nvim": { "branch": "master", "commit": "31f41d91b6b331faa07f0a513adcbc37087d028d" }, - "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, - "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot.vim": { "branch": "release", "commit": "998cf5ab1b85e844c7e8edb864a997e590df7182" }, + "focus.nvim": { "branch": "master", "commit": "c83be53de558f6f0824c8cefcad61719c87ce157" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, - "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, - "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, - "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, - "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, + "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" }, + "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "589c0a9465b38f69d20c058a7b31788068afa48c" }, + "lualine.nvim": { "branch": "master", "commit": "1a3f6bba410aff5a51bf8c84287aaa3a8ba30d0d" }, + "mason-lspconfig": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, - "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, - "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, - "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, + "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, + "mini.bufremove": { "branch": "main", "commit": "75be0b153b0cd2499c031e57d44cde8dad4766e4" }, + "mini.comment": { "branch": "main", "commit": "2c7a512dad27e34a26d0f7d5d5bc2579f88167dc" }, "nabla.nvim": { "branch": "master", "commit": "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e" }, - "neoconf.nvim": { "branch": "main", "commit": "92c981fea858ce1f7440b45af9e649be8fe75c5f" }, - "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, - "neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" }, + "neoconf.nvim": { "branch": "main", "commit": "c87c862a14a4c8c0e2bc823d304e4da472fd7180" }, + "neodev.nvim": { "branch": "main", "commit": "24b403eabde652904077f84fd55441744e77a109" }, + "neorg": { "branch": "main", "commit": "7c4e09d39d6be4494e8c2980a55837d982c8ef4b" }, "neorg-telescope": { "branch": "main", "commit": "1310d4aaefd8149c9839bbe1d5610e94389e2f0e" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-bqf": { "branch": "main", "commit": "c920a55c6153766bd909e474b7feffa9739f07e8" }, + "nvim-bqf": { "branch": "main", "commit": "8784eebf34371049b641646d00232c2603215297" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, - "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, + "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" }, + "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" }, "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" }, - "nvim-treesitter": { "branch": "master", "commit": "f8c2825220bff70919b527ee68fe44e7b1dae4b2" }, - "nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, - "nvim-ufo": { "branch": "main", "commit": "890b94870f052773d77175d07a51f2e083210632" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, - "oil.nvim": { "branch": "master", "commit": "c12a12c34da2a04465308f410095bcbe47996f0b" }, - "playground": { "branch": "master", "commit": "429f3e76cbb1c59fe000b690f7a5bea617b890c0" }, - "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, + "nvim-treesitter": { "branch": "master", "commit": "9c4fc86b67c1d68141cef57846d24cbee9b74fb0" }, + "nvim-treesitter-context": { "branch": "master", "commit": "82c695951612911421e8e21068ba5fc2c2e2c212" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "78c49ca7d2f7ccba2115c11422c037713c978ad1" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, + "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, + "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "readline.nvim": { "branch": "master", "commit": "cab666cbd026dea9c817182e22255ecb3b3419b1" }, - "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" }, + "refactoring.nvim": { "branch": "master", "commit": "bebfcfcc4b604d3647fcce2f4aeb02a95d139c49" }, "rose-pine": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" }, - "smart-splits.nvim": { "branch": "master", "commit": "7aad6019dee974a01333523a5b8e122b7e7da454" }, + "smart-splits.nvim": { "branch": "master", "commit": "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, + "trouble.nvim": { "branch": "main", "commit": "b9e713505457359d1d364ed41d5b1c7f81a6fe9c" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "venn.nvim": { "branch": "main", "commit": "c114563960b8fb1197695d42798d1f3e7190b798" }, - "vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" }, - "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, + "vim-dispatch": { "branch": "master", "commit": "6cc2691576f97d43f8751664d1a1a908b99927e5" }, + "vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" }, + "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, - "vim-tmux-navigator": { "branch": "master", "commit": "addb64a772cb4a3ae1f1363583012b2cada2cd66" }, - "vimtex": { "branch": "master", "commit": "ad17583ce399b6830b4c2888ef2a12d52c5eb607" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, - "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" } + "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, + "vimtex": { "branch": "master", "commit": "cbb20643b7bfe721902dac5760bf0d4889fb5f7e" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }, + "zen-mode.nvim": { "branch": "main", "commit": "cb73b8bd0ef9d765b942db09dc762c603a89ae44" } } \ No newline at end of file diff --git a/lua/rayandrew/plugins.lua b/lua/rayandrew/plugins.lua index e60ddb4..5947147 100644 --- a/lua/rayandrew/plugins.lua +++ b/lua/rayandrew/plugins.lua @@ -305,90 +305,90 @@ return { -- File Management ------------------------------ - { - "stevearc/oil.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - cmd = { "Oil" }, - keys = { - { - "e", - function() - -- disable in oil filetype - if vim.bo.filetype == "oil" then - return - end - require("oil").open_float() - end, - desc = "Open current directory", - }, - { - "E", - function() - -- disable in oil filetype - if vim.bo.filetype == "oil" then - return - end - require("oil").open(".") - end, - desc = "Open current directory", - }, - }, - opts = { - columns = { - -- "icon", - -- "permissions", - -- "size", - -- "mtime", - }, - default_file_explorer = true, - restore_win_options = true, - float = { - padding = 2, - max_width = 240, - max_height = 70, - -- width = 0.2, - -- max_height = 0.5, - border = "rounded", - win_options = { - winblend = 10, - }, - }, - keymaps = { - [""] = { - callback = function() - if vim.bo.filetype == "oil" then - local oil = require("oil") - vim.g.oil_show_info = not vim.g.oil_show_info - if vim.g.oil_show_info then - oil.set_columns({ - "permissions", - "size", - "mtime", - "icon", - }) - else - oil.set_columns({}) - end - return - end - end, - desc = "Toggle info", - }, - ["q"] = "actions.close", - [""] = "actions.toggle_hidden", - ["?"] = "actions.show_help", - }, - }, - init = function() - vim.g.oil_show_info = false - if vim.fn.argc() == 1 then - local stat = vim.loop.fs_stat(vim.fn.argv(0)) - if stat and stat.type == "directory" then - require("oil") - end - end - end, - }, + -- { + -- "stevearc/oil.nvim", + -- dependencies = { "nvim-tree/nvim-web-devicons" }, + -- cmd = { "Oil" }, + -- keys = { + -- { + -- "e", + -- function() + -- -- disable in oil filetype + -- if vim.bo.filetype == "oil" then + -- return + -- end + -- require("oil").open_float() + -- end, + -- desc = "Open current directory", + -- }, + -- { + -- "E", + -- function() + -- -- disable in oil filetype + -- if vim.bo.filetype == "oil" then + -- return + -- end + -- require("oil").open(".") + -- end, + -- desc = "Open current directory", + -- }, + -- }, + -- opts = { + -- columns = { + -- -- "icon", + -- -- "permissions", + -- -- "size", + -- -- "mtime", + -- }, + -- default_file_explorer = true, + -- restore_win_options = true, + -- float = { + -- padding = 2, + -- max_width = 240, + -- max_height = 70, + -- -- width = 0.2, + -- -- max_height = 0.5, + -- border = "rounded", + -- win_options = { + -- winblend = 10, + -- }, + -- }, + -- keymaps = { + -- [""] = { + -- callback = function() + -- if vim.bo.filetype == "oil" then + -- local oil = require("oil") + -- vim.g.oil_show_info = not vim.g.oil_show_info + -- if vim.g.oil_show_info then + -- oil.set_columns({ + -- "permissions", + -- "size", + -- "mtime", + -- "icon", + -- }) + -- else + -- oil.set_columns({}) + -- end + -- return + -- end + -- end, + -- desc = "Toggle info", + -- }, + -- ["q"] = "actions.close", + -- [""] = "actions.toggle_hidden", + -- ["?"] = "actions.show_help", + -- }, + -- }, + -- init = function() + -- vim.g.oil_show_info = false + -- -- if vim.fn.argc() == 1 then + -- -- local stat = vim.loop.fs_stat(vim.fn.argv(0)) + -- -- if stat and stat.type == "directory" then + -- -- require("oil") + -- -- end + -- -- end + -- end, + -- }, -- search/replace in multiple files { @@ -481,6 +481,7 @@ return { { "lukas-reineke/indent-blankline.nvim", + main = "ibl", event = { "BufReadPost", "BufNewFile" }, opts = { -- char = "▏", @@ -1147,44 +1148,28 @@ return { "mbbill/undotree", }, - { - "skywind3000/asyncrun.vim", - cmd = { "AsyncRun", "AsyncStop" }, - keys = { - { - "cc", - function() - local input = vim.fn.input("Command: ") - vim.cmd("AsyncRun " .. input) - -- vim.cmd("sleep 1") - -- vim.cmd("copen") - end, - desc = "AsyncRun", - }, - { "ck", desc = "AsyncStop" }, - }, - config = function() - vim.g.asyncrun_open = 6 - end, - }, + -- { + -- "skywind3000/asyncrun.vim", + -- cmd = { "AsyncRun", "AsyncStop" }, + -- keys = { + -- { + -- "cc", + -- function() + -- local input = vim.fn.input("Command: ") + -- vim.cmd("AsyncRun " .. input) + -- -- vim.cmd("sleep 1") + -- -- vim.cmd("copen") + -- end, + -- desc = "AsyncRun", + -- }, + -- { "ck", desc = "AsyncStop" }, + -- }, + -- config = function() + -- vim.g.asyncrun_open = 6 + -- end, + -- }, -- Folke - { - "folke/flash.nvim", - event = "VeryLazy", - vscode = true, - ---@type Flash.Config - opts = {}, - -- stylua: ignore - keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, - }, - { "folke/trouble.nvim", cmd = { "TroubleToggle", "Trouble" }, @@ -1325,35 +1310,6 @@ return { }, }, - -- Flash Telescope config - { - "nvim-telescope/telescope.nvim", - optional = true, - opts = function(_, opts) - local function flash(prompt_bufnr) - require("flash").jump({ - pattern = "^", - label = { after = { 0, 0 } }, - search = { - mode = "search", - exclude = { - function(win) - return vim.bo[vim.api.nvim_win_get_buf(win)].filetype ~= "TelescopeResults" - end, - }, - }, - action = function(match) - local picker = require("telescope.actions.state").get_current_picker(prompt_bufnr) - picker:set_selection(match.pos[1] - 1) - end, - }) - end - opts.defaults = vim.tbl_deep_extend("force", opts.defaults or {}, { - mappings = { n = { s = flash }, i = { [""] = flash } }, - }) - end, - }, - -- Tmux { "mrjones2014/smart-splits.nvim", @@ -1565,4 +1521,20 @@ return { -- vim.g.vimtex_view_method = "zathura" end, }, + + { + "tpope/vim-dispatch", + commands = { "Make", "Dispatch", "Copen" }, + keys = { + { + "cc", + function() + local input = vim.fn.input("Command: ") + vim.cmd("Dispatch " .. input) + end, + desc = "AsyncRun", + }, + { "ck", desc = "AsyncStop" }, + }, + }, } diff --git a/lua/rayandrew/remap.lua b/lua/rayandrew/remap.lua index 1fb6607..68764d9 100644 --- a/lua/rayandrew/remap.lua +++ b/lua/rayandrew/remap.lua @@ -164,6 +164,11 @@ Util.map("t", "", "close", { desc = "which_key_ignore" }) -- Others ------------------------------ +-- netrw +Util.map("n", "e", function() + vim.cmd("Ex") +end) + -- ufo Util.map("n", "zR", function() require("ufo").openAllFolds() diff --git a/lua/rayandrew/set.lua b/lua/rayandrew/set.lua index 2a2c0a0..93d69b3 100644 --- a/lua/rayandrew/set.lua +++ b/lua/rayandrew/set.lua @@ -19,6 +19,7 @@ opt.cursorline = true -- Enable highlighting of the current line opt.expandtab = true -- Use spaces instead of tabs opt.formatoptions = "jcroqlnt" -- tcqj opt.grepformat = "%f:%l:%c:%m" +-- opt.grepformat = { "%f:%l:%c:%m", "%f:%l:%m,%f" } opt.grepprg = "rg --vimgrep" opt.hlsearch = false opt.ignorecase = true -- Ignore case @@ -78,3 +79,16 @@ vim.g.markdown_recommended_style = 0 opt.isfname:append("@-@") opt.colorcolumn = "80" + +-- Error Format +-- error format for location list +opt.errorformat:append("%f|%l col %c|%m") +-- error format for quickfix +opt.errorformat:append("%f|%l|%m") +-- error format for grep -rn +opt.errorformat:append("%f:%l:%m") +-- error format for ls +opt.errorformat:append("%f:%l:%m") +-- error format for ls -la +opt.errorformat:append("%f:%l:%m,%f") +opt.errorformat:append("%gggggg") diff --git a/lua/rayandrew/theme.lua b/lua/rayandrew/theme.lua index a837c98..2fb2455 100644 --- a/lua/rayandrew/theme.lua +++ b/lua/rayandrew/theme.lua @@ -1,10 +1,15 @@ local M = {} M.colorscheme = "rose-pine" +-- M.colorscheme = "" function M.setup() -- taken from https://github.com/LazyVim/LazyVim/blob/566049aa4a26a86219dd1ad1624f9a1bf18831b6/lua/lazyvim/config/init.lua#L117C3-L129C5 require("lazy.core.util").try(function() + if M.colorscheme == "" then + return + end + if type(M.colorscheme) == "function" then M.colorscheme() else