diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 61daef7..2413627 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -38,6 +38,10 @@ vim.cmd [[
     nnoremap L $
     xnoremap H ^
     xnoremap L $
+    nnoremap <C-a> <Nop>
+    nnoremap <C-x> <Nop>
+    nnoremap ,a <C-a>
+    nnoremap ,x <C-x>
 
     nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
 
@@ -360,13 +364,13 @@ require'lazy'.setup{ --{{{1
         end,
     },
     { 'f-person/git-blame.nvim', --{{{2
-        keys = {',a'},
+        keys = {',g'},
         config = function ()
             require'gitblame'.setup{
                 enabled = false,
             }
             vim.cmd[[
-                nnoremap ,a :GitBlameToggle<CR>
+                nnoremap ,g :GitBlameToggle<CR>
             ]]
         end
     },
@@ -539,12 +543,6 @@ require'lazy'.setup{ --{{{1
             }
         end,
     },
-    { 'kdheepak/lazygit.nvim', --{{{2
-        lazy = true,
-        cmd = { 'LazyGit', 'LazyGitConfig', 'LazyGitCurrentFile', 'LazyGitFilter', 'LazyGitFilterCurrentFile', },
-        dependencies = { 'nvim-lua/plenary.nvim', },
-        keys = { { ',g', '<cmd>LazyGit<cr>', desc = 'LazyGit' }, },
-    },
     { 'mfussenegger/nvim-dap', --{{{2
         dependencies = {
             'nvim-treesitter/nvim-treesitter',
diff --git a/vim/.vimrc b/vim/.vimrc
index 4a8dd6e..72a2139 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,6 +31,13 @@ nnoremap <c-p> :cprevious<CR>
 nnoremap <c-u> <c-u>zz
 nnoremap H ^
 nnoremap L $
+
+" i use ctrl-a for the tmux prefix key
+nnoremap <C-a> <Nop>
+nnoremap <C-x> <Nop>
+nnoremap ,a <C-a>
+nnoremap ,x <C-x>
+
 set autoindent
 set cursorline