split up configs, disable flash keys
This commit is contained in:
parent
f9288900e8
commit
dda7c50d32
61
init.lua
61
init.lua
|
|
@ -84,6 +84,8 @@ I hope you enjoy your Neovim journey,
|
||||||
P.S. You can delete this when you're done too. It's your config now! :)
|
P.S. You can delete this when you're done too. It's your config now! :)
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
|
require 'myconfigs'
|
||||||
|
|
||||||
-- Set <space> as the leader key
|
-- Set <space> as the leader key
|
||||||
-- See `:help mapleader`
|
-- See `:help mapleader`
|
||||||
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
|
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
|
||||||
|
|
@ -103,12 +105,6 @@ vim.opt.number = true
|
||||||
-- You can also add relative line numbers, to help with jumping.
|
-- You can also add relative line numbers, to help with jumping.
|
||||||
-- Experiment for yourself to see if you like it!
|
-- Experiment for yourself to see if you like it!
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = true
|
||||||
vim.opt.expandtab = true
|
|
||||||
vim.opt.tabstop = 2
|
|
||||||
vim.opt.shiftwidth = 2
|
|
||||||
vim.opt.virtualedit = 'block'
|
|
||||||
-- vim.opt.inccommand = "split"
|
|
||||||
vim.opt.termguicolors = true
|
|
||||||
|
|
||||||
-- Enable mouse mode, can be useful for resizing splits for example!
|
-- Enable mouse mode, can be useful for resizing splits for example!
|
||||||
vim.opt.mouse = 'a'
|
vim.opt.mouse = 'a'
|
||||||
|
|
@ -166,59 +162,6 @@ vim.opt.scrolloff = 10
|
||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- See `:help vim.keymap.set()`
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
-- MY KEYMAPS BEGIN
|
|
||||||
vim.api.nvim_exec2(
|
|
||||||
[[
|
|
||||||
function! s:ZoomToggle() abort
|
|
||||||
if exists('t:zoomed') && t:zoomed
|
|
||||||
execute t:zoom_winrestcmd
|
|
||||||
let t:zoomed = 0
|
|
||||||
else
|
|
||||||
let t:zoom_winrestcmd = winrestcmd()
|
|
||||||
resize
|
|
||||||
vertical resize
|
|
||||||
let t:zoomed = 1
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
command! ZoomToggle call s:ZoomToggle()
|
|
||||||
]],
|
|
||||||
{ output = false }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set('n', ',h', [[ (&hls && v:hlsearch ? ':nohls' : ':set hls')."\n"]], { silent = true, expr = true, desc = 'toggles highlighting' })
|
|
||||||
|
|
||||||
vim.keymap.set('n', ';', ':', { noremap = true, desc = 'Command mode' })
|
|
||||||
vim.keymap.set('n', "'", '`', { noremap = true, desc = 'Mark character' })
|
|
||||||
vim.keymap.set('n', '`', "'", { noremap = true, desc = 'Mark line' })
|
|
||||||
vim.keymap.set('n', '<C-z>', '<cmd>ZoomToggle<CR>', { noremap = true, desc = 'Zoom Toggle' })
|
|
||||||
|
|
||||||
vim.keymap.set('i', 'df', '<ESC>', { noremap = true, desc = 'ESC' })
|
|
||||||
vim.keymap.set('n', '<CR>', 'o<ESC>', { noremap = true, desc = 'ESC' })
|
|
||||||
|
|
||||||
vim.keymap.set('n', 'L', '<cmd>bn<CR>', { noremap = true, desc = 'buffer next' })
|
|
||||||
vim.keymap.set('n', 'H', '<cmd>bp<CR>', { noremap = true, desc = 'buffer previous' })
|
|
||||||
|
|
||||||
vim.keymap.set('n', ',n', '<cmd>Neotree toggle<CR>', { noremap = true, desc = 'Tree Toggle' })
|
|
||||||
vim.keymap.set('n', ',N', '<cmd>Neotree reveal left<CR>', { noremap = true, desc = 'Follow File Toggle' })
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>w', '<cmd>:w<CR>', { noremap = true, desc = 'Save file' })
|
|
||||||
|
|
||||||
vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' })
|
|
||||||
vim.keymap.set('n', '<leader>ff', vim.lsp.buf.format, { noremap = true, desc = 'LSP format' })
|
|
||||||
|
|
||||||
vim.g.diagnostics_active = false
|
|
||||||
function _G.toggle_diagnostics()
|
|
||||||
if vim.g.diagnostics_active then
|
|
||||||
vim.g.diagnostics_active = false
|
|
||||||
vim.diagnostic.config { virtual_text = false }
|
|
||||||
else
|
|
||||||
vim.g.diagnostics_active = true
|
|
||||||
vim.diagnostic.config { virtual_text = true }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_set_keymap('n', '<leader>uv', ':call v:lua.toggle_diagnostics()<CR>', { noremap = true, silent = true, desc = 'Toggle diagnostic text' })
|
|
||||||
|
|
||||||
-- NOTES
|
-- NOTES
|
||||||
-- :g/^$/d delete empty lines
|
-- :g/^$/d delete empty lines
|
||||||
-- :v/\w\+/d (skip lines with one or more words) delete empty lines
|
-- :v/\w\+/d (skip lines with one or more words) delete empty lines
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,14 @@ return {
|
||||||
'folke/flash.nvim',
|
'folke/flash.nvim',
|
||||||
event = 'VeryLazy',
|
event = 'VeryLazy',
|
||||||
config = function()
|
config = function()
|
||||||
require('flash').setup()
|
require('flash').setup {
|
||||||
|
modes = {
|
||||||
|
char = {
|
||||||
|
enabled = false,
|
||||||
|
-- keys = { "f", "F", "t", "T", ";", "," },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
vim.keymap.set('n', 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' })
|
vim.keymap.set('n', 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' })
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
'n',
|
'n',
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
vim.opt.expandtab = true
|
||||||
|
vim.opt.tabstop = 2
|
||||||
|
vim.opt.shiftwidth = 2
|
||||||
|
vim.opt.virtualedit = 'block'
|
||||||
|
-- vim.opt.inccommand = "split"
|
||||||
|
vim.opt.termguicolors = true
|
||||||
|
|
||||||
|
vim.api.nvim_exec2(
|
||||||
|
[[
|
||||||
|
function! s:ZoomToggle() abort
|
||||||
|
if exists('t:zoomed') && t:zoomed
|
||||||
|
execute t:zoom_winrestcmd
|
||||||
|
let t:zoomed = 0
|
||||||
|
else
|
||||||
|
let t:zoom_winrestcmd = winrestcmd()
|
||||||
|
resize
|
||||||
|
vertical resize
|
||||||
|
let t:zoomed = 1
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
command! ZoomToggle call s:ZoomToggle()
|
||||||
|
]],
|
||||||
|
{ output = false }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set('n', ',h', [[ (&hls && v:hlsearch ? ':nohls' : ':set hls')."\n"]], { silent = true, expr = true, desc = 'toggles highlighting' })
|
||||||
|
|
||||||
|
vim.keymap.set('n', ';', ':', { noremap = true, desc = 'Command mode' })
|
||||||
|
vim.keymap.set('n', "'", '`', { noremap = true, desc = 'Mark character' })
|
||||||
|
vim.keymap.set('n', '`', "'", { noremap = true, desc = 'Mark line' })
|
||||||
|
vim.keymap.set('n', '<C-z>', '<cmd>ZoomToggle<CR>', { noremap = true, desc = 'Zoom Toggle' })
|
||||||
|
|
||||||
|
vim.keymap.set('i', 'df', '<ESC>', { noremap = true, desc = 'ESC' })
|
||||||
|
vim.keymap.set('n', '<CR>', 'o<ESC>', { noremap = true, desc = 'ESC' })
|
||||||
|
|
||||||
|
vim.keymap.set('n', 'L', '<cmd>bn<CR>', { noremap = true, desc = 'buffer next' })
|
||||||
|
vim.keymap.set('n', 'H', '<cmd>bp<CR>', { noremap = true, desc = 'buffer previous' })
|
||||||
|
|
||||||
|
vim.keymap.set('n', ',n', '<cmd>Neotree toggle<CR>', { noremap = true, desc = 'Tree Toggle' })
|
||||||
|
vim.keymap.set('n', ',N', '<cmd>Neotree reveal left<CR>', { noremap = true, desc = 'Follow File Toggle' })
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<leader>w', '<cmd>:w<CR>', { noremap = true, desc = 'Save file' })
|
||||||
|
|
||||||
|
vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' })
|
||||||
|
vim.keymap.set('n', '<leader>ff', vim.lsp.buf.format, { noremap = true, desc = 'LSP format' })
|
||||||
|
|
||||||
|
vim.g.diagnostics_active = false
|
||||||
|
function _G.toggle_diagnostics()
|
||||||
|
if vim.g.diagnostics_active then
|
||||||
|
vim.g.diagnostics_active = false
|
||||||
|
vim.diagnostic.config { virtual_text = false }
|
||||||
|
else
|
||||||
|
vim.g.diagnostics_active = true
|
||||||
|
vim.diagnostic.config { virtual_text = true }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.api.nvim_set_keymap('n', '<leader>uv', ':call v:lua.toggle_diagnostics()<CR>', { noremap = true, silent = true, desc = 'Toggle diagnostic text' })
|
||||||
Loading…
Reference in New Issue