UltiSnips/c.snippets

@@ -161,7 +161,3 @@ endsnippet
 snippet debug "Debug fprintf"
 fprintf(stderr, "%s: %d: %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__);
 endsnippet
-
-snippet bs "bool string"
-${1:value} ? "true" : "false"
-endsnippet

UltiSnips/c_doxygen.snippets

@@ -1,9 +1,9 @@
 snippet "/// p" "Doxygen parameter block"
-/// @param${1/.+/[/}$1${1/.+/]/} ${2:name} $0
+/// @param${1/.+/[/}$1${1/.+/]/} $0
 endsnippet
 
 snippet "/// t" "Doxygen template parameter block"
-/// @tparam ${1:name} $0
+/// @tparam $0
 endsnippet
 
 snippet "/// b" "Doxygen brief block"
@@ -19,10 +19,6 @@ snippet "/// r" "Doxygen return block"
 /// @return $0
 endsnippet
 
-snippet "/// rv" "Doxygen retval block"
-/// @retval \`${1:name}\` $0
-endsnippet
-
 snippet "/// n" "Doxygen note block"
 /// @note $0
 endsnippet

UltiSnips/cpp.snippets

@@ -88,19 +88,3 @@ endsnippet
 snippet std::printf "std::printf ..."
 std::printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet
-
-snippet printf_sv "printf for std::string_view"
-printf("$1: %.*s\n", static_cast<int>(${1:view}.size()), $1.data());$0
-endsnippet
-
-snippet externc "extern C block"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-$0
-
-#ifdef __cplusplus
-}
-#endif
-endsnippet

plugin/autocmds.vim

@@ -1,15 +1,12 @@
 augroup benieAugroup
-  " Clear all autocmd's in this group
   autocmd!
-
+  au BufEnter *.c set relativenumber
+  au BufLeave *.c set norelativenumber
+  au BufEnter *.cpp set relativenumber
+  au BufLeave *.cpp set norelativenumber
   " Reopening a file at last curson position
   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
           \ | exe "normal! g'\"" | endif
-
-  " TODO: Move this to a plugin & rename to .enter .exit
   au BufRead,BufNewFile .env set filetype=zsh
   au BufRead,BufNewFile .out set filetype=zsh
-
-  " Highlight conflict markers in any filefile
-  au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
 augroup END

syntax/groovy.vim

@@ -39,7 +39,7 @@ syn match groovyNumber "\(\<\d\(\d\|_\d\)*\.\(\d\(\d\|_\d\)*\)\=\|\.\d\(\d\|_\d\
 syn match groovyNumber "\<\d\(\d\|_\d\)*[eE][-+]\=\d\(\d\|_\d\)*[fFdD]\=\>"
 syn match groovyNumber "\<\d\(\d\|_\d\)*\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\>"
 syn region groovyComment start='\/\*' end='\*\/' fold
-syn match groovyComment '\/\/.*$'
+syn match groovyComment '\s*\/\/.*$'
 syn match groovyDelimiter '[()\[\]]'
 syn region groovyBlock matchgroup=groovyDelimiter start='{' end='}' transparent fold
 syn match groovyStructure '\w\+\ze\s*{'
@@ -50,7 +50,7 @@ syn region groovyString start=+'+ end=+'+ oneline contains=groovyIdentifier
 syn region groovyString start=+'''+ end=+'''+ fold contains=groovyIdentifier
 
 syn match groovyKeywordParam "\w\+\ze\s*=\s*"
-syn region groovyFunctionParams matchgroup=groovyDelimiter start='(' end=')' contains=groovyComment,groovyString,groovyIdentifier,groovyNumber,groovyBoolean,groovyKeywordParam transparent
+syn region groovyFunctionParams matchgroup=groovyDelimiter start='(' end=')' contains=groovyString,groovyIdentifier,groovyNumber,groovyBoolean,groovyKeywordParam transparent
 
 syn cluster groovySyntax contains=groovyAssert,groovyBlock,groovyBoolean,groovyBranch,groovyClassDecl,groovyComment,groovyConditional,groovyConstant,groovyDelimiter,groovyError,groovyExceptions,groovyExternal,groovyFunction,groovyIdentifier,groovyMethodDecl,groovyNumber,groovyOperator,groovyRepeat,groovyScopeDecl,groovyStatement,groovyStorageClass,groovyString,groovyStructure,groovyType,groovyTypedef,groovyUserLabelRef
 

vimrc

@@ -127,10 +127,9 @@ if !platform#is_windows()
   Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all --no-update-rc'}
   Plug 'junegunn/fzf.vim'
   let g:fzf_action = {
-  \   'ctrl-t': 'tab split',
-  \   'ctrl-s': 'split',
-  \   'ctrl-v': 'vsplit'
-  \ }
+    \ 'ctrl-t': 'tab split',
+    \ 'ctrl-s': 'split',
+    \ 'ctrl-v': 'vsplit' }
 endif
 
 Plug 'kbenzie/note.vim'