diff options
author | Ben Harris <ben@tilde.team> | 2020-02-04 20:22:43 -0500 |
---|---|---|
committer | Ben Harris <ben@tilde.team> | 2020-02-04 20:22:43 -0500 |
commit | 19e05bf2c28017fef6fd4f0de10b3bd3fafebd8e (patch) | |
tree | e40802e9c26b828a41b387d47adf121c9835ac6c /vim | |
parent | 9769129e8be86784102a1470d61ecfbcddd10344 (diff) |
add some vim
Diffstat (limited to 'vim')
-rw-r--r-- | vim/.vimrc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vim/.vimrc b/vim/.vimrc index b4023f7..6c95dfc 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -8,9 +8,10 @@ filetype plugin indent on syntax enable colo ron -set guifont="Input" +set guifont="JetBrains Mono" +set noerrorbells visualbell t_vb= +set mouse+=a -set spell set autoindent set backspace=indent,eol,start set complete-=i @@ -35,9 +36,12 @@ set undodir=~/.vim/undodir set nrformats-=octal +set ignorecase +set smartcase set incsearch set number +set relativenumber set numberwidth=4 set updatetime=100 set laststatus=2 @@ -56,6 +60,8 @@ set tabpagemax=50 noremap 0 ^ noremap ^ 0 +nmap Q <Nop> " 'Q' in normal mode enters Ex mode. you almost never want this + " shortcuts for 3way merge map <Leader>1 :diffget LOCAL<CR> map <Leader>2 :diffget BASE<CR> |