Run formatter on all lua files
This commit is contained in:
parent
2eca6c0d56
commit
56f0d00f96
|
@ -5,18 +5,18 @@ local bmap = vim.keymap.set
|
|||
local map_opt = { silent = true, buffer = true }
|
||||
|
||||
bmap('n', '<leader>ev', function() require('jdtls').extract_variable() end,
|
||||
{ silent = true, buffer = true, desc = 'Extract variable'})
|
||||
{ silent = true, buffer = true, desc = 'Extract variable' })
|
||||
bmap('v', '<leader>ev', function() require('jdtls').extract_variable(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract variable'})
|
||||
{ silent = true, buffer = true, desc = 'Extract variable' })
|
||||
bmap('n', '<leader>ec', function() require('jdtls').extract_constant() end,
|
||||
{ silent = true, buffer = true, desc = 'Extract constant'})
|
||||
{ silent = true, buffer = true, desc = 'Extract constant' })
|
||||
bmap('v', '<leader>ec', function() require('jdtls').extract_constant(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract constant'})
|
||||
{ silent = true, buffer = true, desc = 'Extract constant' })
|
||||
bmap('v', '<leader>em', function() require('jdtls').extract_method(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract method'})
|
||||
{ silent = true, buffer = true, desc = 'Extract method' })
|
||||
bmap('n', '<leader>ro', function() require('jdtls').organize_imports() end,
|
||||
{ silent = true, buffer = true, desc = 'Organize imports'})
|
||||
{ silent = true, buffer = true, desc = 'Organize imports' })
|
||||
bmap('n', '<leader>tc', function() require 'jdtls'.test_class() end,
|
||||
{ silent = true, buffer = true, desc = 'Test class'})
|
||||
{ silent = true, buffer = true, desc = 'Test class' })
|
||||
bmap('n', '<leader>tm', function() require 'jdtls'.test_nearest_method() end,
|
||||
{ silent = true, buffer = true, desc = 'Test nearest method'})
|
||||
{ silent = true, buffer = true, desc = 'Test nearest method' })
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require'nvim-treesitter.configs'.setup {
|
||||
require 'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = { "typescript" },
|
||||
sync_install = true,
|
||||
auto_install = true,
|
||||
|
|
|
@ -3,9 +3,9 @@ require("trouble").setup {
|
|||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
}
|
||||
vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>Trouble<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xd", "<cmd>Trouble document_diagnostics<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "gR", "<cmd>Trouble lsp_references<cr>", {silent = true, noremap = true})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>Trouble<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xd", "<cmd>Trouble document_diagnostics<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "gR", "<cmd>Trouble lsp_references<cr>", { silent = true, noremap = true })
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
vim.filetype.add({
|
||||
extension = {
|
||||
['vtt'] = 'vtt',
|
||||
},
|
||||
filename = {
|
||||
['.scalafmt.conf'] = 'hocon',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
-- Setup nvim-cmp.
|
||||
local cmp = require'cmp'
|
||||
local cmp = require 'cmp'
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
return { 'ryicoh/deepl.vim',
|
||||
return {
|
||||
'ryicoh/deepl.vim',
|
||||
keys = {
|
||||
|
||||
{ '<leader><C-e>', function() vim.fn['deepl#v']("EN") end, mode = 'v' },
|
||||
{ '<leader><C-d>', function() vim.fn['deepl#v']("DE") end, mode = 'v' },
|
||||
},
|
||||
dependencies = {{ 'tsuyoshicho/vim-pass',
|
||||
init = function ()
|
||||
dependencies = { {
|
||||
'tsuyoshicho/vim-pass',
|
||||
init = function()
|
||||
vim.g.pass_use_agent = 1
|
||||
end
|
||||
}},
|
||||
config = function ()
|
||||
} },
|
||||
config = function()
|
||||
vim.g['deepl#endpoint'] = "https://api-free.deepl.com/v2/translate"
|
||||
vim.g['deepl#auth_key'] = vim.fn['pass#get']('web/deepl.com', 'apikey')
|
||||
end
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
return {
|
||||
'mfussenegger/nvim-lint',
|
||||
|
||||
{
|
||||
'mhartington/formatter.nvim',
|
||||
opts = function()
|
||||
|
|
|
@ -1,3 +1 @@
|
|||
return {
|
||||
'tpope/vim-fugitive'
|
||||
}
|
||||
return { 'tpope/vim-fugitive' }
|
||||
|
|
7
lua/plugins/gen.lua
Normal file
7
lua/plugins/gen.lua
Normal file
|
@ -0,0 +1,7 @@
|
|||
return {
|
||||
"David-Kunz/gen.nvim",
|
||||
opts = {
|
||||
model = "mistral", -- The default model to use.
|
||||
init = false,
|
||||
}
|
||||
}
|
14
lua/plugins/git.lua
Normal file
14
lua/plugins/git.lua
Normal file
|
@ -0,0 +1,14 @@
|
|||
return {
|
||||
'lambdalisue/gina.vim',
|
||||
'gisphm/vim-gitignore',
|
||||
'sjl/splice.vim',
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
config = {
|
||||
signs = {
|
||||
add = { text = '▌' },
|
||||
change = { text = '▐' },
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
|
@ -17,7 +17,7 @@ return {
|
|||
}
|
||||
|
||||
-- Setup keymaps
|
||||
vim.keymap.set("n", "K", require("hover").hover, {desc = "hover.nvim"})
|
||||
vim.keymap.set("n", "gK", require("hover").hover_select, {desc = "hover.nvim (select)"})
|
||||
vim.keymap.set("n", "K", require("hover").hover, { desc = "hover.nvim" })
|
||||
vim.keymap.set("n", "gK", require("hover").hover_select, { desc = "hover.nvim (select)" })
|
||||
end
|
||||
}
|
||||
|
|
|
@ -8,21 +8,24 @@ return {
|
|||
'tpope/vim-commentary',
|
||||
'tpope/vim-sleuth',
|
||||
|
||||
{"chrisgrieser/nvim-genghis", dependencies = "stevearc/dressing.nvim"},
|
||||
{ "chrisgrieser/nvim-genghis", dependencies = "stevearc/dressing.nvim" },
|
||||
|
||||
-- ic / ac
|
||||
{'glts/vim-textobj-comment',
|
||||
{
|
||||
'glts/vim-textobj-comment',
|
||||
dependencies = { 'kana/vim-textobj-user' }
|
||||
},
|
||||
-- ii / ai
|
||||
'michaeljsmith/vim-indent-object',
|
||||
'neovim/nvim-lspconfig',
|
||||
|
||||
{ 'nvim-telescope/telescope.nvim',
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||
},
|
||||
|
||||
{ 'ray-x/lsp_signature.nvim',
|
||||
{
|
||||
'ray-x/lsp_signature.nvim',
|
||||
config = function()
|
||||
require('lsp_signature').setup({})
|
||||
end
|
||||
|
@ -36,9 +39,10 @@ return {
|
|||
'lambdalisue/suda.vim',
|
||||
'jamessan/vim-gnupg',
|
||||
|
||||
{'lervag/vimtex',
|
||||
{
|
||||
'lervag/vimtex',
|
||||
init = function()
|
||||
vim.g.tex_conceal="agm"
|
||||
vim.g.tex_conceal = "agm"
|
||||
vim.g.vimtex_quickfix_ignorefilters = { 'overfull', 'underfull' }
|
||||
vim.g.vimtex_syntax_enabled = 0
|
||||
end,
|
||||
|
|
|
@ -12,7 +12,8 @@ return {
|
|||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
---@class PluginLspOpts
|
||||
opts = function() return {
|
||||
opts = function()
|
||||
return {
|
||||
-- options for vim.diagnostic.config()
|
||||
diagnostics = {
|
||||
underline = true,
|
||||
|
@ -28,7 +29,7 @@ return {
|
|||
severity_sort = true,
|
||||
},
|
||||
-- add any global capabilities here
|
||||
capabilities = { require'lsp-status'.capabilities },
|
||||
capabilities = { require 'lsp-status'.capabilities },
|
||||
servers = {
|
||||
jsonls = {},
|
||||
lua_ls = {
|
||||
|
@ -67,7 +68,8 @@ return {
|
|||
-- Specify * to use this function as a fallback for any server
|
||||
-- ["*"] = function(server, opts) end,
|
||||
},
|
||||
} end,
|
||||
}
|
||||
end,
|
||||
---@param opts PluginLspOpts
|
||||
config = function(_, opts)
|
||||
-- diagnostics
|
||||
|
@ -173,11 +175,11 @@ return {
|
|||
end,
|
||||
},
|
||||
'mfussenegger/nvim-jdtls',
|
||||
{'nvim-lua/lsp-status.nvim',
|
||||
{
|
||||
'nvim-lua/lsp-status.nvim',
|
||||
config = function(_, opts)
|
||||
local lsp_status = require('lsp-status')
|
||||
lsp_status.register_progress()
|
||||
end
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,19 +6,21 @@ return {
|
|||
'crater2150/vim-theme-chroma',
|
||||
},
|
||||
event = "VeryLazy",
|
||||
opts = function(_, opts) return {
|
||||
opts = function(_, opts)
|
||||
return {
|
||||
options = {
|
||||
theme = require('chroma-theme.lualine')
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = { 'branch' },
|
||||
lualine_b = {},
|
||||
lualine_c = { { 'buffers', show_filename_only = false, symbols = { modified = " ✏️]", alternate_file = " 🔃", folder = " 📁"} ,}},
|
||||
lualine_c = { { 'buffers', show_filename_only = false, symbols = { modified = " ✏️]", alternate_file = " 🔃", folder = " 📁" }, } },
|
||||
lualine_x = {},
|
||||
lualine_y = {},
|
||||
lualine_z = {
|
||||
{'tabs',
|
||||
mode=1,
|
||||
{
|
||||
'tabs',
|
||||
mode = 1,
|
||||
fmt = function(name, context)
|
||||
local buflist = vim.fn.tabpagebuflist(context.tabnr)
|
||||
local mod = not vim.tbl_isempty(vim.tbl_filter(
|
||||
|
|
|
@ -85,7 +85,8 @@ return {
|
|||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
},
|
||||
{ 'nvim-treesitter/playground',
|
||||
{
|
||||
'nvim-treesitter/playground',
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
cmd = {
|
||||
'TSPlaygroundToggle',
|
||||
|
@ -93,7 +94,8 @@ return {
|
|||
'TSNodeUnderCursor',
|
||||
}
|
||||
},
|
||||
{ "nvim-treesitter/nvim-treesitter-context",
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter-context",
|
||||
event = "VeryLazy",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
cmd = { 'TSContextEnable', 'TSContextDisable', 'TSContextToggle' },
|
||||
|
@ -102,7 +104,7 @@ return {
|
|||
},
|
||||
opts = { enable = true },
|
||||
config = function(_, opts)
|
||||
require'treesitter-context'.setup(opts)
|
||||
require 'treesitter-context'.setup(opts)
|
||||
vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = "#555555" })
|
||||
vim.api.nvim_set_hl(0, 'TreesitterContextLineNumber', { link = "Special" })
|
||||
end,
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
local sbtToScalaCLI = function()
|
||||
vim.cmd[[s/\s*libraryDependencies\s*+=\s*/\/\/> using dep /]]
|
||||
vim.cmd[[s/" \(%\+\) "/\=repeat(":", strlen(submatch(1)))/g]]
|
||||
vim.cmd [[s/\s*libraryDependencies\s*+=\s*/\/\/> using dep /]]
|
||||
vim.cmd [[s/" \(%\+\) "/\=repeat(":", strlen(submatch(1)))/g]]
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<leader>dep", sbtToScalaCLI, { noremap = true, silent = true, desc = "Convert sbt dependency to Scala CLI" })
|
||||
|
|
Loading…
Reference in a new issue