1
0
Fork 0
mirror of https://github.com/pnx/dotfiles synced 2026-08-26 04:48:13 +02:00

nvim: formatting

This commit is contained in:
Henrik Hautakoski 2024-09-01 14:38:06 +02:00
parent b46a37b4b2
commit 1da358dff8
8 changed files with 163 additions and 165 deletions

View file

@ -1,4 +1,3 @@
return { return {
prompt = "", prompt = "",
current = " ", current = " ",

View file

@ -9,8 +9,9 @@ vim.keymap.set('n', 'Q', '<nop>')
-- --
-- Editing -- Editing
-- --
vim.keymap.set("n", "<leader>W", "<cmd>lua vim.opt.list = not vim.opt.list._value<cr>", { silent = true, desc = "Toggle show whitespace" }) vim.keymap.set("n", "<leader>W", "<cmd>lua vim.opt.list = not vim.opt.list._value<cr>",
vim.keymap.set({'n', 'i'}, '<C-s>', vim.cmd.w, { desc = 'Save current buffer' }) { silent = true, desc = "Toggle show whitespace" })
vim.keymap.set({ 'n', 'i' }, '<C-s>', vim.cmd.w, { desc = 'Save current buffer' })
-- Indent -- Indent
vim.keymap.set('n', '<Tab>', '^=$') vim.keymap.set('n', '<Tab>', '^=$')
@ -31,14 +32,15 @@ vim.keymap.set('x', '<leader>fha', [[:s/0x\(\x\{1\}\X\)/0x0\1/g]], { desc = "For
vim.keymap.set('x', '<leader>fhn', [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex" }) vim.keymap.set('x', '<leader>fhn', [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex" })
-- Case formatting -- Case formatting
vim.keymap.set("x", "<leader>fcsc", [[:s/\%V\([a-z]\+\)_\?/\u\1/g]], { desc = "Convert text from snake_case to CamelCase" }) vim.keymap.set("x", "<leader>fcsc", [[:s/\%V\([a-z]\+\)_\?/\u\1/g]],
{ desc = "Convert text from snake_case to CamelCase" })
-- copy/paste -- copy/paste
vim.keymap.set({'n', 'v'}, '<leader>y', [["+y]], {}) vim.keymap.set({ 'n', 'v' }, '<leader>y', [["+y]], {})
vim.keymap.set({'n', 'v'}, '<leader>p', [["+p]], {}) vim.keymap.set({ 'n', 'v' }, '<leader>p', [["+p]], {})
vim.keymap.set('x', '<leader>p', [["_dP]], {silent = true }) vim.keymap.set('x', '<leader>p', [["_dP]], { silent = true })
-- --
-- Navigation -- Navigation
@ -51,10 +53,10 @@ vim.keymap.set('v', '<S-a>', [[:m '<-2<CR>gv=gv]], { silent = true, desc = 'move
vim.keymap.set('v', '<S-d>', [[:m '>+1<CR>gv=gv]], { silent = true, desc = 'move current selection one line down' }) vim.keymap.set('v', '<S-d>', [[:m '>+1<CR>gv=gv]], { silent = true, desc = 'move current selection one line down' })
-- Make half page jumps stay in the center of screen -- Make half page jumps stay in the center of screen
vim.keymap.set('n', '<C-u>', '<C-u>zz', { silent = true, desc = 'jump half a page up'}) vim.keymap.set('n', '<C-u>', '<C-u>zz', { silent = true, desc = 'jump half a page up' })
vim.keymap.set('n', '<C-d>', '<C-d>zz', { silent = true, desc = 'jump half a page down'}) vim.keymap.set('n', '<C-d>', '<C-d>zz', { silent = true, desc = 'jump half a page down' })
vim.keymap.set('n', '<S-PageUp>', '<C-u>zz', { silent = true, desc = 'jump half a page up'}) vim.keymap.set('n', '<S-PageUp>', '<C-u>zz', { silent = true, desc = 'jump half a page up' })
vim.keymap.set('n', '<S-PageDown>', '<C-d>zz', { silent = true, desc = 'jump half a page down'}) vim.keymap.set('n', '<S-PageDown>', '<C-d>zz', { silent = true, desc = 'jump half a page down' })
-- --
-- Buffers -- Buffers
@ -71,32 +73,32 @@ vim.keymap.set('n', '<leader>bD', buffers.CloseAll, { silent = true, desc
-- Diagnostics -- Diagnostics
-- --
vim.keymap.set('n', "<leader>dk", vim.diagnostic.open_float, {desc = "Show diagnostic message under cursor" }) vim.keymap.set('n', "<leader>dk", vim.diagnostic.open_float, { desc = "Show diagnostic message under cursor" })
vim.keymap.set('n', "<leader>dn", vim.diagnostic.get_next, {desc = "Goto next" }) vim.keymap.set('n', "<leader>dn", vim.diagnostic.get_next, { desc = "Goto next" })
vim.keymap.set('n', "<leader>dp", vim.diagnostic.get_prev, {desc = "Goto previous" }) vim.keymap.set('n', "<leader>dp", vim.diagnostic.get_prev, { desc = "Goto previous" })
vim.keymap.set('n', "<leader>dd", "<cmd>Telescope diagnostics<cr>", {desc = "Open workspace diagnostics" }) vim.keymap.set('n', "<leader>dd", "<cmd>Telescope diagnostics<cr>", { desc = "Open workspace diagnostics" })
-- --
-- File explorer -- File explorer
-- --
vim.keymap.set('n', "<leader>.", "<cmd>Neotree toggle<cr>", {desc = "Toggle Neotree" }) vim.keymap.set('n', "<leader>.", "<cmd>Neotree toggle<cr>", { desc = "Toggle Neotree" })
-- --
-- Git -- Git
-- --
vim.keymap.set('n', "<leader>gp", "<cmd>Gitsigns preview_hunk<cr>", {desc = "Preview section at cursor" }) vim.keymap.set('n', "<leader>gp", "<cmd>Gitsigns preview_hunk<cr>", { desc = "Preview section at cursor" })
vim.keymap.set('n', "<leader>gr", "<cmd>Gitsigns reset_hunk<cr>", {desc = "Reset section at cursor" }) vim.keymap.set('n', "<leader>gr", "<cmd>Gitsigns reset_hunk<cr>", { desc = "Reset section at cursor" })
vim.keymap.set('n', "<leader>gR", "<cmd>Gitsigns reset_buffer<cr>", {desc = "Reset buffer" }) vim.keymap.set('n', "<leader>gR", "<cmd>Gitsigns reset_buffer<cr>", { desc = "Reset buffer" })
vim.keymap.set('n', "<leader>gv", "<cmd>Gitsigns select_hunk<cr>", {desc = "Select section under cursor" }) vim.keymap.set('n', "<leader>gv", "<cmd>Gitsigns select_hunk<cr>", { desc = "Select section under cursor" })
-- --
-- LSP -- LSP
-- --
vim.keymap.set('n', 'go', '<cmd>Telescope lsp_type_definitions<cr>', {desc = 'Goto type definition' }) vim.keymap.set('n', 'go', '<cmd>Telescope lsp_type_definitions<cr>', { desc = 'Goto type definition' })
vim.keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<cr>', {desc = 'Goto definition' }) vim.keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<cr>', { desc = 'Goto definition' })
vim.keymap.set({'n', 'x'}, '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<cr>', {desc = 'Code action' }) vim.keymap.set({ 'n', 'x' }, '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<cr>', { desc = 'Code action' })
vim.keymap.set('n', '<leader>rs', '<cmd>lua vim.lsp.buf.rename()<cr>', {desc = 'Rename symbol'} ) vim.keymap.set('n', '<leader>rs', '<cmd>lua vim.lsp.buf.rename()<cr>', { desc = 'Rename symbol' })
-- --
-- Search -- Search
@ -118,4 +120,3 @@ vim.keymap.set('n', '<leader>ss', '<cmd>Telescope lsp_document_symbols<cr>',
vim.keymap.set('n', '<leader>si', '<cmd>Telescope lsp_implementations<cr>', { desc = 'Search Inplementations' }) vim.keymap.set('n', '<leader>si', '<cmd>Telescope lsp_implementations<cr>', { desc = 'Search Inplementations' })
vim.keymap.set('n', '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>', { desc = 'Search Workspace symbols' }) vim.keymap.set('n', '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>', { desc = 'Search Workspace symbols' })
vim.keymap.set('n', '<leader>sh', '<cmd>Telescope help<cr>', { desc = 'Search Neovim help' }) vim.keymap.set('n', '<leader>sh', '<cmd>Telescope help<cr>', { desc = 'Search Neovim help' })

View file

@ -1,4 +1,3 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
---@diagnostic disable-next-line: undefined-field ---@diagnostic disable-next-line: undefined-field
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then

View file

@ -1,4 +1,3 @@
------------------------------------------------------- -------------------------------------------------------
-- Helper imports -- Helper imports
------------------------------------------------------- -------------------------------------------------------
@ -17,7 +16,7 @@ vim.o.updatetime = 50
-- Displays which-key popup sooner -- Displays which-key popup sooner
vim.o.timeoutlen = 50 vim.o.timeoutlen = 50
vim.o.mouse="a" vim.o.mouse = "a"
vim.o.confirm = true vim.o.confirm = true
------------------------------------------------------- -------------------------------------------------------
@ -77,7 +76,8 @@ vim.o.foldcolumn = "auto"
vim.o.list = false vim.o.list = false
vim.o.listchars = 'tab: »,space:·,eol:,nbsp:␣' vim.o.listchars = 'tab: »,space:·,eol:,nbsp:␣'
vim.o.fillchars = string.format([[eob: ,fold: ,foldopen:%s,foldsep:%s,foldclose:%s]], icons.fold.open, icons.fold.sep, icons.fold.close) vim.o.fillchars = string.format([[eob: ,fold: ,foldopen:%s,foldsep:%s,foldclose:%s]],
icons.fold.open, icons.fold.sep, icons.fold.close)
-- Spell stuff, because i cant English -- Spell stuff, because i cant English
vim.o.spell = true vim.o.spell = true

View file

@ -121,7 +121,7 @@ local options = {
["@lsp.type.property"] = { link = "@variable" }, ["@lsp.type.property"] = { link = "@variable" },
-- Bash -- Bash
["@variable.parameter.bash"] = { fg=colors.rosewater }, ["@variable.parameter.bash"] = { fg = colors.rosewater },
-- Makefile -- Makefile
["@function.make"] = { link = "Keyword" }, ["@function.make"] = { link = "Keyword" },

View file

@ -53,7 +53,6 @@ return {
local augroup = vim.api.nvim_create_augroup("Lsp", {}) local augroup = vim.api.nvim_create_augroup("Lsp", {})
for name, server_opts in pairs(opts.servers) do for name, server_opts in pairs(opts.servers) do
local on_attach = function(_, bufnr) local on_attach = function(_, bufnr)
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })