diff --git a/ctags/.ctags b/ctags/.ctags deleted file mode 100644 index c1189edb..00000000 --- a/ctags/.ctags +++ /dev/null @@ -1,25 +0,0 @@ ---langdef=Elixir ---langmap=Elixir:.ex.exs ---regex-Elixir=/^[ \t]*def(p?)[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\2/f,functions,functions (def ...)/ ---regex-Elixir=/^[ \t]*defcallback[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\1/c,callbacks,callbacks (defcallback ...)/ ---regex-Elixir=/^[ \t]*defdelegate[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\1/d,delegates,delegates (defdelegate ...)/ ---regex-Elixir=/^[ \t]*defexception[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/e,exceptions,exceptions (defexception ...)/ ---regex-Elixir=/^[ \t]*defimpl[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/i,implementations,implementations (defimpl ...)/ ---regex-Elixir=/^[ \t]*defmacro(p?)[ \t]+([a-z_][a-zA-Z0-9_?!]*)\(/\2/a,macros,macros (defmacro ...)/ ---regex-Elixir=/^[ \t]*defmacro(p?)[ \t]+([a-zA-Z0-9_?!]+)?[ \t]+([^ \tA-Za-z0-9_]+)[ \t]*[a-zA-Z0-9_!?!]/\3/o,operators,operators (e.g. "defmacro a <<< b")/ ---regex-Elixir=/^[ \t]*defmodule[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/m,modules,modules (defmodule ...)/ ---regex-Elixir=/^[ \t]*defprotocol[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/p,protocols,protocols (defprotocol...)/ ---regex-Elixir=/^[ \t]*Record\.defrecord[ \t]+:([a-zA-Z0-9_]+)/\1/r,records,records (defrecord...)/ ---regex-Elixir=/^[ \t]*test[ \t]+\"([a-z_][a-zA-Z0-9_?! ]*)\"*/\1/t,tests,tests (test ...)/ - ---langdef=Rust ---langmap=Rust:.rs ---regex-Rust=/^[ \t]*(#\[[^\]]\][ \t]*)*(pub[ \t]+)?(extern[ \t]+)?("[^"]+"[ \t]+)?(unsafe[ \t]+)?fn[ \t]+([a-zA-Z0-9_]+)/\6/f,functions,function definitions/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?type[ \t]+([a-zA-Z0-9_]+)/\2/T,types,type definitions/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?enum[ \t]+([a-zA-Z0-9_]+)/\2/g,enum,enumeration names/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?struct[ \t]+([a-zA-Z0-9_]+)/\2/s,structure names/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?mod[ \t]+([a-zA-Z0-9_]+)/\2/m,modules,module names/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?(static|const)[ \t]+(mut[ \t]+)?([a-zA-Z0-9_]+)/\4/c,consts,static constants/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?(unsafe[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\3/t,traits,traits/ ---regex-Rust=/^[ \t]*(pub[ \t]+)?(unsafe[ \t]+)?impl([ \t\n]*<[^>]*>)?[ \t]+(([a-zA-Z0-9_:]+)[ \t]*(<[^>]*>)?[ \t]+(for)[ \t]+)?([a-zA-Z0-9_]+)/\5 \7 \8/i,impls,trait implementations/ ---regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/d,macros,macro definitions/ diff --git a/vim/.vim/ctags.vim b/vim/.vim/ctags.vim deleted file mode 100644 index a84114a6..00000000 --- a/vim/.vim/ctags.vim +++ /dev/null @@ -1,55 +0,0 @@ -" Add elixir support to ctags -let g:tagbar_type_elixir = { - \ 'ctagstype' : 'elixir', - \ 'kinds' : [ - \ 'f:functions', - \ 'functions:functions', - \ 'c:callbacks', - \ 'd:delegates', - \ 'e:exceptions', - \ 'i:implementations', - \ 'a:macros', - \ 'o:operators', - \ 'm:modules', - \ 'p:protocols', - \ 'r:records', - \ 't:tests' - \ ] -\ } - -" Add rust support to ctags -let g:tagbar_type_rust = { - \ 'ctagstype' : 'rust', - \ 'kinds' : [ - \'T:types,type definitions', - \'f:functions,function definitions', - \'g:enum,enumeration names', - \'s:structure names', - \'m:modules,module names', - \'c:consts,static constants', - \'t:traits', - \'i:impls,trait implementations', - \] -\} - -" Add crystal support to ctags -let g:tagbar_type_crystal = { - \'ctagstype': 'crystal', - \'ctagsbin': 'crystalctags', - \'kinds': [ - \'c:classes', - \'m:modules', - \'d:defs', - \'x:macros', - \'l:libs', - \'s:sruct or unions', - \'f:fun' - \], - \'sro': '.', - \'kind2scope': { - \'c': 'namespace', - \'m': 'namespace', - \'l': 'namespace', - \'s': 'namespace' - \}, -\} diff --git a/vim/.vim/keybindings.vim b/vim/.vim/keybindings.vim index e804f8bc..88efbe80 100644 --- a/vim/.vim/keybindings.vim +++ b/vim/.vim/keybindings.vim @@ -16,7 +16,7 @@ nnoremap p " ================== Middle row "nnoremap a :NERDTreeToggle nnoremap a :Files -nnoremap d :TagbarToggle +"nnoremap d :TagbarToggle nnoremap f :Files nnoremap g :set hlsearch! " Easily jump between lines in all open files diff --git a/vim/.vim/plugins.vim b/vim/.vim/plugins.vim index 38a2e002..9ae321b3 100644 --- a/vim/.vim/plugins.vim +++ b/vim/.vim/plugins.vim @@ -20,9 +20,6 @@ call plug#begin('~/.vim/plugged') " Use vim-plug as our package manager of Plug 'rhysd/vim-crystal' " Add support for the crystal language Plug 'scrooloose/nerdtree' " Add a file browser to vim - Plug 'majutsushi/tagbar' " Add tagbar to show functions on the side - Plug 'lvht/tagbar-markdown' " Add support for markdown to tagbar - Plug 'rust-lang/rust.vim' " Add rust support to vim Plug 'jamessan/vim-gnupg' " Easily use GPG encryption inside of vim diff --git a/vim/.vimrc b/vim/.vimrc index 2ce312ab..53defa86 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -8,7 +8,6 @@ endif source ~/.vim/plugins.vim source ~/.vim/config.vim source ~/.vim/colors.vim -source ~/.vim/ctags.vim source ~/.vim/keybindings.vim " =================================== Plugin-Specific ===================================