dotfiles/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of git.k4li.de:dotfiles/nvim

Browse source
This commit is contained in:
pika 2024-06-29 15:29:04 +02:00
commit 872a98a430
5 changed files with 223 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

72
lua/pika/plugins/formatting.lua
View file

@ -1,39 +1,41 @@
return { return {
'stevearc/conform.nvim', "stevearc/conform.nvim",
event = { 'BufReadPre', 'BufNewFile' }, event = { "BufReadPre", "BufNewFile" },
config = function() config = function()
local conform = require 'conform' local conform = require("conform")
conform.setup { conform.setup({
formatters_by_ft = { formatters_by_ft = {
javascript = { 'prettier' }, javascript = { "prettier" },
typescript = { 'prettier' }, typescript = { "prettier" },
javascriptreact = { 'prettier' }, javascriptreact = { "prettier" },
typescriptreact = { 'prettier' }, typescriptreact = { "prettier" },
svelte = { 'prettier' }, svelte = { "prettier" },
css = { 'prettier' }, css = { "prettier" },
html = { 'prettier' }, -- html = { 'prettier' },
json = { 'prettier' }, fish = { "fish_indent" },
yaml = { 'prettier' }, php = { "pretty-php" },
markdown = { 'prettier' }, json = { "yq" },
graphql = { 'prettier' }, yaml = { "yq" },
liquid = { 'prettier' }, markdown = { "prettier" },
lua = { 'stylua' }, graphql = { "prettier" },
-- python = { "isort", "black" }, liquid = { "prettier" },
}, sh = { "shfmt" },
format_on_save = { lua = { "stylua" },
lsp_fallback = true, },
async = false, format_on_save = {
timeout_ms = 1000, lsp_fallback = false,
}, async = false,
} timeout_ms = 1000,
},
})
vim.keymap.set({ 'n', 'v' }, '<leader>mp', function() vim.keymap.set({ "n", "v" }, "<leader>mp", function()
conform.format { conform.format({
lsp_fallback = true, lsp_fallback = true,
async = false, async = false,
timeout_ms = 1000, timeout_ms = 1000,
} })
end, { desc = 'Format file or range (in visual mode)' }) end, { desc = "Format file or range (in visual mode)" })
end, end,
} }

58
lua/pika/plugins/linting.lua
View file

@ -1,35 +1,35 @@
return { return {
'mfussenegger/nvim-lint', "mfussenegger/nvim-lint",
event = { 'BufReadPre', 'BufNewFile' }, event = { "BufReadPre", "BufNewFile" },
config = function() config = function()
local lint = require 'lint' local lint = require("lint")
lint.linters_by_ft = { lint.linters_by_ft = {
javascript = { 'eslint_d' }, javascript = { "eslint_d" },
typescript = { 'eslint_d' }, typescript = { "eslint_d" },
javascriptreact = { 'eslint_d' }, javascriptreact = { "eslint_d" },
typescriptreact = { 'eslint_d' }, typescriptreact = { "eslint_d" },
python = { 'pylint' }, git = { "gitlint" },
git = { 'gitlint' }, json = { "jsonlint" },
json = { 'jsonlint' }, markdown = { "vale" },
markdown = { 'vale' }, fish = { "fish" },
fish = { 'fish' }, php = { "php" },
php = { 'php' }, yaml = { "yamllint" },
yaml = { 'yamllint' }, css = { "stylelint" },
css = { 'stylelint' }, sh = { "shellcheck" },
} }
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
group = lint_augroup, group = lint_augroup,
callback = function() callback = function()
lint.try_lint() lint.try_lint()
end, end,
}) })
vim.keymap.set('n', '<leader>l', function() vim.keymap.set("n", "<leader>l", function()
lint.try_lint() lint.try_lint()
end, { desc = 'Trigger linting for current file' }) end, { desc = "Trigger linting for current file" })
end, end,
} }

13
lua/pika/plugins/lorem_ipsum.lua Normal file
View file

@ -0,0 +1,13 @@
return {
"derektata/lorem.nvim",
config = function()
require("lorem").setup({
sentenceLength = { -- custom configuration
words_per_sentence = 6,
sentences_per_paragraph = 4,
},
comma_chance = 0.3, -- 30% chance to insert a comma
max_commas_per_sentence = 2, -- maximum 2 commas per sentence
})
end,
}

271
lua/pika/plugins/lsp/lspconfig.lua
View file

