From 2ab8372f82c7ebbe7f937cbfda3d24ae37a56323 Mon Sep 17 00:00:00 2001 From: Aram Markarov Date: Wed, 24 Sep 2025 22:57:58 +0200 Subject: [PATCH] we did something --- lazy-lock.json | 15 +++++----- lua/config/maven.lua | 8 ++++++ lua/options.lua | 2 +- lua/plugins/init.lua | 67 ++++++-------------------------------------- 4 files changed, 24 insertions(+), 68 deletions(-) create mode 100644 lua/config/maven.lua diff --git a/lazy-lock.json b/lazy-lock.json index a602d6d..fd95edd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" }, - "auto-session": { "branch": "main", "commit": "f9b6562febb44b61cc04dc857f843941033f30a4" }, + "auto-session": { "branch": "main", "commit": "af683b2cb176aa8e0cddb3cdc2dada21f09bb09b" }, "base46-colors": { "branch": "main", "commit": "131ca742f6e8d1eb4c938a2519a94840ba129c2f" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, @@ -9,20 +9,20 @@ "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cord.nvim": { "branch": "master", "commit": "1aadec47743e6cfe77ae6860a5b4305a465f03be" }, - "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, + "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "maven.nvim": { "branch": "main", "commit": "3c013c55a381d821c5031dcd279d2e4205011380" }, "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" }, - "nvim-dap": { "branch": "master", "commit": "7523676a4be17644587aa47e4d42f6f7646d4727" }, - "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" }, + "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, + "nvim-lspconfig": { "branch": "master", "commit": "b3cce1419ca67871ae782b3e529652f8a016f0de" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, @@ -31,9 +31,8 @@ "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "687ef75fdbd497eabc9eea92b52e7b4d403b3319" }, - "snacks.nvim": { "branch": "main", "commit": "7e3c655bec091e39d35ce950a41efd52c6341801" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "undotree": { "branch": "main", "commit": "68fb733769fed365cca72d7c97c5cc2fd3d31055" }, + "undotree": { "branch": "main", "commit": "ddc11977141c5b96b10568a32291115730ad626d" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "vim-suda": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" } } diff --git a/lua/config/maven.lua b/lua/config/maven.lua new file mode 100644 index 0000000..a9932bb --- /dev/null +++ b/lua/config/maven.lua @@ -0,0 +1,8 @@ +require('maven').setup({ + executable = "mvn", -- `mvn` should be in your `PATH`, or the path to the maven exectable, for example `./mvnw` + cwd = nil, -- work directory, default to `vim.fn.getcwd()` + settings = nil, -- specify the settings file or use the default settings + commands = { -- add custom goals to the command list + { cmd = { "clean", "compile" }, desc = "clean then compile" }, + }, +}) diff --git a/lua/options.lua b/lua/options.lua index 114dc6e..c9d8ec1 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -19,7 +19,7 @@ vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 vim.opt.colorcolumn = "80" vim.opt.textwidth = 80 -vim.opt.formatoptions = "tcrqnj" +vim.opt.formatoptions = "rqnj" vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" vim.o.laststatus = 3 vim.o.clipboard = "unnamedplus" diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 853edb0..153ce1e 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -106,22 +106,6 @@ return { require("config.colorizer") end, }, - { - "folke/noice.nvim", - opts_extend = { "routes" }, - opts = { - routes = { - { - filter = { - event = "lsp", - kind = "progress", - find = "jdtls", - }, - opts = { skip = true }, - }, - }, - }, - }, -- { -- "zbirenbaum/copilot.lua", -- lazy = true, @@ -137,50 +121,15 @@ return { require("config.dap") end, }, - { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - -----@type snacks.Config - opts = { - bigfile = { enabled = true }, - dashboard = { enabled = true }, - explorer = { enabled = true }, - indent = { - enabled = true, - scope = { - enabled = false, - underline = true, - animate = { - enabled = true, - fps = 144, - easing = "inExpo", - duration = 20, - }, - }, - chunk = { - enabled = true, - char = { - corner_top = "╭", - corner_bottom = "╰", - - vertical = "│", - arrow = "╼", - }, - }, - }, - input = { enabled = true }, - picker = { enabled = true }, - notifier = { enabled = true }, - quickfile = { enabled = true }, - scope = { enabled = true }, - scroll = { enabled = false }, - statuscolumn = { enabled = true }, - words = { enabled = true }, - }, - }, { "notken12/base46-colors", }, - + { + "eatgrass/maven.nvim", + cmd = { "Maven", "MavenExec" }, + dependencies = "nvim-lua/plenary.nvim", + config = function() + require("config.maven") + end + }, }