From dda7c50d32564483bf1a12dca9055705095ca659 Mon Sep 17 00:00:00 2001 From: lsanto Date: Wed, 2 Oct 2024 00:57:47 -0400 Subject: [PATCH] split up configs, disable flash keys --- init.lua | 61 ++---------------------------------- lua/custom/plugins/flash.lua | 9 +++++- lua/myconfigs.lua | 58 ++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 60 deletions(-) create mode 100644 lua/myconfigs.lua diff --git a/init.lua b/init.lua index 5237863b..3ab05197 100644 --- a/init.lua +++ b/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! :) --]] +require 'myconfigs' + -- Set as the leader key -- See `:help mapleader` -- 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. -- Experiment for yourself to see if you like it! 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! vim.opt.mouse = 'a' @@ -166,59 +162,6 @@ vim.opt.scrolloff = 10 -- [[ Basic Keymaps ]] -- 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', '', 'ZoomToggle', { noremap = true, desc = 'Zoom Toggle' }) - -vim.keymap.set('i', 'df', '', { noremap = true, desc = 'ESC' }) -vim.keymap.set('n', '', 'o', { noremap = true, desc = 'ESC' }) - -vim.keymap.set('n', 'L', 'bn', { noremap = true, desc = 'buffer next' }) -vim.keymap.set('n', 'H', 'bp', { noremap = true, desc = 'buffer previous' }) - -vim.keymap.set('n', ',n', 'Neotree toggle', { noremap = true, desc = 'Tree Toggle' }) -vim.keymap.set('n', ',N', 'Neotree reveal left', { noremap = true, desc = 'Follow File Toggle' }) - -vim.keymap.set('n', 'w', ':w', { noremap = true, desc = 'Save file' }) - -vim.keymap.set('i', '', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' }) -vim.keymap.set('n', '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', 'uv', ':call v:lua.toggle_diagnostics()', { noremap = true, silent = true, desc = 'Toggle diagnostic text' }) - -- NOTES -- :g/^$/d delete empty lines -- :v/\w\+/d (skip lines with one or more words) delete empty lines diff --git a/lua/custom/plugins/flash.lua b/lua/custom/plugins/flash.lua index 89ea1c4e..d4e16ea7 100644 --- a/lua/custom/plugins/flash.lua +++ b/lua/custom/plugins/flash.lua @@ -2,7 +2,14 @@ return { 'folke/flash.nvim', event = 'VeryLazy', config = function() - require('flash').setup() + require('flash').setup { + modes = { + char = { + enabled = false, + -- keys = { "f", "F", "t", "T", ";", "," }, + }, + }, + } vim.keymap.set('n', 'f', 'lua require("flash").jump()', { noremap = true, desc = 'flash search' }) vim.keymap.set( 'n', diff --git a/lua/myconfigs.lua b/lua/myconfigs.lua new file mode 100644 index 00000000..4d245bfa --- /dev/null +++ b/lua/myconfigs.lua @@ -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', '', 'ZoomToggle', { noremap = true, desc = 'Zoom Toggle' }) + +vim.keymap.set('i', 'df', '', { noremap = true, desc = 'ESC' }) +vim.keymap.set('n', '', 'o', { noremap = true, desc = 'ESC' }) + +vim.keymap.set('n', 'L', 'bn', { noremap = true, desc = 'buffer next' }) +vim.keymap.set('n', 'H', 'bp', { noremap = true, desc = 'buffer previous' }) + +vim.keymap.set('n', ',n', 'Neotree toggle', { noremap = true, desc = 'Tree Toggle' }) +vim.keymap.set('n', ',N', 'Neotree reveal left', { noremap = true, desc = 'Follow File Toggle' }) + +vim.keymap.set('n', 'w', ':w', { noremap = true, desc = 'Save file' }) + +vim.keymap.set('i', '', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' }) +vim.keymap.set('n', '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', 'uv', ':call v:lua.toggle_diagnostics()', { noremap = true, silent = true, desc = 'Toggle diagnostic text' })