Skip to content

Commit

Permalink
feat(lazy): add java and trouble, format files
Browse files Browse the repository at this point in the history
  • Loading branch information
alexiszamanidis committed Jun 2, 2024
1 parent 261cb8d commit 266d577
Show file tree
Hide file tree
Showing 13 changed files with 293 additions and 226 deletions.
8 changes: 4 additions & 4 deletions nvim/.config/nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('options')
require('keymaps')
require('lazy_init')
require('misc')
require("options")
require("keymaps")
require("lazy_init")
require("misc")
8 changes: 8 additions & 0 deletions nvim/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,21 @@
"gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
"impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
"lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" },
"lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
"none-ls.nvim": { "branch": "main", "commit": "f5b960a73418249aebcdae3455de320360509253" },
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-dap": { "branch": "master", "commit": "7122fd5848919a9aeff8c52bd9e71cbc51d0c90e" },
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
"nvim-java": { "branch": "main", "commit": "30a1d3648f4b527f7d26ed36f1042cf28c566e0d" },
"nvim-java-core": { "branch": "main", "commit": "469aabd3e88cfa3a4d131f81de8b8caed14cb585" },
"nvim-java-dap": { "branch": "main", "commit": "55c90c5d2414f6e66f843f38e111bee284d71e61" },
"nvim-java-refactor": { "branch": "main", "commit": "7b841d53ed0ba55857debd0e32ce069b2c17e745" },
"nvim-java-test": { "branch": "main", "commit": "a3fe70c48936e1c143ed366e127e9c3db4791716" },
"nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" },
"nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
"nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" },
Expand All @@ -34,6 +41,7 @@
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
"todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
"trouble.nvim": { "branch": "main", "commit": "e2969409cf3f38f69913cc8fd9aa13137aabe760" },
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
"which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }
Expand Down
8 changes: 4 additions & 4 deletions nvim/.config/nvim/lua/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ vim.api.nvim_set_keymap("n", "<C-f>", "<cmd>!tmux neww tmux-sessionizer<CR>", {
vim.api.nvim_set_keymap("n", "<C-_>", '<cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
vim.api.nvim_set_keymap("i", "<C-_>", '<esc><cmd>lua require("Comment.api").toggle.linewise()<CR>', { noremap = true })
vim.api.nvim_set_keymap(
"v",
"<C-_>",
'<esc><cmd>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>',
{ noremap = true }
"v",
"<C-_>",
'<esc><cmd>lua require("Comment.api").toggle.linewise(vim.fn.visualmode())<CR>',
{ noremap = true }
)

-- Source file
Expand Down
18 changes: 9 additions & 9 deletions nvim/.config/nvim/lua/lazy_init.lua
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)

require("lazy").setup({
spec = "plugins",
change_detection = { notify = false }
change_detection = { notify = false },
})
6 changes: 3 additions & 3 deletions nvim/.config/nvim/lua/misc.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
vim.api.nvim_create_autocmd('TextYankPost', {
pattern = '*',
local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
vim.api.nvim_create_autocmd("TextYankPost", {
pattern = "*",
group = highlight_group,
callback = function()
vim.highlight.on_yank()
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/plugins/bufferline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ return {
max_name_length = 30,
max_prefix_length = 30, -- prefix used when a buffer is de-duplicated
tab_size = 21,
diagnostics = false, -- | "nvim_lsp" | "coc",
diagnostics = false, -- | "nvim_lsp" | "coc",
diagnostics_update_in_insert = false,
-- diagnostics_indicator = function(count, level, diagnostics_dict, context)
-- return "("..count..")"
Expand Down
22 changes: 22 additions & 0 deletions nvim/.config/nvim/lua/plugins/java.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
return {
"nvim-java/nvim-java",
dependencies = {
"nvim-java/lua-async-await",
"nvim-java/nvim-java-refactor",
"nvim-java/nvim-java-core",
"nvim-java/nvim-java-test",
"nvim-java/nvim-java-dap",
"MunifTanjim/nui.nvim",
"neovim/nvim-lspconfig",
"mfussenegger/nvim-dap",
{
"williamboman/mason.nvim",
opts = {
registries = {
"github:nvim-java/mason-registry",
"github:mason-org/mason-registry",
},
},
},
},
}
194 changes: 97 additions & 97 deletions nvim/.config/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
return {
"neovim/nvim-lspconfig",
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-cmdline",
"hrsh7th/nvim-cmp",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
"j-hui/fidget.nvim",
},

config = function()
local cmp = require("cmp")
local cmp_lsp = require("cmp_nvim_lsp")
local capabilities = vim.tbl_deep_extend(
"force",
{},
vim.lsp.protocol.make_client_capabilities(),
cmp_lsp.default_capabilities()
)

require("fidget").setup({})
require("mason").setup()
require("mason-lspconfig").setup({
ensure_installed = {
"cssls",
"cssmodules_ls",
"html",
"jsonls",
"tsserver",
"lua_ls",
"yamlls",
"bashls",
"prismals",
"jdtls",
},
handlers = {
function(server_name) -- default handler (optional)
require("lspconfig")[server_name].setup({
capabilities = capabilities,
})
end,

["lua_ls"] = function()
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { "vim", "it", "describe", "before_each", "after_each" },
},
},
},
})
end,
},
})

local cmp_select = { behavior = cmp.SelectBehavior.Select }

cmp.setup({
snippet = {
expand = function(args)
require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
end,
},
mapping = cmp.mapping.preset.insert({
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
["<C-y>"] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "luasnip" }, -- For luasnip users.
}, {
{ name = "buffer" },
}),
})

vim.diagnostic.config({
-- update_in_insert = true,
float = {
focusable = false,
style = "minimal",
border = "rounded",
source = "always",
header = "",
prefix = "",
},
})
end,
return {
"neovim/nvim-lspconfig",
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-cmdline",
"hrsh7th/nvim-cmp",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
"j-hui/fidget.nvim",
},

config = function()
local cmp = require("cmp")
local cmp_lsp = require("cmp_nvim_lsp")
local capabilities = vim.tbl_deep_extend(
"force",
{},
vim.lsp.protocol.make_client_capabilities(),
cmp_lsp.default_capabilities()
)

require("fidget").setup({})
require("mason").setup()
require("mason-lspconfig").setup({
ensure_installed = {
"cssls",
"cssmodules_ls",
"html",
"jsonls",
"tsserver",
"lua_ls",
"yamlls",
"bashls",
"prismals",
"jdtls",
},
handlers = {
function(server_name) -- default handler (optional)
require("lspconfig")[server_name].setup({
capabilities = capabilities,
})
end,

["lua_ls"] = function()
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { "vim", "it", "describe", "before_each", "after_each" },
},
},
},
})
end,
},
})