@ -1,154 +1,147 @@
return { return {
'neovim/nvim-lspconfig', "neovim/nvim-lspconfig",
event = { 'BufReadPre', 'BufNewFile' }, event = { "BufReadPre", "BufNewFile" },
dependencies = { dependencies = {
'hrsh7th/cmp-nvim-lsp', "hrsh7th/cmp-nvim-lsp",
{ 'antosha417/nvim-lsp-file-operations', config = true }, { "antosha417/nvim-lsp-file-operations", config = true },
{ 'folke/neodev.nvim', opts = {} }, { "folke/neodev.nvim", opts = {} },
}, },
config = function() config = function()
-- import lspconfig plugin -- import lspconfig plugin
local lspconfig = require 'lspconfig' local lspconfig = require("lspconfig")
-- import mason_lspconfig plugin -- import mason_lspconfig plugin
local mason_lspconfig = require 'mason-lspconfig' local mason_lspconfig = require("mason-lspconfig")
-- import cmp-nvim-lsp plugin -- import cmp-nvim-lsp plugin
local cmp_nvim_lsp = require 'cmp_nvim_lsp' local cmp_nvim_lsp = require("cmp_nvim_lsp")
local keymap = vim.keymap -- for conciseness local keymap = vim.keymap -- for conciseness
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup('UserLspConfig', {}), group = vim.api.nvim_create_augroup("UserLspConfig", {}),
callback = function(ev) callback = function(ev)
-- Buffer local mappings. -- Buffer local mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions -- See `:help vim.lsp.*` for documentation on any of the below functions
local opts = { buffer = ev.buf, silent = true } local opts = { buffer = ev.buf, silent = true }
-- set keybinds opts.desc = "See available code actions"
-- opts.desc = 'Show LSP references' keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
-- keymap.set('n', 'gR', '<cmd>Telescope lsp_references<CR>', opts) -- show definition, references
-- opts.desc = 'Go to declaration' opts.desc = "Smart rename"
-- keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) -- go to declaration keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
-- opts.desc = 'Show LSP definitions' opts.desc = "Show buffer diagnostics"
-- keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<CR>', opts) -- show lsp definitions keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file
-- opts.desc = 'Show LSP implementations' opts.desc = "Show line diagnostics"
-- keymap.set('n', 'gi', '<cmd>Telescope lsp_implementations<CR>', opts) -- show lsp implementations keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
-- opts.desc = 'Show LSP type definitions' opts.desc = "Show documentation for what is under cursor"
-- keymap.set('n', 'gt', '<cmd>Telescope lsp_type_definitions<CR>', opts) -- show lsp type definitions keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
opts.desc = 'See available code actions' opts.desc = "Restart LSP"
keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
end,
})
opts.desc = 'Smart rename' -- used to enable autocompletion (assign to every lsp server config)
keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts) -- smart rename local capabilities = cmp_nvim_lsp.default_capabilities()
opts.desc = 'Show buffer diagnostics' -- Change the Diagnostic symbols in the sign column (gutter)
keymap.set('n', '<leader>D', '<cmd>Telescope diagnostics bufnr=0<CR>', opts) -- show diagnostics for file -- (not in youtube nvim video)
local signs = { Error = "", Warn = "", Hint = "", Info = "" }
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end
opts.desc = 'Show line diagnostics' mason_lspconfig.setup_handlers({
keymap.set('n', '<leader>d', vim.diagnostic.open_float, opts) -- show diagnostics for line -- default handler for installed servers
function(server_name)
-- opts.desc = 'Go to previous diagnostic' lspconfig[server_name].setup({
-- keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer capabilities = capabilities,
})
-- opts.desc = 'Go to next diagnostic' end,
-- keymap.set('n', ']d', vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer ["svelte"] = function()
-- configure svelte server
opts.desc = 'Show documentation for what is under cursor' lspconfig["svelte"].setup({
keymap.set('n', 'K', vim.lsp.buf.hover, opts) -- show documentation for what is under cursor capabilities = capabilities,
on_attach = function(client, bufnr)
opts.desc = 'Restart LSP' vim.api.nvim_create_autocmd("BufWritePost", {
keymap.set('n', '<leader>rs', ':LspRestart<CR>', opts) -- mapping to restart lsp if necessary pattern = { "*.js", "*.ts" },
end, callback = function(ctx)
}) -- Here use ctx.match instead of ctx.file
client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
-- used to enable autocompletion (assign to every lsp server config) end,
local capabilities = cmp_nvim_lsp.default_capabilities() })
end,
-- Change the Diagnostic symbols in the sign column (gutter) })
-- (not in youtube nvim video) end,
local signs = { Error = '', Warn = '', Hint = '', Info = '' } ["graphql"] = function()
for type, icon in pairs(signs) do -- configure graphql language server
local hl = 'DiagnosticSign' .. type lspconfig["graphql"].setup({
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = '' }) capabilities = capabilities,
end filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
})
mason_lspconfig.setup_handlers { end,
-- default handler for installed servers ["emmet_ls"] = function()
function(server_name) -- configure emmet language server
lspconfig[server_name].setup { lspconfig["emmet_ls"].setup({
capabilities = capabilities, capabilities = capabilities,
} filetypes = {
end, "html",
['svelte'] = function() "typescriptreact",
-- configure svelte server "javascriptreact",
lspconfig['svelte'].setup { "css",
capabilities = capabilities, "sass",
on_attach = function(client, bufnr) "scss",
vim.api.nvim_create_autocmd('BufWritePost', { "less",
pattern = { '*.js', '*.ts' }, "svelte",
callback = function(ctx) },
-- Here use ctx.match instead of ctx.file })
client.notify('$/onDidChangeTsOrJsFile', { uri = ctx.match }) end,
end, ["lua_ls"] = function()
}) -- ─< configure lua server (with special settings) >────────────────────────────────────
end, lspconfig["lua_ls"].setup({
} capabilities = capabilities,
end, settings = {
['graphql'] = function() Lua = {
-- configure graphql language server -- ─< make the language server recognize "vim" global >─────────────────────────────────
lspconfig['graphql'].setup { diagnostics = {
capabilities = capabilities, globals = { "vim" },
filetypes = { 'graphql', 'gql', 'svelte', 'typescriptreact', 'javascriptreact' }, },
} completion = {
end, callSnippet = "Replace",
['emmet_ls'] = function() },
-- configure emmet language server },
lspconfig['emmet_ls'].setup { },
capabilities = capabilities, })
filetypes = { 'html', 'typescriptreact', 'javascriptreact', 'css', 'sass', 'scss', 'less', 'svelte' }, end,
} ["cssls"] = function()
end, -- ─< configure CSS server >────────────────────────────────────────────────────────────
['lua_ls'] = function() lspconfig["cssls"].setup({
-- configure lua server (with special settings) capabilities = capabilities,
lspconfig['lua_ls'].setup { filetypes = {
capabilities = capabilities, "html",
settings = { "css",
Lua = { "scss",
-- make the language server recognize "vim" global "php",
diagnostics = { },
globals = { 'vim' }, })
}, end,
completion = { ["intelephense"] = function()
callSnippet = 'Replace', -- ─< configure PHP server >────────────────────────────────────────────────────────────
}, lspconfig["intelephense"].setup({
}, capabilities = capabilities,
}, })
} end,
end, ["marksman"] = function()
['cssls'] = function() -- ─< configure Markdown server >───────────────────────────────────────────────────────
-- configure CSS server lspconfig["marksman"].setup({
lspconfig['cssls'].setup { capabilities = capabilities,
capabilities = capabilities, })
} end,
end, })
['intelephense'] = function() end,
-- configure PHP server
lspconfig['intelephense'].setup {
capabilities = capabilities,
}
end,
['marksman'] = function()
-- configure Markdown server
lspconfig['marksman'].setup {
capabilities = capabilities,
}
end,
}
end,
} }

