pauljako/neovim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nonels): lua formatting

Browse source
This commit is contained in:
Paul Fey 2025-03-31 18:23:09 +02:00
parent a33ed53635
commit 66ee14e884
9 changed files with 198 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
lua/plugins/completions.lua
View file

@ -1,59 +1,54 @@
return { return {
{ {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
dependencies = { dependencies = {
"saadparwaiz1/cmp_luasnip", "saadparwaiz1/cmp_luasnip", "rafamadriz/friendly-snippets"
"rafamadriz/friendly-snippets", }
}, }, {"hrsh7th/cmp-nvim-lsp"}, {
}, "hrsh7th/nvim-cmp",
{ "hrsh7th/cmp-nvim-lsp" }, config = function()
{ local cmp = require "cmp"
"hrsh7th/nvim-cmp",
config = function()
local cmp = require "cmp"
cmp.setup { cmp.setup {
snippet = { snippet = {
-- REQUIRED - you must specify a snippet engine -- REQUIRED - you must specify a snippet engine
expand = function(args) expand = function(args)
-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. -- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
require("luasnip").lsp_expand(args.body) -- For `luasnip` users. require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
-- require('snippy').expand_snippet(args.body) -- For `snippy` users. -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+) -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
-- For `mini.snippets` users: -- For `mini.snippets` users:
-- local insert = MiniSnippets.config.expand.insert or MiniSnippets.default_insert -- local insert = MiniSnippets.config.expand.insert or MiniSnippets.default_insert
-- insert({ body = args.body }) -- Insert at cursor -- insert({ body = args.body }) -- Insert at cursor
-- cmp.resubscribe({ "TextChangedI", "TextChangedP" }) -- cmp.resubscribe({ "TextChangedI", "TextChangedP" })
-- require("cmp.config").set_onetime({ sources = {} }) -- require("cmp.config").set_onetime({ sources = {} })
end, end
}, },
window = { window = {
--completion = cmp.config.window.bordered(), -- completion = cmp.config.window.bordered(),
--documentation = cmp.config.window.bordered(), -- documentation = cmp.config.window.bordered(),
}, },
mapping = cmp.mapping.preset.insert { mapping = cmp.mapping.preset.insert {
["<C-b>"] = cmp.mapping.scroll_docs(-4), ["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(), ["<C-e>"] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. ["<CR>"] = cmp.mapping.confirm {select = true} -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
--{ name = "nvim_lsp" }, -- { name = "nvim_lsp" },
--{ name = "vsnip" }, -- For vsnip users. -- { name = "vsnip" }, -- For vsnip users.
{ name = "luasnip" }, -- For luasnip users. {name = "luasnip"} -- For luasnip users.
-- { name = 'ultisnips' }, -- For ultisnips users. -- { name = 'ultisnips' }, -- For ultisnips users.
-- { name = 'snippy' }, -- For snippy users. -- { name = 'snippy' }, -- For snippy users.
}, { }, {{name = "buffer"}})
{ name = "buffer" }, }
}),
}
-- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below -- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below
-- Set configuration for specific filetype. -- Set configuration for specific filetype.
--[[ cmp.setup.filetype('gitcommit', { --[[ cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'git' }, { name = 'git' },
}, { }, {
@ -61,30 +56,24 @@ return {
}) })
}) })
require("cmp_git").setup() ]] require("cmp_git").setup() ]]
-- --
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline({ "/", "?" }, { cmp.setup.cmdline({"/", "?"}, {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = { sources = {{name = "buffer"}}
{ name = "buffer" }, })
},
})
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline(":", { cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({ sources = cmp.config.sources({{name = "path"}},
{ name = "path" }, {{name = "cmdline"}}),
}, { matching = {disallow_symbol_nonprefix_matching = false}
{ name = "cmdline" }, })
}),
matching = { disallow_symbol_nonprefix_matching = false },
})
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_vscode").lazy_load() end
}
end,
},
} }

6
lua/plugins/iceberg.lua
View file

@ -1,6 +1,4 @@
return { return {
'cocopon/iceberg.vim', 'cocopon/iceberg.vim',
config = function() config = function() vim.cmd('colorscheme iceberg') end
vim.cmd('colorscheme iceberg')
end
} }

58
lua/plugins/lsp.lua
View file

@ -1,37 +1,27 @@
return { return {
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
config = function() config = function() require('mason').setup() end
require('mason').setup() }, {
end "williamboman/mason-lspconfig.nvim",
}, config = function()
{ require('mason-lspconfig').setup {
"williamboman/mason-lspconfig.nvim", ensure_installed = {"nil_ls", "pyright", "gopls"}
config = function() }
require('mason-lspconfig').setup { end
ensure_installed = { "nil_ls", "pyright" }, }, {
} "neovim/nvim-lspconfig",
end config = function()
}, local lspconfig = require('lspconfig')
{
"neovim/nvim-lspconfig",
config = function()
local lspconfig = require('lspconfig')
local capabilities = require('cmp_nvim_lsp').default_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
lspconfig.pyright.setup({ lspconfig.pyright.setup({capabilities = capabilities})
capabilities = capabilities lspconfig.nil_ls.setup({capabilities = capabilities})
}) vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
lspconfig.nil_ls.setup({ vim.keymap.set('n', 'gd', vim.lsp.buf.definition,
capabilities = capabilities {desc = 'Go to definition'})
}) vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action,
vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) {desc = 'Show Code Actions'})
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { end
desc = 'Go to definition' }
})
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, {
desc = 'Show Code Actions'
})
end
}
} }

