From 5bef1b14caaf0a48555bb433872b07626bc7f3ac Mon Sep 17 00:00:00 2001 From: Alexander Karle Date: Tue, 23 Jan 2018 18:40:31 -0500 Subject: [PATCH] Adding ftplugins, moving vim scripts to vim/ --- keys.vim | 17 ----------------- plugins.vim | 39 --------------------------------------- pluginsettings.vim | 20 -------------------- setup.sh | 19 ++++++++++++++----- theme.vim | 23 ----------------------- vim/ftplugin/tex.vim | 8 ++++++++ vim/keys.vim | 17 +++++++++++++++++ vim/plugins.vim | 39 +++++++++++++++++++++++++++++++++++++++ vim/pluginsettings.vim | 20 ++++++++++++++++++++ vim/theme.vim | 23 +++++++++++++++++++++++ vim/vimrc | 45 +++++++++++++++++++++++++++++++++++++++++++++ vimrc | 45 --------------------------------------------- 12 files changed, 166 insertions(+), 149 deletions(-) delete mode 100644 keys.vim delete mode 100644 plugins.vim delete mode 100644 pluginsettings.vim delete mode 100644 theme.vim create mode 100644 vim/ftplugin/tex.vim create mode 100644 vim/keys.vim create mode 100644 vim/plugins.vim create mode 100644 vim/pluginsettings.vim create mode 100644 vim/theme.vim create mode 100644 vim/vimrc delete mode 100644 vimrc diff --git a/keys.vim b/keys.vim deleted file mode 100644 index 918cb03..0000000 --- a/keys.vim +++ /dev/null @@ -1,17 +0,0 @@ -"================================ -" KEY MAPPINGS -"================================ -"Map 'jk' to ESC (its wonderful) -inoremap jk - -"Map ctrl-i/j/k/h to switch between splits -nnoremap j -nnoremap k -nnoremap h -nnoremap l - -"Map ctrl-p to fuzzy finder -nnoremap :GFiles - -" HTML autoclose tag -iabbrev diff --git a/plugins.vim b/plugins.vim deleted file mode 100644 index c79032b..0000000 --- a/plugins.vim +++ /dev/null @@ -1,39 +0,0 @@ -" Plugs will be downloaded under the specified directory. -call plug#begin('~/.vim/bundle') - -" Colorscheme -Plug 'rakr/vim-one' - -" Plug nerdtree for tree package explorer -Plug 'scrooloose/nerdtree' - -" Airline = status bar for vime -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' - -" Fugitive = git for vim -Plug 'tpope/vim-fugitive' - -" NERD Commenter = for comments -Plug 'scrooloose/nerdcommenter' - -" Git Gutter -Plug 'airblade/vim-gitgutter' - -" Syntastic for syntax checks -Plug 'vim-syntastic/syntastic' - -" todo task plugin -Plug 'irrationalistic/vim-tasks' - -" Simple latex tools -Plug 'lervag/vimtex' - -" fzf -- fuzzy finder -Plug 'junegunn/fzf.vim' - -" surround for parens and such -Plug 'tpope/vim-surround' - -" List ends here. Plugins become visible to Vim after this call. -call plug#end() diff --git a/pluginsettings.vim b/pluginsettings.vim deleted file mode 100644 index e42e0ea..0000000 --- a/pluginsettings.vim +++ /dev/null @@ -1,20 +0,0 @@ -" Syntastic Default Settings -"set statusline+=%#warningmsg# -"set statusline+=%{SyntasticStatuslineFlag()} -"set statusline+=%* - -"let g:syntastic_always_populate_loc_list = 1 -"let g:syntastic_auto_loc_list = 1 -"let g:syntastic_check_on_open = 0 -"let g:syntastic_check_on_wq = 0 - -"let g:syntastic_python_checkers = ['flake8'] -"let g:syntastic_python_flake8_post_args='--ignore=E116' - -" vimtex stuff -" Set pdf viewer to sim -let g:vimtex_view_method='skim' - -"for airline status bar -- need to include font -let g:airline_powerline_fonts = 1 -let g:airline_theme = 'onedark' diff --git a/setup.sh b/setup.sh index d31c78c..7256efa 100644 --- a/setup.sh +++ b/setup.sh @@ -3,13 +3,22 @@ # Set up vimrc VIMHOME=~/.vim +GITVIM=~/git/dotfiles/vim if [ ! -d $VIMHOME ]; then echo "Making ~/.vim" mkdir $VIMHOME fi -ln -s ~/git/dotfiles/vimrc ~/.vimrc -ln -s ~/git/dotfiles/theme.vim ~/.vim/theme.vim -ln -s ~/git/dotfiles/plugins.vim ~/.vim/plugins.vim -ln -s ~/git/dotfiles/pluginsettings.vim ~/.vim/pluginsettings.vim -ln -s ~/git/dotfiles/keys.vim ~/.vim/keys.vim +ln -s $GITVIM/vimrc ~/.vimrc +ln -s $GITVIM/theme.vim $VIMHOME/theme.vim +ln -s $GITVIM/plugins.vim $VIMHOME/plugins.vim +ln -s $GITVIM/pluginsettings.vim $VIMHOME/pluginsettings.vim +ln -s $GITVIM/keys.vim $VIMHOME/keys.vim + +# filetype plugins +FTPLUGDIR=$VIMHOME/ftplugin +if [ ! -d $FTPLUGDIR ]; then + mkdir $FTPLUGDIR +fi + +ln -s $GITVIM/ftplugin/tex.vim $FTPLUGDIR/tex.vim diff --git a/theme.vim b/theme.vim deleted file mode 100644 index 618e65e..0000000 --- a/theme.vim +++ /dev/null @@ -1,23 +0,0 @@ -"================================ -" THEME -"================================ -"Syntax highlighting on -syntax on - -" COLORSCHEME -" use iterm profiles to determin background -if $ITERM_PROFILE=='light_background' - set background=light -else - set background=dark -endif - -" load colorscheme if plugins installed -if filereadable(expand("~/.vim/bundle/vim-one/colors/one.vim")) - colorscheme one -endif - -" if can use truecolor, do -if (has("termguicolors")) - set termguicolors -endif diff --git a/vim/ftplugin/tex.vim b/vim/ftplugin/tex.vim new file mode 100644 index 0000000..b07436a --- /dev/null +++ b/vim/ftplugin/tex.vim @@ -0,0 +1,8 @@ +" ignore the wrapped lines +noremap k gk +noremap j gj +noremap 0 g0 +noremap $ g$ + +" spell check! +setlocal spell spelllang=en_us diff --git a/vim/keys.vim b/vim/keys.vim new file mode 100644 index 0000000..918cb03 --- /dev/null +++ b/vim/keys.vim @@ -0,0 +1,17 @@ +"================================ +" KEY MAPPINGS +"================================ +"Map 'jk' to ESC (its wonderful) +inoremap jk + +"Map ctrl-i/j/k/h to switch between splits +nnoremap j +nnoremap k +nnoremap h +nnoremap l + +"Map ctrl-p to fuzzy finder +nnoremap :GFiles + +" HTML autoclose tag +iabbrev diff --git a/vim/plugins.vim b/vim/plugins.vim new file mode 100644 index 0000000..c79032b --- /dev/null +++ b/vim/plugins.vim @@ -0,0 +1,39 @@ +" Plugs will be downloaded under the specified directory. +call plug#begin('~/.vim/bundle') + +" Colorscheme +Plug 'rakr/vim-one' + +" Plug nerdtree for tree package explorer +Plug 'scrooloose/nerdtree' + +" Airline = status bar for vime +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' + +" Fugitive = git for vim +Plug 'tpope/vim-fugitive' + +" NERD Commenter = for comments +Plug 'scrooloose/nerdcommenter' + +" Git Gutter +Plug 'airblade/vim-gitgutter' + +" Syntastic for syntax checks +Plug 'vim-syntastic/syntastic' + +" todo task plugin +Plug 'irrationalistic/vim-tasks' + +" Simple latex tools +Plug 'lervag/vimtex' + +" fzf -- fuzzy finder +Plug 'junegunn/fzf.vim' + +" surround for parens and such +Plug 'tpope/vim-surround' + +" List ends here. Plugins become visible to Vim after this call. +call plug#end() diff --git a/vim/pluginsettings.vim b/vim/pluginsettings.vim new file mode 100644 index 0000000..626e984 --- /dev/null +++ b/vim/pluginsettings.vim @@ -0,0 +1,20 @@ +" Syntastic Default Settings +set statusline+=%#warningmsg# +set statusline+=%{SyntasticStatuslineFlag()} +set statusline+=%* + +"let g:syntastic_always_populate_loc_list = 1 +"let g:syntastic_auto_loc_list = 1 +let g:syntastic_check_on_open = 0 +let g:syntastic_check_on_wq = 0 + +let g:syntastic_python_checkers = ['flake8'] +let g:syntastic_python_flake8_post_args='--ignore=E116' + +" vimtex stuff +" Set pdf viewer to sim +let g:vimtex_view_method='skim' + +"for airline status bar -- need to include font +let g:airline_powerline_fonts = 1 +let g:airline_theme = 'onedark' diff --git a/vim/theme.vim b/vim/theme.vim new file mode 100644 index 0000000..618e65e --- /dev/null +++ b/vim/theme.vim @@ -0,0 +1,23 @@ +"================================ +" THEME +"================================ +"Syntax highlighting on +syntax on + +" COLORSCHEME +" use iterm profiles to determin background +if $ITERM_PROFILE=='light_background' + set background=light +else + set background=dark +endif + +" load colorscheme if plugins installed +if filereadable(expand("~/.vim/bundle/vim-one/colors/one.vim")) + colorscheme one +endif + +" if can use truecolor, do +if (has("termguicolors")) + set termguicolors +endif diff --git a/vim/vimrc b/vim/vimrc new file mode 100644 index 0000000..a4d368b --- /dev/null +++ b/vim/vimrc @@ -0,0 +1,45 @@ +"============================= +"tab and line number stuff +"============================= +"line numbers on +set number +set relativenumber +"tab is really spaces +set expandtab +"4 spaces per tab +set tabstop=4 +set softtabstop=4 +set shiftwidth=4 +"set smartindent --> temp. turned off due to +"python # bug... theres a workaround somewhere +set autoindent +set smarttab + +"search highlighting +set hlsearch + +set rtp+=/usr/local/opt/fzf +filetype plugin indent on + + +" OTHER +" Link clipboard to mac +set clipboard=unnamed + +"For security (modeline vulnerability) +set modelines=0 + +" Encoding +set encoding=utf-8 + +" Show whitespace with 'set: list' (disable: set: nolist) +set listchars=space:·,tab:>–,trail:~,eol:¬ + +" Source helper files +" Only load plugins if vim-plug installed! +if filereadable(expand("~/.vim/autoload/plug.vim")) + source ~/.vim/plugins.vim + source ~/.vim/pluginsettings.vim +endif +source ~/.vim/theme.vim +source ~/.vim/keys.vim diff --git a/vimrc b/vimrc deleted file mode 100644 index a4d368b..0000000 --- a/vimrc +++ /dev/null @@ -1,45 +0,0 @@ -"============================= -"tab and line number stuff -"============================= -"line numbers on -set number -set relativenumber -"tab is really spaces -set expandtab -"4 spaces per tab -set tabstop=4 -set softtabstop=4 -set shiftwidth=4 -"set smartindent --> temp. turned off due to -"python # bug... theres a workaround somewhere -set autoindent -set smarttab - -"search highlighting -set hlsearch - -set rtp+=/usr/local/opt/fzf -filetype plugin indent on - - -" OTHER -" Link clipboard to mac -set clipboard=unnamed - -"For security (modeline vulnerability) -set modelines=0 - -" Encoding -set encoding=utf-8 - -" Show whitespace with 'set: list' (disable: set: nolist) -set listchars=space:·,tab:>–,trail:~,eol:¬ - -" Source helper files -" Only load plugins if vim-plug installed! -if filereadable(expand("~/.vim/autoload/plug.vim")) - source ~/.vim/plugins.vim - source ~/.vim/pluginsettings.vim -endif -source ~/.vim/theme.vim -source ~/.vim/keys.vim -- libgit2 0.28.4