diff --git a/.gitmodules b/.gitmodules
index 7a951be..3fef052 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule ".vim/bundle/vim-sort-motion"]
 	path = pack/plugins/start/vim-sort-motion
 	url = https://github.com/christoomey/vim-sort-motion.git
-[submodule ".vim/bundle/vim-fswitch"]
-	path = pack/plugins/start/vim-fswitch
-	url = https://github.com/derekwyatt/vim-fswitch.git
 [submodule ".vim/bundle/vim-go"]
 	path = pack/plugins/start/vim-go
 	url = https://github.com/fatih/vim-go.git
@@ -91,3 +88,9 @@
 [submodule "pack/plugins/start/suda.vim"]
 	path = pack/plugins/start/suda.vim
 	url = https://github.com/lambdalisue/suda.vim.git
+[submodule "pack/plugins/start/plenary.nvim"]
+	path = pack/plugins/start/plenary.nvim
+	url = https://github.com/nvim-lua/plenary.nvim.git
+[submodule "pack/plugins/opt/hflip.nvim"]
+	path = pack/plugins/opt/hflip.nvim
+	url = https://github.com/FooSoft/hflip.nvim.git
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index ee37997..494e6c3 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -1,2 +1,8 @@
 " vim-fswitch
-noremap gfs :FSHere<Cr>
+noremap gfs :HFlip<Cr>
+
+if has('nvim')
+lua << EOF
+    vim.diagnostic.disable()
+EOF
+endif
diff --git a/ftplugin/cpp.vim b/ftplugin/cpp.vim
index 6229af4..494e6c3 100644
--- a/ftplugin/cpp.vim
+++ b/ftplugin/cpp.vim
@@ -1,5 +1,5 @@
 " vim-fswitch
-noremap gfs :FSHere<Cr>
+noremap gfs :HFlip<Cr>
 
 if has('nvim')
 lua << EOF
diff --git a/pack/plugins/opt/hflip.nvim b/pack/plugins/opt/hflip.nvim
new file mode 160000
index 0000000..354a21e
--- /dev/null
+++ b/pack/plugins/opt/hflip.nvim
@@ -0,0 +1 @@
+Subproject commit 354a21ea72460c792604ca340295934b020d8c9f
diff --git a/pack/plugins/start/plenary.nvim b/pack/plugins/start/plenary.nvim
new file mode 160000
index 0000000..4b7e520
--- /dev/null
+++ b/pack/plugins/start/plenary.nvim
@@ -0,0 +1 @@
+Subproject commit 4b7e52044bbb84242158d977a50c4cbcd85070c7
diff --git a/pack/plugins/start/vim-fswitch b/pack/plugins/start/vim-fswitch
deleted file mode 160000
index 94acdd8..0000000
--- a/pack/plugins/start/vim-fswitch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 94acdd8bc92458d3bf7e6557df8d93b533564491
diff --git a/plugins.vim b/plugins.vim
index bba4b23..30bacd6 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -5,6 +5,7 @@ if has('nvim')
     packadd nvim-cmp
     packadd nvim-lspconfig
     packadd vim-vsnip
+    packadd hflip.nvim
 
 lua << EOF
     -- Use an on_attach function to only map the following keys
@@ -102,6 +103,9 @@ lua << EOF
 EOF
 endif
 
+" hflip.nvim
+command! HFlipReload lua require'plenary.reload'.reload_module('hflip', false)
+
 " fzf
 if executable('fzf')
     packadd fzf.vim