diff --git a/.gitmodules b/.gitmodules
index e29316a..d353960 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".vim/bundle/vim-argwrap"]
-	path = pack/plugins/start/vim-argwrap
-	url = https://git.foosoft.net/alex/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
@@ -97,3 +94,6 @@
 [submodule "pack/plugins/start/fzf-lua"]
 	path = pack/plugins/start/fzf-lua
 	url = https://github.com/ibhagwan/fzf-lua.git
+[submodule "pack/plugins/start/argonaut.nvim"]
+	path = pack/plugins/start/argonaut.nvim
+	url = https://git.foosoft.net/alex/argonaut.nvim.git
diff --git a/ftplugin/c.lua b/ftplugin/c.lua
index dc8d061..6a1a781 100644
--- a/ftplugin/c.lua
+++ b/ftplugin/c.lua
@@ -1,3 +1 @@
 vim.diagnostic.disable()
-
-vim.b.argwrap_wrap_closing_brace = 0
diff --git a/ftplugin/cpp.lua b/ftplugin/cpp.lua
index dc8d061..6a1a781 100644
--- a/ftplugin/cpp.lua
+++ b/ftplugin/cpp.lua
@@ -1,3 +1 @@
 vim.diagnostic.disable()
-
-vim.b.argwrap_wrap_closing_brace = 0
diff --git a/ftplugin/go.lua b/ftplugin/go.lua
index 850bee8..fe94aed 100644
--- a/ftplugin/go.lua
+++ b/ftplugin/go.lua
@@ -5,5 +5,3 @@ vim.keymap.set('n', '<leader>c', vim.cmd.GoCoverage)
 vim.keymap.set('n', '<leader>i', vim.cmd.GoInstall)
 vim.keymap.set('n', '<leader>r', vim.cmd.GoRun)
 vim.keymap.set('n', '<leader>t', vim.cmd.GoTest)
-
-vim.b.argwrap_tail_comma = 1
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
index a233807..f7d26b8 100644
--- a/lua/config/plugins.lua
+++ b/lua/config/plugins.lua
@@ -1,3 +1,9 @@
+-- argonaut.nvim
+vim.keymap.set('n', '<leader>a', function()
+    vim.cmd.ArgonautReload()
+    vim.cmd.ArgonautReflow()
+end)
+
 -- comment.nvim
 require('Comment').setup()
 
@@ -88,9 +94,6 @@ 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
new file mode 160000
index 0000000..bbb57ff
--- /dev/null
+++ b/pack/plugins/start/argonaut.nvim
@@ -0,0 +1 @@
+Subproject commit bbb57ff024ccd70a34eab48180c6023bbe908922
diff --git a/pack/plugins/start/vim-argwrap b/pack/plugins/start/vim-argwrap
deleted file mode 160000
index b532cb6..0000000
--- a/pack/plugins/start/vim-argwrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b532cb6805864da4cfcfe0bb6a1ced61e291be02