diff --git a/lazy-lock.json b/lazy-lock.json index 5865fab..3f2aced 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,31 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "fidget.nvim": { "branch": "main", "commit": "933db4596e4bab1b09b6d48a10e21819e4cc458f" }, - "lazy.nvim": { "branch": "main", "commit": "08954f723bf2d442ea020551e3acc956f4dc6dc7" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, - "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, - "mini.move": { "branch": "main", "commit": "251d541a8ab745e81295a53c128829cb2bff18e3" }, - "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, - "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, - "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" }, - "nvim-lspconfig": { "branch": "master", "commit": "6e5c78ebc9936ca74add66bda22c566f951b6ee5" }, - "nvim-tree.lua": { "branch": "master", "commit": "85c502e9076d9c82e2f04addabb3614846ae7558" }, - "nvim-treesitter": { "branch": "master", "commit": "5e4f959d5979730ddb2ee9ae60f5133081502b23" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-web-devicons": { "branch": "master", "commit": "6662f059bf78e6092ba90cd1929599625f448f55" }, - "plenary": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, - "rose-pine": { "branch": "main", "commit": "f48fcd5ccc5f70d8e221e7e2e87ee2003c5eda37" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "5ee5002373655fd684a4ad0d47a3de876ceacf9a" }, - "telescope.nvim": { "branch": "master", "commit": "c2b8311dfacd08b3056b8f0249025d633a4e71a8" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.comment": { "branch": "main", "commit": "264b8a63edd5a9a41d5361a1d52c13131c3c51a2" }, + "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, + "mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" }, + "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, + "mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" }, + "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" }, + "nvim-treesitter": { "branch": "master", "commit": "00a513f87ee3c339c2024b08db3eb63ba7736ed6" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-ts-autotag": { "branch": "main", "commit": "4c00b86bd1246ba9c4cd50a823d8296cd2eb9663" }, + "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, + "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rose-pine": { "branch": "main", "commit": "20c7940da844aa4f162a64e552ae3c7e9fdc3b93" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, + "telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" }, "vim-prettier": { "branch": "master", "commit": "7dbdbb12c50a9f4ba72390cce2846248e4368fd0" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } +} diff --git a/lua/stevenmm/lazy/_laravel_nvim.lua b/lua/stevenmm/lazy/_laravel_nvim.lua new file mode 100644 index 0000000..291f883 --- /dev/null +++ b/lua/stevenmm/lazy/_laravel_nvim.lua @@ -0,0 +1,21 @@ +return { + +} +-- return { +-- "adalessa/laravel.nvim", +-- dependencies = { +-- "tpope/vim-dotenv", +-- "nvim-telescope/telescope.nvim", +-- "MunifTanjim/nui.nvim", +-- "kevinhwang91/promise-async", +-- }, +-- cmd = { "Laravel" }, +-- keys = { +-- { "la", ":Laravel artisan" }, +-- { "lr", ":Laravel routes" }, +-- { "lm", ":Laravel related" }, +-- }, +-- event = { "VeryLazy" }, +-- opts = {}, +-- config = true, +-- } diff --git a/lua/stevenmm/lazy/harpoon.lua b/lua/stevenmm/lazy/harpoon.lua new file mode 100644 index 0000000..d5aeb2e --- /dev/null +++ b/lua/stevenmm/lazy/harpoon.lua @@ -0,0 +1,9 @@ + +return { + "ThePrimeagen/harpoon", + + + global_settings = { + + } +} diff --git a/lua/stevenmm/lazy/lsp.lua b/lua/stevenmm/lazy/lsp.lua index 305cbc4..1263fee 100644 --- a/lua/stevenmm/lazy/lsp.lua +++ b/lua/stevenmm/lazy/lsp.lua @@ -26,10 +26,12 @@ return { require("mason").setup() require("mason-lspconfig").setup({ ensure_installed = { + "gopls", "clangd", "lua_ls", "rust_analyzer", - "tsserver", + -- "php" + -- "tsserver", }, handlers = { function(server_name) -- default handler (optional) @@ -59,6 +61,12 @@ return { capabilities = capabilities, }) end, + ["gopls"] = function () + local lspconfig = require("lspconfig") + lspconfig.gopls.setup { + capabilities = capabilities, + } + end } }) @@ -101,6 +109,7 @@ return { }) vim.diagnostic.config({ + -- virtual_text = false, signs = { text = { [vim.diagnostic.severity.ERROR] = '', @@ -119,6 +128,9 @@ return { prefix = "", }, }) + + vim.o.updatetime = 250 + vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]] end } diff --git a/lua/stevenmm/lazy/lualine.lua b/lua/stevenmm/lazy/lualine.lua index 542fac7..64abf2c 100644 --- a/lua/stevenmm/lazy/lualine.lua +++ b/lua/stevenmm/lazy/lualine.lua @@ -119,7 +119,7 @@ return { 'datetime', icons_enabled = true, icon = { '' }, - style = '%H:%M', + style = '%H:%M:%S', }, }, }, diff --git a/lua/stevenmm/lazy/telescope.lua b/lua/stevenmm/lazy/telescope.lua index ed7dab9..9412946 100644 --- a/lua/stevenmm/lazy/telescope.lua +++ b/lua/stevenmm/lazy/telescope.lua @@ -2,10 +2,21 @@ -- print('telescope.lua loaded') return { - "nvim-telescope/telescope-file-browser.nvim", + "nvim-telescope/telescope-file-browser.nvim", - dependencies = { - "nvim-telescope/telescope.nvim", --- "nvim-lua/plenary.nvim" - }, + dependencies = { + "nvim-telescope/telescope.nvim", +-- "nvim-lua/plenary.nvim" + }, + + config = function () + local telescope = require('telescope') + -- telescope.setup({ + -- + -- }) + telescope.load_extension('harpoon') + end + -- extensions = { + -- + -- } } diff --git a/lua/stevenmm/lazy/treesitter.lua b/lua/stevenmm/lazy/treesitter.lua index df6bbb7..8b43a9e 100644 --- a/lua/stevenmm/lazy/treesitter.lua +++ b/lua/stevenmm/lazy/treesitter.lua @@ -19,7 +19,7 @@ return { -- for name, fn in pairs(move) do -- if name:find("goto") == 1 then -- move[name] = function(q, ...) - -- if vim.wo.diff then + -- if vim.wo.diff then -- local config = configs.get_module("textobjects.move")[name] -- for key, query in pairs(config or {}) do -- if q == query and key:find("[%]%[][cC]") then @@ -44,7 +44,7 @@ return { opts = { highlight = { enable = true }, indent = { enable = true }, - -- autotag = { + -- autotag = { -- enable = true, -- -- enable_rename = true, -- -- enable_close = true, @@ -67,6 +67,7 @@ return { "luap", "markdown", "markdown_inline", + "php", "python", "query", "regex", diff --git a/lua/stevenmm/remap.lua b/lua/stevenmm/remap.lua index 7ab02d4..454fa72 100644 --- a/lua/stevenmm/remap.lua +++ b/lua/stevenmm/remap.lua @@ -2,6 +2,8 @@ vim.g.mapleader = " " local keyset = vim.keymap.set +keyset("", "", "") keyset("n", "ma", ":Mason", { silent = true }) keyset("n", "na", ":NvimTreeToggle", { silent = true }) keyset("n", "fb", ":Telescope file_browser path=%:p:h", { noremap = true, silent = true }) +keyset("n", "ha", ":Telescope harpoon marks", { noremap = true, silent = true }) diff --git a/lua/stevenmm/set.lua b/lua/stevenmm/set.lua index 1a96925..b3c8d93 100644 --- a/lua/stevenmm/set.lua +++ b/lua/stevenmm/set.lua @@ -20,9 +20,9 @@ vim.opt.swapfile = false vim.opt.backup = false if vim.fn.has('win32') or vim.fn.has('win64') then - vim.opt.undodir = os.getenv("XDG_CONFIG_HOME") .. "/.vim/undodir" + vim.opt.undodir = os.getenv("XDG_CONFIG_HOME") .. "/.vim/undodir" else - vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" + vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" end vim.opt.undofile = true