Compare commits

..

3 Commits

5 changed files with 23 additions and 40 deletions

View File

@ -15,17 +15,6 @@ vim.api.nvim_create_autocmd('FileType', {
end,
})
-- use html for htmldjango
vim.api.nvim_create_autocmd('FileType', {
group = augroup,
pattern = {
'html',
},
callback = function()
vim.bo.filetype = 'html'
end,
})
-- always use the tex filetype for latex things, as those are most supported by
-- latex language servers.
vim.api.nvim_create_autocmd('FileType', {

View File

@ -29,11 +29,10 @@ vim.keymap.set({ 'v', 'n' }, 'zk', '<C-e>', { desc = 'move and scroll up' })
vim.keymap.set({ 'v', 'n' }, 'zj', '<C-y>', { desc = 'move and scroll down' })
-- go to beginning and end in insert mode
vim.keymap.set('i', '<C-S-h>', '<esc>^i', { desc = 'Go to the start of the line' })
vim.keymap.set('i', '<C-S-l>', '<End>', { desc = 'Go to the end of the line' })
vim.keymap.set('i', '<C-s>', '<esc>^i', { desc = 'Go to the start of the line' })
vim.keymap.set('i', '<C-e>', '<End>', { desc = 'Go to the end of the line' })
vim.keymap.set('i', '<C-w>', '<esc>lwi', { desc = 'Go a word further' })
vim.keymap.set('i', '<C-b>', '<esc>lbi', { desc = 'Go a word backward' })
vim.keymap.set('i', '<C-e>', '<esc>lea', { desc = 'Go a to next word end' })
-- navigate hjkl in insert mode
vim.keymap.set('i', '<C-h>', '<Left>', { desc = 'Move left' })

View File

@ -158,7 +158,6 @@ local servers = {
prefix = 'self',
},
cargo = {
features = 'all',
buildScripts = {
enable = true,
},
@ -210,11 +209,11 @@ local servers = {
-- load token and additional languagetool items later
},
},
languageToolOrg = {
apiKey = require 'custom.secret.languagetool',
username = 'accounts@cscherr.de',
languageToolHttpServerUrl = 'https://api.languagetoolplus.com/v2/',
},
-- languageToolOrg = {
-- apiKey = require 'custom.secret.languagetool',
-- username = 'accounts@cscherr.de',
-- languageToolHttpServerUrl = 'https://api.languagetoolplus.com/v2/',
-- },
languageToolHttpServerUrl = 'https://api.languagetoolplus.com/v2/',
},
lua_ls = {

View File

@ -1,4 +1,6 @@
return {
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
-- NOTE: Plugins can specify dependencies.
--
-- The dependencies are proper plugin specifications as well - anything

View File

@ -118,8 +118,8 @@ return {
local leap = require 'leap'
leap.opts.safe_labels = 'asfghjkliztrewb'
leap.opts.labels = 'sfnjklhodweimbuyvrgtaqpcxz'
leap.opts.safe_labels = 'sfnutSFNLHMUGTZ?'
leap.opts.labels = 'sfnjklhodweimbuyvrgtaqpcxzSFNJKLHODWEIMBUYVRGTAQPCXZ?'
leap.opts.special_keys = {
next_target = '<enter>',
prev_target = '<tab>',
@ -198,24 +198,19 @@ return {
local wk = require 'which-key'
local defaults = {
mode = { 'n', 'v' },
{ '<leader>c', group = '[C]ode/[C]olor' },
{ '<leader>ct', group = '[T]rouble' },
{ '<leader>d', group = '[D]ebug' },
{ '<leader>dc', group = '[C]hange' },
{ '<leader>dw', group = '[W]indow' },
{ '<leader>f', group = '[F]ormatting' },
{ '<leader>g', group = '[G]ood tools' },
{ '<leader>r', group = '[R]ename' },
{ '<leader>t', group = '[T]oggle' },
{ '<leader>w', group = '[W]orkspace' },
{ '<leader>wb', group = 'buffer' },
{ '<localleader>', group = 'select' },
{ '<localleader>f', group = '[F]ind' },
{ '[', group = 'prev' },
{ ']', group = 'next' },
{ 'g', group = 'goto' },
['<localleader>'] = { name = '+select', f = { name = '[F]ind' } },
['g'] = { name = '+goto' },
[']'] = { name = '+next' },
['['] = { name = '+prev' },
['<leader>d'] = { name = '+[D]ebug', w = { name = '[W]indow' }, c = { name = '[C]hange' } },
['<leader>c'] = { name = '+[C]ode/[C]olor', t = { name = '+[T]rouble' } },
['<leader>g'] = { name = '+[G]ood tools' },
['<leader>f'] = { name = '+[F]ormatting' },
['<leader>r'] = { name = '[R]ename' },
['<leader>w'] = { name = '[W]orkspace', b = { name = 'buffer' } },
['<leader>t'] = { name = '[T]oggle', ['🚫'] = 'which_key_ignore' },
}
wk.add(defaults, opts)
wk.register(defaults, opts)
end,
},
{
@ -643,7 +638,6 @@ return {
},
{
'MeanderingProgrammer/dashboard.nvim',
enable = true,
event = 'VimEnter',
dependencies = {
'MaximilianLloyd/ascii.nvim',