diff --git a/dev/share/devconfig/jayeshbadwaik/nvimrc.local b/dev/share/devconfig/jayeshbadwaik/nvimrc.local
index fad595070647b1f0499b2c7690fe926f6954afcb..32e1d409f66245c4f2ee6e805730ce4db51381f6 100644
--- a/dev/share/devconfig/jayeshbadwaik/nvimrc.local
+++ b/dev/share/devconfig/jayeshbadwaik/nvimrc.local
@@ -26,16 +26,16 @@ map <F9> :YcmCompleter FixIt<CR>
 function! s:insert_gates()
   set formatoptions-=cro
   let gatename_0 = substitute(substitute(toupper(@%), "\\.", "_", "g"), "/", "_", "g")
-  let gatename_1 = substitute(gatename_0, "SRC_CPP_INCLUDE_", "", "g")
-  let gatename_2 = substitute(gatename_1, "TEST_CPP_INCLUDE_", "", "g")
-  let gatename_3 = substitute(gatename_2, "BENCH_CPP_INCLUDE_", "", "g")
-  let gatename_4 = substitute(gatename_3, "SRC_CUDA_INCLUDE_", "", "g")
-  let gatename_5 = substitute(gatename_4, "TEST_CUDA_INCLUDE_", "", "g")
-  let gatename_6 = substitute(gatename_5, "BENCH_CUDA_INCLUDE_", "", "g")
-  let gatename_7 = substitute(gatename_6, "SRC_HIP_INCLUDE_", "", "g")
-  let gatename_8 = substitute(gatename_7, "TEST_HIP_INCLUDE_", "", "g")
-  let gatename_9 = substitute(gatename_8, "BENCH_HIP_INCLUDE_", "", "g")
-  let gatename_10 = substitute(gatename_9, "LABS_ETERNAL_CPP_INCLUDE_", "", "g")
+  let gatename_1 = substitute(gatename_0,  "^SRC_CPP_INCLUDE_", "", "g")
+  let gatename_2 = substitute(gatename_1,  "^TEST_COMMON_CPP_INCLUDE_", "", "g")
+  let gatename_3 = substitute(gatename_2,  "^BENCH_COMMON_CPP_INCLUDE_", "", "g")
+  let gatename_4 = substitute(gatename_3,  "^SRC_CUDA_INCLUDE_", "", "g")
+  let gatename_5 = substitute(gatename_4,  "^TEST_COMMON_CUDA_INCLUDE_", "", "g")
+  let gatename_6 = substitute(gatename_5,  "^BENCH_COMMON_CUDA_INCLUDE_", "", "g")
+  let gatename_7 = substitute(gatename_6,  "^SRC_HIP_INCLUDE_", "", "g")
+  let gatename_8 = substitute(gatename_7,  "^TEST_COMMON_HIP_INCLUDE_", "", "g")
+  let gatename_9 = substitute(gatename_8,  "^BENCH_COMMON_HIP_INCLUDE_", "", "g")
+  let gatename_10 = substitute(gatename_9, "^LAB_EXEC23_SRC_CPP_INCLUDE_", "", "g")
   let gatename = gatename_10
   execute "normal! o#ifndef " . gatename
   execute "normal! o#define " . gatename
@@ -129,8 +129,12 @@ autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
 
 augroup filetypedetect
-    au BufRead,BufNewFile *.jnum set filetype=json
-    au BufRead,BufNewFile *.cuhpp set filetype=cuda
-    au BufRead,BufNewFile *.cuh set filetype=cuda
+  au BufRead,BufNewFile *.jnum set filetype=json
+  au BufRead,BufNewFile *.cuhpp set filetype=cuda
+  au BufRead,BufNewFile *.cuh set filetype=cuda
 augroup END
+
+
+let g:formatters_cuda = ['clangformat']
+
 " REUSE-IgnoreEnd