From 918b8ff932b41d6730419517bc6a0c454cd7d926 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 14:36:42 +0200 Subject: [PATCH 1/8] set formatoptions and spell --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 0279852..45af565 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ vim.opt.signcolumn = 'yes' vim.opt.clipboard = '' -- don't just use the system clipboard vim.opt.wrap = false vim.opt.breakindent = false -vim.opt.spell = false +vim.opt.spell = true vim.opt.conceallevel = 2 vim.opt.concealcursor = 'c' vim.opt.undofile = true @@ -52,7 +52,7 @@ vim.opt.startofline = false -- Cursor in same column for few commands vim.opt.splitbelow = true -- Splits open bottom right vim.opt.splitright = true vim.opt.breakindentopt = { shift = 2, min = 20 } -vim.opt.formatoptions = '' -- see :h fo-table & :h formatoptions +vim.opt.formatoptions = 'trowacnlm1jp' -- see :h fo-table & :h formatoptions vim.opt.breakindent = true -- Diff From 9d803a72530b81274df40e264188eb5d95ce1228 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 14:53:49 +0200 Subject: [PATCH 2/8] spell false for dash --- lua/custom/plugins/ui.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua index 42c910b..089e1d4 100644 --- a/lua/custom/plugins/ui.lua +++ b/lua/custom/plugins/ui.lua @@ -632,6 +632,7 @@ return { vim.b.minitrailspace_disable = true vim.opt_local.list = false vim.opt_local.colorcolumn = '0' + vim.opt_local.spell = false end, }) end, From e2caa8cc6ca4da2f84ef86708c86e9d9c67572d8 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 14:57:28 +0200 Subject: [PATCH 3/8] spell and scroll --- init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 45af565..3b91b6c 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,6 @@ vim.opt.signcolumn = 'yes' vim.opt.clipboard = '' -- don't just use the system clipboard vim.opt.wrap = false vim.opt.breakindent = false -vim.opt.spell = true vim.opt.conceallevel = 2 vim.opt.concealcursor = 'c' vim.opt.undofile = true @@ -73,7 +72,7 @@ vim.o.guifont = 'FiraCode Nerd Font:h15' vim.opt.termguicolors = true vim.opt.shortmess = 'xsTOInfFitloCaAs' vim.opt.showmode = true -- Show mode in cmd window -vim.opt.scrolloff = 10 -- Keep at least n lines above/below +vim.opt.scrolloff = 6 -- Keep at least n lines above/below vim.opt.sidescrolloff = 10 -- Keep at least n lines left/right vim.opt.numberwidth = 2 -- Minimum number of columns to use for the line number vim.opt.number = true -- Show line numbers @@ -136,8 +135,8 @@ vim.opt.pumblend = 10 -- Popup blend -- Spelling correction -- === -vim.opt.spell = false -- manually enable spell with `set spell` or `ts` -vim.opt.spelllang = 'en,de_de,' +vim.opt.spell = true -- manually enable spell with `set spell` or `ts` +vim.opt.spelllang = 'en,de_de' vim.opt.spellsuggest = 'double,50,timeout:5000' -- autocommands From 1a245961d984a5297deb6bfa0ffe93c2aab13e99 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 15:27:50 +0200 Subject: [PATCH 4/8] ltex use spellfile idk what that does lol --- lua/custom/plugins/configs/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/plugins/configs/lsp.lua b/lua/custom/plugins/configs/lsp.lua index 14438b9..43d09e6 100644 --- a/lua/custom/plugins/configs/lsp.lua +++ b/lua/custom/plugins/configs/lsp.lua @@ -185,7 +185,7 @@ local servers = { }, }, ltex = { - use_spellfile = false, + use_spellfile = true, settings = { ltex = { checkFrequency = 'save', -- shut up while i'm just editing, see From fa322fb88e6cb190fbde33e3dc310bb098202f93 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 15:28:18 +0200 Subject: [PATCH 5/8] move lazygit to new tools.lua --- lua/custom/plugins/tools.lua | 13 +++++++++++++ lua/custom/plugins/ui.lua | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 lua/custom/plugins/tools.lua diff --git a/lua/custom/plugins/tools.lua b/lua/custom/plugins/tools.lua new file mode 100644 index 0000000..6428029 --- /dev/null +++ b/lua/custom/plugins/tools.lua @@ -0,0 +1,13 @@ +return { + { + 'kdheepak/lazygit.nvim', + keys = { + { 'gg', 'LazyGit', desc = 'Open LazyGit' }, + }, + cmd = 'LazyGit', + -- optional for floating window border decoration + dependencies = { + 'nvim-lua/plenary.nvim', + }, + }, +} diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua index 089e1d4..3e47e38 100644 --- a/lua/custom/plugins/ui.lua +++ b/lua/custom/plugins/ui.lua @@ -127,17 +127,6 @@ return { } end, }, - { - 'kdheepak/lazygit.nvim', - keys = { - { 'gg', 'LazyGit', desc = 'Open LazyGit' }, - }, - cmd = 'LazyGit', - -- optional for floating window border decoration - dependencies = { - 'nvim-lua/plenary.nvim', - }, - }, { 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' From f5542cea1a7623ef1e0729661c120fb92d98e3ef Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 15:28:30 +0200 Subject: [PATCH 6/8] add trailspace again --- lua/custom/plugins/ui.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua index 3e47e38..41821f6 100644 --- a/lua/custom/plugins/ui.lua +++ b/lua/custom/plugins/ui.lua @@ -127,6 +127,7 @@ return { } end, }, + { 'echasnovski/mini.trailspace', lazy = false, version = false, opts = { only_in_normal_buffers = true } }, { 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' From 549d1a16b0f0ebc188808cab548cc693baa3de29 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 15:28:43 +0200 Subject: [PATCH 7/8] disable formatting in telescope that was weird --- lua/custom/autocmds.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lua/custom/autocmds.lua b/lua/custom/autocmds.lua index d0819df..7a5b89f 100644 --- a/lua/custom/autocmds.lua +++ b/lua/custom/autocmds.lua @@ -42,3 +42,14 @@ vim.api.nvim_create_autocmd('FileType', { vim.opt_local.concealcursor = '' end, }) + +-- disable auto formatting for some filetypes +vim.api.nvim_create_autocmd('FileType', { + group = augroup, + pattern = { + 'TelescopePrompt', + }, + callback = function() + vim.opt_local.formatoptions = '' + end, +}) From bb3d5261e2a8f447aa7b4a6d1f6a186f7a4094c1 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Tue, 9 Jul 2024 17:00:00 +0200 Subject: [PATCH 8/8] spell --- spell/en.utf-8.add | 2 ++ spell/en.utf-8.add.spl | Bin 4801 -> 4823 bytes 2 files changed, 2 insertions(+) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index c3b6821..01a8418 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -382,3 +382,5 @@ lemmy selfhosting ELO FIDE +BDD +Pentesting diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 2a849144932e9bd1d4e1b3429f1185c5bff032c2..27db0ef55ff77d4e95d9c47ffc095819a967ecda 100644 GIT binary patch delta 1828 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