68
lua/plugins/lualine.lua
View file

@ -1,38 +1,40 @@
return { return {
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' }, dependencies = {'nvim-tree/nvim-web-devicons'},
config = function() config = function()
local iceberg = require('lualine.themes.iceberg_dark') local iceberg = require('lualine.themes.iceberg_dark')
iceberg.normal.c.bg = nil iceberg.normal.c.bg = nil
iceberg.inactive.c.bg = nil iceberg.inactive.c.bg = nil
require('lualine').setup { require('lualine').setup {
options = { options = {
theme = iceberg, theme = iceberg,
component_separators = '', component_separators = '',
section_separators = { left = '', right = '' }, section_separators = {left = '', right = ''}
}, },
sections = { sections = {
lualine_a = { { 'mode', separator = { left = '' }, right_padding = 2 } }, lualine_a = {
lualine_b = { 'filename', 'branch' }, {'mode', separator = {left = ''}, right_padding = 2}
lualine_c = { },
'%=', --[[ add your center compoentnts here in place of this comment ]] lualine_b = {'filename', 'branch'},
}, lualine_c = {
lualine_x = {}, '%=' --[[ add your center compoentnts here in place of this comment ]]
lualine_y = { 'filetype', 'progress' }, },
lualine_z = { lualine_x = {},
{ 'location', separator = { right = '' }, left_padding = 2 }, lualine_y = {'filetype', 'progress'},
}, lualine_z = {
}, {'location', separator = {right = ''}, left_padding = 2}
inactive_sections = { }
lualine_a = { 'filename' }, },
lualine_b = {}, inactive_sections = {
lualine_c = {}, lualine_a = {'filename'},
lualine_x = {}, lualine_b = {},
lualine_y = {}, lualine_c = {},
lualine_z = { 'location' }, lualine_x = {},
}, lualine_y = {},
tabline = {}, lualine_z = {'location'}
extensions = {}, },
} tabline = {},
extensions = {}
}
end end
} }

23
lua/plugins/neotree.lua
View file

@ -1,13 +1,12 @@
return { return {
"nvim-neo-tree/neo-tree.nvim", "nvim-neo-tree/neo-tree.nvim",
--branch = "v3.x", -- branch = "v3.x",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "MunifTanjim/nui.nvim"
"MunifTanjim/nui.nvim", -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
--{"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information },
}, config = function()
config = function() vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal left<CR>', {})
vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal left<CR>', {}) end
end }
}

46
lua/plugins/nonels.lua
View file

@ -1,15 +1,35 @@
return { return {
"nvimtools/none-ls.nvim", "nvimtools/none-ls.nvim",
dependencies = { "nvim-lua/plenary.nvim", "nvimtools/none-ls-extras.nvim" }, dependencies = {"nvim-lua/plenary.nvim", "nvimtools/none-ls-extras.nvim"},
config = function() config = function()
local null_ls = require "null-ls" local null_ls = require("null-ls")
null_ls.setup { local helpers = require("null-ls.helpers")
sources = { local lua_format = {
null_ls.builtins.formatting.stylua, meta = {
null_ls.builtins.formatting.alejandra, url = "https://github.com/Koihik/LuaFormatter",
null_ls.builtins.diagnostics.pylint, description = "Reformats your Lua source code."
}, },
} method = null_ls.methods.FORMATTING,
vim.keymap.set("n", "<C-s-i>", vim.lsp.buf.format, {}) filetypes = {"lua"},
end, generator = null_ls.generator({
command = "lua-format",
to_stdin = true,
format = nil,
on_output = function(params, done)
done({{text = params.output}})
end
})
}
null_ls.setup {
sources = {
null_ls.builtins.formatting.alejandra,
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.gofmt,
null_ls.builtins.diagnostics.pylint, lua_format
},
debug = true
}
vim.keymap.set("n", "<C-s-i>", vim.lsp.buf.format, {})
end
} }

13
lua/plugins/transparent.lua
View file

@ -1,9 +1,8 @@
return { return {
'xiyaowong/transparent.nvim', 'xiyaowong/transparent.nvim',
config = function() config = function()
vim.keymap.set('n', '<leader>t', ':TransparentToggle<CR>', { vim.keymap.set('n', '<leader>t', ':TransparentToggle<CR>',
desc = "Toggle Transparency", {desc = "Toggle Transparency"})
}) vim.opt.termguicolors = true
vim.opt.termguicolors = true end
end
} }

20
lua/plugins/treesitter.lua
View file

@ -1,12 +1,12 @@
return { return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()
require("nvim-treesitter.configs").setup{ require("nvim-treesitter.configs").setup {
auto_install = true, auto_install = true,
sync_install = false, sync_install = false,
highlight = { enable = true }, highlight = {enable = true},
indent = { enable = true } indent = {enable = true}
} }
end end
} }

30
lua/plugins/whichkey.lua
View file

@ -1,18 +1,16 @@
return { return {
"folke/which-key.nvim", "folke/which-key.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = { opts = {
-- your configuration comes here -- your configuration comes here
-- or leave it empty to use the default settings -- or leave it empty to use the default settings
-- refer to the configuration section below -- refer to the configuration section below
}, },
keys = { keys = {
{ {
"<leader>?", "<leader>?",
function() function() require("which-key").show({global = false}) end,
require("which-key").show({ global = false }) desc = "Buffer Local Keymaps (which-key)"
end, }
desc = "Buffer Local Keymaps (which-key)", }
},
},
} }