From a85cd7288c5505237282e74f2926d689b0eb3c15 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 12 Mar 2023 11:58:29 -0700
Subject: [PATCH] Remove argonaut for now

---
 .gitmodules                      | 6 +++---
 lua/config/plugins.lua           | 7 +++----
 pack/plugins/start/argonaut.nvim | 1 -
 pack/plugins/start/vim-argwrap   | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 160000 pack/plugins/start/argonaut.nvim
 create mode 160000 pack/plugins/start/vim-argwrap

diff --git a/.gitmodules b/.gitmodules
index fcaf23a..6977ce8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule ".vim/bundle/vim-argwrap"]
+	path = pack/plugins/start/vim-argwrap
+	url = https://github.com/FooSoft/vim-argwrap.git
 [submodule ".vim/bundle/vim-sort-motion"]
 	path = pack/plugins/start/vim-sort-motion
 	url = https://github.com/christoomey/vim-sort-motion.git
@@ -94,6 +97,3 @@
 [submodule "pack/plugins/start/revolver.nvim"]
 	path = pack/plugins/start/revolver.nvim
 	url = https://github.com/FooSoft/revolver.nvim.git
-[submodule "pack/plugins/start/argonaut.nvim"]
-	path = pack/plugins/start/argonaut.nvim
-	url = https://github.com/FooSoft/argonaut.nvim.git
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index 53f7f9f..bff386c 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -1,7 +1,3 @@
--- argonaut.nvim
-require('argonaut').setup()
-vim.keymap.set('n', '<leader>a', vim.cmd.ArgonautReflow)
-
 -- comment.nvim
 require('Comment').setup()
 
@@ -64,6 +60,9 @@ require('lualine').setup {
 require('revolver').setup({'.c', '.cpp', '.h', '.hpp', '.inl'})
 vim.keymap.set('n', 'gfs', vim.cmd.Revolver)
 
+-- vim-argwrap
+vim.keymap.set('n', '<leader>a', vim.cmd.ArgWrap)
+
 -- vim-better-whitespace
 vim.api.nvim_set_hl(0, 'ExtraWhitespace', {link = 'Search'})
 
diff --git a/pack/plugins/start/argonaut.nvim b/pack/plugins/start/argonaut.nvim
deleted file mode 160000
index 139d34a..0000000
--- a/pack/plugins/start/argonaut.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 139d34a8c6e6cc617cb8fd21a6ab3079292c0a88
diff --git a/pack/plugins/start/vim-argwrap b/pack/plugins/start/vim-argwrap
new file mode 160000
index 0000000..feaba6b
--- /dev/null
+++ b/pack/plugins/start/vim-argwrap
@@ -0,0 +1 @@
+Subproject commit feaba6b8b6ca099d267c81ee2c4ba43ce6de8499