added auto formatting and .editorconfig
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
[*.lua]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
+2
-3
@@ -4,9 +4,8 @@ vim.bo.tabstop = 4
|
|||||||
|
|
||||||
local home = os.getenv("HOME") or os.getenv("USERPROFILE")
|
local home = os.getenv("HOME") or os.getenv("USERPROFILE")
|
||||||
local config = {
|
local config = {
|
||||||
cmd = { home .. '/.local/share/java/jdtls/bin/jdtls'},
|
cmd = { home .. '/.local/share/java/jdtls/bin/jdtls' },
|
||||||
root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
|
root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
|
||||||
}
|
}
|
||||||
|
|
||||||
require('jdtls').start_or_attach(config)
|
require('jdtls').start_or_attach(config)
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,5 @@ require("config.set")
|
|||||||
require("config.remap")
|
require("config.remap")
|
||||||
|
|
||||||
vim.cmd("set completeopt+=noselect")
|
vim.cmd("set completeopt+=noselect")
|
||||||
vim.lsp.enable({'basedpyright', 'lua_ls', 'yamlls', 'gopls', 'htmx', 'jsonls' })
|
vim.lsp.enable({ 'basedpyright', 'lua_ls', 'yamlls', 'gopls', 'htmx', 'jsonls' })
|
||||||
vim.o.winborder='rounded'
|
vim.o.winborder = 'rounded'
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
|||||||
if vim.v.shell_error ~= 0 then
|
if vim.v.shell_error ~= 0 then
|
||||||
vim.api.nvim_echo({
|
vim.api.nvim_echo({
|
||||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||||
{ out, "WarningMsg" },
|
{ out, "WarningMsg" },
|
||||||
{ "\nPress any key to exit..." },
|
{ "\nPress any key to exit..." },
|
||||||
}, true, {})
|
}, true, {})
|
||||||
vim.fn.getchar()
|
vim.fn.getchar()
|
||||||
@@ -31,4 +31,3 @@ require("lazy").setup({
|
|||||||
-- automatically check for plugin updates
|
-- automatically check for plugin updates
|
||||||
checker = { enabled = true },
|
checker = { enabled = true },
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||||
|
|
||||||
|
|||||||
@@ -33,4 +33,3 @@ vim.g.c_syntax_for_h = 1
|
|||||||
vim.cmd.colorscheme("moonfly")
|
vim.cmd.colorscheme("moonfly")
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { noremap = true, silent = true })
|
vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { noremap = true, silent = true })
|
||||||
|
|
||||||
|
|||||||
+26
-9
@@ -1,11 +1,28 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"saghen/blink.cmp"
|
"saghen/blink.cmp"
|
||||||
}
|
},
|
||||||
},
|
config = function()
|
||||||
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
{ "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
|
group = vim.api.nvim_create_augroup('my.lsp', {}),
|
||||||
|
callback = function(args)
|
||||||
|
local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
|
||||||
|
if not client then return end
|
||||||
|
if client:supports_method('textDocument/formatting') then
|
||||||
|
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||||
|
group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
|
||||||
|
buffer = args.buf,
|
||||||
|
callback = function()
|
||||||
|
vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
||||||
|
{ "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+37
-38
@@ -1,42 +1,41 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"mbbill/undotree",
|
"mbbill/undotree",
|
||||||
config = function()
|
config = function()
|
||||||
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
|
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"tpope/vim-fugitive",
|
"tpope/vim-fugitive",
|
||||||
config = function()
|
config = function()
|
||||||
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
|
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
dependencies = {"nvim-lua/plenary.nvim"},
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
local builtin = require('telescope.builtin')
|
local builtin = require('telescope.builtin')
|
||||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
|
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
|
||||||
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
|
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
|
||||||
vim.keymap.set('n', '<leader>ps', function()
|
vim.keymap.set('n', '<leader>ps', function()
|
||||||
builtin.grep_string({ search = vim.fn.input("Grep > ") });
|
builtin.grep_string({ search = vim.fn.input("Grep > ") });
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"theprimeagen/harpoon",
|
"theprimeagen/harpoon",
|
||||||
config = function()
|
config = function()
|
||||||
local mark = require("harpoon.mark")
|
local mark = require("harpoon.mark")
|
||||||
local ui = require("harpoon.ui")
|
local ui = require("harpoon.ui")
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>a", mark.add_file)
|
vim.keymap.set("n", "<leader>a", mark.add_file)
|
||||||
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
|
vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
|
||||||
vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
|
vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
|
||||||
vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
|
vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
|
||||||
vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
|
vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+17
-18
@@ -1,20 +1,19 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
require("lualine").setup()
|
require("lualine").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"bluz71/vim-moonfly-colors",
|
"bluz71/vim-moonfly-colors",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.moonflyTransparent = true
|
vim.g.moonflyTransparent = true
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{ "EdenEast/nightfox.nvim", lazy = false },
|
{ "EdenEast/nightfox.nvim", lazy = false },
|
||||||
{ "oxfist/night-owl.nvim", lazy = false },
|
{ "oxfist/night-owl.nvim", lazy = false },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user