Ran luaformat on all neovim files, removed unneeded files
This commit is contained in:
parent
1df85d3a12
commit
fa8e0e7331
11 changed files with 277 additions and 285 deletions
|
@ -12,8 +12,9 @@ require('jdtls').start_or_attach({
|
||||||
'java.base/java.util=ALL-UNNAMED', '--add-opens',
|
'java.base/java.util=ALL-UNNAMED', '--add-opens',
|
||||||
'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir ..
|
'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir ..
|
||||||
'/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar',
|
'/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar',
|
||||||
'-configuration', nvim_local_dir .. '/mason/packages/jdtls/config_linux',
|
'-configuration',
|
||||||
'-data', workspace_dir
|
nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data',
|
||||||
|
workspace_dir
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ return function()
|
||||||
snippet = {
|
snippet = {
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
require('luasnip').lsp_expand(args.body)
|
require('luasnip').lsp_expand(args.body)
|
||||||
end,
|
end
|
||||||
},
|
},
|
||||||
mapping = {
|
mapping = {
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||||
|
@ -25,7 +25,7 @@ return function()
|
||||||
['<C-e>'] = cmp.mapping.close(),
|
['<C-e>'] = cmp.mapping.close(),
|
||||||
['<CR>'] = cmp.mapping.confirm {
|
['<CR>'] = cmp.mapping.confirm {
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
select = true,
|
select = true
|
||||||
},
|
},
|
||||||
['<Tab>'] = function(fallback)
|
['<Tab>'] = function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
|
@ -44,24 +44,18 @@ return function()
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end,
|
end
|
||||||
},
|
},
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'nvim_lsp' },
|
{name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'},
|
||||||
{ name = 'luasnip' },
|
{name = 'git'}, {name = 'buffer'}
|
||||||
{ name = 'path' },
|
}
|
||||||
{ name = 'git' },
|
|
||||||
{ name = 'buffer' },
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Enable autopairs when enter is processed
|
-- Enable autopairs when enter is processed
|
||||||
-- on completion
|
-- on completion
|
||||||
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
|
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
|
||||||
cmp.event:on(
|
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
|
||||||
'confirm_done',
|
|
||||||
cmp_autopairs.on_confirm_done()
|
|
||||||
)
|
|
||||||
|
|
||||||
-- load friendly-snippets to luasnip
|
-- load friendly-snippets to luasnip
|
||||||
require('luasnip/loaders/from_vscode').lazy_load()
|
require('luasnip/loaders/from_vscode').lazy_load()
|
||||||
|
|
|
@ -2,7 +2,10 @@ return function ()
|
||||||
require('catppuccin').setup({
|
require('catppuccin').setup({
|
||||||
transparent_background = false,
|
transparent_background = false,
|
||||||
term_colors = false,
|
term_colors = false,
|
||||||
compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'},
|
compile = {
|
||||||
|
enabled = true,
|
||||||
|
path = vim.fn.stdpath 'cache' .. '/catppuccin'
|
||||||
|
},
|
||||||
styles = {
|
styles = {
|
||||||
comments = {'italic'},
|
comments = {'italic'},
|
||||||
functions = {'italic'},
|
functions = {'italic'},
|
||||||
|
|
|
@ -3,6 +3,6 @@ return function ()
|
||||||
require('indent_blankline').setup {
|
require('indent_blankline').setup {
|
||||||
space_char_blankline = ' ',
|
space_char_blankline = ' ',
|
||||||
show_current_context = true,
|
show_current_context = true,
|
||||||
show_current_context_start = true,
|
show_current_context_start = true
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,7 +25,7 @@ require('packer').startup(function()
|
||||||
use {
|
use {
|
||||||
'catppuccin/nvim',
|
'catppuccin/nvim',
|
||||||
as = 'catppuccin',
|
as = 'catppuccin',
|
||||||
config = require('plugins.colorscheme'),
|
config = require('plugins.colorscheme')
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Git in signcolumn
|
-- Git in signcolumn
|
||||||
|
@ -36,10 +36,8 @@ require('packer').startup(function()
|
||||||
'hoob3rt/lualine.nvim',
|
'hoob3rt/lualine.nvim',
|
||||||
requires = {'kyazdani42/nvim-web-devicons', opt = true},
|
requires = {'kyazdani42/nvim-web-devicons', opt = true},
|
||||||
config = function()
|
config = function()
|
||||||
require('lualine').setup {
|
require('lualine').setup {options = {theme = 'catppuccin'}}
|
||||||
options = { theme = 'catppuccin' }
|
end
|
||||||
}
|
|
||||||
end,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Tabline/bufferline
|
-- Tabline/bufferline
|
||||||
|
@ -83,7 +81,9 @@ require('packer').startup(function()
|
||||||
-- Display possible keybinds
|
-- Display possible keybinds
|
||||||
use {
|
use {
|
||||||
'folke/which-key.nvim',
|
'folke/which-key.nvim',
|
||||||
config = function() require('which-key').setup {} end
|
config = function()
|
||||||
|
require('which-key').setup {spelling = {enabled = true}}
|
||||||
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Read editorconfig settings
|
-- Read editorconfig settings
|
||||||
|
@ -102,10 +102,7 @@ require('packer').startup(function()
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Configs for built-in LSP
|
-- Configs for built-in LSP
|
||||||
use {
|
use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup}
|
||||||
'neovim/nvim-lspconfig',
|
|
||||||
config = require('plugins.lspconfig').setup
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Additional LSP features for Java
|
-- Additional LSP features for Java
|
||||||
use 'mfussenegger/nvim-jdtls'
|
use 'mfussenegger/nvim-jdtls'
|
||||||
|
@ -123,9 +120,9 @@ require('packer').startup(function()
|
||||||
{'hrsh7th/cmp-buffer'}, -- Buffer source
|
{'hrsh7th/cmp-buffer'}, -- Buffer source
|
||||||
{'saadparwaiz1/cmp_luasnip'}, -- Snippets source
|
{'saadparwaiz1/cmp_luasnip'}, -- Snippets source
|
||||||
{'L3MON4D3/LuaSnip'}, -- Snippets plugin
|
{'L3MON4D3/LuaSnip'}, -- Snippets plugin
|
||||||
{ 'rafamadriz/friendly-snippets' }, -- Snippets collection
|
{'rafamadriz/friendly-snippets'} -- Snippets collection
|
||||||
},
|
},
|
||||||
config = require('plugins.cmp'),
|
config = require('plugins.cmp')
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Automatic brackets
|
-- Automatic brackets
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
require'lualine'.setup {
|
require'lualine'.setup {options = {theme = 'catppuccin'}}
|
||||||
options = {theme = 'catppuccin'},
|
|
||||||
}
|
|
||||||
|
|
|
@ -2,8 +2,9 @@ return function ()
|
||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json',
|
'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json',
|
||||||
'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex',
|
'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python',
|
||||||
'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml'
|
'regex', 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript',
|
||||||
|
'yaml'
|
||||||
},
|
},
|
||||||
highlight = {enable = true},
|
highlight = {enable = true},
|
||||||
indent = {enable = true},
|
indent = {enable = true},
|
||||||
|
|
|
@ -38,12 +38,10 @@ cmd 'highlight SignColumn guibg=transparent'
|
||||||
-- Use suda by default
|
-- Use suda by default
|
||||||
g.suda_smart_edit = 1
|
g.suda_smart_edit = 1
|
||||||
|
|
||||||
|
|
||||||
-- Split direction
|
-- Split direction
|
||||||
o.splitbelow = true
|
o.splitbelow = true
|
||||||
o.splitright = true
|
o.splitright = true
|
||||||
|
|
||||||
|
|
||||||
-- Case insensitive search
|
-- Case insensitive search
|
||||||
o.ignorecase = true
|
o.ignorecase = true
|
||||||
o.smartcase = true
|
o.smartcase = true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue