summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.vim/init.lua8
-rw-r--r--.vim/lua/plugins/_git-messenger.lua1
2 files changed, 8 insertions, 1 deletions
diff --git a/.vim/init.lua b/.vim/init.lua
index e25acf7..60d7e04 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -4,7 +4,8 @@ local g = vim.g
 local o = vim.o
 
 local nnoremap = require('astronauta.keymap').nnoremap
-local inoremap = require('astronauta.keymap').tnoremap
+local inoremap = require('astronauta.keymap').inoremap
+local vnoremap = require('astronauta.keymap').vnoremap
 
 g.mapleader = ' ' -- <leader> key to <space>
 g.maplocalleader = '\\'
@@ -78,6 +79,11 @@ nnoremap { 'gx', function() require('misc').open_under_cursor('url-launcher') en
 nnoremap { 'gGw', function() require('misc').word_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end }
 nnoremap { 'gGe', function() require('misc').expr_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end }
 nnoremap { 'gGf', function() require('misc').file_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end }
+nnoremap { 'gs', function() require('misc').word_under_cursor(function(s) fn.feedkeys(':%s/' .. s .. '//g'); cmd [[ call feedkeys("\<left>\<left>") ]] end) end }
+
+nnoremap { '<leader>gg', function() require('neogit').open({ kind = "split" }) end }
+nnoremap { 'gm', function() cmd [[ GitMessenger ]] end }
+vnoremap { 'T', function() cmd [[ retab! | call feedkeys("\<esc>") ]] end }
 -- }}}
 
 -- AUTO GROUPS -- {{{
diff --git a/.vim/lua/plugins/_git-messenger.lua b/.vim/lua/plugins/_git-messenger.lua
index ea1c271..dceadeb 100644
--- a/.vim/lua/plugins/_git-messenger.lua
+++ b/.vim/lua/plugins/_git-messenger.lua
@@ -1,3 +1,4 @@
 -- vim.g.git_messenger_include_diff = false
 vim.g.git_messenger_always_into_popup = true
 vim.g.git_messenger_close_on_cursor_moved = true
+vim.g.git_messenger_no_default_mappings = true