From e56729498d29fbffcf7b2cee74469b52d505ad80 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Wed, 17 Apr 2024 13:23:28 +0100
Subject: [PATCH] Stop remapping Q and W, and update reg file

---
 vimrc            |  4 ----
 windows-gvim.reg | 23 -----------------------
 windows-nvim.reg | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 windows-gvim.reg
 create mode 100644 windows-nvim.reg

diff --git a/vimrc b/vimrc
index 25adb52..5ec7610 100644
--- a/vimrc
+++ b/vimrc
@@ -130,10 +130,6 @@ if has('eval')
     " Technically only 'if 1' would be required, as 'has()' is provided by
     " +eval, but this is clearer.
 
-    command Q q
-    command W w
-    command WQ wq
-    command Wq wq
     filetype plugin indent on
     let g:limelight_default_coefficient=0.8
     let g:nroff_is_groff=1
diff --git a/windows-gvim.reg b/windows-gvim.reg
deleted file mode 100644
index 0c953d8..0000000
--- a/windows-gvim.reg
+++ /dev/null
@@ -1,23 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*]
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell]
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\gvim]
-@="Edit with Vim"
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\gvim\command]
-@="\"C:\\vim\\vim90\\gvim.exe\" \"%1\""
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\gvim-R]
-@="Open with Vim (read-only)"
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\gvim-R\command]
-@="\"C:\\vim\\vim90\\gvim.exe\" -R \"%1\""
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\gvim]
-@="Open Vim here"
-
-[HKEY_CURRENT_USER\SOFTWARE\Classes\Directory\Background\shell\gvim\command]
-@="\"C:\\vim\\vim90\\gvim.exe\" -c \":NERDTree\""
diff --git a/windows-nvim.reg b/windows-nvim.reg
new file mode 100644
index 0000000..4b57d23
--- /dev/null
+++ b/windows-nvim.reg
@@ -0,0 +1,17 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*]
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell]
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\nvim]
+@="Edit with Nvim"
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\nvim\command]
+@="\"C:\\nvim-win64\\bin\\nvim.exe\" \"%1\""
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\nvim-R]
+@="Open with Nvim (read-only)"
+
+[HKEY_CURRENT_USER\SOFTWARE\Classes\*\shell\nvim-R\command]
+@="\"C:\\nvim-win64\\bin\\nvim.exe\" -R \"%1\""