Merge branch 'wsl-merge'

removed some wsl specific commits

init.lua

@@ -37,7 +37,6 @@ require('lazy').setup(vim.tbl_extend('keep', config.user_lazy_opts(), {
 				'matchparen',
 				'2html_plugin',
 				'tarPlugin',
-				'netrwPlugin',
 				'tutor',
 				'zipPlugin',
 			},

lua/plex/config/autocmds.lua

@@ -96,7 +96,7 @@ vim.api.nvim_create_autocmd('VimResized', {
 -- Wrap and enable spell-checker in text filetypes
 vim.api.nvim_create_autocmd('FileType', {
 	group = augroup('spell_conceal'),
-	pattern = { 'gitcommit', 'markdown' },
+	pattern = { 'gitcommit', 'markdown', 'tex', 'latex', 'norg' },
 	callback = function()
 		vim.opt_local.spell = true
 		vim.opt_local.conceallevel = 0

lua/plex/config/keymaps.lua

@@ -72,6 +72,10 @@ map('c', '<C-l>', '<End>')
 map('n', 'zl', 'z4l')
 map('n', 'zh', 'z4h')
 
+-- move to spelling mistake
+map('n', 'zn', ']s')
+map('n', 'zN', '[s')
+
 -- Clipboard
 -- ===
 

lua/plex/config/options.lua

@@ -26,6 +26,7 @@ opt.shada = { "'1000", "<50", "s10", "h" }
 opt.conceallevel = 3
 opt.signcolumn = 'yes'
 opt.spelloptions:append('camel')
+opt.spelllang = 'en,de'
 
 -- What to save for views and sessions
 opt.viewoptions:remove('folds')

lua/plex/plugins/editor.lua

@@ -170,7 +170,9 @@ return {
 
 	-----------------------------------------------------------------------------
 	{
+		-- NOTE: This is leap for selecting things!
 		'ggandor/flit.nvim',
+		enabled = true,
 		keys = function()
 			---@type LazyKeys[]
 			local ret = {}
@@ -187,13 +189,17 @@ return {
 		'ggandor/leap.nvim',
 		-- stylua: ignore
 		keys = {
-			{ 't', '<Plug>(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
-			{ 'T', '<Plug>(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' },
-			{ '<leader>wt', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap from windows' },
+			{ 'gl', '<Plug>(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
+			{ 'gL', '<Plug>(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' },
+			{ '<leader>wl', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' },
 		},
 		config = function ()
 			local leap = require('leap')
 			leap.opts.case_sensitive = false
+			leap.opts.safe_labels = { 's', 'f', 'n', 'u', 't', 'e' }
+			--leap.opts.labels = { 'a', 's', 'f', 'n', 'j', 'k', 'r', 'e', 'r', 'm',
+			--	'ö', 'b', 'v',  'u', 'z', 'w', '2', '3', '4', '5', '6',
+			--	'7', '8', '9' }
 		end,
 	},
 

spell/en.utf-8.add

@@ -1,3 +1,15 @@
 #ifferent
 Linter
 Neorg
+DevOps
+NewTec
+Mergetools
+Quellrepository
+gemerged
+mergen
+a
+ccl
+NTSG
+a
+Jira
+ReqEng