From efe3e7e5177a24f8c3474219a74577c46caccbec Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Sat, 29 May 2021 13:20:00 +0530
Subject: [PATCH] Revert "nvim: after: ftplugin: Fix various key mappings"

This reverts commit e6397864d07b740a5797be3c177a6be9a07b86de.

This was actually wrong. nnoremap should be always what we want. For
example, this broke the <Leader>r mapping for gitrebase and would invoke
:Reword from lambdalisue/reword.vim.
---
 .../.config/nvim/after/ftplugin/gitrebase.vim | 12 +++++-----
 nvim/.config/nvim/after/ftplugin/haskell.vim  | 24 +++++++++----------
 nvim/.config/nvim/after/ftplugin/qf.vim       |  6 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nvim/.config/nvim/after/ftplugin/gitrebase.vim b/nvim/.config/nvim/after/ftplugin/gitrebase.vim
index 1934cec..d23fb6a 100644
--- a/nvim/.config/nvim/after/ftplugin/gitrebase.vim
+++ b/nvim/.config/nvim/after/ftplugin/gitrebase.vim
@@ -20,11 +20,11 @@ augroup fe_interactive_rebase_reverse
 augroup END
 
 " See https://github.com/neovim/neovim/blob/master/runtime/ftplugin/gitrebase.vim
-nmap <buffer> <silent> <Leader>p :Pick<CR>
-nmap <buffer> <silent> <Leader>s :Squash<CR>
-nmap <buffer> <silent> <Leader>e :Edit<CR>
-nmap <buffer> <silent> <Leader>r :Reword<CR>
-nmap <buffer> <silent> <Leader>f :Fixup<CR>
-nmap <buffer> <silent> <Leader>c :Cycle<CR>
+nnoremap <buffer> <silent> <Leader>p :Pick<CR>
+nnoremap <buffer> <silent> <Leader>s :Squash<CR>
+nnoremap <buffer> <silent> <Leader>e :Edit<CR>
+nnoremap <buffer> <silent> <Leader>r :Reword<CR>
+nnoremap <buffer> <silent> <Leader>f :Fixup<CR>
+nnoremap <buffer> <silent> <Leader>c :Cycle<CR>
 
 setlocal bufhidden=wipe
diff --git a/nvim/.config/nvim/after/ftplugin/haskell.vim b/nvim/.config/nvim/after/ftplugin/haskell.vim
index eed2117..e8f5841 100644
--- a/nvim/.config/nvim/after/ftplugin/haskell.vim
+++ b/nvim/.config/nvim/after/ftplugin/haskell.vim
@@ -10,30 +10,30 @@ nmap <buffer> <LocalLeader>k  :GhcidKill<CR>
 
 " Taken from https://github.com/danidiaz/miscellany/blob/master/linux/.vim/ftplugin/haskell/movements.vim
 " Next top-level type signature
-nmap <buffer> <script> <silent> ]f /^\w[^:=$]*\(::\\|\n\s*::\)<CR>
+nnoremap <script> <silent> ]f /^\w[^:=$]*\(::\\|\n\s*::\)<CR>
 " Previous top-level type signature
-nmap <buffer> <script> <silent> [f ?^\w[^:=$]*::\(::\\|\n\s*::\)<CR>
+nnoremap <script> <silent> [f ?^\w[^:=$]*::\(::\\|\n\s*::\)<CR>
 " Next type signature
-nmap <buffer> <script> <silent> ]l /^\s*\w[^:=$]*\(::\\|\n\s*::\)<CR>
+nnoremap <script> <silent> ]l /^\s*\w[^:=$]*\(::\\|\n\s*::\)<CR>
 " Previous type signature
-nmap <buffer> <script> <silent> [l ?^\s*\w[^:=$]*\(::\\|\n\s*::\)<CR>
+nnoremap <script> <silent> [l ?^\s*\w[^:=$]*\(::\\|\n\s*::\)<CR>
 " Next data declaration
-nmap <buffer> <script> <silent> ]t /^\(data \\|newtype \\|type \\|class\)<CR>
+nnoremap <script> <silent> ]t /^\(data \\|newtype \\|type \\|class\)<CR>
 " Previous data declaration
-nmap <buffer> <script> <silent> [t ?^\(data \\|newtype \\|type \\|class\)<CR>
+nnoremap <script> <silent> [t ?^\(data \\|newtype \\|type \\|class\)<CR>
 " Beginning of imports
-nmap <buffer> <script> <silent> [i gg/^import <CR>z<CR>
+nnoremap <script> <silent> [i gg/^import <CR>z<CR>
 " End of imports
-nmap <buffer> <script> <silent> [I G?^import <CR>zb
+nnoremap <script> <silent> [I G?^import <CR>zb
 " Beginning of module exports
-nmap <buffer> <script> <silent> [m gg/^module <CR>z<CR>
+nnoremap <script> <silent> [m gg/^module <CR>z<CR>
 " End of module exports (wonky)
-nmap <buffer> <script> <silent> [M gg/^\s*)\s*where\s*$<CR>zb<CR>
+nnoremap <script> <silent> [M gg/^\s*)\s*where\s*$<CR>zb<CR>
 " Next named chunk of documentation
 " https://www.haskell.org/haddock/doc/html/ch03s05.html
-nmap <buffer> <script> <silent> ]n /^-- \$\w\+<CR>z<CR>
+nnoremap <script> <silent> ]n /^-- \$\w\+<CR>z<CR>
 " Previous named chunk of documentation
-nmap <buffer> <script> <silent> [n ?^-- \$\w\+<CR>z<CR>
+nnoremap <script> <silent> [n ?^-- \$\w\+<CR>z<CR>
 
 let g:haskell_classic_highlighting = 1
 let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
diff --git a/nvim/.config/nvim/after/ftplugin/qf.vim b/nvim/.config/nvim/after/ftplugin/qf.vim
index 26aea74..4039ad3 100644
--- a/nvim/.config/nvim/after/ftplugin/qf.vim
+++ b/nvim/.config/nvim/after/ftplugin/qf.vim
@@ -12,6 +12,6 @@ setlocal nocursorline
 setlocal nobuflisted
 setlocal nospell
 
-nmap <buffer> [- :colder<CR>
-nmap <buffer> ]+ :cnewer<CR>
-nmap <buffer> <Leader>g :Cfilter<SPACE>
+nnoremap <buffer> [- :colder<CR>
+nnoremap <buffer> ]+ :cnewer<CR>
+nnoremap <buffer> <Leader>g :Cfilter<SPACE>