aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkatherine <ageha@airen-no-jikken.icu>2021-07-26 21:25:26 -0700
committerkatherine <ageha@airen-no-jikken.icu>2021-07-26 21:25:26 -0700
commit2680e47ecdcc8eb30a52eb330c4312df6e9ab4f7 (patch)
tree58e712221d5e7caa37172421b6227c8402da8c32
parent37752e3df02e112b8bd2243e1573f01ba3a7092e (diff)
downloaddotfiles-2680e47ecdcc8eb30a52eb330c4312df6e9ab4f7.tar.gz
vim vundle -> plug
-rw-r--r--.vimrc75
1 files changed, 38 insertions, 37 deletions
diff --git a/.vimrc b/.vimrc
index 78ccaeb..4db2b7c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,50 +6,48 @@ set nocompatible
-""""""""""""
-" VUNDLE "
-""""""""""""
-
-exec 'set rtp+=' . split(&rtp, ',')[0] . '/bundle/Vundle.vim'
-call vundle#begin()
+"""""""""""""
+" PLUGINS "
+"""""""""""""
-Plugin 'gmarik/Vundle.vim'
+call plug#begin('~/.vim/plugged')
"FILETYPES
-Plugin 'vim-crystal/vim-crystal'
-Plugin 'elixir-lang/vim-elixir'
-Plugin 'https://git.airen-no-jikken.icu/ageha/every.vim.git'
-Plugin 'plasticboy/vim-markdown'
-Plugin 'https://git.airen-no-jikken.icu/ageha/mips.vim.git'
-Plugin 'rust-lang/rust.vim'
-Plugin 'cakebaker/scss-syntax.vim'
-Plugin 'cespare/vim-toml'
+Plug 'vim-crystal/vim-crystal'
+Plug 'elixir-lang/vim-elixir'
+Plug 'https://git.airen-no-jikken.icu/ageha/every.vim.git'
+Plug 'leanprover/lean.vim'
+Plug 'plasticboy/vim-markdown'
+Plug 'https://git.airen-no-jikken.icu/ageha/mips.vim.git'
+Plug 'rust-lang/rust.vim'
+Plug 'cakebaker/scss-syntax.vim'
+Plug 'cespare/vim-toml'
"FUNCTIONALITY
-Plugin 'junegunn/vim-easy-align'
+Plug 'junegunn/vim-easy-align'
-Plugin 'xolox/vim-misc'
-Plugin 'https://git.airen-no-jikken.icu/ageha/vim-easytags.git'
+Plug 'xolox/vim-misc'
+Plug 'https://git.airen-no-jikken.icu/ageha/vim-easytags.git'
-Plugin 'tommcdo/vim-exchange'
+Plug 'tommcdo/vim-exchange'
-Plugin 'lilydjwg/fcitx.vim'
+Plug 'lilydjwg/fcitx.vim', { 'branch': 'fcitx4' }
-Plugin 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter'
-Plugin 'junegunn/goyo.vim'
+Plug 'junegunn/goyo.vim'
-Plugin 'sjl/gundo.vim'
+Plug 'sjl/gundo.vim'
-Plugin 'itchyny/lightline.vim'
+Plug 'itchyny/lightline.vim'
-Plugin 'dhruvasagar/vim-table-mode'
+Plug 'dhruvasagar/vim-table-mode'
-Plugin 'tomtom/tcomment_vim'
+Plug 'tomtom/tcomment_vim'
-Plugin 'SirVer/ultisnips'
+Plug 'SirVer/ultisnips'
-call vundle#end()
+call plug#end()
@@ -282,6 +280,7 @@ if has('autocmd')
au FileType elixir call <SID>settings_elixir()
au FileType javascript call <SID>settings_c()
au FileType tex call <SID>settings_tex()
+ au FileType go call <SID>settings_c()
au FileType haskell call <SID>settings_haskell()
au FileType html call <SID>settings_html()
au FileType xhtml call <SID>settings_html()
@@ -386,9 +385,11 @@ fun! s:settings_c()
setlocal softtabstop=4
setlocal cinoptions=:0,(s,m1,U1
"mappings
- "note: these mappings are in weird reverse order to avoid opening folds
+ nnoremap <buffer> -_ O//<Space>
nnoremap <buffer> -- O<Space>*/<Esc>hhi/*<Space>
+ "note: weird reverse order to avoid opening folds
inoremap <buffer> {<CR> }<Esc>i{<CR><Esc>O
+ inoremap <buffer> (<CR> )<Esc>i(<CR><Esc>O
endfun
fun! s:settings_coffee()
@@ -421,14 +422,6 @@ fun! s:settings_elixir()
inoremap <buffer> do<CR> end<Esc>hhido<CR><Esc>O
endfun
-fun! s:settings_ia64()
- "settings
- setlocal foldmethod=syntax
- "mappings
- nnoremap <buffer> -- A<Space>*/<Esc>hhi<Tab>/*<Space>
- nnoremap <buffer> -_ O<Space>*/<Esc>hhi/*<Space>
-endfun
-
fun! s:settings_haskell()
"settings
setlocal shiftwidth=4
@@ -449,6 +442,14 @@ fun! s:settings_html()
nnoremap <buffer> -- O<Space>--><Esc>3hi<!--<Space>
endfun
+fun! s:settings_ia64()
+ "settings
+ setlocal foldmethod=syntax
+ "mappings
+ nnoremap <buffer> -- A<Space>*/<Esc>hhi<Tab>/*<Space>
+ nnoremap <buffer> -_ O<Space>*/<Esc>hhi/*<Space>
+endfun
+
fun! s:settings_markdown()
"settings
setlocal shiftwidth=4