fix small issues
This commit is contained in:
@@ -1,11 +1,6 @@
|
|||||||
" Modeline and Notes {
|
" Modeline and Notes {
|
||||||
" vim: set sw=4 ts=4 sts=4 et tw=78 foldmarker={,} nofoldenable foldmethod=marker spell:
|
" vim: set sw=4 ts=4 sts=4 et tw=78 foldmarker={,} nofoldenable foldmethod=marker spell:
|
||||||
"
|
|
||||||
" This is Nachuan's personal vim config fork from
|
|
||||||
" spf13/spf13-vim (http://spf13.com)
|
|
||||||
|
|
||||||
" Environment {
|
" Environment {
|
||||||
|
|
||||||
" The default leader is '\', but many people prefer ',' as it's in a standard
|
" The default leader is '\', but many people prefer ',' as it's in a standard
|
||||||
let mapleader = ','
|
let mapleader = ','
|
||||||
let maplocalleader = '_'
|
let maplocalleader = '_'
|
||||||
|
|||||||
+5
-3
@@ -1,8 +1,10 @@
|
|||||||
|
|
||||||
" Environment {
|
" Environment {
|
||||||
|
|
||||||
" Basics {
|
" Basics {
|
||||||
set nocompatible " Must be first line
|
set nocompatible " Must be first line
|
||||||
|
|
||||||
|
" So we don't need to put it inside autoload
|
||||||
|
source ~/.dotfiles/autoload/plug.vim
|
||||||
" }
|
" }
|
||||||
" }
|
" }
|
||||||
|
|
||||||
@@ -81,7 +83,7 @@
|
|||||||
if isdirectory(expand(plugin_dir . "/nerdtree"))
|
if isdirectory(expand(plugin_dir . "/nerdtree"))
|
||||||
let g:NERDShutUp=1
|
let g:NERDShutUp=1
|
||||||
nnoremap <C-e> :NERDTreeToggle<CR>
|
nnoremap <C-e> :NERDTreeToggle<CR>
|
||||||
nmap <leader>nt :NERDTreeFind<CR>
|
nmap <leader>e :NERDTreeFind<CR>
|
||||||
|
|
||||||
let NERDTreeShowBookmarks=1
|
let NERDTreeShowBookmarks=1
|
||||||
"let NERDTreeIgnore=['\.py[cd]$', '\~$', '\.swo$', '\.swp$', '^\.git$', '^\.hg$', '^\.svn$', '\.bzr$']
|
"let NERDTreeIgnore=['\.py[cd]$', '\~$', '\.swo$', '\.swp$', '^\.git$', '^\.hg$', '^\.svn$', '\.bzr$']
|
||||||
|
|||||||
+4
-8
@@ -97,16 +97,12 @@ sync_repo() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_vundle() {
|
setup_vimplug() {
|
||||||
|
|
||||||
# setup for vim
|
# setup for vim
|
||||||
curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
|
curl -fLo $APP_PATH/autoload/plug.vim --create-dirs \
|
||||||
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim > /dev/null 2>&1
|
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim > /dev/null 2>&1
|
||||||
|
|
||||||
# setup for neovim
|
|
||||||
#sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
|
|
||||||
# https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
|
||||||
|
|
||||||
local system_shell="$SHELL"
|
local system_shell="$SHELL"
|
||||||
export SHELL='/bin/sh'
|
export SHELL='/bin/sh'
|
||||||
|
|
||||||
@@ -117,7 +113,7 @@ setup_vundle() {
|
|||||||
"+qall"
|
"+qall"
|
||||||
|
|
||||||
export SHELL="$system_shell"
|
export SHELL="$system_shell"
|
||||||
success "Now updating/installing plugins using Vundle"
|
success "Now updating/installing plugins using vim-plug"
|
||||||
}
|
}
|
||||||
|
|
||||||
set_up_nvim() {
|
set_up_nvim() {
|
||||||
@@ -165,7 +161,7 @@ set_up_vim() {
|
|||||||
|
|
||||||
success "Setting up vim symlinks."
|
success "Setting up vim symlinks."
|
||||||
|
|
||||||
setup_vundle
|
setup_vimplug
|
||||||
set_up_nvim
|
set_up_nvim
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user