From 87f7485642626161d85a8a79d94e7820fae48f7c Mon Sep 17 00:00:00 2001 From: hex Date: Wed, 23 Jul 2025 19:38:50 +0200 Subject: [PATCH] fix --- after/plugin/lsp.lua | 13 +- init.lua | 13 +- lazy-lock.json | 16 ++ lua/hex/{ => config}/keymaps.lua | 0 lua/hex/{installer.lua => config/lazy.lua} | 15 +- lua/hex/install/lazy.lua | 16 ++ lua/hex/plugins.lua | 69 ++++++++ plugin/packer_compiled.lua | 179 --------------------- 8 files changed, 134 insertions(+), 187 deletions(-) create mode 100644 lazy-lock.json rename lua/hex/{ => config}/keymaps.lua (100%) rename lua/hex/{installer.lua => config/lazy.lua} (70%) create mode 100644 lua/hex/install/lazy.lua create mode 100644 lua/hex/plugins.lua delete mode 100644 plugin/packer_compiled.lua diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index abdb1a9..929f3a9 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -3,6 +3,14 @@ local fidget = require('fidget') local nlcmp = require('cmp_nvim_lsp') local cmp = require('cmp') local map = vim.keymap.set +--[[ +local jdtls = require('jdtls') + +jdtls.start_or_attach({ + cmd = { '/home/hex/Documents/dev/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository/bin/jdtls' }, + root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]), +}) +--]] vim.opt.signcolumn = 'yes' @@ -16,7 +24,7 @@ lc_defaults.capabilities = vim.tbl_deep_extend( cmp.setup({ sources = { { name = 'nvim_lsp' }, - { name = 'buffer', keyword_length = 3 }, -- only start autocompleting after a few chars typed + { name = 'buffer', keyword_length = 3 }, -- only start autocompleting after a few chars typed }, snippet = { expand = function(args) @@ -37,7 +45,7 @@ vim.api.nvim_create_autocmd('LspAttach', { desc = 'LSP actions (apparently)', callback = function(event) fidget.notify("LSP attached to current buffer.", nil, nil) - + local opts = { buffer = event.buf } map('n', 'K', 'lua vim.lsp.buf.hover()', opts) @@ -45,6 +53,7 @@ vim.api.nvim_create_autocmd('LspAttach', { map('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) map('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) map('n', 'gf', 'lua vim.lsp.buf.format({async = false, timeout_ms = 10000})', opts) + map("n", "r", "Telescope diagnostics bufnr=0", opts) end, }) diff --git a/init.lua b/init.lua index 6ef533c..982cc07 100644 --- a/init.lua +++ b/init.lua @@ -1,10 +1,9 @@ -require("hex.installer") -require("hex.keymaps") - -vim.g.mapleader = " " - local opt = vim.opt +-- set leader to space bar +vim.g.mapleader = " " + +-- remaining options opt.nu = true opt.relativenumber = true @@ -32,3 +31,7 @@ opt.scrolloff = 8 opt.updatetime = 50 opt.colorcolumn = "80" + +require("hex.install.lazy") +require("hex.config.lazy") +require("hex.config.keymaps") diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..9f84972 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,16 @@ +{ + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neovim": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rustaceanvim": { "branch": "master", "commit": "eaa8d3dc22026da53fbb1b63f504541c70de44f4" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" } +} diff --git a/lua/hex/keymaps.lua b/lua/hex/config/keymaps.lua similarity index 100% rename from lua/hex/keymaps.lua rename to lua/hex/config/keymaps.lua diff --git a/lua/hex/installer.lua b/lua/hex/config/lazy.lua similarity index 70% rename from lua/hex/installer.lua rename to lua/hex/config/lazy.lua index 489b63d..d4e1ca0 100644 --- a/lua/hex/installer.lua +++ b/lua/hex/config/lazy.lua @@ -1,4 +1,16 @@ -vim.cmd [[packadd packer.nvim]] +require("lazy").setup({ + spec = { + -- import your plugins + { import = "hex.plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) +--[[ +vim.cmd packadd packer.nvim return require('packer').startup(function(use) use 'wbthomason/packer.nvim' @@ -39,3 +51,4 @@ return require('packer').startup(function(use) use ({"rose-pine/neovim"}) end) +--]] diff --git a/lua/hex/install/lazy.lua b/lua/hex/install/lazy.lua new file mode 100644 index 0000000..272c178 --- /dev/null +++ b/lua/hex/install/lazy.lua @@ -0,0 +1,16 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) diff --git a/lua/hex/plugins.lua b/lua/hex/plugins.lua new file mode 100644 index 0000000..7df0a73 --- /dev/null +++ b/lua/hex/plugins.lua @@ -0,0 +1,69 @@ +return { + "j-hui/fidget.nvim", + { + "nvim-telescope/telescope.nvim", + dependencies = { + 'nvim-lua/plenary.nvim' + }, + opts = { + pickers = { + buffers = { + show_all_buffers = true, + }, + }, + } + }, + 'mrcjkb/rustaceanvim', + { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, + "nvim-lualine/lualine.nvim", + + { 'neovim/nvim-lspconfig' }, + { 'hrsh7th/nvim-cmp' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-buffer' }, + { + 'williamboman/mason-lspconfig.nvim', + dependencies = { + 'williamboman/mason.nvim' + } + }, + --{ 'mfussenegger/nvim-jdtls' }, + { "rose-pine/neovim" } +} +--[[ +vim.cmd packadd packer.nvim + +return require('packer').startup(function(use) + use 'wbthomason/packer.nvim' + + use 'j-hui/fidget.nvim' + + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.8', + -- or , branch = '0.1.x', + requires = { { 'nvim-lua/plenary.nvim' } }, + config = function () + require('telescope').setup() + end + } + + 'mrcjkb/rustaceanvim') + + 'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + + {"nvim-lualine/lualine.nvim"}) + + { 'neovim/nvim-lspconfig' }) + { 'hrsh7th/nvim-cmp' }) + { 'hrsh7th/cmp-nvim-lsp' }) + { 'hrsh7th/cmp-buffer' }) + use { + 'williamboman/mason-lspconfig.nvim', + requires = { { 'williamboman/mason.nvim' } } + } + + {'mfussenegger/nvim-jdtls'}) + + use ({"rose-pine/neovim"}) +end) +--]] diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index af60aca..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,179 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/hex/.cache/nvim/packer_hererocks/2.1.1716656478/share/lua/5.1/?.lua;/home/hex/.cache/nvim/packer_hererocks/2.1.1716656478/share/lua/5.1/?/init.lua;/home/hex/.cache/nvim/packer_hererocks/2.1.1716656478/lib/luarocks/rocks-5.1/?.lua;/home/hex/.cache/nvim/packer_hererocks/2.1.1716656478/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/hex/.cache/nvim/packer_hererocks/2.1.1716656478/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - catppuccin = { - config = { "\27LJ\2\nÆ\1\0\1\6\0\v\0\24\f\1\0\0X\1\1€'\1\0\0007\1\1\0006\1\2\0009\1\3\0019\1\4\1\18\3\0\0B\1\2\0016\1\2\0009\1\5\0019\1\6\1)\3\0\0'\4\a\0005\5\b\0B\1\4\0016\1\2\0009\1\5\0019\1\6\1)\3\0\0'\4\t\0005\5\n\0B\1\4\1K\0\1\0\1\0\1\abg\tnone\16NormalFloat\1\0\1\abg\tnone\vNormal\16nvim_set_hl\bapi\16colorscheme\bcmd\bvim\vcolors\15catppuccin+\1\0\2\0\2\0\0053\0\0\0007\0\1\0006\0\1\0B\0\1\1K\0\1\0\19ColorMyPencils\0\0" }, - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/catppuccin", - url = "https://github.com/catppuccin/nvim" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["fidget.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/fidget.nvim", - url = "https://github.com/j-hui/fidget.nvim" - }, - ["love2d.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/love2d.nvim", - url = "https://github.com/S1M0N38/love2d.nvim" - }, - ["mason-lspconfig.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", - url = "https://github.com/williamboman/mason-lspconfig.nvim" - }, - ["mason.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/mason.nvim", - url = "https://github.com/williamboman/mason.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-jdtls"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/nvim-jdtls", - url = "https://github.com/mfussenegger/nvim-jdtls" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - rustaceanvim = { - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/rustaceanvim", - url = "https://github.com/mrcjkb/rustaceanvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\2\nˆ\1\0\0\5\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\4\0005\4\3\0=\4\5\3=\3\a\2B\0\2\1K\0\1\0\fpickers\1\0\1\fpickers\0\fbuffers\1\0\1\fbuffers\0\1\0\1\21show_all_buffers\2\nsetup\14telescope\frequire\0" }, - loaded = true, - path = "/home/hex/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: catppuccin -time([[Config for catppuccin]], true) -try_loadstring("\27LJ\2\nÆ\1\0\1\6\0\v\0\24\f\1\0\0X\1\1€'\1\0\0007\1\1\0006\1\2\0009\1\3\0019\1\4\1\18\3\0\0B\1\2\0016\1\2\0009\1\5\0019\1\6\1)\3\0\0'\4\a\0005\5\b\0B\1\4\0016\1\2\0009\1\5\0019\1\6\1)\3\0\0'\4\t\0005\5\n\0B\1\4\1K\0\1\0\1\0\1\abg\tnone\16NormalFloat\1\0\1\abg\tnone\vNormal\16nvim_set_hl\bapi\16colorscheme\bcmd\bvim\vcolors\15catppuccin+\1\0\2\0\2\0\0053\0\0\0007\0\1\0006\0\1\0B\0\1\1K\0\1\0\19ColorMyPencils\0\0", "config", "catppuccin") -time([[Config for catppuccin]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\nˆ\1\0\0\5\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\4\0005\4\3\0=\4\5\3=\3\a\2B\0\2\1K\0\1\0\fpickers\1\0\1\fpickers\0\fbuffers\1\0\1\fbuffers\0\1\0\1\21show_all_buffers\2\nsetup\14telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end