nvim/colors/dotfiles.vim

@@ -419,9 +419,3 @@
   hi! link zshFunction Function
   hi! link zshVariable Variable
 " }}}
-
-" Assembly {{{
-  hi! def link riscvRegister    Variable
-  hi! def link riscvCSRegister  Special
-  hi! def link riscvLabel       Function
-" }}}

nvim/dotfiles/plugins-list.vim

@@ -60,7 +60,6 @@
   Plug 'sheerun/vim-polyglot'
   Plug 'chikamichi/mediawiki.vim'
   Plug 'ron-rs/ron.vim'
-  Plug 'kylelaker/riscv.vim'
   if g:vim_ide
     Plug 'neoclide/coc.nvim', { 'branch': 'release' }
     Plug 'dag/vim2hs'

nvim/plugin/editing.vim

@@ -272,11 +272,9 @@ set commentstring=//%s
   " Make an alias for the comment text object
   omap <silent> gc ac
 
+  let g:tcomment#ignore_comment_def = ['asm']
   let g:tcomment#commentstring_c = '// %s'
 
-  call tcomment#type#Define('asm',   '# %s')
-  call tcomment#type#Define('riscv', '# %s')
-
 " }}}