local cmp_select = { behavior = cmp.SelectBehavior.Select }

cmp.setup({
snippet = {
expand = function(args)
require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
end,
},
mapping = cmp.mapping.preset.insert({
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
["<C-y>"] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "luasnip" }, -- For luasnip users.
}, {
{ name = "buffer" },
}),
})

vim.diagnostic.config({
-- update_in_insert = true,
float = {
focusable = false,
style = "minimal",
border = "rounded",
source = "always",
header = "",
prefix = "",
},
})
end,
}
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ return {

-- Add components to right sections
ins_right({
"o:encoding", -- option component same as &encoding in viml
"o:encoding", -- option component same as &encoding in viml
fmt = string.upper, -- I'm not sure why it's upper case either ;)
cond = conditions.hide_in_width,
color = { fg = colors.green, gui = "bold" },
Expand Down
10 changes: 5 additions & 5 deletions nvim/.config/nvim/lua/plugins/null-ls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ return {
null_ls.setup({
debug = false,
sources = {
formatting.stylua, -- Lua
formatting.stylua, -- Lua
require("none-ls.formatting.beautysh"), -- Bash, Zsh
diagnostics.codespell, -- Codespell
require("none-ls.diagnostics.eslint"), -- JavaScript etc
diagnostics.codespell, -- Codespell
require("none-ls.diagnostics.eslint"), -- JavaScript etc
require("none-ls.code_actions.eslint"), -- JavaScript etc
formatting.prettier, -- javascript etc
formatting.google_java_format, -- java
formatting.prettier, -- javascript etc
formatting.google_java_format, -- java
},
-- you can reuse a shared lspconfig on_attach callback here
on_attach = function(client, bufnr)
Expand Down
Loading

0 comments on commit 266d577

Please sign in to comment.