24
lua/pika/plugins/trouble.lua
View file

@ -1,12 +1,12 @@
-- return { return {
-- "folke/trouble.nvim", "folke/trouble.nvim",
-- dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" }, dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" },
-- keys = { keys = {
-- { "<leader>xx", "<cmd>TroubleToggle<CR>", desc = "Open/close trouble list" }, { "<leader>xx", "<cmd>TroubleToggle<CR>", desc = "Open/close trouble list" },
-- { "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Open trouble workspace diagnostics" }, { "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Open trouble workspace diagnostics" },
-- { "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>", desc = "Open trouble document diagnostics" }, { "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>", desc = "Open trouble document diagnostics" },
-- { "<leader>xq", "<cmd>TroubleToggle quickfix<CR>", desc = "Open trouble quickfix list" }, { "<leader>xq", "<cmd>TroubleToggle quickfix<CR>", desc = "Open trouble quickfix list" },
-- { "<leader>xl", "<cmd>TroubleToggle loclist<CR>", desc = "Open trouble location list" }, { "<leader>xl", "<cmd>TroubleToggle loclist<CR>", desc = "Open trouble location list" },
-- { "<leader>xt", "<cmd>TodoTrouble<CR>", desc = "Open todos in trouble" }, { "<leader>xt", "<cmd>TodoTrouble<CR>", desc = "Open todos in trouble" },
-- }, },
-- } }