diff --git a/nvim/init.lua b/nvim/init.lua index a1af3e7..a4a5390 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,23 +1,23 @@ -require('plugins') -require('keybindings') -require('mason').setup({}) +require("plugins") +require("keybindings") +require("mason").setup({}) require("mason-lspconfig").setup() -require('configs/lsp_config') +require("configs/lsp_config") --require('configs/nvim_jdtls') -require('autocmds') -require('sets') -require("bufferline").setup {} +require("autocmds") +require("sets") +require("bufferline").setup({}) require("luasnip.loaders.from_vscode").lazy_load() require("transparent").setup({ - extra_groups = { - "BufferLineTabClose", - "BufferlineBufferSelected", - "BufferLineFill", - "BufferLineBackground", - "BufferLineSeparator", - "BufferLineIndicatorSelected", - }, - exclude_groups = {}, + extra_groups = { + "BufferLineTabClose", + "BufferlineBufferSelected", + "BufferLineFill", + "BufferLineBackground", + "BufferLineSeparator", + "BufferLineIndicatorSelected", + }, + exclude_groups = {}, }) vim.cmd([[syntax on]]) vim.opt.background = "dark" diff --git a/nvim/lua/configs/nvim_jdtls.lua b/nvim/lua/configs/nvim_jdtls.lua deleted file mode 100644 index e336c8f..0000000 --- a/nvim/lua/configs/nvim_jdtls.lua +++ /dev/null @@ -1,6 +0,0 @@ -local config = { - cmd = { '/path/to/jdt-language-server/bin/jdtls' }, - root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]), -} - -require('jdtls').start_or_attach(config) diff --git a/nvim/lua/configs/treesitter.lua b/nvim/lua/configs/treesitter.lua index 5a96d62..e69de29 100644 --- a/nvim/lua/configs/treesitter.lua +++ b/nvim/lua/configs/treesitter.lua @@ -1,10 +0,0 @@ -require 'nvim-treesitter.configs'.setup { - ensure_installed = 'all', - ignore_install = { 'phpdoc' }, - highlight = { -- enable highlighting - enable = true, - }, - indent = { - enable = true, -- default is disabled anyways - } -} diff --git a/nvim/pack/plugins/start/nvim-jdtls b/nvim/pack/plugins/start/nvim-jdtls deleted file mode 160000 index 96e3978..0000000 --- a/nvim/pack/plugins/start/nvim-jdtls +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 96e3978c3fdae3950f6ccda548775e8b8952f74a diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua deleted file mode 100644 index 4f85041..0000000 --- a/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,269 +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/jackson/.cache/nvim/packer_hererocks/2.1.1692716794/share/lua/5.1/?.lua;/home/jackson/.cache/nvim/packer_hererocks/2.1.1692716794/share/lua/5.1/?/init.lua;/home/jackson/.cache/nvim/packer_hererocks/2.1.1692716794/lib/luarocks/rocks-5.1/?.lua;/home/jackson/.cache/nvim/packer_hererocks/2.1.1692716794/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/jackson/.cache/nvim/packer_hererocks/2.1.1692716794/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 = { - LuaSnip = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["bufferline.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/bufferline.nvim", - url = "https://github.com/akinsho/bufferline.nvim" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-calc"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-calc", - url = "https://github.com/hrsh7th/cmp-calc" - }, - ["cmp-cmdline"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-cmdline", - url = "https://github.com/hrsh7th/cmp-cmdline" - }, - ["cmp-emoji"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-emoji", - url = "https://github.com/hrsh7th/cmp-emoji" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-path"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - ["cmp-spell"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp-spell", - url = "https://github.com/f3fora/cmp-spell" - }, - cmp_luasnip = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["dart-vim-plugin"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/dart-vim-plugin", - url = "https://github.com/dart-lang/dart-vim-plugin" - }, - ["friendly-snippets"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/friendly-snippets", - url = "https://github.com/rafamadriz/friendly-snippets" - }, - ["gruvbox.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", - url = "https://github.com/ellisonleao/gruvbox.nvim" - }, - ["mason-lspconfig.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", - url = "https://github.com/williamboman/mason-lspconfig.nvim" - }, - ["mason.nvim"] = { - config = { "\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18configs/mason\frequire\0" }, - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/mason.nvim", - url = "https://github.com/williamboman/mason.nvim" - }, - ["nvim-cmp"] = { - config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16configs/cmp\frequire\0" }, - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-jdtls"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-jdtls", - url = "https://github.com/mfussenegger/nvim-jdtls" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-transparent"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-transparent", - url = "https://github.com/xiyaowong/nvim-transparent" - }, - ["nvim-tree.lua"] = { - config = { "\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21configs/filetree\frequire\0" }, - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/kyazdani42/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23configs/treesitter\frequire\0" }, - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["popup.nvim"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/popup.nvim", - url = "https://github.com/nvim-lua/popup.nvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22configs/telescope\frequire\0" }, - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["vim-airline"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/vim-airline", - url = "https://github.com/vim-airline/vim-airline" - }, - ["vim-flutter"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/vim-flutter", - url = "https://github.com/thosakwe/vim-flutter" - }, - ["vim-fugitive"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - }, - ["vim-test"] = { - loaded = true, - path = "/home/jackson/.local/share/nvim/site/pack/packer/start/vim-test", - url = "https://github.com/vim-test/vim-test" - } -} - -time([[Defining packer_plugins]], false) --- Config for: mason.nvim -time([[Config for mason.nvim]], true) -try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18configs/mason\frequire\0", "config", "mason.nvim") -time([[Config for mason.nvim]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21configs/filetree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16configs/cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22configs/telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23configs/treesitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], 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